rename patches

7 files changed, 30 insertions, 62 deletions

diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 9ab6114c5b09..a68755868ef9 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6eab62e027b7cb0d4a0c6cc8275bac28 lha-114i-r4.ebuild 1096
-MD5 e0293e04e38f2dce108fdd9da4c3f0f6 ChangeLog 2725
-MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r4 59
-MD5 928b60b965833353acc7d99b063b9f29 files/lha-114i-malloc.patch 257
-MD5 ff83fd8d0be0194387cb243d91100e61 files/lha-dir_length_bounds_check.patch 556
-MD5 7e87f643ac65634d0b934b7bfcd6a8cb files/lha-114i.diff 1721
-MD5 aecad116178774c3d84d2776e099639a files/lha-command_buffer.patch 6437
-MD5 414d7156c3bc01a95a10ee240e3e8535 files/lha-114i-symlink.patch 308
-MD5 9c4e9404173fd5897d3736e33c909b81 files/lha-114i-lhext.diff 513
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDlOqgIKl8Uu19MoRAkw6AJ4rkWFkiPmwyCHBsmGCpQHnxDoR3gCggHO6
-uDVqET6+CywuoSSTrDszMbo=
-=zakb
------END PGP SIGNATURE-----
+MD5 e470eb5963d8ee09bfd2727eeb56bba2 ChangeLog 3054
+MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r5 59
+MD5 2be58a222a07490e0347f138f65c97d4 files/lha-114i-build.patch 1341
+MD5 bf52f3a88c9f88cdbaadda926050333e files/lha-114i-detect-cmd-extract-fail.patch 3151
+MD5 de7e57548c17115a6a39b8cb5f88234d files/lha-114i-dir_length_bounds_check.patch 502
+MD5 254ee5496c0968b19e8e1a20c3b90289 files/lha-114i-malloc.patch 180
+MD5 a1ef659783bc7224c48dbc07cf436788 files/lha-114i-sec.patch 1621
+MD5 f44e42e6131c63f0e2e67e49732b6e57 files/lha-114i-sec2.patch 5754
+MD5 d409c5c0a2b75a477e7baa7ebc62a559 files/lha-114i-symlink.patch 228
+MD5 87f8394a1eaec58d059d1283e326daac lha-114i-r5.ebuild 1107
diff --git a/app-arch/lha/files/lha-dir_length_bounds_check.patch b/app-arch/lha/files/lha-114i-dir_length_bounds_check.patch
index 7a0ae1e086e2..78543673b982 100644
--- a/app-arch/lha/files/lha-dir_length_bounds_check.patch
+++ b/app-arch/lha/files/lha-114i-dir_length_bounds_check.patch
@@ -1,5 +1,5 @@
---- src/header.c	2002-07-19 17:23:58.000000000 +0900
-+++ src/header.c	2004-06-16 09:49:23.000000000 +0900
+--- lha-114i/src/header.c
++++ lha-114i/src/header.c
 @@ -648,8 +648,17 @@
  	}
  
diff --git a/app-arch/lha/files/lha-114i-lhext.diff b/app-arch/lha/files/lha-114i-lhext.diff
deleted file mode 100644
index dca1f2a458be..000000000000
--- a/app-arch/lha/files/lha-114i-lhext.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN lha-114i/src/lhext.c lha-114i.lhext/src/lhext.c
---- lha-114i/src/lhext.c	2000-10-04 23:57:38.000000000 +0900
-+++ lha-114i.lhext/src/lhext.c	2004-05-20 01:06:41.000000000 +0900
-@@ -207,9 +207,11 @@
- 	}
- 
- 	if (extract_directory)
--		sprintf(name, "%s/%s", extract_directory, q);
--	else
--		strcpy(name, q);
-+		snprintf(name, sizeof(name), "%s/%s", extract_directory, q);
-+	else {
-+		strncpy(name, q, sizeof(name));
-+		name[sizeof(name) - 1] = '\0';
-+	}
- 
- 
- 	/* LZHDIRS_METHODを持つヘッダをチェックする */
diff --git a/app-arch/lha/files/lha-114i-malloc.patch b/app-arch/lha/files/lha-114i-malloc.patch
index cc3b034dc5e3..9f4499aecaff 100644
--- a/app-arch/lha/files/lha-114i-malloc.patch
+++ b/app-arch/lha/files/lha-114i-malloc.patch
@@ -1,5 +1,5 @@
---- lha-114i/src/lha.h.orig	2004-05-19 19:24:19.000000000 -0400
-+++ lha-114i/src/lha.h	2004-05-19 19:23:19.000000000 -0400
+--- lha-114i/src/lha.h
++++ lha-114i/src/lha.h
 @@ -16,6 +16,7 @@
  #include <sys/types.h>
  #include <sys/file.h>
diff --git a/app-arch/lha/files/lha-114i.diff b/app-arch/lha/files/lha-114i-sec.patch
index d723d668a94c..3f4dca7993d6 100644
--- a/app-arch/lha/files/lha-114i.diff
+++ b/app-arch/lha/files/lha-114i-sec.patch
@@ -1,5 +1,5 @@
---- header.c.old	2000-10-05 19:36:03.000000000 +0200
-+++ header.c	2004-04-17 23:55:54.000000000 +0200
+--- lha-114i/src/header.c
++++ lha-114i/src/header.c
 @@ -538,6 +538,10 @@
  				/*
  				 * filename
@@ -22,8 +22,8 @@
  				for (i = 0; i < header_size - 3; i++)
  					dirname[i] = (char) get_byte();
  				dirname[header_size - 3] = '\0';
---- lhext.c.old	2000-10-04 16:57:38.000000000 +0200
-+++ lhext.c	2004-04-18 01:27:44.000000000 +0200
+--- lha-114i/src/lhext.c
++++ lha-114i/src/lhext.c
 @@ -190,8 +190,13 @@
  		q = (char *) rindex(hdr->name, '/') + 1;
  	}
diff --git a/app-arch/lha/files/lha-command_buffer.patch b/app-arch/lha/files/lha-114i-sec2.patch
index e2a477784470..897389def8d2 100644
--- a/app-arch/lha/files/lha-command_buffer.patch
+++ b/app-arch/lha/files/lha-114i-sec2.patch
@@ -1,6 +1,5 @@
-diff -urNp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h
---- lha-114i.orig/src/lha_macro.h	2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lha_macro.h	2004-08-03 15:54:05.000000000 -0500
+--- lha-114i/src/lha_macro.h
++++ lha-114i/src/lha_macro.h
 @@ -53,7 +53,7 @@
  #define SEEK_SET		0
  #define SEEK_CUR		1
@@ -10,9 +9,8 @@ diff -urNp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h
  
  
  /* non-integral functions */
-diff -urNp lha-114i.orig/src/lharc.c lha-114i/src/lharc.c
---- lha-114i.orig/src/lharc.c	2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lharc.c	2004-08-03 15:54:05.000000000 -0500
+--- lha-114i/src/lharc.c
++++ lha-114i/src/lharc.c
 @@ -830,9 +830,10 @@ find_files(name, v_filec, v_filev)
  	DIRENTRY       *dp;
  	struct stat     tmp_stbuf, arc_stbuf, fil_stbuf;
@@ -86,9 +84,8 @@ diff -urNp lha-114i.orig/src/lharc.c lha-114i/src/lharc.c
  	if (open_old_archive_1(expanded_archive_name, &fp)) {
  		archive_name = expanded_archive_name;
  		return fp;
-diff -urNp lha-114i.orig/src/lhext.c lha-114i/src/lhext.c
---- lha-114i.orig/src/lhext.c	2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lhext.c	2004-08-03 15:55:40.000000000 -0500
+--- lha-114i/src/lhext.c
++++ lha-114i/src/lhext.c
 @@ -82,7 +82,8 @@ make_parent_path(name)
  	register char  *p;
  
@@ -137,9 +134,8 @@ diff -urNp lha-114i.orig/src/lhext.c lha-114i/src/lhext.c
  				warning("Can't make Symbolic Link", buf);
  				return;
  #endif
-diff -urNp lha-114i.orig/src/lhlist.c lha-114i/src/lhlist.c
---- lha-114i.orig/src/lhlist.c	2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lhlist.c	2004-08-03 15:54:05.000000000 -0500
+--- lha-114i/src/lhlist.c
++++ lha-114i/src/lhlist.c
 @@ -250,7 +250,8 @@ list_one(hdr)
  			printf(" %s", hdr->name);
  		else {
@@ -150,9 +146,8 @@ diff -urNp lha-114i.orig/src/lhlist.c lha-114i/src/lhlist.c
  			b1 = strtok(buf, "|");
  			b2 = strtok(NULL, "|");
  			printf(" %s -> %s", b1, b2);
-diff -urNp lha-114i.orig/src/util.c lha-114i/src/util.c
---- lha-114i.orig/src/util.c	2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/util.c	2004-08-03 15:54:05.000000000 -0500
+--- lha-114i/src/util.c
++++ lha-114i/src/util.c
 @@ -276,21 +276,27 @@ rmdir(path)
  	char           *path;
  {
diff --git a/app-arch/lha/files/lha-114i-symlink.patch b/app-arch/lha/files/lha-114i-symlink.patch
index 1189eef82e16..a872fa5548f9 100644
--- a/app-arch/lha/files/lha-114i-symlink.patch
+++ b/app-arch/lha/files/lha-114i-symlink.patch
@@ -1,5 +1,5 @@
---- lha-114i/src/lhext.c.symlink	2000-10-04 10:57:38.000000000 -0400
-+++ lha-114i/src/lhext.c	2003-05-19 22:55:57.000000000 -0400
+--- lha-114i/src/lhext.c
++++ lha-114i/src/lhext.c
 @@ -351,6 +351,7 @@ extract_one(afp, hdr)
  				}