Fix build with new automake/aclocal. Also bug #343341: _FORTIFY_SOURCE.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64

3 files changed, 31 insertions, 28 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 1b9e7e1ef640..df8a035ae090 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/vpopmail
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.108 2012/02/09 03:50:00 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.109 2013/05/30 23:21:24 robbat2 Exp $
+
+  30 May 2013; Robin H. Johnson <robbat2@gentoo.org> vpopmail-5.4.33.ebuild:
+  Fix build with new automake/aclocal. Also bug #343341: _FORTIFY_SOURCE.
 
   09 Feb 2012; Jeroen Roovers <jer@gentoo.org> vpopmail-5.4.33.ebuild:
   Stable for HPPA (bug #378371).
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index a681fb75578e..d43a3553105f 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 99vpopmail 64 RMD160 c5587e2065da076bdd33c5b97139029936a26637 SHA1 5bc3f3ae1938c9951d0003b47d04154996596f25 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4
-AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
-AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 RMD160 691f03e6a7eee4597ef7615720618bccd2c8439f SHA1 dc5a5e9e2323346bb2687049d9d3a68ac1fec866 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085
-AUX vpopmail-double-free.patch 411 RMD160 82594d0ae6618411227fafa136fcedd83b328d37 SHA1 755786c15f8b065db0757cdb4204c5cc835d99ad SHA256 30baf7ccd16af5ab375e03b56764c367f589f0cf1e0535fcc98b5c591829b055
-AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4
-DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
-DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc
-DIST vpopmail-5.4.33.tar.gz 612271 RMD160 d064f1a53e7cbe41c87af790ab2dee2d406df7b2 SHA1 1fd185321c5460458683ab7acfc104420b213e2d SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4
-EBUILD vpopmail-5.4.16.ebuild 7521 RMD160 7943ab09ea5920bf1f88f81792ec93dc7fe92e3c SHA1 6aa6a81d331557f2f3944c5b6f8a11b30a3a1a5c SHA256 c6d5e2c30808c07dc676be37fcd60b1ef9d9c8e518662691350d20062c3b07ed
-EBUILD vpopmail-5.4.30-r1.ebuild 7208 RMD160 9a8409f1c3679d69d5f7a8de0742716011a697ba SHA1 d58ab7f7de5311446966cb1283ba5b947af42c5d SHA256 a0340942a6c0b68018fe04a4c140cc0abd590ddf08f38dcba8d5285341b0be68
-EBUILD vpopmail-5.4.30-r2.ebuild 7306 RMD160 4ab8a27d5538d4429cb240e3b39eeb921faa6901 SHA1 181d8c78baf61c9981b320d99b7c5772485f0222 SHA256 fbbd326a402cd28f4450d75430216574dd1d99c2d72da04f54360d856b82cb4e
-EBUILD vpopmail-5.4.33.ebuild 7374 RMD160 352445da84b70eace3baa2a8c8a87ce285c373bf SHA1 fe91bfefb5925ac78b2ceefe6ef53947c58cdeb6 SHA256 2b5cc7f115be008a34ca2949ff131e27579b39c5c5bade32f344c6fca9ac170a
-MISC ChangeLog 16664 RMD160 6fe7b7e25b77faec485cf47647964a2eb77347ba SHA1 fd8d8e0550741f0985537285adc4814e082d31d0 SHA256 acb20d7606c4113929aff19fc85cc04a3130a953d164993480a1cd4c3945d433
-MISC metadata.xml 517 RMD160 3ac125856ecc0b4a40da3121250fe0ae5e6d74c8 SHA1 2f0e78d2e5e00498860b9d72bdb4b66883370c55 SHA256 d651b3c6eb2a45f76ffd4546a77248df9f5750e9acd14b4896d3cac0bec65c88
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk8zQowACgkQVWmRsqeSphNtqACeJ0BnhnJ/9XXMLF6Kj0/nY67U
-BswAn3Pn3UYml0pmeFMRAxPti8ew7gmK
-=xdJ8
------END PGP SIGNATURE-----
+AUX 99vpopmail 64 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953 WHIRLPOOL 2fcd1e603dce3cb7c174fedf3189b8a060e64595d3a0836b15082a46cee612c8fad4f5742eb6ae5490ed5adfb16a14a431b55090c9e60140ac6c00ae62f19e4b
+AUX vpopmail-5.4.9-access.violation.patch 918 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac SHA512 8d877f5057550d25a77a617e81913e9fd94875ab1f1dd6c41e5d49756ff89cd2e089c48d48c81f990d901d5fcfbd0c467b2b0d1a3cdf8c7e78581c1f368e64fd WHIRLPOOL a4111f32fbba3604285c22d01d7f53202571573144d33a1dae866f4738748db0f98b3908f845c32919f579abf019bdb32b8f40418529c339c4fb8448014cda3f
+AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085 SHA512 982e30f3c6bd6a11316460d71ef9c2bdc687108de1529b6016a2ffaf7136fa2c3636935b46ae6ed9864148cd09623eb149fe33e5bef2451dceb5e23e7e1a505a WHIRLPOOL 18426a981a2534ad9fdc390f672cbec1482a60f55da148c7fbbe747ac52e7490eb6c1afe9645a115ff7cf07cc0a8239419900d1213c6e4990287fa4d1e123b7f
+AUX vpopmail-double-free.patch 411 SHA256 30baf7ccd16af5ab375e03b56764c367f589f0cf1e0535fcc98b5c591829b055 SHA512 f12c29172e0bf0da173847c30db552dfb49e437805c74e0d03064dffb7a1bf71b0d897a5f13d019fd25cb103e394f0f869778de42288e6c6cc3e8612037b5190 WHIRLPOOL 8678656496fdea52e9f40ed3da113ac7c71cd24371e87108bd6bf9800ed55ecc392f044ff33ca694852772b6e815c6e167a5a3c0ec9dcc70e1bc31f840597820
+AUX vpopmail-lazy.patch 324 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4 SHA512 42f1e24ee850b9e858a271d734246981c506d74556a62d0124ebe8e842553e32e57603975545d8f49d76e3cca832a73ef61ef191a0a1cf07f9343fe609ecc0c5 WHIRLPOOL 6a00bc14728d58f49257350312950ac32aa8f9689fd1e53105da50464b32ea54f862411def1771a4a597681ab97c88463a4e05c892841c447b428789eb67eeda
+DIST vpopmail-5.4.16.tar.gz 453019 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a SHA512 a7ce5640a59ee7f216869d08cb681eb323910f4fd7dcc9f644fe9bcb842c6703745edbbd5bb95ab44dc59b4684a8e29b115a3aeb893ef7514fdc28eab46328d0 WHIRLPOOL 10bc8c4f05b11cabaaf69e49f42006bd8b46d671f189c4e5d8258e3fb88bffb76e086398792dc655b3a02d6f59efcb48727602b50273138a3b35940725faeba3
+DIST vpopmail-5.4.30.tar.gz 609358 SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc SHA512 62bb677cb2f928d37fff1346a7aa7a6f9f7900159d1edcf0f471bf252c59f19e2b8605c27033e9123339a75dc4058b4fd21ea5e05684590e50c94a1431d91c7b WHIRLPOOL 0a4caafe23dd649e6c5917bac6fa414dd702b8631231c94385a2afc24e977b3ea07e6cdf71261935e4a7df2e7508edad40124c15cfab2e02308c060c5d50e44a
+DIST vpopmail-5.4.33.tar.gz 612271 SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab WHIRLPOOL 9b49635984e541880528e56da9932a74e1a0988ef0b82f0f15538b6f9744c3bf1e86da45dd5de0c55af714669547c48d1f13830c8480e6760bc548b5047520f3
+EBUILD vpopmail-5.4.16.ebuild 7521 SHA256 c6d5e2c30808c07dc676be37fcd60b1ef9d9c8e518662691350d20062c3b07ed SHA512 d4b34acacf59f6c5826cb4a033cacb4bb5da33cd6556833f2f071b42ccf1ac10dc9748336b18d6c58322b1e723bfc428c7db940f3184b38671edec33e018fbc0 WHIRLPOOL 3bda566fd24fb91458a0844b84edec0568f6f95e0c099149c3751450bb071ad0047937cab9f578c646eb82000f540f7d09988b98d9837328186788fc35f57d1f
+EBUILD vpopmail-5.4.30-r1.ebuild 7208 SHA256 a0340942a6c0b68018fe04a4c140cc0abd590ddf08f38dcba8d5285341b0be68 SHA512 da04f34d620b92787ace4d0a0cbad04a250bc5dcbdf48caa26a713cbde33821d479e94361dae1ce3d807d286b7a31a218acdb6896949d77231dda838c684f0f6 WHIRLPOOL acd5a867b9d4893ba06e39b820d6b27cb9e89a43b983e68ad4cc8bfe280a242c4721dba2498168eb1955f14eed6ea3c271dd54761316c13ed380c468cdf197cc
+EBUILD vpopmail-5.4.30-r2.ebuild 7306 SHA256 fbbd326a402cd28f4450d75430216574dd1d99c2d72da04f54360d856b82cb4e SHA512 3f82f7487f3575dcb4ce5f57ff3874c43393c926e6fdffff32ac3b1ae3b9075c16f417998013e84990122773116da514919fddc70e70e2849b22f59073934735 WHIRLPOOL 39f46c5304b08447bf855a886aefc4f97ce8dfb0c1f05219d19fa53a54e706308cb9db300c486f4963fdd87452b931711cab97dc03e21559f3e100f958fe4876
+EBUILD vpopmail-5.4.33.ebuild 7651 SHA256 c95f04b00f37f2268b3fa4f2eb512e98f3fce128c23663d199f1fdecc87fe6c1 SHA512 bcdcd7fe5549d336cdf941a88d8e170c462e1feb8be6c4d98c12f9710e4330b89c231f97af6f38775ac1e5d069dfa9e676ab5b576e9225aa1b78f404d5bdd508 WHIRLPOOL 05135747c2637af26ba00ee809e50ba67a4f609046ae83e1a47e912603d1416782e0cb778777f7895c5430914ba12f95022054d79525b95ed16e4207dd8fda28
+MISC ChangeLog 16820 SHA256 023e6945eacf62fc87d8b889757b344e4ab87637c88202f4cee461c39cefcd42 SHA512 336d23b03ccfa546ba998e8a87f438bea7e300838661c551e7edae512e21fd340a45943bca3d70a6d76917cf818781e437d19cbd5487477c217afb78de371da0 WHIRLPOOL a3de32a8c7e2453aa09de6017f306dd290043e407a8293d5f05b681899d42ad2af651c48821ba68eb1b546fe4c92013047b1013b87a472f820a15cdfc07271b0
+MISC metadata.xml 517 SHA256 d651b3c6eb2a45f76ffd4546a77248df9f5750e9acd14b4896d3cac0bec65c88 SHA512 8519dbf3455005c2750ad6f8b601b62cba5b72938934dec10769a17f35a8343cfc2e76744134176082deb9aa77c571cc485b1afd74f487235bcbb6c91d1025cb WHIRLPOOL 18263a8f7cddab9aaa95f686f5a41d4c614809a0c2e963c82e96c2ee4dcc7288c9f8d626aab25f4a57dedfbecb44c590307b18250797485af208b30b3b7ad475
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index afac37b8d7fd..cb6aac82c44f 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.7 2012/02/09 03:50:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.8 2013/05/30 23:21:24 robbat2 Exp $
 
 EAPI=4
 
@@ -58,6 +58,16 @@ src_prepare() {
 	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
 		vdelivermail.c vpopbull.c vqmaillocal.c || die
 
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
 	eautoreconf
 	ht_fix_file cdb/Makefile
 }