--- alpine-2.00+dfsg.orig/debian/pilot.manpages +++ alpine-2.00+dfsg/debian/pilot.manpages @@ -0,0 +1 @@ +doc/pilot.1 --- alpine-2.00+dfsg.orig/debian/alpine.manpages +++ alpine-2.00+dfsg/debian/alpine.manpages @@ -0,0 +1,2 @@ +doc/alpine.1 +doc/rp*.1 --- alpine-2.00+dfsg.orig/debian/alpine-pico.postinst +++ alpine-2.00+dfsg/debian/alpine-pico.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + update-alternatives --install /usr/bin/pico pico /usr/bin/pico.alpine 40 \ + --slave /usr/share/man/man1/pico.1.gz pico.1.gz \ + /usr/share/man/man1/pico.alpine.1.gz +fi + +#DEBHELPER# + --- alpine-2.00+dfsg.orig/debian/control +++ alpine-2.00+dfsg/debian/control @@ -0,0 +1,67 @@ +Source: alpine +Section: mail +Priority: optional +Maintainer: Asheesh Laroia +Uploaders: Andreas Tille +Build-Depends: debhelper (>= 5), libldap2-dev, libpam0g-dev, libncurses-dev, + libssl-dev, autotools-dev, ca-certificates, automake, autoconf, libtool, libkrb5-dev, + quilt, cdbs, aspell +Standards-Version: 3.8.0 +DM-Upload-Allowed: yes +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/alpine/trunk/?rev=0&sc=0 +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/alpine/trunk/ +Homepage: http://www.washington.edu/alpine/ + +Package: alpine +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: aspell, mail-transport-agent | exim4 +Description: Text-based email client, friendly for novices but powerful + Alpine is an upgrade of the well-known PINE email client. Its name derives + from the use of the Apache License and its ties to PINE. + . + It features a full suite of support for mail protocols like IMAP and SMTP and + security protocols like TLS. It uses curses for its interface. + +Package: alpine-dbg +Architecture: any +Depends: alpine (= ${binary:Version}) | alpine-pico (= ${binary:Version}) | pilot (= ${binary:Version}) +Suggests: aspell +Section: debug +Priority: extra +Description: Text-based email client's debugging symbols + Alpine is an upgrade of the well-known PINE email client. Its name derives + from the use of the Apache License and its ties to PINE. + . + It features a full suite of support for mail protocols like IMAP and SMTP and + security protocols like TLS. It uses curses for its interface. + . + This build stores the debugging symbols to the alpine package. + +Package: alpine-pico +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Section: editors +Priority: extra +Description: Simple text editor from Alpine, a text-based email client + "pico" is a simple but powerful text editor. It was originally the pine + composer, the editor used by the pine email client for writing email messages. + . + It has gained popularity since its initial use in that context and is now used + as a stand-alone editor by many users. + . + It is similar to but less powerful than GNU Nano, an editor created with the + pico interface when the pico license was non-free. + +Package: pilot +Architecture: any +Section: utils +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple file browser from Alpine, a text-based email client + "pilot" is a simple file browser from Alpine. It is used in Alpine to + let the user select attachments. As with (Al)pine, commands are displayed + at the bottom of the screen, and context-sensitive help is provided. + . + As a stand-alone program, it is useful as a basic file browser, filling the + same utility as programs like the midnight commander. --- alpine-2.00+dfsg.orig/debian/alpine-pico.prerm +++ alpine-2.00+dfsg/debian/alpine-pico.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove pico /usr/bin/pico.alpine +fi + +#DEBHELPER# + --- alpine-2.00+dfsg.orig/debian/changelog +++ alpine-2.00+dfsg/debian/changelog @@ -0,0 +1,245 @@ +alpine (2.00+dfsg-6~bpo50+1) lenny-backports; urgency=low + + * Backport to stable. + + -- Micah Anderson Tue, 02 Feb 2010 14:56:17 -0500 + +alpine (2.00+dfsg-6) unstable; urgency=low + + * Add diversion for pico and remove conflict with nano. + (Closes: #415169) + * Build-depend on aspell. This makes it always build correctly with + spell-checking support. (LP: #340993) + * Change section of alpine-debug to "debug", fixing the override disparity. + + -- Asheesh Laroia Fri, 11 Dec 2009 15:49:07 -0500 + +alpine (2.00+dfsg-5) unstable; urgency=low + + * Remove memory leak from pico/composer.c. Thanks to George Danchev for + finding the issue and submitting a patch. (Closes: #534984) + + -- Asheesh Laroia Wed, 09 Dec 2009 09:38:50 -0500 + +alpine (2.00+dfsg-4) unstable; urgency=low + + * Changed debian/control to not use backslashes for line + continuations. Thanks to Cyril Brulebois (kibi)! (Closes: #535279). + + -- Asheesh Laroia Tue, 07 Jul 2009 14:30:09 -0400 + +alpine (2.00+dfsg-3) unstable; urgency=low + + * Add Barry deFreese's little patch to fix building on Debian GNU/Hurd. + (Closes: #532533) + + -- Asheesh Laroia Tue, 23 Jun 2009 11:15:38 -0400 + +alpine (2.00+dfsg-2) unstable; urgency=low + + * Update to package description: note that Alpine is no longer in + alpha. (Closes: #499640) + + -- Asheesh Laroia Tue, 23 Sep 2008 12:17:56 -0700 + +alpine (2.00+dfsg-1) unstable; urgency=low + + [ Andreas Tille ] + * New upstream version + * Use quilt to apply patches + * Standards-Version: 3.8.0 (no changes needed) + * Added Vcs fields for collab-maint svn at alioth + * Replaced explicit mentioning Apache license in copyright + by hint to /usr/share/common-licenses/Apache-2.0 and + added copyright of packaging stuff + * Use cdbs and debhelper files instead of moving files + manually in debian/rules + [ Asheesh Laroia ] + * Bumped version number to 2.00+dfsg + * Minimized alpine/Makefile.in patch + + -- Asheesh Laroia Sun, 14 Sep 2008 14:09:17 -0700 + +alpine (1.10+dfsg-4) unstable; urgency=low + + * Er, re-adding patch for kFreeBSD (which got included in upstream). + (Closes: #494314) + + -- Asheesh Laroia Mon, 11 Aug 2008 02:29:12 -0300 + +alpine (1.10+dfsg-3) unstable; urgency=low + + * Er, re-re-add patch to configure.ac for arm gnueabi (Closes: #471519) + + -- Asheesh Laroia Wed, 19 Mar 2008 12:03:02 -0700 + +alpine (1.10+dfsg-2) unstable; urgency=low + + * Re-add patch to configure.ac that fixes arm gnueabi (Closes: #471519) + + -- Asheesh Laroia Tue, 18 Mar 2008 11:00:12 -0700 + +alpine (1.10+dfsg-1) unstable; urgency=low + + * New upstream release. + * Removed configure.ac patch because upstream fixed krb5. + + -- Asheesh Laroia Mon, 17 Mar 2008 22:13:21 -0700 + +alpine (1.0+dfsg-4) unstable; urgency=low + + * Adding patch from upstream configure.ac to fix krb5; + thanks to Per Olofsson for the clean patch (Closes: #455359) + + -- Asheesh Laroia Fri, 15 Feb 2008 14:21:41 -0800 + +alpine (1.0+dfsg-3) unstable; urgency=low + + * Resolved serious conflict with uw-mailutil. (Closes: #460695) + + -- Asheesh Laroia Mon, 14 Jan 2008 12:12:50 -0800 + +alpine (1.0+dfsg-2) unstable; urgency=low + + * Link with libraries as needed (incomplete fix for #460327). + * Include mailutil binary also. (Closes: #459920) + * Don't enable debug by default. (Closes: #459661) + * Trying to fix krb5. + * Using /usr/bin/mlock instead of /usr/sbin/mlock. (Closes: #451490) + * Add patch to configure.ac that fixes arm-linux-gnueabi (Closes: #459830) + + -- Asheesh Laroia Sat, 05 Jan 2008 11:22:01 -0800 + +alpine (1.0+dfsg-1) unstable; urgency=low + + * New upstream release. (Closes: #457327) + * Migrate to new real Homepage field. + + -- Asheesh Laroia Fri, 04 Jan 2008 17:01:16 -0800 + +alpine (0.999999+dfsg-2) unstable; urgency=low + + * Add a build-depends on libkrb5-dev, but does not close bug #455359 + due to upstream autoconf problems + * Added a configure argument to set the MTA path (Closes: #427097) + * Properly added XS-DM-Upload-Allowed as per #453400 + + -- Asheesh Laroia Sat, 15 Dec 2007 01:20:21 -0800 + +alpine (0.999999+dfsg-1) unstable; urgency=low + + * New upstream release. + * Stop patching Makefiles and just pass an argument to configure (oops) + * Add DM-Upload-Allowed: yes to source section of control + + -- Asheesh Laroia Fri, 07 Dec 2007 10:39:13 -0800 + +alpine (0.99999+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Asheesh Laroia Sat, 10 Nov 2007 15:51:34 +0900 + +alpine (0.9999+dfsg-1) unstable; urgency=low + + * New upstream release + * alpine-dbg only requires alpine | alpine-pico | pilot now. + + -- Asheesh Laroia Fri, 07 Sep 2007 11:31:11 -0700 + +alpine (0.999+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Asheesh Laroia Fri, 29 Jun 2007 01:59:10 -0400 + +alpine (0.99+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Asheesh Laroia Thu, 03 May 2007 14:56:05 -0400 + +alpine (0.98+dfsg-1) unstable; urgency=low + + * Added a note to README.Debian about sending mail, and Suggests: + mail-transport-agent. (Closes: #414266) + * New upstream release. + + -- Asheesh Laroia Thu, 15 Mar 2007 14:57:22 -0400 + +alpine (0.83+dfsg-3) unstable; urgency=low + + * Adding -dbg package with debug symbols. + + -- Asheesh Laroia Wed, 14 Mar 2007 06:43:45 -0400 + +alpine (0.83+dfsg-2) unstable; urgency=low + + * Bumped compat/ to 5 for future use of dh_strip. + * Uses --with-debug-level=0 instead of entirely removing the + feature. + * Fixes pinerc handling for address book sorting. (Closes: #410300) + * Supports GNU/kFreeBSD in configure.ac. (Closes: #414228) + * Renames passfile to ~/.pine-passfile in keeping with e.g. .pinerc. + * Documented that in README.Debian. + + -- Asheesh Laroia Wed, 07 Mar 2007 11:11:50 -0500 + +alpine (0.83+dfsg-1) unstable; urgency=low + + * New upstream release + * Now sed handles updating source for path changes + * Supports passfile of ~/.alpine-passfile (Closes: #410976) + * Upstream fixed man page to remove -create_lu (Closes: #410302) + + -- Asheesh Laroia Fri, 2 Mar 2007 17:53:35 -0500 + +alpine (0.82+dfsg-5) unstable; urgency=low + + * Actually make pilot "priority: optional". + + -- Asheesh Laroia Sat, 17 Feb 2007 13:17:42 -0500 + +alpine (0.82+dfsg-4) unstable; urgency=low + + * Give pico the "mail - optional" and pilot the "utils - optional" suite. + * Disable debug in alpine configure. (Closes: #405689) + * Enabled aspell as spellchecker + + -- Asheesh Laroia Fri, 16 Feb 2007 15:07:14 -0500 + +alpine (0.82+dfsg-3) unstable; urgency=low + + * Make pilot not conflict: pilot. + + -- Asheesh Laroia Sat, 3 Feb 2007 02:09:25 -0500 + +alpine (0.82+dfsg-2) unstable; urgency=low + + * Renamed alpine-pilot to pilot as was actually wanted. + + -- Asheesh Laroia Fri, 2 Feb 2007 16:00:10 -0500 + +alpine (0.82+dfsg-1) unstable; urgency=low + + * Configuration files are now in /etc, and the documentation is updated. + (Closes: #405700) + * debian/rules now cleans correctly. (Closes: #407477) + * alpinef symlink in place. (Closes: #405690) + * alpine-pilot package now created for pilot. (Closes: #405693) + + -- Asheesh Laroia Fri, 2 Feb 2007 16:00:08 -0500 + +alpine (0.81+dfsg-1) unstable; urgency=low + + * New upstream release. + * Repacked original tarball because it included non-DFSG-free RFC files. + + -- Asheesh Laroia Wed, 20 Dec 2006 09:08:59 -0500 + +alpine (0.8-1) unstable; urgency=low + + * Initial release. (Closes: #401001) + * Changed imap/Makefile to enable IPv6 mode and skip the interactive prompt. + + -- Asheesh Laroia Wed, 29 Nov 2006 22:56:28 -0500 --- alpine-2.00+dfsg.orig/debian/README.Debian +++ alpine-2.00+dfsg/debian/README.Debian @@ -0,0 +1,57 @@ +This file provides notes for users of the Alpine package. + +== Sending email == + +By default, alpine doesn't know how to send email. If your system is +configured with a working local mail transport agent, you can configure +PINE to do SMTP to localhost by pressing these keys: + +M (Main screen) +S (Setup) +C (Configuration) + +Navigate to the smtp-server entry, press enter, and type "localhost". Press enter again. + +E (Exit setup) +Y ("Yes" replaces settings) + +System administrators may want to set smtp-server in the /etc/pinerc. + +== Maildir == + +The package for pine in Debian provides a patch to let it read +Maildir-style mail boxes. This package does not yet provide that +functionality. I am looking for a moderately good solution for this, +as per Debian bug #405762. + +== Passfile == + +The washington.edu developers of Alpine and Pine have a feature they +implemented but don't like called "passfile". This lets users store +their passwords in a file so they don't have to type it each time they +run the mail program. This feature is similar to "Save password" +features in Thunderbird, Icedove, Evolution, and other mail user +agents that are or have been in Debian. + +In this package, the file ~/.pine-passfile is where Alpine stores its +obfuscated password. + +NOTE: If you save your password here, and someone else can get a copy +of this file, then that person has your password! + +== Bugs == + +If you have problems with this package and are using Debian, please +submit a bug using the Debian bug reporting system. The easiest way +to do this is to use the program "reportbug" as packaged in Debian. + +If you are using a Debian-derived distribution, you may have a +modified package. For example, if you are using Ubuntu, and the +alpine package version number contains the word "ubuntu" in it, then +it is probably modified. Modified packages' bugs should be submitted +with the bug tracker of the group that did the modifying. + +But if you have an unmodified package, even running on a non-Debian +system, it should be okay to file bugs against the Debian bug tracker. +Information on how to do that is available at +http://www.debian.org/Bugs/Reporting - see the "Example" section. --- alpine-2.00+dfsg.orig/debian/copyright +++ alpine-2.00+dfsg/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Asheesh Laroia on +Tue, 05 Dec 2006 15:37:10 -0500. + +It was downloaded from ftp://ftp.cac.washington.edu/alpine/ but the +tarball includes RFC texts which are not DFSG-free. Therefore, I +repacked the tarball without imap/docs/rfc/rfc*.txt. + +Upstream Authors: University of Washington - http://www.washington.edu/alpine/ + +Copyright (C) 2006 University of Washington + +License: + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +On Debian GNU/Linux you can find this license under +`/usr/share/common-licenses/Apache-2.0'. + +The Debian packaging is + (C) 2006-2008 Asheesh Laroia + (C) 2008, Andreas Tille and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- alpine-2.00+dfsg.orig/debian/watch +++ alpine-2.00+dfsg/debian/watch @@ -0,0 +1,10 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Examine an FTP server +ftp://ftp.cac.washington.edu/alpine/alpine-(.*?)\.tar\.gz debian uupdate --- alpine-2.00+dfsg.orig/debian/rules +++ alpine-2.00+dfsg/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f +# debian/rules for alpine using cdbs +# Andreas Tille , GPL + +install/alpine-pico:: +# Rename pico to pico.alpine. +# alpine-pico.install puts this in the alpine-pico package. + mv pico/pico pico/pico.alpine + mv doc/pico.1 doc/pico.alpine.1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,--as-needed" --with-krb5 \ + --with-system-pinerc=/etc/pine.conf \ + --with-system-fixed-pinerc=/etc/pinerc.fixed \ + --with-debug-level=0 \ + --with-spellcheck-prog=aspell \ + --without-tcl \ + --with-passfile=.pine-passfile \ + --with-smtp-msa=/usr/sbin/sendmail \ + --with-krb5-dir=/usr + +# install README only into alpine package +DEB_INSTALL_DOCS_ALL := +DEB_INSTALL_DOCS_alpine := README + --- alpine-2.00+dfsg.orig/debian/alpine.links +++ alpine-2.00+dfsg/debian/alpine.links @@ -0,0 +1,2 @@ +usr/share/man/man1/alpine.1.gz usr/share/man/man1/alpinef.1.gz +usr/bin/alpine usr/bin/alpinef --- alpine-2.00+dfsg.orig/debian/alpine.install +++ alpine-2.00+dfsg/debian/alpine.install @@ -0,0 +1,3 @@ +alpine/alpine usr/bin +alpine/rpdump usr/bin +alpine/rpload usr/bin --- alpine-2.00+dfsg.orig/debian/alpine-pico.install +++ alpine-2.00+dfsg/debian/alpine-pico.install @@ -0,0 +1 @@ +pico/pico.alpine usr/bin --- alpine-2.00+dfsg.orig/debian/pilot.install +++ alpine-2.00+dfsg/debian/pilot.install @@ -0,0 +1 @@ +pico/pilot usr/bin --- alpine-2.00+dfsg.orig/debian/alpine-pico.manpages +++ alpine-2.00+dfsg/debian/alpine-pico.manpages @@ -0,0 +1 @@ +doc/pico.alpine.1 --- alpine-2.00+dfsg.orig/debian/compat +++ alpine-2.00+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- alpine-2.00+dfsg.orig/debian/patches/40_fix_tech_notes_hardcoded_paths.patch +++ alpine-2.00+dfsg/debian/patches/40_fix_tech_notes_hardcoded_paths.patch @@ -0,0 +1,38 @@ +Index: alpine-2.00/doc/tech-notes.txt +=================================================================== +--- alpine-2.00.orig/doc/tech-notes.txt 2009-06-23 13:10:25.000000000 -0400 ++++ alpine-2.00/doc/tech-notes.txt 2009-06-23 13:11:15.000000000 -0400 +@@ -273,13 +273,13 @@ + sendmail-path, and compile-time options. The first MTA specified in the + following list is used: + 1. _sendmail-path_ in /etc/pine.conf.fixed +- 2. _smtp-server_ in /usr/local/pine.conf.fixed ++ 2. _smtp-server_ in /etc/pine.conf.fixed + 3. _sendmail-path_ specified on the command line. + 4. _smtp-server_ specified on the command line. + 5. _sendmail-path_ in the user's .pinerc file. + 6. _smtp-server_ in the user's .pinerc file. + 7. _sendmail-path_ in /etc/pine.conf +- 8. _smtp-server_ in /usr/local/pine.conf ++ 8. _smtp-server_ in /etc/pine.conf + 9. DF_SENDMAIL_PATH defined at compile time. + 10. SENDMAIL and SENDMAILFLAGS defined at compile time. + +@@ -603,7 +603,7 @@ + into _Alpine_ so there are no _required_ auxiliary files. Instead of copying + the binaries manually, you may use make install to install them. + +- There are three optional auxiliary files: /usr/local/lib/pine.info, ++ There are three optional auxiliary files: /etc/pine.info, + /etc/pine.conf, and /etc/pine.conf.fixed. The file + pine.info contains text on how to get further help on the local system. It + is part of the help text for the main menu and should probably refer to the +@@ -681,7 +681,7 @@ + Pine's global configuration file. + /etc/pine.conf.fixed + Non-overridable global configuration file. +- /usr/local/lib/pine.info ++ /etc/pine.info + Local pointer to system administrator. + ~/.pinerc + Personal configuration file for each user. --- alpine-2.00+dfsg.orig/debian/patches/10_alpine_1.10_spooldir.patch +++ alpine-2.00+dfsg/debian/patches/10_alpine_1.10_spooldir.patch @@ -0,0 +1,60 @@ +--- alpine-2.00.orig/imap/docs/imaprc.txt ++++ alpine-2.00/imap/docs/imaprc.txt +@@ -168,8 +168,8 @@ + Sets the directory in which the user's data can be found. A user's + folders can be found in a subdirectory of the black box directory + named with the user's username. For example, if the blackbox +- directory is /usr/spool/folders/, user jones' data can be found +- in /usr/spool/folders/jones/. The user's black-box directory is ++ directory is /var/spool/folders/, user jones' data can be found ++ in /var/spool/folders/jones/. The user's black-box directory is + the location of folders, .mminit, .imaprc, .newsrc, and all other + files used by c-client; internally, it sets c-client's idea of the + user's ``home directory'', overriding /etc/passwd. +@@ -411,14 +411,14 @@ + If non-zero, a warning message is given if an attempt to create a + lock file fails. Otherwise, EACCES is treated as a "silent failure", + and it proceeds without trying to use the lock file. This is for +- the benefit of users on systems with paranoid /usr/spool/mail +- protections which don't let users create /usr/spool/mail/$(USER).lock ++ the benefit of users on systems with paranoid /var/spool/mail ++ protections which don't let users create /var/spool/mail/$(USER).lock + files; these unfortunate users would be harassed with a flood of + error messages otherwise. The problem is that on SVR4, if EACCES + remains disabled and fcntl() locking is also disabled, then there is + no locking at all which is doubleplus-ungood. + +- If the site is paranoid on /usr/spool/mail protections AND if there ++ If the site is paranoid on /var/spool/mail protections AND if there + is no fcntl() locking (SVR4) or usable flock() locking (e.g. NFS), + then there is no way to win. Find a different system to use. + +--- alpine-2.00.orig/imap/docs/locking.txt ++++ alpine-2.00/imap/docs/locking.txt +@@ -255,7 +255,7 @@ + timeout for this lock, after which it is broken on the presumption + that it is a stale lock. If it can not create the .lock file due to + an EACCES (protection failure) error, it once silently proceeded +-without this lock; this was for systems which protect /usr/spool/mail ++without this lock; this was for systems which protect /var/spool/mail + from unprivileged processes creating files. Today, c-client reports + an error unless it is built otherwise. The purpose of this lock is to + prevent against unfavorable interactions with mail delivery. +@@ -278,7 +278,7 @@ + + Mail delivery daemons use lock (1), (2), or both. Lock (1) works + over NFS; lock (2) is the only one that works on sites that protect +-/usr/spool/mail against unprivileged file creation. Prudent mail ++/var/spool/mail against unprivileged file creation. Prudent mail + delivery daemons use both forms of locking, and of course so does + c-client. + +@@ -335,7 +335,7 @@ + the mail file is NFS-mounted. + + What this means is that there is *no* locking protection at all +-in the case of a client using an NFS-mounted /usr/spool/mail that does ++in the case of a client using an NFS-mounted /var/spool/mail that does + not permit file creation by unprivileged programs. It is impossible, + under these circumstances, for an unprivileged program to do anything + about it. Worse, if EACCES errors on .lock file creation are no-op'ed --- alpine-2.00+dfsg.orig/debian/patches/50_danchev_malloc_once.patch +++ alpine-2.00+dfsg/debian/patches/50_danchev_malloc_once.patch @@ -0,0 +1,20 @@ +--- alpine-2.00/pico/composer.c.orig 2009-06-28 20:46:47.000000000 +0300 ++++ alpine-2.00/pico/composer.c 2009-06-28 20:49:32.000000000 +0300 +@@ -794,7 +794,7 @@ + len += lmp->fname ? strlen(lmp->fname) : 0; + + if(len+3 > sizeof(buf)){ +- bfp = malloc(len+3); ++ /*bfp = malloc(len+3);*/ + space = len+3; + if((bfp=malloc(len+3)) == NULL){ + emlwrite("\007Can't malloc space for filename", +@@ -1270,7 +1270,7 @@ + len += strlen(lmp->size); + + if(len+3 > sizeof(buf)){ +- bfp = malloc(len+3); ++ /*bfp = malloc(len+3);*/ + space = len+3; + if((bfp=malloc(len+3)) == NULL){ + emlwrite("\007Can't malloc space for filename", --- alpine-2.00+dfsg.orig/debian/patches/10_hurd_build.patch +++ alpine-2.00+dfsg/debian/patches/10_hurd_build.patch @@ -0,0 +1,13 @@ +Index: alpine-2.00+dfsg/configure +=================================================================== +--- alpine-2.00+dfsg.orig/configure 2009-06-09 15:42:00.000000000 -0400 ++++ alpine-2.00+dfsg/configure 2009-06-09 15:43:36.610000000 -0400 +@@ -32878,7 +32878,7 @@ + + + case "$host" in +- *-linux-gnu*|*-k*bsd*-gnu*) ++ *-linux-gnu*|*-k*bsd*-gnu*|*-*-gnu*) + alpine_path_delim="/" + alpine_mode_readonly="(0600)" + if test -f /etc/fedora-release ; then --- alpine-2.00+dfsg.orig/debian/patches/40_fix_filter_hardcoded_paths.patch +++ alpine-2.00+dfsg/debian/patches/40_fix_filter_hardcoded_paths.patch @@ -0,0 +1,13 @@ +Index: alpine-2.00/pith/filter.c +=================================================================== +--- alpine-2.00.orig/pith/filter.c 2009-06-23 13:11:50.000000000 -0400 ++++ alpine-2.00/pith/filter.c 2009-06-23 13:12:02.000000000 -0400 +@@ -3134,7 +3134,7 @@ + #endif + + #ifndef SYSTEM_PINE_INFO_PATH +-#define SYSTEM_PINE_INFO_PATH "/usr/local/lib/pine.info" ++#define SYSTEM_PINE_INFO_PATH "/etc/pine.info" + #endif + #define CHTML_VAR_EXPAND(S) (!strcmp(S, "PINE_INFO_PATH") \ + ? SYSTEM_PINE_INFO_PATH : S) --- alpine-2.00+dfsg.orig/debian/patches/10_config2etc.patch +++ alpine-2.00+dfsg/debian/patches/10_config2etc.patch @@ -0,0 +1,322 @@ +This patch updates code and doc to move pine.conf from /usr/local/lib to /etc. +Some more fixes in the doc according the move /usr/spool/news -> /var/spool/news. +--- alpine-2.00.orig/pith/filter.c ++++ alpine-2.00/pith/filter.c +@@ -7640,7 +7640,7 @@ + } + else if(!strcmp(s, "PINE_CONF_PATH")){ + #if defined(_WINDOWS) || !defined(SYSTEM_PINERC) +- p = "/usr/local/lib/pine.conf"; ++ p = "/etc/pine.conf"; + #else + p = SYSTEM_PINERC; + #endif +@@ -7649,7 +7649,7 @@ + #ifdef SYSTEM_PINERC_FIXED + p = SYSTEM_PINERC_FIXED; + #else +- p = "/usr/local/lib/pine.conf.fixed"; ++ p = "/etc/pine.conf.fixed"; + #endif + } + else if(!strcmp(s, "PINE_INFO_PATH")){ +--- alpine-2.00.orig/doc/tech-notes.txt ++++ alpine-2.00/doc/tech-notes.txt +@@ -272,13 +272,13 @@ + The selection of which MTA to use depends on the settings of smtp-server, + sendmail-path, and compile-time options. The first MTA specified in the + following list is used: +- 1. _sendmail-path_ in /usr/local/lib/pine.conf.fixed ++ 1. _sendmail-path_ in /etc/pine.conf.fixed + 2. _smtp-server_ in /usr/local/pine.conf.fixed + 3. _sendmail-path_ specified on the command line. + 4. _smtp-server_ specified on the command line. + 5. _sendmail-path_ in the user's .pinerc file. + 6. _smtp-server_ in the user's .pinerc file. +- 7. _sendmail-path_ in /usr/local/lib/pine.conf ++ 7. _sendmail-path_ in /etc/pine.conf + 8. _smtp-server_ in /usr/local/pine.conf + 9. DF_SENDMAIL_PATH defined at compile time. + 10. SENDMAIL and SENDMAILFLAGS defined at compile time. +@@ -604,7 +604,7 @@ + the binaries manually, you may use make install to install them. + + There are three optional auxiliary files: /usr/local/lib/pine.info, +- /usr/local/lib/pine.conf, and /usr/local/lib/pine.conf.fixed. The file ++ /etc/pine.conf, and /etc/pine.conf.fixed. The file + pine.info contains text on how to get further help on the local system. It + is part of the help text for the main menu and should probably refer to the + local help desk or the system administrator. If this file doesn't exist a +@@ -677,9 +677,9 @@ + This section lists the various files which _Alpine_ uses which are not email + folders. All of these are the default names of files, they may vary based on + _Alpine_'s configuration. +- /usr/local/lib/pine.conf ++ /etc/pine.conf + Pine's global configuration file. +- /usr/local/lib/pine.conf.fixed ++ /etc/pine.conf.fixed + Non-overridable global configuration file. + /usr/local/lib/pine.info + Local pointer to system administrator. +@@ -875,10 +875,10 @@ + Configuration: Prints a sample system configuration file to the + screen or standard output. To generate an initial system + configuration file, execute +- alpine -conf > /usr/local/lib/pine.conf ++ alpine -conf > /etc/pine.conf + To generate a system configuration file using settings from an old + system configuration file, execute +- alpine -P old-pine.conf -conf > /usr/local/lib/pine.conf ++ alpine -P old-pine.conf -conf > /etc/pine.conf + A system configuration file is not required. + -convert_sigs _-p pinerc_ + Convert signatures contained in signature files into literal +@@ -976,7 +976,7 @@ + Pinerc may be either a local file or a remote configuration folder. + -P _pinerc_ + Uses the named file as the system wide configuration file instead of +- _/usr/local/lib/pine.conf_ on UNIX, or nothing on _PC-Alpine_. Pinerc ++ _/etc/pine.conf_ on UNIX, or nothing on _PC-Alpine_. Pinerc + may be either a local file or a remote configuration folder. + -passfile _passfile_ + This tells _Alpine_ what file should be used as the password file. +@@ -1183,8 +1183,8 @@ + configuration. In most cases, the compiled-in preferences will suit users + and administrators just fine. When running _Alpine_ on a UNIX system, the + default built-in configuration can be changed by setting variables in the +- system configuration files, /usr/local/lib/pine.conf or +- /usr/local/lib/pine.conf.fixed. (Actually, these files can be changed using ++ system configuration files, /etc/pine.conf or ++ /etc/pine.conf.fixed. (Actually, these files can be changed using + the configure arguments --with-system-pinerc=VALUE or + --with-system-fixed-pinerc=VALUE.) The location of the pine.conf file can be + changed with the -P command line argument. Both _Alpine_ and _PC-Alpine_ +@@ -2771,7 +2771,7 @@ + _news-spool-directory_ + This option tells _Alpine_ where to look for the "news spool" for + newsgroups when accessing news locally, rather than via NNTP. The +- default path is usually /usr/spool/news. ++ default path is usually /var/spool/news. + _newsrc-path_ + This option overrides the default name _Alpine_ uses for your + "newsrc" news status and subscription file. If set, _Alpine_ will +@@ -3679,7 +3679,7 @@ + For Unix _Alpine_ the program _ispell_ works well as an alternate + spell checker. If your Unix system has _ispell_ it is probably + reasonable to make it the default speller by configuring it as the +- default in the system configuration file, /usr/local/lib/pine.conf. ++ default in the system configuration file, /etc/pine.conf. + If this option is not set, then the system's _spell_ command is used. + The spell command does not work the same as the alternate speller. It + produces a list of misspelled words on its standard output, instead, +@@ -4073,12 +4073,12 @@ + must exist as a full path or a path relative to your home directory). + Now for an example: + +- url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape, +- /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT ++ url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/bin/sensible-browser, ++ /usr/bin/lynx, C:\BIN\NETSCAPE.BAT + This example shows that for the first browser in the list to be used + the environment variable DISPLAY must be defined. If it is, then the +- file /usr/local/bin/netscape must exist. If either condition is not +- met, then the file /usr/local/bin/lynx must exist. If it doesn't, ++ file /usr/bin/sensible-browser must exist. If either condition is not ++ met, then the file /usr/bin/lynx must exist. If it doesn't, + then the final path and file must exist. Note that the last entry is + a DOS/Windows path. This is one way to support _Alpine_ running on + more than one architecture with the same configuration file. +@@ -10471,9 +10471,9 @@ + 4. a command line argument + 5. the system-wide _fixed_ configuration file (Unix _Alpine_ only) + +- The fixed configuration file is normally /usr/local/lib/pine.conf.fixed. ++ The fixed configuration file is normally /etc/pine.conf.fixed. + +- The system-wide configuration file is normally /usr/local/lib/pine.conf for ++ The system-wide configuration file is normally /etc/pine.conf for + Unix _Alpine_ and is normally not set for _PC-Alpine_. For _PC-Alpine_, if + the environment variable _$PINECONF_ is set, that is used for the + system-wide configuration. This location can be set or changed on the +@@ -10722,7 +10722,7 @@ + * A program that implements the SMTP or ESMTP protocol via stdio. + * An entry in /etc/services for the alternate service. + * An entry in /etc/inetd.conf for the alternate service. +- * An entry in /usr/local/lib/pine.conf, /usr/local/lib/pine.conf.fixed or ++ * An entry in /etc/pine.conf, /etc/pine.conf.fixed or + ~/.pinerc. + _________________________________________________________________ + +@@ -11688,7 +11688,7 @@ + + The second selection is the standard UNIX print command. The default is + _lpr_, but it can be changed on a system basis to anything so desired in +- /usr/local/lib/pine.conf. ++ /etc/pine.conf. + + The third selection is the user's personal choice for a UNIX print command. + The text to be printed is piped into the command. _Enscript_ or _lpr_ with +--- alpine-2.00.orig/doc/tech-notes/background.html ++++ alpine-2.00/doc/tech-notes/background.html +@@ -129,7 +129,7 @@ +
    + +
  1. sendmail-path in +-/usr/local/lib/pine.conf.fixed ++/etc/pine.conf.fixed + +
  2. smtp-server in /usr/local/pine.conf.fixed + +@@ -141,9 +141,9 @@ + +
  3. smtp-server in the user's .pinerc file. + +-
  4. sendmail-path in /usr/local/lib/pine.conf ++
  5. sendmail-path in /etc/pine.conf + +-
  6. smtp-server in /usr/local/pine.conf ++
  7. smtp-server in /etc/pine.conf + +
  8. DF_SENDMAIL_PATH defined at compile time. + +--- alpine-2.00.orig/doc/tech-notes/config-notes.html ++++ alpine-2.00/doc/tech-notes/config-notes.html +@@ -931,10 +931,10 @@ +
+

+ The fixed configuration file is normally +-/usr/local/lib/pine.conf.fixed. ++/etc/pine.conf.fixed. +

+ The system-wide configuration file is normally +-/usr/local/lib/pine.conf for Unix Alpine and is normally not ++/etc/pine.conf for Unix Alpine and is normally not + set for PC-Alpine. + For PC-Alpine, if the environment variable $PINECONF is set, that + is used for the system-wide configuration. +@@ -1252,8 +1252,8 @@ + +

  • An entry in /etc/inetd.conf for the alternate service. + +-
  • An entry in /usr/local/lib/pine.conf, +-/usr/local/lib/pine.conf.fixed or ~/.pinerc. ++
  • An entry in /etc/pine.conf, ++/etc/pine.conf.fixed or ~/.pinerc. + + + +--- alpine-2.00.orig/doc/tech-notes/config.html ++++ alpine-2.00/doc/tech-notes/config.html +@@ -7,8 +7,8 @@ + configuration. In most cases, the compiled-in preferences will suit users + and administrators just fine. When running Alpine on a UNIX system, the + default built-in configuration can be changed by setting variables in the +-system configuration files, /usr/local/lib/pine.conf +-or /usr/local/lib/pine.conf.fixed. ++system configuration files, /etc/pine.conf ++or /etc/pine.conf.fixed. + (Actually, these files can be changed using the configure arguments + --with-system-pinerc=VALUE or --with-system-fixed-pinerc=VALUE.) + The location of the pine.conf file can be changed with the -P command line +@@ -2326,7 +2326,7 @@ + +
    This option tells Alpine where to look for the "news spool" for + newsgroups when accessing news locally, rather than via NNTP. The default +-path is usually /usr/spool/news.

    ++path is usually /var/spool/news.

    + +

    newsrc-path + +@@ -3686,7 +3686,7 @@ + alternate spell checker. + If your Unix system has ispell it is probably reasonable to make + it the default speller by configuring it as the default in the +-system configuration file, /usr/local/lib/pine.conf. ++system configuration file, /etc/pine.conf. + +

    + If this option is not set, then the system's spell command is used. +--- alpine-2.00.orig/doc/tech-notes/installation.html ++++ alpine-2.00/doc/tech-notes/installation.html +@@ -227,8 +227,8 @@ + + There are three optional auxiliary files: + /usr/local/lib/pine.info, +-/usr/local/lib/pine.conf, and +-/usr/local/lib/pine.conf.fixed. The file ++/etc/pine.conf, and ++/etc/pine.conf.fixed. The file + pine.info contains text on how to get further help on the + local system. It is part of the help text for the + main menu and should probably refer to the local help desk or the system +@@ -318,11 +318,11 @@ + +

    + +-
    /usr/local/lib/pine.conf ++
    /etc/pine.conf + +
    Pine's global configuration file. + +-
    /usr/local/lib/pine.conf.fixed ++
    /etc/pine.conf.fixed + +
    Non-overridable global configuration file. + +--- alpine-2.00.orig/doc/tech-notes/porting.html ++++ alpine-2.00/doc/tech-notes/porting.html +@@ -307,11 +307,11 @@ +
    + ___ +
    +-Reading of /usr/local/lib/pine.conf ++Reading of /etc/pine.conf +
    + ___ +
    +-Fixing variables and features in /usr/local/lib/pine.conf.fixed ++Fixing variables and features in /etc/pine.conf.fixed +
    + ___ +
    +--- alpine-2.00.orig/doc/tech-notes/cmd-line.html ++++ alpine-2.00/doc/tech-notes/cmd-line.html +@@ -87,7 +87,7 @@ + file, execute + + 
    
+-		alpine -conf > /usr/local/lib/pine.conf
++		alpine -conf > /etc/pine.conf
+
    +

    + +@@ -95,7 +95,7 @@ + system configuration file, execute + + 

    
+-		alpine -P old-pine.conf -conf > /usr/local/lib/pine.conf
++		alpine -P old-pine.conf -conf > /etc/pine.conf
+
    +

    + A system configuration file is not required. +@@ -258,7 +258,7 @@ +

    -P pinerc + +
    Uses the named file as the system wide configuration file instead of +-/usr/local/lib/pine.conf on UNIX, or nothing on PC-Alpine. ++/etc/pine.conf on UNIX, or nothing on PC-Alpine. + Pinerc may be either a local file or a remote configuration folder. +

    + +--- alpine-2.00.orig/doc/tech-notes/low-level.html ++++ alpine-2.00/doc/tech-notes/low-level.html +@@ -787,7 +787,7 @@ + + The second selection is the standard UNIX print command. The default is + lpr, but it can be changed on a system basis to anything so +-desired in /usr/local/lib/pine.conf.

    ++desired in /etc/pine.conf.

    + + The third selection is + the user's personal choice for a UNIX print command. The text to be --- alpine-2.00+dfsg.orig/debian/patches/10_alpine_1.10_patches.patch +++ alpine-2.00+dfsg/debian/patches/10_alpine_1.10_patches.patch @@ -0,0 +1,26 @@ +This patch fixes the issue that -lpam is mentioned at the wrong position in +the makefile. Attaching it to the end of all libs fixes the problem. +--- alpine-2.00.orig/configure.ac ++++ alpine-2.00/configure.ac +@@ -597,7 +597,7 @@ + else + dnl preload c-client default locations/options + case $host in +- *-linux-gnu) ++ *-linux-gnu*) + if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then + alpine_SSLTYPE="nopwd" + if test -d /etc/pki/tls ; then +--- alpine-2.00.orig/alpine/Makefile.in ++++ alpine-2.00/alpine/Makefile.in +@@ -169,7 +169,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lpam + LIBTOOL = @LIBTOOL@ + LN = @LN@ + LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ --- alpine-2.00+dfsg.orig/debian/patches/series +++ alpine-2.00+dfsg/debian/patches/series @@ -0,0 +1,9 @@ +10_alpine_1.10_patches.patch +10_config2etc.patch +10_alpine_1.10_mlock.patch +10_alpine_1.10_spooldir.patch +20_barry_defreese_hurd_build_fix.patch +30_fix_man_page_hardcoded_paths.patch +40_fix_tech_notes_hardcoded_paths.patch +40_fix_filter_hardcoded_paths.patch +50_danchev_malloc_once.patch --- alpine-2.00+dfsg.orig/debian/patches/20_barry_defreese_hurd_build_fix.patch +++ alpine-2.00+dfsg/debian/patches/20_barry_defreese_hurd_build_fix.patch @@ -0,0 +1,13 @@ +Index: alpine-2.00+dfsg/configure +=================================================================== +--- alpine-2.00+dfsg.orig/configure 2009-06-09 15:42:00.000000000 -0400 ++++ alpine-2.00+dfsg/configure 2009-06-09 15:43:36.610000000 -0400 +@@ -32878,7 +32878,7 @@ + + + case "$host" in +- *-linux-gnu*|*-k*bsd*-gnu*) ++ *-linux-gnu*|*-k*bsd*-gnu*|*-*-gnu*) + alpine_path_delim="/" + alpine_mode_readonly="(0600)" + if test -f /etc/fedora-release ; then --- alpine-2.00+dfsg.orig/debian/patches/10_alpine_1.10_mlock.patch +++ alpine-2.00+dfsg/debian/patches/10_alpine_1.10_mlock.patch @@ -0,0 +1,11 @@ +--- alpine-2.00.orig/imap/src/osdep/unix/Makefile ++++ alpine-2.00/imap/src/osdep/unix/Makefile +@@ -106,7 +106,7 @@ + LOCKPGM= + # Test alternatives if LOCKPGM not specified + LOCKPGM1=/usr/libexec/mlock +-LOCKPGM2=/usr/sbin/mlock ++LOCKPGM2=/usr/bin/mlock + LOCKPGM3=/etc/mlock + + --- alpine-2.00+dfsg.orig/debian/patches/30_fix_man_page_hardcoded_paths.patch +++ alpine-2.00+dfsg/debian/patches/30_fix_man_page_hardcoded_paths.patch @@ -0,0 +1,19 @@ +Index: alpine-2.00/doc/alpine.1 +=================================================================== +--- alpine-2.00.orig/doc/alpine.1 2009-06-23 13:08:33.000000000 -0400 ++++ alpine-2.00/doc/alpine.1 2009-06-23 13:09:27.000000000 -0400 +@@ -305,11 +305,11 @@ + .br + /etc/mime.types System-wide file ext. to MIME type mapping + .br +-/usr/local/lib/pine.info Local pointer to system administrator. ++/etc/pine.info Local pointer to system administrator. + .br +-/usr/local/lib/pine.conf System-wide configuration file. ++/etc/pine.conf System-wide configuration file. + .br +-/usr/local/lib/pine.conf.fixed Non-overridable configuration file. ++/etc/pine.conf.fixed Non-overridable configuration file. + .br + /tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. + .br