4 files changed, 96 insertions, 10 deletions
diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index 790aee1dd404..b69d7b121c95 100644
--- a/app-arch/cpio/ChangeLog
+++ b/app-arch/cpio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/cpio
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.46 2005/12/25 01:05:28 kumba Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.47 2006/02/18 21:42:46 vapier Exp $
+
+  18 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/cpio-2.6-stpcpy-hack.patch, cpio-2.6-r5.ebuild:
+  Fix by Benigno B. Junior for building on *BSD systems #123237.
 
   25 Dec 2005; Joshua Kinard <kumba@gentoo.org> cpio-2.6-r5.ebuild:
   Marked stable on mips.
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index e54eeae76338..dd5f168aef2d 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,24 +1,55 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7d230948beced54e710a2b79162ce1e3 ChangeLog 7629
-MD5 1aa1e97053e83282aecbbff9c590534d cpio-2.6-r5.ebuild 1579
+MD5 b18034d37455d571761e712540d50a7b ChangeLog 7803
+RMD160 10344dce7b40e3e4cbce23ac61783b297023de1a ChangeLog 7803
+SHA256 f0695d1cdb646dfc1f24e50ab8f67b2c5d6888f6938d64a749f059fdf9dc06a9 ChangeLog 7803
+MD5 83cf3aa60af3a6cd06aae888203a466f cpio-2.6-r5.ebuild 1633
+RMD160 d836760a96f37d9eabfd6eb748a901feb4094d96 cpio-2.6-r5.ebuild 1633
+SHA256 e2b21b3a914025bf862539054cc27d9f6d3afc77f717ef95e963149db39ad097 cpio-2.6-r5.ebuild 1633
 MD5 527f6d401d12741d17a7ac7761a6d2d7 files/2.6-isnumber.patch 861
+RMD160 9354385fd0838cd8c9b43f8dcfc3c0b3547858de files/2.6-isnumber.patch 861
+SHA256 b38b263324b06de3d57e4d9e30f04da411821ed97fa8f95b1c4832bdd43b5463 files/2.6-isnumber.patch 861
 MD5 ae93625090241de60fb662d4dd0153dc files/2.6-lstat.patch 843
+RMD160 9772cf9735394da69c2fdb87d161015871c03802 files/2.6-lstat.patch 843
+SHA256 0aec1557f10e9829c7e906c1d673bf7417a6fc55a3c428e54287efb31fd15fc2 files/2.6-lstat.patch 843
 MD5 7894f923500cbeeb0b36117e08049b5d files/2.6-rili-big-files.patch 2709
+RMD160 21db65441563da0548bc13f9d06b1d8ba4aeb5ca files/2.6-rili-big-files.patch 2709
+SHA256 8ac2ff5e8fb098dbbe1a64e69deeb9ac5da8285fe82ac203c7fea369758585cd files/2.6-rili-big-files.patch 2709
 MD5 e5b0619beac9b1fe4490c3424e903f1f files/2.6-umask.patch 1382
+RMD160 ff9cfc83442885a65f2a93f43688678b5f57e510 files/2.6-umask.patch 1382
+SHA256 5333a0de11a771b7e5baf08be53710cae06e4079b032c7ecf92105fcf1f59e5a files/2.6-umask.patch 1382
 MD5 30a2b9b7ee23e9f02c93e8eca8c466c2 files/cpio-2.6-checksum.patch 1244
+RMD160 be6dc2fd5073902333caee6bd583372bdc38e8f8 files/cpio-2.6-checksum.patch 1244
+SHA256 ba6a5f6c9b4f1eaf5b77022d56b3a483a4b670d3f8642ad0c2eea48c1083bef1 files/cpio-2.6-checksum.patch 1244
 MD5 08647cfda931b161030477956f57b03b files/cpio-2.6-chmodRaceC.patch 4153
+RMD160 3686277cc4f3409eb03cf75424006a6f57210bf4 files/cpio-2.6-chmodRaceC.patch 4153
+SHA256 eb729227f45a96ede00cbb79ec7efaa8eeff700c166ab23c520c5031a26e1792 files/cpio-2.6-chmodRaceC.patch 4153
 MD5 ad27a9309017220fb814c7877fd52cb1 files/cpio-2.6-dirTraversal.patch 6673
+RMD160 ea1324c407b245f5dfb7a2d8e8fdeb87b8ee87ff files/cpio-2.6-dirTraversal.patch 6673
+SHA256 224e8f017bb645a0eb46deae150eaca134c4d8863d10d6f9460b330dbc87a6d9 files/cpio-2.6-dirTraversal.patch 6673
 MD5 c1efb6f13ac85b99cf4f468083101b53 files/cpio-2.6-gcc4-tests.patch 542
+RMD160 280612794b3a0ed21a2aaaf80f0c30ba38f996fd files/cpio-2.6-gcc4-tests.patch 542
+SHA256 8d5a760b82291069d0ab60b1f374e0386344db66dce0d46d6fc0b5aacfcbe3f4 files/cpio-2.6-gcc4-tests.patch 542
+MD5 21ddca574d0cc72a6a98da4510d7ec3e files/cpio-2.6-stpcpy-hack.patch 1307
+RMD160 a723529bfce1f908dccad8300ef2f81e04026e47 files/cpio-2.6-stpcpy-hack.patch 1307
+SHA256 f3e15d2f2e857e79b3b9d82ee645ea0b54e15f86f27ab16085135ec64b5683af files/cpio-2.6-stpcpy-hack.patch 1307
 MD5 5264c887ab223304098de4bc540617a0 files/cpio-2.6-warnings.patch 6280
+RMD160 eb4affc1612285baf6c07957e66138d213bdb8c2 files/cpio-2.6-warnings.patch 6280
+SHA256 78aefdf4d4f8fa792d040d40e7668b87dccff8396bfde191cd3397f0af100ca9 files/cpio-2.6-warnings.patch 6280
 MD5 8e7b24c3c6b13e2228034d738bc9732b files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
+RMD160 f5424c6e3c39a2578737165dbbb6276de880eb45 files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
+SHA256 aed95b698c91951063371bcf524bc0f15b31fe9d967519b0043a886995368f69 files/cpio-2.6-writeOutHeaderBufferOverflow.patch 18611
 MD5 898f15e2e1a554916e69e9397f130e81 files/digest-cpio-2.6-r5 61
+RMD160 5270033e70c315bfc74f3435f3280daf5b14462c files/digest-cpio-2.6-r5 61
+SHA256 5a7e7cd8661f79240ec3e12cf79fd0b38180acfe689f9aea09bb0083a04aa015 files/digest-cpio-2.6-r5 61
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDyInl2+ySkm8kpY0RAqGBAJ0elzG+TOFwyL3i43pH+Qv5bX2NZACgnBzd
-2Go5yaARngwcUuHsvapZMwk=
-=k3pA
+iD8DBQFD95Tl2+ySkm8kpY0RAqLvAJ4jtk+VMW7cXIQYQ9qaDP8dEEgwyQCghy7z
+7qRq+JJJMGYJgeABYrzllGQ=
+=D489
 -----END PGP SIGNATURE-----
diff --git a/app-arch/cpio/cpio-2.6-r5.ebuild b/app-arch/cpio/cpio-2.6-r5.ebuild
index de18980ef328..5650aaf17a97 100644
--- a/app-arch/cpio/cpio-2.6-r5.ebuild
+++ b/app-arch/cpio/cpio-2.6-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.6-r5.ebuild,v 1.10 2005/12/25 01:05:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.6-r5.ebuild,v 1.11 2006/02/18 21:42:46 vapier Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-checksum.patch
 	epatch "${FILESDIR}"/${P}-warnings.patch
 	epatch "${FILESDIR}"/${P}-writeOutHeaderBufferOverflow.patch #112140
+	epatch "${FILESDIR}"/${P}-stpcpy-hack.patch #123237
 }
 
 src_compile() {
diff --git a/app-arch/cpio/files/cpio-2.6-stpcpy-hack.patch b/app-arch/cpio/files/cpio-2.6-stpcpy-hack.patch
new file mode 100644
index 000000000000..c5f0d855a8c0
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.6-stpcpy-hack.patch
@@ -0,0 +1,50 @@
+This is a hack to provide stpcpy on systems where the system libc does
+not provide the function.  Upstream has incorporated a proper fix that
+utilizes gnulib; we use this version instead because it is much smaller.
+
+Patch by Benigno B. Junior
+
+http://bugs.gentoo.org/123237
+
+--- cpio-2.6/configure
++++ cpio-2.6/configure
+@@ -11727,7 +11726,7 @@
+ 
+ 
+ 
+-for ac_func in bcopy mkdir strdup strerror
++for ac_func in bcopy mkdir strdup strerror stpcpy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+--- cpio-2.6/config.h.in
++++ cpio-2.6/config.h.in
+@@ -251,6 +251,9 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+ 
++/* Define to 1 if you have the `stpcpy' function. */
++#undef HAVE_STPCPY
++
+ /* Define to 1 if you have the `strcasecmp' function. */
+ #undef HAVE_STRCASECMP
+ 
+--- cpio-2.6/src/copyout.c
++++ cpio-2.6/src/copyout.c
+@@ -356,7 +356,16 @@
+   char ascii_header[110];
+   char *p;
+ 
++#ifdef HAVE_STPCPY
+   p = stpcpy (ascii_header, magic_string);
++#else
++  {
++    unsigned long __length = strlen (magic_string);
++    memcpy (ascii_header, magic_string, __length);
++    p += __length;
++  }
++#endif 
++  
+   to_ascii_or_warn (p, file_hdr->c_ino, 8, LG_16,
+ 		    file_hdr->c_name, _("inode number"));
+   p += 8;