[gentoo-commits] repo/gentoo:master commit in: app-arch/dump/files/

[David Seifert]

commit:     41a0df79170417915d31e78bbf1db02c5f2c1653
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug  8 08:30:09 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:23:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a0df79

app-arch/dump: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/5350

 .../files/dump-0.4.44-fix-pointers-aliasing.patch  | 126 ---------------------
 ...mp-0.4.44-rl_completion_matches-detection.patch |  24 ----
 app-arch/dump/files/dump-0.4.44-sysmacros.patch    |  12 --
 app-arch/dump/files/dump-0.4.44-underlinking.patch |  31 -----
 4 files changed, 193 deletions(-)

diff --git a/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch b/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch
deleted file mode 100644
index 6e329008547..00000000000
--- a/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306
-
-=== modified file 'dump/tape.c'
---- dump/tape.c	2011-06-20 07:22:40 +0000
-+++ dump/tape.c	2011-06-20 07:57:11 +0000
-@@ -1281,9 +1281,9 @@
- 			compresult = 1;
- #ifdef HAVE_ZLIB
- 			if (zipflag == COMPRESS_ZLIB) {
--				compresult = compress2(comp_buf->buf, 
-+				compresult = compress2((Bytef *)comp_buf->buf, 
- 						       &worklen,
--						       (char *)slp->tblock[0],
-+						       (Bytef *)slp->tblock[0],
- 						       writesize, 
- 						       compressed);
- 				if (compresult == Z_OK)
-@@ -1313,8 +1313,9 @@
- #ifdef HAVE_LZO
- 			if (zipflag == COMPRESS_LZO) {
- 				lzo_uint worklen2 = worklen;
--				compresult = lzo1x_1_compress((char *)slp->tblock[0],writesize,
--                                                              comp_buf->buf,
-+				compresult = lzo1x_1_compress((lzo_bytep)slp->tblock[0],
-+                                                              writesize,
-+                                                              (lzo_bytep)comp_buf->buf,
- 							      &worklen2,
-                                                               LZO_WorkMem);
- 				worklen = worklen2;
-
-=== modified file 'dump/traverse.c'
---- dump/traverse.c	2011-06-20 07:22:40 +0000
-+++ dump/traverse.c	2011-06-20 07:57:11 +0000
-@@ -782,13 +782,13 @@
- 	for (i = p->next_block; i < blockcnt; i++) {
- 		p->buf[p->cnt++] = 0;
- 		if (p->cnt == p->max) {
--			blksout (p->buf, p->cnt, p->ino);
-+			blksout ((blk_t *)p->buf, p->cnt, p->ino);
- 			p->cnt = 0;
- 		}
- 	}
- 	p->buf[p->cnt++] = *blocknr;
- 	if (p->cnt == p->max) {
--		blksout (p->buf, p->cnt, p->ino);
-+		blksout ((blk_t *)p->buf, p->cnt, p->ino);
- 		p->cnt = 0;
- 	}
- 	p->next_block = blockcnt + 1;
-@@ -868,14 +868,15 @@
- void
- dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
- {
-+	fsizeT remaining;
-+	char buf[TP_BSIZE];
-+	struct new_bsd_inode nbi;
-+	int i;
-+#ifdef	__linux__
-+	struct block_context bc;
-+#else
- 	unsigned long cnt;
--	fsizeT size, remaining;
--	char buf[TP_BSIZE];
--	struct new_bsd_inode nbi;
--	int i;
--#ifdef	__linux__
--	struct block_context bc;
--#else
-+	fsizeT size;
- 	int ind_level;
- #endif
- 	u_quad_t i_size;
-@@ -1001,13 +1002,13 @@
- 		for (i = 0; i < (int)howmany(remaining, sblock->fs_fsize); i++) {
- 			bc.buf[bc.cnt++] = 0;
- 			if (bc.cnt == bc.max) {
--				blksout (bc.buf, bc.cnt, bc.ino);
-+				blksout ((blk_t *)bc.buf, bc.cnt, bc.ino);
- 				bc.cnt = 0;
- 			}
- 		}
- 	}
- 	if (bc.cnt > 0) {
--		blksout (bc.buf, bc.cnt, bc.ino);
-+		blksout ((blk_t *)bc.buf, bc.cnt, bc.ino);
- 	}
- 	free(bc.buf);
- 	dump_xattr(ino, dp);
-@@ -1016,7 +1017,7 @@
- 		cnt = NDADDR * sblock->fs_frag;
- 	else
- 		cnt = howmany(i_size, sblock->fs_fsize);
--	blksout(&dp->di_db[0], cnt, ino);
-+	blksout((blk_t *)&dp->di_db[0], cnt, ino);
- 	if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0) {
- 		dump_xattr(ino, dp);
- 		return;
-
-=== modified file 'restore/tape.c'
---- restore/tape.c	2011-06-20 07:22:40 +0000
-+++ restore/tape.c	2011-06-20 07:57:11 +0000
-@@ -2335,8 +2335,10 @@
- #ifndef HAVE_ZLIB
- 			errx(1,"This restore version doesn't support zlib decompression");
- #else
--			cresult = uncompress(comprbuf, &worklen, 
--					     tpbin->buf, blocklen);
-+			cresult = uncompress((Bytef *)comprbuf,
-+			                     &worklen, 
-+					     (Bytef *)tpbin->buf,
-+					     blocklen);
- 			output = comprbuf;
- 			switch (cresult) {
- 				case Z_OK:
-@@ -2397,8 +2399,8 @@
- 			errx(1,"This restore version doesn't support lzo decompression");
- #else
- 			lzo_uint worklen2 = worklen;
--			cresult = lzo1x_decompress(tpbin->buf, blocklen,
--                                                   comprbuf, &worklen2, NULL);
-+			cresult = lzo1x_decompress((lzo_bytep)tpbin->buf, blocklen,
-+                                                   (lzo_bytep)comprbuf, &worklen2, NULL);
- 			worklen = worklen2;
- 			output = comprbuf;
- 			switch (cresult) {
-

diff --git a/app-arch/dump/files/dump-0.4.44-rl_completion_matches-detection.patch b/app-arch/dump/files/dump-0.4.44-rl_completion_matches-detection.patch
deleted file mode 100644
index 6f968f549d7..00000000000
--- a/app-arch/dump/files/dump-0.4.44-rl_completion_matches-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3322906&group_id=1306&atid=301306
-
-=== modified file 'configure.in'
---- configure.in	2011-06-20 07:22:40 +0000
-+++ configure.in	2011-06-20 07:56:19 +0000
-@@ -516,7 +516,7 @@
- dnl
- dnl Check for rl_completion_matches
- dnl
--AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap")
-+AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], [$rdllib])
- if test "$rlcm" = yes; then
- 	AC_DEFINE([HAVE_READLINE_RLCM],1,[Define this if your readline libs have the rl_completion_matches library.])
- fi
-@@ -524,7 +524,7 @@
- dnl
- dnl Check for rl_completion_append_character
- dnl
--AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap")
-+AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], [$rdllib])
- if test "$rcac" = yes; then
- 	AC_DEFINE([HAVE_READLINE_CAC],1,[Define this if your readline libs have the rl_completion_append_character variable.])
- fi
-

diff --git a/app-arch/dump/files/dump-0.4.44-sysmacros.patch b/app-arch/dump/files/dump-0.4.44-sysmacros.patch
deleted file mode 100644
index bda233ffa44..00000000000
--- a/app-arch/dump/files/dump-0.4.44-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/580204
-
---- a/restore/tape.c
-+++ b/restore/tape.c
-@@ -65,6 +65,7 @@
- #include <sys/un.h>
- 
- #ifdef	__linux__
-+#include <sys/sysmacros.h>
- #include <sys/time.h>
- #include <time.h>
- #ifdef HAVE_EXT2FS_EXT2_FS_H

diff --git a/app-arch/dump/files/dump-0.4.44-underlinking.patch b/app-arch/dump/files/dump-0.4.44-underlinking.patch
deleted file mode 100644
index b211f007976..00000000000
--- a/app-arch/dump/files/dump-0.4.44-underlinking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/MCONFIG.in b/MCONFIG.in
-index 64cb016..f5d1012 100644
---- a/MCONFIG.in
-+++ b/MCONFIG.in
-@@ -40,7 +40,7 @@ GINC+=		@EXT2FS_CFLAGS@
- # indicate where the ext2fs library can be found (this is not needed if you
- # have run `make install-libs' in the e2fsprogs source directory).
- #GLIBDIR=	-L/usr/src/e2fsprogs-0.5c/lib
--GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@
-+GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@
- 
- #
- # Definitions (don't change them unless you know what you are doing)
-diff --git a/configure.in b/configure.in
-index 2d69157..c8a9e04 100644
---- a/configure.in
-+++ b/configure.in
-@@ -414,11 +414,12 @@ fi
- if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
- 	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
- fi
-+PKG_CHECK_MODULES(COM_ERR, [com_err])
- 
- dnl
- dnl Check for ext2fs_read_inode_full
- dnl
--AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [-lcom_err])
-+AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [$COM_ERR_LIBS])
- if test "$rif" = yes; then
- 	AC_DEFINE([HAVE_EXT2FS_READ_INODE_FULL],1,[Define this if your ext2fs libs have the ext2fs_read_inode_full function.])
- fi