prepare for stable: remove broken version - remove -r2. Users with broken archives are encouraged to use the patch from bug #217552

(Portage version: 2.2_rc67/cvs/Linux i686)

6 files changed, 20 insertions, 332 deletions

diff --git a/app-arch/rzip/ChangeLog b/app-arch/rzip/ChangeLog
index 0c1f0553e240..7d8d6a30e7f9 100644
--- a/app-arch/rzip/ChangeLog
+++ b/app-arch/rzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rzip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.29 2010/01/17 19:30:05 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.30 2010/03/14 16:06:31 bangert Exp $
+
+  14 Mar 2010; Thilo Bangert <bangert@gentoo.org>
+  -files/rzip-2.0-darwin.patch, -rzip-2.1.ebuild, rzip-2.1-r1.ebuild,
+  -rzip-2.1-r2.ebuild, -files/rzip-2.1-handle-broken-archive.patch:
+  prepare for stable: remove broken version - remove -r2. Users with broken
+  archives are encouraged to use the patch from bug #217552
 
 *rzip-2.1-r2 (17 Jan 2010)
 *rzip-2.1-r1 (17 Jan 2010)
diff --git a/app-arch/rzip/files/rzip-2.0-darwin.patch b/app-arch/rzip/files/rzip-2.0-darwin.patch
deleted file mode 100644
index b7858d83529c..000000000000
--- a/app-arch/rzip/files/rzip-2.0-darwin.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- rzip-2.0/Makefile.in
-+++ rzip-2.0/Makefile.in
-@@ -3,8 +3,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--INSTALL_BIN=$(exec_prefix)/bin
--INSTALL_MAN=$(prefix)/man
-+INSTALL_BIN=$(DESTDIR)/@bindir@
-+INSTALL_MAN=$(DESTDIR)/@mandir@
- 
- LIBS=@LIBS@
- CC=@CC@
-@@ -20,7 +20,7 @@
- .SUFFIXES:
- .SUFFIXES: .c .o
- 
--OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
-+OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o
- 
- # note that the -I. is needed to handle config.h when using VPATH
- .c.o:
-@@ -35,6 +35,7 @@
- 	${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
- 	-mkdir -p ${INSTALL_MAN}/man1
- 	${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
-+	ln -s rzip $(INSTALL_BIN)/runzip
- 
- rzip: $(OBJS)
- 	$(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
---- rzip-2.0/configure.in
-+++ rzip-2.0/configure.in
-@@ -2,6 +2,12 @@
- AC_INIT(main.c)
- AC_CONFIG_HEADER(config.h)
- 
-+# test prior to AC_PROG_CC, since it sets cflags on it's own.
-+if test x"CFLAGS" = x
-+then
-+	DEFAULT_CFLAGS="-g -Wall -O3"
-+fi
-+
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
-@@ -9,10 +15,10 @@
- AC_SYS_LARGEFILE
- 
- # Thanks to Martin Pool
--if test x"$GCC" = xyes 
-+if test x"$GCC" = xyes && test x"$DEFAULT_CFLAGS" != x
- then
-     CFLAGS="-g -Wall -O3"
--    AC_MSG_NOTICE([Setting gcc options: $CFLAGS])
-+    AC_MSG_RESULT([Setting default cflags: $CFLAGS])
- fi
- 
- AC_CHECK_HEADERS(fcntl.h sys/time.h sys/unistd.h unistd.h)
-@@ -26,31 +32,15 @@
- AC_CHECK_SIZEOF(long)
- AC_CHECK_SIZEOF(short)
- 
--AC_CACHE_CHECK([for large file support],rzip_cv_HAVE_LARGE_FILES,[
--AC_TRY_RUN([
--#include <stdio.h>
--#include <sys/types.h>
--main() { return (sizeof(off_t) == 4); }],
--rzip_cv_HAVE_LARGE_FILES=yes,
--rzip_cv_HAVE_LARGE_FILES=no,
--rzip_cv_HAVE_LARGE_FILES=cross)])
--if test x"$rzip_cv_HAVE_LARGE_FILES" = x"yes"; then
--    AC_DEFINE(HAVE_LARGE_FILES, 1, [ ])
--fi
--
--
-+AC_SYS_LARGEFILE
- AC_C_INLINE
- 
- 
- AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , 
-         AC_MSG_ERROR([Could not find bz2 library - please install libbz2-devel]))
- 
--echo $ac_n "checking for errno in errno.h... $ac_c"
--AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
--echo yes; AC_DEFINE(HAVE_ERRNO_DECL),
--echo no)
--
- AC_CHECK_FUNCS(mmap strerror)
- AC_CHECK_FUNCS(getopt_long)
-+AC_CHECK_FUNCS(strndup)
- 
- AC_OUTPUT(Makefile)
---- rzip-2.0/main.c
-+++ rzip-2.0/main.c
-@@ -18,6 +18,7 @@
- /* rzip compression - main program */
- 
- #include "rzip.h"
-+#include "strutils.h"
- 
- static void usage(void)
- {
-@@ -58,7 +59,7 @@
- 		fatal("bad magic file descriptor!?\n");
- 	}
- 
--#if HAVE_LARGE_FILES
-+#if _LARGE_FILES
- 	v = htonl(st.st_size & 0xFFFFFFFF);
- 	memcpy(&magic[6], &v, 4);
- 	v = htonl(st.st_size >> 32);
---- rzip-2.0/rzip.h
-+++ rzip-2.0/rzip.h
-@@ -94,7 +94,7 @@
- #define strerror(i) sys_errlist[i]
- #endif
- 
--#ifndef HAVE_ERRNO_DECL
-+#if !defined(errno)
- extern int errno;
- #endif
- 
---- rzip-2.0/strutils.c
-+++ rzip-2.0/strutils.c
-@@ -0,0 +1,29 @@
-+/* 
-+   Copyright (C) 2005 Gentoo Foundation
-+   
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+/* string utilities that may be missing on various platforms */
-+
-+#include "strutils.h"
-+
-+#ifndef HAVE_STRNDUP
-+char* strndup(const char* s, size_t n) {
-+	char* ret = malloc(n + 1);
-+	if (ret == NULL) return(ret);
-+	ret[n] = '\0';
-+	return(memcpy(ret, s, n));
-+}
-+#endif
---- rzip-2.0/strutils.h
-+++ rzip-2.0/strutils.h
-@@ -0,0 +1,31 @@
-+/* 
-+   Copyright (C) 2005 Gentoo Foundation
-+   
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+/* string utilities that may be missing on various platforms */
-+
-+#ifndef _HEADER_STRUTIL
-+#define _HEADER_STRUTIL 1
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include "config.h"
-+
-+# ifndef HAVE_STRNDUP
-+char* strndup(const char* s, size_t n);
-+# endif
-+
-+#endif
diff --git a/app-arch/rzip/files/rzip-2.1-handle-broken-archive.patch b/app-arch/rzip/files/rzip-2.1-handle-broken-archive.patch
deleted file mode 100644
index 860c866eeab3..000000000000
--- a/app-arch/rzip/files/rzip-2.1-handle-broken-archive.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur rzip-2.1/main.c rzip-2.1-patched/main.c
---- rzip-2.1/main.c	2006-02-14 01:38:23.000000000 +0100
-+++ rzip-2.1-patched/main.c	2008-07-30 19:29:49.426926726 +0200
-@@ -35,6 +35,7 @@
- 	printf("     -k            keep existing files\n");
- 	printf("     -P            show compression progress\n");
- 	printf("     -L level      set compression level\n");
-+	printf("     -l nr         set higher bits of the expected file length to nr\n");
- 	printf("     -V            show version\n");
- #if 0
- 	/* damn, this will be quite hard to do */
-@@ -172,6 +173,13 @@
- 
- 	
- 	read_magic(fd_in, fd_out, &expected_size);
-+
-+#ifdef HAVE_LARGE_FILES
-+	if (control->nr) {
-+		expected_size = ( ((off_t)(control->nr))<<32) | (expected_size & 0xFFFFFFFF);
-+	}
-+#endif
-+
- 	runzip_fd(fd_in, fd_out, fd_hist, expected_size);	
- 	
- 	if ((control->flags & FLAG_TEST_ONLY) == 0) {
-@@ -267,7 +275,7 @@
- 		control.flags |= FLAG_DECOMPRESS;
- 	}
- 
--	while ((c = getopt(argc, argv, "h0123456789dS:tVvkfPo:L:")) != -1) {
-+	while ((c = getopt(argc, argv, "h0123456789dS:tVvkl:fPo:L:")) != -1) {
- 		if (isdigit(c)) {
- 			control.compression_level = c - '0';
- 			continue;
-@@ -295,6 +303,12 @@
- 		case 'k':
- 			control.flags |= FLAG_KEEP_FILES;
- 			break;
-+		case 'l':
-+#ifndef HAVE_LARGE_FILES
-+			fatal("You used the -l option, but this rzip doesn't support large files.");
-+#endif
-+			control.nr = atoi(optarg);
-+			break;
- 		case 'v':
- 			control.verbosity++;
- 			break;
-diff -ur rzip-2.1/runzip.c rzip-2.1-patched/runzip.c
---- rzip-2.1/runzip.c	2003-10-08 00:08:28.000000000 +0200
-+++ rzip-2.1-patched/runzip.c	2008-07-30 19:34:03.803564086 +0200
-@@ -179,10 +179,16 @@
-  */
- off_t runzip_fd(int fd_in, int fd_out, int fd_hist, off_t expected_size)
- {
--	off_t total = 0;
--	while (total < expected_size) {
--		total += runzip_chunk(fd_in, fd_out, fd_hist);
-+	off_t total = 0, fin=1;
-+	while (fin && total < expected_size) {
-+		fin = runzip_chunk(fd_in, fd_out, fd_hist);
-+		total += fin;
- 	}
-+
-+	if (total < expected_size) {
-+		fprintf(stderr, "Warning: The uncompressed size does not equal the expected file size.\nHowever if you used the -l option, this may be okay.\n");
-+	}
-+
- 	return total;
- }
- 
-diff -ur rzip-2.1/rzip.h rzip-2.1-patched/rzip.h
---- rzip-2.1/rzip.h	2006-02-14 01:38:23.000000000 +0100
-+++ rzip-2.1-patched/rzip.h	2008-07-30 19:29:49.426926726 +0200
-@@ -113,6 +113,7 @@
- 	unsigned compression_level;
- 	unsigned flags;
- 	unsigned verbosity;
-+	unsigned nr;
- };
- 
- void fatal(const char *format, ...);
diff --git a/app-arch/rzip/rzip-2.1-r1.ebuild b/app-arch/rzip/rzip-2.1-r1.ebuild
index 7d0ae6a645ec..0e1326ef903e 100644
--- a/app-arch/rzip/rzip-2.1-r1.ebuild
+++ b/app-arch/rzip/rzip-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1-r1.ebuild,v 1.1 2010/01/17 19:30:05 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1-r1.ebuild,v 1.2 2010/03/14 16:06:31 bangert Exp $
 
 EAPI="2"
 
@@ -25,3 +25,15 @@ src_prepare() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 }
+
+pkg_postinst() {
+	ewarn "Warning: Gentoo shipped a broken rzip for quite some time. During"
+	ewarn "compression of large files it didn't set the right file size, so"
+	ewarn "if you have any reason to believe that your archive was compressed "
+	ewarn "with an old Gentoo rzip, please refer to "
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=217552 "
+	ewarn "for the rzip-handle-broken-archive.patch patch to rescue your"
+	ewarn "data."
+	ewarn
+	ewarn "We apologize for the inconvenience."
+}
diff --git a/app-arch/rzip/rzip-2.1-r2.ebuild b/app-arch/rzip/rzip-2.1-r2.ebuild
deleted file mode 100644
index a6250fb94cd7..000000000000
--- a/app-arch/rzip/rzip-2.1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1-r2.ebuild,v 1.1 2010/01/17 19:30:05 bangert Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Compression program for large files"
-HOMEPAGE="http://rzip.samba.org"
-SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-arch/bzip2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-darwin.patch
-	epatch "${FILESDIR}"/${PN}-2.1-handle-broken-archive.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
diff --git a/app-arch/rzip/rzip-2.1.ebuild b/app-arch/rzip/rzip-2.1.ebuild
deleted file mode 100644
index b3c66cfb6df5..000000000000
--- a/app-arch/rzip/rzip-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1.ebuild,v 1.12 2010/01/10 00:36:27 jer Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="compression program for large files"
-HOMEPAGE="http://rzip.samba.org"
-SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-arch/bzip2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.0-darwin.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
-
-pkg_postinst() {
-	ewarn "It has been reported that this tool will fail on files >4GB"
-	ewarn "Please see https://bugs.gentoo.org/show_bug.cgi?id=217552 for more"
-	ewarn "information."
-}