Fix compile issues, bug 216588.

Package-Manager: portage-2.1.5_rc3

5 files changed, 56 insertions, 4 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 38dc5319811e..f9408cd96d64 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.72 2008/04/17 19:42:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.73 2008/04/17 20:31:58 ulm Exp $
+
+  17 Apr 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/a2ps-4.14-check-mempcpy.patch,
+  +files/a2ps-4.14-fix-stpcpy-proto.patch, a2ps-4.14.ebuild:
+  Fix compile issues, bug 216588. Thanks to Colin Bennett <colin@gibibit.com>.
 
   17 Apr 2008; Jeroen Roovers <jer@gentoo.org> a2ps-4.13c-r6.ebuild:
   Stable for HPPA (bug #212050).
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 23fb9e5b9a24..35373b1571d6 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 AUX 50a2ps-gentoo.el 253 RMD160 4e98bec1dd60efb072e7cf7b6e6e3f58d53a4ead SHA1 210038d9f7e39a14fa8639aa02cb7c81945883b1 SHA256 3d114d11eca3eb4f96e656d188e90082432a1206f39fd471d72c0d4e392d7615
 AUX a2ps-4.13-fixcachecheck.patch 444 RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 SHA1 64dadd08f018a65e380fd798157ce04af3a8f6b2 SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622
@@ -11,6 +14,8 @@ AUX a2ps-4.13c-locale-gentoo.diff 981 RMD160 f7366bf6eba344e88c9e7179ddda3fdb9b1
 AUX a2ps-4.13c-psmandup.diff 569 RMD160 8c9436d9b72a1a2e78f8325c53e1e36bc29e2fbe SHA1 8407ed69c5f787db3149825a1f60fd5ae5a8d434 SHA256 2e64be23e030ed0f08b243f0513800336d06739fc7e347a09c130958531b85cd
 AUX a2ps-4.13c-psset.patch 469 RMD160 f7b62d2408bacf0e8715b81445269749f95bef6a SHA1 d3e2c1cdb7c46fc42203344776ed9f6a2e7cfff5 SHA256 0ddb899c48c897fc333e73702f9dc666be4cbd6215da6db860784fb503500b68
 AUX a2ps-4.13c-stdarg.patch 1505 RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e SHA1 c215dae65c8e14fceaa31917e4a596800211c3e7 SHA256 9e7e630386b694b90b0bc6454bedc7c102d46b8bb6a6246eabd37e8b6d639c68
+AUX a2ps-4.14-check-mempcpy.patch 514 RMD160 b61b89124a6f8e810ee2ace6a042d0e8981cb7c2 SHA1 6aed29c1399e79f3914b408059610f9e7c0fc38e SHA256 7ec2164888d1621a8406d431ed3accd137ec8f92e0ca885175bc1c17010519a1
+AUX a2ps-4.14-fix-stpcpy-proto.patch 436 RMD160 4bb4768497ddde06486a0c22842010145660c97d SHA1 58fa90134f1027e3f05aeb08212cbcc10f420738 SHA256 3707120fbbbd8306f01fec785c18b9fa2eee02ec689cde5ad251a9337af6573e
 DIST a2ps-4.13c-ja_nls.patch.gz 38189 RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 SHA1 7eeb2c85697b5eff13701b7b600e4a959b12f134 SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f
 DIST a2ps-4.13c.tar.gz 2395885 RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 SHA1 f32f8476578a97049a5a75216ad6eda9f902dbc2 SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890
 DIST a2ps-4.14-ja_nls.patch.gz 27576 RMD160 0e67be153e5bd87cbba2c615bc4ea76e72a800cb SHA1 fc939288580a1fcc1c3596ec4e77b049eab5d357 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc
@@ -18,6 +23,13 @@ DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SH
 EBUILD a2ps-4.13c-r2.ebuild 1990 RMD160 10b16e03d203e46ff99e5b510d08e7254633bdbf SHA1 bc4b5a7602e1f64634bef86e1a45581c4ce5577c SHA256 37b53f5af4180ee5231e35e81b6f4297543b534bab5476c9c38e1a98250f87ef
 EBUILD a2ps-4.13c-r5.ebuild 3043 RMD160 b24ce20ea767f7b71cbeb38e7ac50d27daa71a8b SHA1 d8288d61a452709201d7a98d4ca21b7645542c3c SHA256 0da707f72719e90531d682f9c3d7fd4b1785fc51b7bafee4a05477a821b26149
 EBUILD a2ps-4.13c-r6.ebuild 3367 RMD160 9dcc10a7045bcd1008806a4cb4e061b86ace15e5 SHA1 55ece7b21c55324231de6ebe464115f6578593b5 SHA256 40171e8f0076bbf794057534c878a5b39e1e20eb42497aaca6348cac3622bc8d
-EBUILD a2ps-4.14.ebuild 3208 RMD160 2c46a8b8dafd9dc398d6b9f59fb6a04010f54ec0 SHA1 e5f021cffbe57d7ed3ba8a6bb95427f52b71aaa1 SHA256 862b53c3ea361414901f3cabf8f1ff45839c25df5de66599bca352f26b4812d8
-MISC ChangeLog 10749 RMD160 5f9aa899966b24f799acd32864a98785bdec2a47 SHA1 bb1235fa96aa9801a47e747c4459da0f609cef0f SHA256 67b972fbc46613390d0a1accc075e6b07b135c7e16b1b16cf0cf7025217f5108
+EBUILD a2ps-4.14.ebuild 3425 RMD160 1b52c03a57e65192a1c78c4584d58950835dc635 SHA1 514f5fc0cb14f794dd116d7437389418c209a0c2 SHA256 c9fccfaf692333587a39d8f0cc45b4e540c6e3ccf93add53718bee14477728a1
+MISC ChangeLog 10977 RMD160 55860ac2cc3553efd8ed10f38ff342d88ff933b0 SHA1 c8cfc368c5ea4a20c23a121c43db534d5966abe9 SHA256 b01ee164a03af9007442a80fef84273ff40933b214cadd04c6b1f0e8c85f5579
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkgHs70ACgkQOeoy/oIi7uz/zQCfXkE4Si8UWbyJlLfj+ZnW4f2u
+9H8AoKyiasuKe5l1PNxT77Mu2ZGknFBX
+=qGLv
+-----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14.ebuild b/app-text/a2ps/a2ps-4.14.ebuild
index 83e9b934cdfc..817711aeff57 100644
--- a/app-text/a2ps/a2ps-4.14.ebuild
+++ b/app-text/a2ps/a2ps-4.14.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/app-text/a2ps/a2ps-4.14.ebuild,v 1.2 2008/04/09 12:36:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14.ebuild,v 1.3 2008/04/17 20:31:58 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -74,6 +74,12 @@ src_unpack() {
 	# fix chmod error, #167670
 	epatch "${FILESDIR}/a2ps-4.13-manpage-chmod.patch"
 
+	# add configure check for mempcpy, bug 216588
+	epatch "${FILESDIR}/${P}-check-mempcpy.patch"
+
+	# fix compilation error due to invalid stpcpy() prototype, bug 216588
+	epatch "${FILESDIR}/${P}-fix-stpcpy-proto.patch"
+
 	AT_M4DIR="m4" eautoreconf || die "eautoreconf failed"
 }
 
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
new file mode 100644
index 000000000000..7b820cead05f
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
@@ -0,0 +1,12 @@
+--- a2ps-4.14-orig/configure.in	2008-04-16 08:36:03.000000000 +0200
++++ a2ps-4.14/configure.in	2008-04-16 08:36:29.000000000 +0200
+@@ -137,7 +137,8 @@
+ ad_REPLACE_FUNC_STRCASECMP
+ ad_REPLACE_FUNC_STRNCASECMP
+ ad_REPLACE_FUNC_RENAME
+-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
++  tempnam strsignal psignal setlocale mempcpy)
+ ad_FUNC_SYSTEMPAPERNAME
+ ad_FUNC_ATEXIT
+ ad_FUNC_STRFTIME
diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
new file mode 100644
index 000000000000..7c3c69076ae9
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
@@ -0,0 +1,17 @@
+=== modified file 'lib/xstrrpl.c'
+--- lib/xstrrpl.c	2008-04-14 18:04:50 +0000
++++ lib/xstrrpl.c	2008-04-14 18:20:20 +0000
+@@ -20,12 +20,10 @@
+ 
+ #include "system.h"
+ #include <assert.h>
+ #include "xstrrpl.h"
+ 
+-extern char * stpcpy();
+-
+ /* Perform subsitutions in string.  Result is malloc'd
+    E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
+    where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
+    */
+ char *
+