projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84b2575)
version bump
authorEray Aslan <eras@gentoo.org>
Fri, 6 Jan 2012 11:12:04 +0000 (11:12 +0000)
committerEray Aslan <eras@gentoo.org>
Fri, 6 Jan 2012 11:12:04 +0000 (11:12 +0000)
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

mail-mta/postfix/ChangeLog patch | blob | history
mail-mta/postfix/Manifest patch | blob | history
mail-mta/postfix/postfix-2.9_pre20120102.ebuild [moved from mail-mta/postfix/postfix-2.9_pre20111222.ebuild with 81% similarity] patch | blob | history

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index f36efca6e572c19a4f45178fc85bae9ae91d426e..15f2c5646516c8b4ebfe7db6b6237e9d50397e3c 100644 (file)
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.320 2012/01/04 21:57:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.321 2012/01/06 11:12:04 eras Exp $
+
+*postfix-2.9_pre20120102 (06 Jan 2012)
+
+  06 Jan 2012; Eray Aslan <eras@gentoo.org> -postfix-2.9_pre20111222.ebuild,
+  +postfix-2.9_pre20120102.ebuild:
+  version bump
 
   04 Jan 2012; Brent Baude <ranger@gentoo.org> postfix-2.8.7.ebuild:
   Marking postfix-2.8.7 ppc for bug 395289
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 9295bf444bef6569bbfa84075bf6d34a1de11552..27f763dc1ae01a2b312af4e310e485b3a8ade09b 100644 (file)
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postfix.rc6.2.5 1424 RMD160 c0026032a5a807c19431b1381df48dab14469796 SHA1 3aae6fdb80488398442237b2a8a581e4da448e0d SHA256 f5ab48b469db3f62a5e5ccc15e5cfa6e0ace97d2c2bc66af334d105b0dfa7d31
 AUX postfix.rc6.2.6 1996 RMD160 a7936897d1b8249e3fc0da2426afcbbe25bbe0ce SHA1 34e7d5899649b932808551f4d08517b4c1dcceca SHA256 2beed4cf54d6634620bd44ce6337912a7dfaeada1fd03c04f37f777628a5c9bf
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
@@ -11,7 +14,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20111222.tar.gz 3758331 RMD160 fd542e753de6a5c61c071b2d9c0dda86b231fcef SHA1 adb1ac223f96ac12a621fe32ee293fb66a5294db SHA256 16407d10c8a72da0ed606a0094e29ca4c642eb1b2d2caba5d277fa18abfe9cb4
+DIST postfix-2.9-20120102.tar.gz 3760059 RMD160 af51826c6eeeba6fcac73ff5a38d1702bdb72a66 SHA1 e4fff35fd6c1307468c2f7c391389067b05fd9ea SHA256 7829c95afdd7fa0e7b72975e2235e7c743a5f132b1f7158b510df7c54ad1d84b
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
@@ -27,6 +30,23 @@ EBUILD postfix-2.8.4.ebuild 8438 RMD160 cdf05986adb042588e332017a430d1c9c10bc527
 EBUILD postfix-2.8.5.ebuild 8447 RMD160 d783620f452d45b164b81c3f32fea5488dd703d1 SHA1 55cb7e91a94f1765e13ee8e130f991cc31561fab SHA256 01dcded08cbdb7317ea6fb7d75005d6f49c3faa32209f746bc63710dff77d7cf
 EBUILD postfix-2.8.6.ebuild 8435 RMD160 d794ccd5fae24cbef65034aedb5f8919ca216483 SHA1 3a0e9b1920bc6fab81287057f1f15bf00a5376a2 SHA256 6c25ce81553164eb797f83b4b170e0b8dd4049ee984653b043e27605ca32ce3a
 EBUILD postfix-2.8.7.ebuild 8431 RMD160 b604c427448fded02435ed2e76996c69142f3d2e SHA1 f2e705c64e702c6011a4813fb97f89af57418089 SHA256 7dda83c42f7ef1c56daea7f6651e4cd0fdf043a2cf12f0d4d3e8edf9a1874144
-EBUILD postfix-2.9_pre20111222.ebuild 8998 RMD160 d0273c679cdfae45c2291f4818fc578ce12a1305 SHA1 44d05d4dab89054896f7ff61bdfae269f5564537 SHA256 2061f332545614856f8407e7b271d4a9d27d114caffeb43132f298a7910262b4
-MISC ChangeLog 74634 RMD160 71f6fff71dd11c4a332f51ebdec85337124ca805 SHA1 dde0622193ccb8f6bfe6e1fc6e840d4c552b0c80 SHA256 e8d2a0668cf0050a79a5ddf8670d0a829ad5f786fa9eede152cb3ff0c1789146
+EBUILD postfix-2.9_pre20120102.ebuild 9684 RMD160 486da046ab75ea10a5640487a56e256d9183c625 SHA1 08dab3e9681d2b09b1037904dc9a06d9910e458f SHA256 0fa8b87255b8651bb0f88574cdb8b9c363174607a1ad73432d0b24a0bc5100d8
+MISC ChangeLog 74800 RMD160 0025cb1dcdd3346c116f1ae70da9972d1cb1696f SHA1 8dda7af23d074f938743131ea17eb5904eac90bb SHA256 93f0790a522656bf986c6cbb6fd097d67d2a9a441795d68b117b9a862c4ccd50
 MISC metadata.xml 501 RMD160 faf5708865464f36ec686bb58b2474e2a5a1fb53 SHA1 f5d83c47e3edc4a6c337d4bb905eb4917dc0d417 SHA256 7a46203782ad8363c75a53faa35a434e20f879a7f23f624388ce248ea8bb55a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPBtcSAAoJEHfx8XVYajsfsocQAKzXmBap2cdGcL08A8Ts5j98
+yBxSBrLw5MRqZ9i0I8lWFxeo/jvbr/rCB64HvK0fa6cyb1lNzDbxHEe6ZR3wkLwP
+HDLizu2xOTEUvegnuauvQI1rby44OPybEaYqrbImfm3BZnrqmob9jL57Yr136p0/
+0zaMVnavjLuuxtrybWUWcK3wNn+iGT9uVQyOAjrDTYnbCPdm3iQeVsEqY4eLFTM1
+4ZjjgzXXCZjwYnX7z8++dmYaJn10qfN1qOvFuz8wIB9G7Zy8l3eSZ+cdrV/0hJK6
+5vOcgr4b+lpGyz7ZM1y3pV+JvR52wB5r1PdUQ7u7xPxL7mO+ZwrEIwjwG7w19a4Z
+WhS00dtuJpDR9hM/QFD/zxGijhN1Kqn+JfmRCMob3LYFQsD/hiyph/eO85p1l3S6
+fjZDIa2I5ecMQLMKgfCe6+dg1GLIUSwS9WCGiZxaZ8noHXsYEttHpvmGUVzpDmlj
+xzK4YVyKKE3uv4UhCCVPV2yU1bcnbnJlcyks+qWkSPLJLtXcaiv+HJ5DPwCPiPKS
+O3oqG1xZn0ehDPbwyDNI4uBQlMA1wGGaue0uOO+K8B0/FLMawj9BxVWhhWEtFoHR
+FnY7wI6uoZ4POKsyeoGw5m9sUN/DdREg+5rSVIMYaTmSHylsXQele02bp4mCG7F3
+T/MqMXLNvJreqrJlMgly
+=2Zdu
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.9_pre20111222.ebuild b/mail-mta/postfix/postfix-2.9_pre20120102.ebuild
similarity index 81%
rename from mail-mta/postfix/postfix-2.9_pre20111222.ebuild
rename to mail-mta/postfix/postfix-2.9_pre20120102.ebuild
index 0d7b137c9362dc82c760791ea484e772b04f6e56..fecdc4162ecaae8c4c81b8cae267273b56369f1b 100644 (file)
--- a/mail-mta/postfix/postfix-2.9_pre20111222.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20120102.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111222.ebuild,v 1.1 2011/12/23 15:48:55 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20120102.ebuild,v 1.1 2012/01/06 11:12:04 eras Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 LICENSE="IBM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
        dev-lang/perl
@@ -108,6 +108,12 @@ src_configure() {
                mylibs="${mylibs} -lssl -lcrypto"
        fi
 
+       # broken. and "in other words, not supported" by upstream.
+       # and I'd rather not patch. Use inet_protocols setting in main.cf
+       #if ! use ipv6; then
+       #       mycc="${mycc} -DNO_IPV6"
+       #fi
+
        if use sasl; then
                if use dovecot-sasl; then
                        # Set dovecot as default.
@@ -153,19 +159,19 @@ src_configure() {
                mylibs="${mylibs} ${CDB_LIBS}"
        fi
 
-       mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
-       mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-       mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
-       mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
-       mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
-       mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
-       mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-       mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-       mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
-       mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
-       mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
-       mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
-       mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
+#      mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
+#      mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+#      mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
+#      mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
+#      mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
+#      mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
+#      mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+#      mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+#      mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+#      mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
+#      mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
+#      mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
+#      mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
 
        # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
        # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
@@ -264,6 +270,23 @@ src_install () {
        rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
 }
 
+pkg_preinst() {
+       [[ -d ${ROOT}/etc/postfix ]] && {
+       # changed default for inet_protocols?
+       if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+               if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
+               then
+                       ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+                       ewarn "That will keep the same behaviour as previous postfix versions."
+                       ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+               else
+                       # delete inet_protocols setting. there is already one in /etc/postfix
+                       sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+               fi
+       fi
+       }
+}
+
 pkg_postinst() {
        # Do not install server.{key,pem) SSL certificates if they already exist
        if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
@@ -281,14 +304,10 @@ pkg_postinst() {
                ewarn
        fi
 
-       elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
-       elog "for incompatibilities and other major changes between releases."
-
        if [[ ${REPLACING_VERSIONS} < 2.9 ]]; then
                elog "If you are using old style postfix instances by symlinking"
                elog "startup scripts in ${ROOT}etc/init.d, please consider"
                elog "upgrading your config for postmulti support. For more info:"
                elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
-               elog
        fi
 }
Unnamed repository; edit this file 'description' to name the repository.