Small fixes for current tar compatibility. Thanks to Philipp Wehrheim for reporting and James for patching

Package-Manager: portage-2.1.3.12

7 files changed, 71 insertions, 35 deletions

diff --git a/app-arch/ipkg-utils/ChangeLog b/app-arch/ipkg-utils/ChangeLog
index 420934cbc277..87ea27359ac7 100644
--- a/app-arch/ipkg-utils/ChangeLog
+++ b/app-arch/ipkg-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-arch/ipkg-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.9 2007/01/23 15:40:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.10 2007/10/13 01:11:50 seemant Exp $
+
+*ipkg-utils-1.7.050831-r1 (13 Oct 2007)
+*ipkg-utils-1.7-r1 (13 Oct 2007)
+
+  13 Oct 2007; Seemant Kulleen <seemant@gentoo.org>
+  +files/ipkg-utils-tar_call_fixes.patch, -ipkg-utils-1.7.ebuild,
+  +ipkg-utils-1.7-r1.ebuild, -ipkg-utils-1.7.050831.ebuild,
+  +ipkg-utils-1.7.050831-r1.ebuild:
+  Small fixes for current tar compatibility. Thanks to Philipp Wehrheim for
+  reporting and James for patching
 
   23 Jan 2007; Marius Mauch <genone@gentoo.org> ipkg-utils-1.7.ebuild,
   ipkg-utils-1.7.050831.ebuild:
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index 2b01678dbcb5..178d1e648352 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -1,38 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ipkg-utils-1.7-build_fixes.patch 855 RMD160 2f371569a47d02738b217d1c81a97d2dac8da3aa SHA1 2b7bc3ed2298a0a03c929877e3b45d5adf6a21fc SHA256 95527be98be707cb1f176f3db88fa60f8752635e7db9c49408f02c7da1324e32
 MD5 2648e3c60f90844028184eb06a0be837 files/ipkg-utils-1.7-build_fixes.patch 855
 RMD160 2f371569a47d02738b217d1c81a97d2dac8da3aa files/ipkg-utils-1.7-build_fixes.patch 855
 SHA256 95527be98be707cb1f176f3db88fa60f8752635e7db9c49408f02c7da1324e32 files/ipkg-utils-1.7-build_fixes.patch 855
+AUX ipkg-utils-tar_call_fixes.patch 1500 RMD160 de9d8e70009557549c6a392bdd98707c396e48a5 SHA1 05982c834337dbdd7b5bb14b772b5f1a8cf16d03 SHA256 b0183d519f886056d7f79b65182aaed557d5e86e8f5d7a3911235e661d40e79d
+MD5 9f6aee43fa53ac7ee09b4ce67101c432 files/ipkg-utils-tar_call_fixes.patch 1500
+RMD160 de9d8e70009557549c6a392bdd98707c396e48a5 files/ipkg-utils-tar_call_fixes.patch 1500
+SHA256 b0183d519f886056d7f79b65182aaed557d5e86e8f5d7a3911235e661d40e79d files/ipkg-utils-tar_call_fixes.patch 1500
 DIST ipkg-utils-050831.tar.gz 29175 RMD160 0b41d3afa907013f105f704afe9327ddeda360b3 SHA1 482be22bca16fa7c04769ff39be7e43c348a6242 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b
 DIST ipkg-utils-1.7.tar.gz 19480 RMD160 4fa46546be381b8503b1a97be51f9e56cb63112e SHA1 fe29ae3a936124ae84ce24e4ab71c09af98af1af SHA256 813428c1aac04393ba64d0a23f9f820277357cbcdbdd391b9cf2bbf5257e8625
-EBUILD ipkg-utils-1.7.050831.ebuild 1341 RMD160 e4e8f67b5939652d2cf93fadd095c5a9815e5332 SHA1 c49450a4db299f431ad0818e9d9fa89b04953019 SHA256 0593c4601dd1e218ab54b310b6c2b45f6e2839dcb6bc91ef9014af8dc6a05fae
-MD5 eb09608e5e2fbbeefd6f281da6f08e20 ipkg-utils-1.7.050831.ebuild 1341
-RMD160 e4e8f67b5939652d2cf93fadd095c5a9815e5332 ipkg-utils-1.7.050831.ebuild 1341
-SHA256 0593c4601dd1e218ab54b310b6c2b45f6e2839dcb6bc91ef9014af8dc6a05fae ipkg-utils-1.7.050831.ebuild 1341
-EBUILD ipkg-utils-1.7.ebuild 1083 RMD160 4355054ab4d87f467150c39b22c0f8e109026028 SHA1 69be67b051163c40c6eef53ea63c05595a3c1b61 SHA256 7e1d950a6a4d64d5e6ed80f6e025ad522916fd320752fd7a583fd6551f8ced17
-MD5 dd7a82b36feeca3f7c68e44557630a35 ipkg-utils-1.7.ebuild 1083
-RMD160 4355054ab4d87f467150c39b22c0f8e109026028 ipkg-utils-1.7.ebuild 1083
-SHA256 7e1d950a6a4d64d5e6ed80f6e025ad522916fd320752fd7a583fd6551f8ced17 ipkg-utils-1.7.ebuild 1083
-MISC ChangeLog 1352 RMD160 96595231bf547efa9b7aec544d583f5738eeb6f0 SHA1 88ff129f1fa71c4cb7e1522e56dd7347636edea7 SHA256 c0e85763013e92efb9246bc40c656332d47d9a4e760d907345bd035e577bd1e4
-MD5 e32f8dc40fc89760dbcedaeaa3c33f7e ChangeLog 1352
-RMD160 96595231bf547efa9b7aec544d583f5738eeb6f0 ChangeLog 1352
-SHA256 c0e85763013e92efb9246bc40c656332d47d9a4e760d907345bd035e577bd1e4 ChangeLog 1352
+EBUILD ipkg-utils-1.7-r1.ebuild 1143 RMD160 6c76d7c5f5c11b20eed604f7b7df38f2d29473bc SHA1 f64a308672eb53410a39ecff8b82ac1d06b10f9d SHA256 b5f5a13232c8af424958e8c508c8d689260a812a6def03d8c3706da893248a5d
+MD5 7858fe74fe9e2ed494018b887094acae ipkg-utils-1.7-r1.ebuild 1143
+RMD160 6c76d7c5f5c11b20eed604f7b7df38f2d29473bc ipkg-utils-1.7-r1.ebuild 1143
+SHA256 b5f5a13232c8af424958e8c508c8d689260a812a6def03d8c3706da893248a5d ipkg-utils-1.7-r1.ebuild 1143
+EBUILD ipkg-utils-1.7.050831-r1.ebuild 1401 RMD160 b0556bcaab54f26ce72496bbaef6c7dbdddcbe4f SHA1 a28ac5d7cbf08f4b4acefa0e04ff3429e0d60956 SHA256 c4c2e41fb99de56f0b157c7595839855c705b4be8f882e7d322986c9aa444879
+MD5 db4788b01b3e292128451dc9af22ce73 ipkg-utils-1.7.050831-r1.ebuild 1401
+RMD160 b0556bcaab54f26ce72496bbaef6c7dbdddcbe4f ipkg-utils-1.7.050831-r1.ebuild 1401
+SHA256 c4c2e41fb99de56f0b157c7595839855c705b4be8f882e7d322986c9aa444879 ipkg-utils-1.7.050831-r1.ebuild 1401
+MISC ChangeLog 1754 RMD160 a6849d93b092d92dd1ac90ad1a8cd31722bd1270 SHA1 5495afc5f2f9f74d11dc6b35da54c4336c93a3bf SHA256 2d78688909159907d77cb0c87bc3a0513a6627ab3f43315ded846fa5bf17c718
+MD5 d7738a6a865cb23ad566e95d856c2db3 ChangeLog 1754
+RMD160 a6849d93b092d92dd1ac90ad1a8cd31722bd1270 ChangeLog 1754
+SHA256 2d78688909159907d77cb0c87bc3a0513a6627ab3f43315ded846fa5bf17c718 ChangeLog 1754
 MISC metadata.xml 470 RMD160 0ee9229296e2447465a5749478b66b0a3232ee01 SHA1 044f9192a6036e1784e10555d0c0c61239dea1f1 SHA256 3d991c0f9bdb1ffbeb019aecf6542b7144d2de61da72ebbcb69933a243142f28
 MD5 6b8611791f64cdda78ca95bf5351176b metadata.xml 470
 RMD160 0ee9229296e2447465a5749478b66b0a3232ee01 metadata.xml 470
 SHA256 3d991c0f9bdb1ffbeb019aecf6542b7144d2de61da72ebbcb69933a243142f28 metadata.xml 470
-MD5 c018887ab981373330779a1bf153fcf3 files/digest-ipkg-utils-1.7 241
-RMD160 79986ac021d0636f8f9d6f8ba4777155d2d8c660 files/digest-ipkg-utils-1.7 241
-SHA256 1934a842f9a2860c162c2bd62171890ddcf6959b896a91860ef1b2c07af1ae92 files/digest-ipkg-utils-1.7 241
-MD5 25b3ebe9f7253417a676bd1e488e6316 files/digest-ipkg-utils-1.7.050831 250
-RMD160 a9e701b7cc8a05f3ed8b5a295c3a1a9449a9d975 files/digest-ipkg-utils-1.7.050831 250
-SHA256 b71679808d22af54d60689033577147300949faa52a41ba513214e57fca16b30 files/digest-ipkg-utils-1.7.050831 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFti746J2i8a8J4okRAmSBAJ9NwVGHmrcqUVJIrQ4Z+N10SfgzRACfXAZ9
-Tn5vtiJMuVoCK6sZuZQu8CI=
-=oU3o
------END PGP SIGNATURE-----
+MD5 c018887ab981373330779a1bf153fcf3 files/digest-ipkg-utils-1.7-r1 241
+RMD160 79986ac021d0636f8f9d6f8ba4777155d2d8c660 files/digest-ipkg-utils-1.7-r1 241
+SHA256 1934a842f9a2860c162c2bd62171890ddcf6959b896a91860ef1b2c07af1ae92 files/digest-ipkg-utils-1.7-r1 241
+MD5 25b3ebe9f7253417a676bd1e488e6316 files/digest-ipkg-utils-1.7.050831-r1 250
+RMD160 a9e701b7cc8a05f3ed8b5a295c3a1a9449a9d975 files/digest-ipkg-utils-1.7.050831-r1 250
+SHA256 b71679808d22af54d60689033577147300949faa52a41ba513214e57fca16b30 files/digest-ipkg-utils-1.7.050831-r1 250
diff --git a/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7 b/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7-r1
index 2295067c2555..2295067c2555 100644
--- a/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7
+++ b/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7-r1
diff --git a/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7.050831 b/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7.050831-r1
index 050fe1b78d8e..050fe1b78d8e 100644
--- a/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7.050831
+++ b/app-arch/ipkg-utils/files/digest-ipkg-utils-1.7.050831-r1
diff --git a/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
new file mode 100644
index 000000000000..da1e02b4fddb
--- /dev/null
+++ b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch
@@ -0,0 +1,28 @@
+Index: ipkg-utils-050831/ipkg.py
+===================================================================
+--- ipkg-utils-050831/ipkg.py	{cset c946c633-8984-433c-8beb-a6cf3926b0af}
++++ ipkg-utils-050831/ipkg.py	{local clone}
+@@ -152,9 +152,9 @@ class Package:
+             self.filename = os.path.basename(fn)
+ 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
+             if self.isdeb:
+-                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
++                control = os.popen("ar p "+fn+" control.tar.gz | gtar xfzO - --wildcards '*control'","r")
+             else:
+-                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
++                control = os.popen("gtar xfzO "+fn+" --wildcards '*control.tar.gz' | gtar xfzO - --wildcards '*control'","r")
+             line = control.readline()
+             while 1:
+                 if not line: break
+@@ -181,7 +181,7 @@ class Package:
+             if self.isdeb:
+                 data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
+             else:
+-                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
++                data = os.popen("gtar xfzO "+fn+" --wildcards '*data.tar.gz' | gtar tfz -","r")
+             while 1:
+                 line = data.readline()
+                 if not line: break
+# Checksums: MD5
+# 3b32292e44cc49af1d6c599fd8a44fb8  ipkg.py
+# a103926695d45fe3c6d08a841ed6cd99  ipkg.py [diff]
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7-r1.ebuild
index 30a1295e3300..a6c5a37d0c85 100644
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.ebuild,v 1.8 2007/01/23 15:40:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7-r1.ebuild,v 1.1 2007/10/13 01:11:50 seemant Exp $
 
 inherit distutils eutils toolchain-funcs
 
@@ -21,7 +21,9 @@ RDEPEND="dev-lang/python
 DEPEND="${RDEPEND}"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack "${A}"; cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-tar_call_fixes.patch
 
 	sed '/python setup.py build/d' -i Makefile
 
@@ -38,5 +40,5 @@ src_compile() {
 
 src_install() {
 	distutils_src_install
-	use minimal && rm ${D}/usr/bin/ipkg-upload
+	use minimal && rm "${D}"/usr/bin/ipkg-upload
 }
diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild
index 4e3ef3279547..de6564b17f63 100644
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831.ebuild,v 1.3 2007/01/23 15:40:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild,v 1.1 2007/10/13 01:11:50 seemant Exp $
 
 inherit distutils eutils toolchain-funcs versionator
 
@@ -24,7 +24,9 @@ RDEPEND="dev-lang/python
 DEPEND="${RDEPEND}"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack "${A}"; cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-tar_call_fixes.patch
 
 	sed '/python setup.py build/d' -i Makefile
 
@@ -41,7 +43,7 @@ src_compile() {
 
 src_install() {
 	distutils_src_install
-	use minimal && rm ${D}/usr/bin/ipkg-upload
+	use minimal && rm "${D}"/usr/bin/ipkg-upload
 }
 
 pkg_postinst() {