--- sortmail-2.4.orig/config.h +++ sortmail-2.4/config.h @@ -41,7 +41,7 @@ #endif #if defined(LINUX) -# define SPOOLDIR "/var/spool/mail/" +# define SPOOLDIR "/var/mail/" # define VACATION "/usr/bin/vacation" # define LOCKLOCKF 0 # define LOCKFLOCK 0 --- sortmail-2.4.orig/sortmail.h +++ sortmail-2.4/sortmail.h @@ -76,7 +76,7 @@ extern char *user ; /* userid */ extern char *home ; /* user's $HOME */ -extern char *mailbox ; /* $MAIL, default = /usr/spool/mail/$USER */ +extern char *mailbox ; /* $MAIL, default = /var/mail/$USER */ extern char *mailrc ; /* $MAILRC, default = $HOME/.mailrc */ extern char *sortmailrc ; /* initfile, default = $HOME/.sortmailrc */ extern char *deflt ; /* where unclasifiable mail goes */ --- sortmail-2.4.orig/sortmail.1 +++ sortmail-2.4/sortmail.1 @@ -76,7 +76,7 @@ Don't let the long list of options and command below frighten you. New users might do well to skip to the EXAMPLES section below, and/or -read the README and sample files in /usr/doc/sortmail. +read the README and sample files in /usr/share/doc/sortmail. When \fBsortmail\fP starts up, it first reads the following config files: /usr/lib/sortmailrc, /usr/local/lib/sortmailrc, /etc/sortmailrc, @@ -100,7 +100,7 @@ .TP 15 \fB\-mailbox\fP \fIpath\fP Set the user's system mailbox, overriding the default for your system -(typically \fB/usr/spool/mail/\fP\fIuser\fP). +(\fB/var/mail/\fP\fIuser\fP). .TP 15 \fB\-mailrc\fP \fIpath\fP Set the .mailrc file, overriding the default of @@ -477,8 +477,7 @@ messages, messages sent to stderr will be sent back to the sender as bounces. .TP 10 .B mailbox -The user's mail box. Default is typically \fB/usr/spool/mail/\fP\fIuser\fP, -depending on the operating system. +The user's mail box. Default is \fB/var/mail/\fP\fIuser\fP. .TP 10 .B mailrc Full path of the user's \fB.mailrc\fP file. There's no real point in --- sortmail-2.4.orig/sortmail.c +++ sortmail-2.4/sortmail.c @@ -73,7 +73,7 @@ #if BOUNCECHECK #ifdef LINUX -#include +#include #else #include #endif --- sortmail-2.4.orig/Makefile +++ sortmail-2.4/Makefile @@ -20,7 +20,7 @@ # Linux CFLAGS = ${DBG} -DLINUX -I/usr/include/gdbm -LDFLAGS = -lgdbm +LIB = -lgdbm_compat # Ultrix #CFLAGS = ${DBG} -DULTRIX --- sortmail-2.4.orig/debian/compat +++ sortmail-2.4/debian/compat @@ -0,0 +1 @@ +4 --- sortmail-2.4.orig/debian/sortmail.dirs +++ sortmail-2.4/debian/sortmail.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/man/man1 +usr/share/doc/sortmail +usr/share/doc/sortmail/examples --- sortmail-2.4.orig/debian/rules +++ sortmail-2.4/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f +# Made with the aid of debmake, by Christoph Lameter, +# based on the sample debian/rules file for GNU hello by Ian Jackson. + +package=sortmail + +build: build-stamp +build-stamp: + dh_testdir + make + touch build-stamp + +clean: + dh_testdir + -rm -f build-stamp + -make clobber + -rm -f `find . -name "*~"` + -rm -rf debian/sortmail debian/files* core debian/substvars + dh_clean + +binary-indep: build + dh_testdir +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install sortmail `pwd`/debian/sortmail/usr/bin + cp sample.sortmailrc sample.forward sortmailrc.* `pwd`/debian/sortmail/usr/share/doc/sortmail/examples + + dh_installdocs README + dh_installmanpages + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: binary binary-arch binary-indep clean checkroot --- sortmail-2.4.orig/debian/control +++ sortmail-2.4/debian/control @@ -0,0 +1,15 @@ +Source: sortmail +Section: mail +Priority: optional +Maintainer: Hamish Moffatt +Build-Depends: debhelper (>= 4), libgdbm-dev +Standards-Version: 3.5.8 + +Package: sortmail +Architecture: any +Depends: ${shlibs:Depends} +Description: a simple mail sorter + sortmail is a simple mail sorter you can use in your .forward + to sort your mail into folders automatically, delete unwanted mail, + etc. + --- sortmail-2.4.orig/debian/copyright +++ sortmail-2.4/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Hamish Moffatt hamish@debian.org on +Sun, 23 Nov 1997 21:24:58 +1100. sortmail originally comes from +comp.sources.unix volume 28. + +The source code for 2.4 and later was obtained from +http://sortmail.sourceforge.net + + +Copyright © 1990-2003 Edward A. Falk + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. --- sortmail-2.4.orig/debian/changelog +++ sortmail-2.4/debian/changelog @@ -0,0 +1,90 @@ +sortmail (1:2.4-1ubuntu1) oneiric; urgency=low + + * Fix FTBFS with ld --as-needed. LP: #832922. + + -- Matthias Klose Tue, 13 Sep 2011 13:16:42 +0200 + +sortmail (1:2.4-1) unstable; urgency=low + + * New upstream release (after 12 years!) + + -- Hamish Moffatt Thu, 8 Jan 2004 23:20:00 +1100 + +sortmail (19910421-10) unstable; urgency=low + + * Changed priority from extra to optional + * Applied patch from Joern "Wulf" Heissler to use + instead of so sortmail would compile with gcc-3.3 + (closes: #195038) + * Upgrade to debhelper 4 + + -- Hamish Moffatt Fri, 11 Jul 2003 00:04:03 +1000 + +sortmail (19910421-9) unstable; urgency=low + + * Fixed default mail spool path; should be /var/mail, + not /var/spool/mail + + -- Hamish Moffatt Wed, 16 Jan 2002 08:22:33 +1100 + +sortmail (19910421-8) unstable; urgency=low + + * Applied patch to included prototypes for all functions + that return 64-bit integers. Thanks to John R. Daily + (closes: #126741) + * Fixed default mail spool path in /usr/bin/sortmail and + sortmail(1) (was /usr/spool/mail, now /var/spool/mail). + Changelog says this was fixed in 1998, wonder what + happened to that.... + + -- Hamish Moffatt Sun, 30 Dec 2001 12:15:56 +1100 + +sortmail (19910421-7) unstable; urgency=low + + * Applied patch to remove use of sys_errlist[] and MAXPATHLEN, + which don't apply on Hurd. Thanks to Nick Rusnov + and James Morrison for patches. (closes: #106961, #106964) + + -- Hamish Moffatt Sat, 11 Aug 2001 12:21:59 +1000 + +sortmail (19910421-6) frozen unstable; urgency=low + + * Added header checks for CC and cc (not just Cc) (closes: #105284) + * Fixed bug in fprintf of error messages when temporary files + couldn't be created (closes: #43367) + + -- Hamish Moffatt Sun, 22 Jul 2001 22:00:14 +1000 + +sortmail (19910421-5) frozen unstable; urgency=low + + * FHS compliant + * Converted from debstd to debhelper + + -- Hamish Moffatt Fri, 1 Oct 1999 19:20:13 +1000 + +sortmail (19910421-4) frozen unstable; urgency=low + + * Fixed manual page, which said use "set logfilename=" but should + have said "set logfile=". Reported by + + -- Hamish Moffatt Sat, 21 Nov 1998 15:55:00 +1100 + +sortmail (19910421-3) frozen unstable; urgency=low + + * Changed default mail spool directory from /usr/spool/mail to + /var/spool/mail, fixes #28994 + + -- Hamish Moffatt Sat, 21 Nov 1998 15:42:00 +1100 + +sortmail (19910421-2) frozen unstable; urgency=low + + * Corrected maintainer email address + + -- Hamish Moffatt Tue, 24 Mar 1998 23:30:00 +1100 + +sortmail (19910421-1) unstable; urgency=low + + * Initial Release. + + -- Hamish Moffatt Sun, 23 Nov 1997 21:24:58 +1100 +