Fix from upstream for an update regression #200315 by Billy DeVincentis.

Package-Manager: portage-2.1.4_rc9

5 files changed, 206 insertions, 5 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 7cd7c921907f..f700a5578fa0 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.124 2007/12/01 17:07:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.125 2007/12/10 08:39:40 vapier Exp $
+
+*tar-1.19-r1 (10 Dec 2007)
+
+  10 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/tar-1.19-update-flag.patch, +tar-1.19-r1.ebuild:
+  Fix from upstream for an update regression #200315 by Billy DeVincentis.
 
   01 Dec 2007; Markus Rothe <corsair@gentoo.org> tar-1.19.ebuild:
   Stable on ppc64
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index d5713f17f25d..510e1d6f734e 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rmt 273 RMD160 18f5fac369cc3372af7bd83384bb437a67baaa44 SHA1 971081167d145e45288a173d74ca19aa24c0c05e SHA256 8de946561fc5fe3603627c78c9777dc1f7bad7926171822f3a25958a6cd3be55
 MD5 38de71f12e9b0b3a5a5083f420e812bd files/rmt 273
 RMD160 18f5fac369cc3372af7bd83384bb437a67baaa44 files/rmt 273
@@ -14,6 +17,10 @@ AUX tar-1.19-gnu-inline.patch 5997 RMD160 2345e986c114aa4498f4e4fabab9453e02afcc
 MD5 23a9edaee95aaeeb8d660c30a5bf8e7b files/tar-1.19-gnu-inline.patch 5997
 RMD160 2345e986c114aa4498f4e4fabab9453e02afcc93 files/tar-1.19-gnu-inline.patch 5997
 SHA256 8321e782c140397c025822cde84c7f737eb7631655ab07f1803441627086c784 files/tar-1.19-gnu-inline.patch 5997
+AUX tar-1.19-update-flag.patch 2910 RMD160 60d2629b0946cea35731dfde24fa4d1266fdbec7 SHA1 660c81ff1e6573a1a644adb9d8f2d6e6450c80ad SHA256 cffa6ed0ba8737e772bc2a9f67fc3f985f0b90819d4f7c3b7127848dcc5eef9b
+MD5 26b91419aa0cef2037f418055ff4f615 files/tar-1.19-update-flag.patch 2910
+RMD160 60d2629b0946cea35731dfde24fa4d1266fdbec7 files/tar-1.19-update-flag.patch 2910
+SHA256 cffa6ed0ba8737e772bc2a9f67fc3f985f0b90819d4f7c3b7127848dcc5eef9b files/tar-1.19-update-flag.patch 2910
 AUX tar.1 13004 RMD160 c0afe404edbb6e11c2b4be51458056f115df30bd SHA1 ddd9670245e2026f26d7338cf0d0f1713f00b774 SHA256 9525814c05657180e309ee5fdf592cc61edbc92911921ed21fefc34bbe1dc36c
 MD5 e4f5b9d8a64483a12eb0cae5428f7cc7 files/tar.1 13004
 RMD160 c0afe404edbb6e11c2b4be51458056f115df30bd files/tar.1 13004
@@ -37,14 +44,18 @@ EBUILD tar-1.18-r2.ebuild 1732 RMD160 1245f815a5861ecb84b9f345a4ad618822234521 S
 MD5 7447fea958f223b215f98ed732f7b0f7 tar-1.18-r2.ebuild 1732
 RMD160 1245f815a5861ecb84b9f345a4ad618822234521 tar-1.18-r2.ebuild 1732
 SHA256 349fdf4cfdd8833715f79f97375ed1e4aed590e9559f695088f648f6dcd2a9ed tar-1.18-r2.ebuild 1732
+EBUILD tar-1.19-r1.ebuild 1777 RMD160 88d0ceb18df161f2a6ed5ed4e0561fd75104c2d6 SHA1 bdbac51d446f092eca50edf37a500720b03260fc SHA256 93ad5df653bebf7696e31e7279ae65426c8454c1532a0a3619972835bbdf4b52
+MD5 9391baf031ff05e6a5cec0508e66f795 tar-1.19-r1.ebuild 1777
+RMD160 88d0ceb18df161f2a6ed5ed4e0561fd75104c2d6 tar-1.19-r1.ebuild 1777
+SHA256 93ad5df653bebf7696e31e7279ae65426c8454c1532a0a3619972835bbdf4b52 tar-1.19-r1.ebuild 1777
 EBUILD tar-1.19.ebuild 1711 RMD160 439a60dd3a0eaced6dd6e841c0ae970b04085240 SHA1 88586606711241bd5fecc19feb196a0a256ca0e8 SHA256 ac53a0b2493d25057ef4d0ca4ae315b5e9617905597405e8447724d65f0cb97c
 MD5 6a7d1cee467e9d9bd37d756142be0d3e tar-1.19.ebuild 1711
 RMD160 439a60dd3a0eaced6dd6e841c0ae970b04085240 tar-1.19.ebuild 1711
 SHA256 ac53a0b2493d25057ef4d0ca4ae315b5e9617905597405e8447724d65f0cb97c tar-1.19.ebuild 1711
-MISC ChangeLog 18825 RMD160 dd43f2a957a065d368438159d102d884906f093e SHA1 41d6d499562c1bf1acb633a736fa28afb3477b4d SHA256 a1327cf6472fa351060afe470c8a1d6abf533a343c096b5c1e085fb992d24cd3
-MD5 7f4aaa4fa9e58d5419066f8fd29fc505 ChangeLog 18825
-RMD160 dd43f2a957a065d368438159d102d884906f093e ChangeLog 18825
-SHA256 a1327cf6472fa351060afe470c8a1d6abf533a343c096b5c1e085fb992d24cd3 ChangeLog 18825
+MISC ChangeLog 19036 RMD160 8d43e88463849f538129d29211d87ecce3d4ec94 SHA1 43e48182de39e1b124a04c188207d9afcef81118 SHA256 ab3074f147e3ef75a3e4fa0309c500340a0676f03fa4245573a30e875165c25f
+MD5 c48ed6c1aacaf9fc0c7b77d93cd9d5d9 ChangeLog 19036
+RMD160 8d43e88463849f538129d29211d87ecce3d4ec94 ChangeLog 19036
+SHA256 ab3074f147e3ef75a3e4fa0309c500340a0676f03fa4245573a30e875165c25f ChangeLog 19036
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -64,3 +75,13 @@ SHA256 a51da4b71a4e3ead5181f8d00573d01e876cc22461033318932e9462ce85fc9a files/di
 MD5 b03e23bde88e8c52a5e1329d42bc52b4 files/digest-tar-1.19 232
 RMD160 e5cb06fa7936508ac5c45680ead34d1b1fd50bd3 files/digest-tar-1.19 232
 SHA256 9c70d607b5ef352235456d3f110693969cdb6d37e8049209a02bb2008bc4a589 files/digest-tar-1.19 232
+MD5 b03e23bde88e8c52a5e1329d42bc52b4 files/digest-tar-1.19-r1 232
+RMD160 e5cb06fa7936508ac5c45680ead34d1b1fd50bd3 files/digest-tar-1.19-r1 232
+SHA256 9c70d607b5ef352235456d3f110693969cdb6d37e8049209a02bb2008bc4a589 files/digest-tar-1.19-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHXPsqp/wUKkr7RBoRAo0sAJ4y1ngku/kgOBPBqk6hsddyQSWsjgCfSboZ
+6yzJdc40Sf832/0T9yr6fvA=
+=M50a
+-----END PGP SIGNATURE-----
diff --git a/app-arch/tar/files/digest-tar-1.19-r1 b/app-arch/tar/files/digest-tar-1.19-r1
new file mode 100644
index 000000000000..bb34999276de
--- /dev/null
+++ b/app-arch/tar/files/digest-tar-1.19-r1
@@ -0,0 +1,3 @@
+MD5 bcc2e19b19823b9ab68c94586067a792 tar-1.19.tar.bz2 1882486
+RMD160 302d814c1b1d6a8074a9d26e202eb59284b675b0 tar-1.19.tar.bz2 1882486
+SHA256 c690d46da77b1ee07b7c758de46d6d07da698a75e63ed3e8f83e3fca8f809cb4 tar-1.19.tar.bz2 1882486
diff --git a/app-arch/tar/files/tar-1.19-update-flag.patch b/app-arch/tar/files/tar-1.19-update-flag.patch
new file mode 100644
index 000000000000..09f6df947951
--- /dev/null
+++ b/app-arch/tar/files/tar-1.19-update-flag.patch
@@ -0,0 +1,102 @@
+http://bugs.gentoo.org/200315
+
+2007-12-05  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* src/buffer.c (check_compressed_archive): Do not bail out if the
+	file is too short, set boolean flag, passed as an argument
+	instead.  This fixes a bug introduced on 2007-08-24. See also
+	tests/shortupd.at.
+
+Index: src/buffer.c
+===================================================================
+RCS file: /cvsroot/tar/tar/src/buffer.c,v
+retrieving revision 1.115
+retrieving revision 1.116
+diff -u -p -r1.115 -r1.116
+--- src/buffer.c	31 Oct 2007 13:10:55 -0000	1.115
++++ src/buffer.c	5 Dec 2007 09:45:22 -0000	1.116
+@@ -229,19 +229,21 @@ static struct zip_magic const magic[] = 
+ 
+ /* Check if the file ARCHIVE is a compressed archive. */
+ enum compress_type
+-check_compressed_archive ()
++check_compressed_archive (bool *pshort)
+ {
+   struct zip_magic const *p;
+   bool sfr;
+-  bool short_file = false;
++  bool temp;
++
++  if (!pshort)
++    pshort = &temp;
+   
+   /* Prepare global data needed for find_next_block: */
+   record_end = record_start; /* set up for 1st record = # 0 */
+   sfr = read_full_records;
+   read_full_records = true; /* Suppress fatal error on reading a partial
+ 			       record */
+-  if (find_next_block () == 0)
+-    short_file = true;
++  *pshort = find_next_block () == 0;
+   
+   /* Restore global values */
+   read_full_records = sfr;
+@@ -254,9 +256,6 @@ check_compressed_archive ()
+     if (memcmp (record_start->buffer, p->magic, p->length) == 0)
+       return p->type;
+ 
+-  if (short_file)
+-    ERROR ((0, 0, _("This does not look like a tar archive")));
+-
+   return ct_none;
+ }
+ 
+@@ -273,11 +272,16 @@ open_compressed_archive ()
+ 
+   if (!multi_volume_option)
+     {
+-      enum compress_type type = check_compressed_archive ();
++      bool shortfile;
++      enum compress_type type = check_compressed_archive (&shortfile);
+ 
+       if (type == ct_none)
+-	return archive;
+-
++	{
++	  if (shortfile)
++	    ERROR ((0, 0, _("This does not look like a tar archive")));
++	  return archive;
++	}
++      
+       /* FD is not needed any more */
+       rmtclose (archive);
+ 
+@@ -502,15 +506,18 @@ _open_archive (enum access_mode wanted_a
+ 	{
+ 	case ACCESS_READ:
+ 	  {
++	    bool shortfile;
+ 	    enum compress_type type;
+ 
+ 	    archive = STDIN_FILENO;
+ 
+-	    type = check_compressed_archive ();
++	    type = check_compressed_archive (&shortfile);
+ 	    if (type != ct_none)
+ 	      FATAL_ERROR ((0, 0,
+ 			    _("Archive is compressed. Use %s option"),
+ 			    compress_option (type)));
++	    if (shortfile)
++	      ERROR ((0, 0, _("This does not look like a tar archive")));
+ 	  }
+ 	  break;
+ 
+@@ -554,7 +561,7 @@ _open_archive (enum access_mode wanted_a
+ 			   O_RDWR | O_CREAT | O_BINARY,
+ 			   MODE_RW, rsh_command_option);
+ 
+-	if (check_compressed_archive () != ct_none)
++	if (check_compressed_archive (NULL) != ct_none)
+ 	  FATAL_ERROR ((0, 0,
+ 			_("Cannot update compressed archives")));
+ 	break;
diff --git a/app-arch/tar/tar-1.19-r1.ebuild b/app-arch/tar/tar-1.19-r1.ebuild
new file mode 100644
index 000000000000..2f9a7212f8a7
--- /dev/null
+++ b/app-arch/tar/tar-1.19-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.19-r1.ebuild,v 1.1 2007/12/10 08:39:40 vapier Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
+	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
+	mirror://gnu/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static userland_GNU"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gnu-inline.patch #198817
+	epatch "${FILESDIR}"/${P}-update-flag.patch #200315
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_compile() {
+	local myconf
+	use static && append-ldflags -static
+	use userland_GNU || myconf="--program-prefix=g"
+	# Work around bug in sandbox #67051
+	gl_cv_func_chown_follows_symlink=yes \
+	econf \
+		--enable-backup-scripts \
+		--bindir=/bin \
+		--libexecdir=/usr/sbin \
+		$(use_enable nls) \
+		${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	local p=""
+	use userland_GNU || p=g
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt || die
+	fi
+
+	dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
+	newman "${FILESDIR}"/tar.1 ${p}tar.1
+	mv "${D}"/usr/sbin/${p}backup{,-tar}
+	mv "${D}"/usr/sbin/${p}restore{,-tar}
+
+	rm -f "${D}"/usr/$(get_libdir)/charset.alias
+}