Postfix 2.5.x with own patch allowing logging services differently in master.cf

Signed-off-by: Raphaël Marichez <falco@gentoo.org>

12 files changed, 47 insertions, 33 deletions

diff --git a/mail-client/mutt/mutt-1.5.16.ebuild b/mail-client/mutt/mutt-1.5.16.ebuild
index a1f13ad..392e76b 100644
--- a/mail-client/mutt/mutt-1.5.16.ebuild
+++ b/mail-client/mutt/mutt-1.5.16.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 			http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
 		)
 		nntp? (
-			vanilla? ( 
+			vanilla? (
 				http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
 			)
 			!vanilla? (
diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 7ad2917..e82719c 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.154 2008/03/16 08:13:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.159 2008/04/13 23:06:39 ulm Exp $
+
+  13 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -postfix-2.4.5.ebuild:
+  Remove last vulnerable ebuild wrt bug 201671.
+
+  08 Apr 2008; Raphael Marichez <falco@gentoo.org> files/postfix.rc6.2.5:
+  Fix bashism in init.d/postfix reported by Peter Alfredsen, bug #216949
+
+*postfix-2.4.7 (21 Mar 2008)
+
+  21 Mar 2008; Raphael Marichez <falco@gentoo.org> +postfix-2.4.7.ebuild:
+  Version bump 2.4.x series using previous vda-ng patch, closes bug #199330
+
+  21 Mar 2008; Raphael Marichez <falco@gentoo.org> postfix-2.4.5.ebuild,
+  postfix-2.4.6-r2.ebuild:
+  QA: remove bindnow-flags, bug #210599; fix repoman warns (LICENSE, copyright)
+
+*postfix-2.5.1 (17 Mar 2008)
+*postfix-2.5.0 (17 Mar 2008)
+
+  17 Mar 2008; Raphael Marichez <falco@gentoo.org> +files/postfix.rc6.2.5,
+  +postfix-2.5.0.ebuild, +postfix-2.5.1.ebuild:
+  Version bump (bug 207807). Removes bindnow-flags calls, and implements
+  multi-instances bug 166872, thanks to busby@edoceo.com for his rc script
 
   16 Mar 2008; Ulrich Mueller <ulm@gentoo.org> -postfix-2.2.10-r1.ebuild:
   Remove old, bug 201671.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 666eae4..2be4973 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,9 +1,10 @@
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix-2.0.9-get-FQDN.patch 1057 RMD160 492e9de53c0a16e71940ab4f4ed99bc4f76061fa SHA1 38f0322792822612a836ded1845368b23d3c1120 SHA256 6e5f5a1f9bc60e04d6decc8491c5955c625396f23698d961c412b50ec793e878
+AUX postfix-2.5.0-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
 AUX postfix-2.5.1-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
 AUX postfix-master.cf.patch 1064 RMD160 25283e8c3c27ff156e229ad1ae8643d3be61d6b7 SHA1 86088a034f6cf4a09a68436c97df5e5babf11251 SHA256 b1f7040cb9445379c4318e2161efd79c74bc6927125f4542eb87500ece145f60
 AUX postfix.rc6.2.2.9 648 RMD160 5c8242c63e4263734ae2c51f20c5970db53dc604 SHA1 fc8f2b301c853fe01ad920c33a3c1027a4480322 SHA256 8c7c77faf61f81f4e29bafd4255bdd2fc237c15059440b16c975a7f4967b3ac0
-AUX postfix.rc6.2.5 1007 RMD160 ce23f65420f8ec56fb409e8d0c80aac9160d4e58 SHA1 c9e421bcb6cb2dc2e8b389174d15ee07c483f06a SHA256 6becdabfa880dd703ad185edb19b520d80b0b59df4bff858fde79bc9b4cb81ec
+AUX postfix.rc6.2.5 1412 RMD160 ea2df7e53456d96cf1b34ebd46869dc8c0034e7d SHA1 f77d3f6a43040524dc468830fb73d4d2147db5db SHA256 bdb33f04cce1ccd87eaaef590d70dfec7beb777fbafe1adc4382e2a8c58bb0d2
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 131 RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f SHA1 613dff95ac21bd306c2917e5360430772efbb146 SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7
 DIST postfix-2.2.10-vda.patch.gz 7799 RMD160 01c36255cb2bac7518b94fd5074d1182b7680bdd SHA1 00a989f11fb8bb4561738e454960d6b163a7c68e SHA256 32aa3f7219e3da3bda362223ee34d6571c796f601b565de1890bce628446e0cc
@@ -17,11 +18,11 @@ DIST postfix-2.5.0-vda-ng-r1.patch.gz 28964 RMD160 35527bf9358ce35ca9cc863d1e5fe
 DIST postfix-2.5.0.tar.gz 3153152 RMD160 2f7c29d63a747bce259ed5596e4b59f279aa8196 SHA1 d611ac3b6f0536a9320b355a76bd345997f08b7b SHA256 da757ac8181f258ad2ce4532a092e1c3e74bd65a73a75eec6c00130bffd53d99
 DIST postfix-2.5.1-vda-ng-r1.patch.gz 28964 RMD160 35527bf9358ce35ca9cc863d1e5fe71ce0e3814e SHA1 134e9973c09fa2c137d4b4a4295eed6c209a43b5 SHA256 36e47b7b57317c1055c48481261bdccd4688fdad3ae26c7a2988ea812ac068d5
 DIST postfix-2.5.1.tar.gz 3153629 RMD160 cf414306742d642ccab78212ee33af955d7a9023 SHA1 4ceb805b78aff4c872b7e55554d2364e06f695b3 SHA256 bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
-EBUILD postfix-2.2.11-r1.ebuild 10448 RMD160 c407b24fb1bea9d24a383fee8dadafa947dadc30 SHA1 4ef1ef001c1cf8746174747044b8cccdc834a233 SHA256 5d4d6ed2a019db9e20c0cec7343536fe7712fe531e21e87f395f8994c3b3a09d
-EBUILD postfix-2.3.8-r1.ebuild 11840 RMD160 f7f254efd821ee77b00a7fa7cd200ed21654b798 SHA1 937e350c81762ffab956fafc6cc50f1777e994b0 SHA256 c650e6aef86bfbeb2cf0977d199e4e272470bb4d322243088d7c7cc0a305c100
-EBUILD postfix-2.4.6-r2.ebuild 11884 RMD160 50b62bd4c493ba0e6678b8246c72dce7c3aa22ea SHA1 b544e044bf0cc19591f0e4af07347db4188c4881 SHA256 975febee09403a411edb703697b49dcb4e5e93cb39b6f3b65f3f125fbac4e986
-EBUILD postfix-2.4.7.ebuild 11887 RMD160 aa5c2ee74a3871cf454f13e7ba54f19039cae3fe SHA1 e191d9aa7e7ddd499011b2802a2340b1b37a760c SHA256 2731e81cc697b966b6a67ffa11474ec89780c5089782d1f41d9bfef3f1cfad2d
-EBUILD postfix-2.5.0.ebuild 11974 RMD160 251f1bc5ac3ffd0d4ccfea9041dfba41526149a9 SHA1 e09025436c2107b2d1aaa1515e2456ded97c0f91 SHA256 a6e4bd8ac71da94d6cc01993eb081b501b5b52e17bd7fb68c700f2407cf5ce5e
+EBUILD postfix-2.2.11-r1.ebuild 10444 RMD160 497f04e50d7a17fa8fe2cfd16a09ab782a96d911 SHA1 4a0c3f72416dd7fbd084be171cdec0107d575e2b SHA256 61b3a4f69b463ea772cb349c585a477c2faf5b0c02ccc2a67e33a2db6d435666
+EBUILD postfix-2.3.8-r1.ebuild 11777 RMD160 e70ed0ae4998ece4a3d3c98cd75bed9d9a558646 SHA1 8e65faa7311dff65bfb6351e9706d1d6452d76e2 SHA256 361a86999b96413c10bf1e46ba4d1e77b1b5361e1be6ba699a3e2962f06a4876
+EBUILD postfix-2.4.6-r2.ebuild 11825 RMD160 7677e32b281a789ad55b339579c21338b629182e SHA1 86b8b0fc3e29fdcdb4e3200e08195a12fb916f4c SHA256 4eba825a51fa695bf37f3f0ed46f3bb4c83c6f485c0803d64c2f8aa2b7cdb25d
+EBUILD postfix-2.4.7.ebuild 11828 RMD160 e6727fabb323e920a9e76a564869327af186f230 SHA1 cb8533c642670d6ecfabd5dd274828b192f1dcd4 SHA256 f28ebb304440c62ca961d6504b2c12d676419fa72df382d27695856562bd9e84
+EBUILD postfix-2.5.0.ebuild 12000 RMD160 00aae793626cb0d902fd768cf94ee3ec71ffda84 SHA1 e4ae84ab8f8bcd46b63021bb825cfbd21f29c7e5 SHA256 2a27b0ab668b0db73ccc4cd512ec75b9263b75dc953bda56f2e7abb20a3cc2e2
 EBUILD postfix-2.5.1.ebuild 12000 RMD160 00aae793626cb0d902fd768cf94ee3ec71ffda84 SHA1 e4ae84ab8f8bcd46b63021bb825cfbd21f29c7e5 SHA256 2a27b0ab668b0db73ccc4cd512ec75b9263b75dc953bda56f2e7abb20a3cc2e2
-MISC ChangeLog 47671 RMD160 c4ab8b6768268d33f6375ef490fe890403ef7e7e SHA1 1b544c61ce02e4edc561954b5dcaadb67c640a4e SHA256 a46d6554e3a845e45b9275f4c596495bc49fd0b9769de6f3624d98e0a101fef4
+MISC ChangeLog 48631 RMD160 c922410f507408aa796e2923428edcb38b2dbe10 SHA1 62795b50a43108404a7f84159ebe8fcf91f2f0f9 SHA256 4458c3216af7660c4a06edbacd90680814748dbd6cf0732fcfe05b3cc0a1cc5e
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
diff --git a/mail-mta/postfix/files/CVS/Entries b/mail-mta/postfix/files/CVS/Entries
deleted file mode 100644
index 9216f52..0000000
--- a/mail-mta/postfix/files/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/mailer.conf/1.5/Tue Jul  5 01:04:50 2005//
-/postfix-2.0.9-get-FQDN.patch/1.2/Wed Jun 30 21:07:57 2004//
-/postfix-master.cf.patch/1.1/Fri Apr  7 16:00:47 2006//
-/smtp.pass/1.2/Sun Jul 18 03:26:56 2004//
-/smtp.sasl/1.2/Sun Jul 18 03:26:56 2004//
-/postfix.rc6.2.2.9/1.2/Tue Sep 25 14:25:07 2007//
-D
diff --git a/mail-mta/postfix/files/CVS/Repository b/mail-mta/postfix/files/CVS/Repository
deleted file mode 100644
index 587c83f..0000000
--- a/mail-mta/postfix/files/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-gentoo-x86/mail-mta/postfix/files
diff --git a/mail-mta/postfix/files/CVS/Root b/mail-mta/postfix/files/CVS/Root
deleted file mode 100644
index 7543cd2..0000000
--- a/mail-mta/postfix/files/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:falco@cvs.gentoo.org:/var/cvsroot
diff --git a/mail-mta/postfix/files/postfix.rc6.2.5 b/mail-mta/postfix/files/postfix.rc6.2.5
index 5a05d7d..48cbcf0 100644
--- a/mail-mta/postfix/files/postfix.rc6.2.5
+++ b/mail-mta/postfix/files/postfix.rc6.2.5
@@ -1,11 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.2.9,v 1.2 2007/07/12 08:45:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.5,v 1.2 2008/04/08 22:02:34 falco Exp $
+
+# If you plan to simultaneously use several Postfix instances, don't forget
+# to specify your alternate_config_directories variable in your main main.cf file.
+# Then make a symlink from /etc/init.d/postfix to /etc/init.d/postfix.alt,
+# prepare your new /etc/postfix.alt environment, and at least change these working paths:
+# queue_directory = /var/spool/postfix.alt
+# data_directory = /var/lib/postfix.alt
 
 CONF_DIR="/etc/postfix"
 CONF_OPT="${SVCNAME##*.}"
-if [[ -n ${CONF_OPT} && ${SVCNAME} != "postfix" ]]; then
+if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then
 	CONF_DIR="${CONF_DIR}.${CONF_OPT}"
 fi
 
diff --git a/mail-mta/postfix/postfix-2.2.11-r1.ebuild b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
index 3d04064..506a812 100644
--- a/mail-mta/postfix/postfix-2.2.11-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.7 2008/03/14 01:11:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.8 2008/04/13 22:53:12 vapier Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened cdb"
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.tar.
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 PROVIDE="virtual/mta virtual/mda"
 DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
diff --git a/mail-mta/postfix/postfix-2.3.8-r1.ebuild b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
index 83d7532..e6da154 100644
--- a/mail-mta/postfix/postfix-2.3.8-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.7 2008/03/14 01:11:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.8 2008/04/13 22:53:12 vapier Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -32,7 +32,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 LICENSE="IPL-1"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 # regular ebuild.
 PROVIDE="virtual/mta virtual/mda"
@@ -168,9 +168,6 @@ src_unpack() {
 		epatch "${WORKDIR}/${VDA_P}.patch"
 	fi
 
-	# Falco's patch
-	epatch "${FILESDIR}/${P}-strncmp.patch"
-
 	# Postfix does not get the FQDN if no hostname is configured.
 	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
 
diff --git a/mail-mta/postfix/postfix-2.4.6-r2.ebuild b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
index 3f10366..4bb129a 100644
--- a/mail-mta/postfix/postfix-2.4.6-r2.ebuild
+++ b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
@@ -159,9 +159,6 @@ src_unpack() {
 		epatch "${WORKDIR}/${VDA_P}.patch"
 	fi
 
-	# Falco's patch
-	epatch "${FILESDIR}/${P}-strncmp.patch"
-
 	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 
diff --git a/mail-mta/postfix/postfix-2.4.7.ebuild b/mail-mta/postfix/postfix-2.4.7.ebuild
index 2de0fc3..9aaec00 100644
--- a/mail-mta/postfix/postfix-2.4.7.ebuild
+++ b/mail-mta/postfix/postfix-2.4.7.ebuild
@@ -159,9 +159,6 @@ src_unpack() {
 		epatch "${WORKDIR}/${VDA_P}.patch"
 	fi
 
-	# Falco's patch
-	epatch "${FILESDIR}/${P}-strncmp.patch"
-
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 
diff --git a/mail-mta/postfix/postfix-2.5.0.ebuild b/mail-mta/postfix/postfix-2.5.0.ebuild
index 30b5f93..ce207c9 100644
--- a/mail-mta/postfix/postfix-2.5.0.ebuild
+++ b/mail-mta/postfix/postfix-2.5.0.ebuild
@@ -311,6 +311,7 @@ src_install () {
 
 	# Set proper permissions on required files/directories
 	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
 	fowners postfix:postfix /var/lib/postfix
 	fperms 0750 /var/lib/postfix
 	fowners root:postdrop /usr/sbin/post{drop,queue}