rpms/lha/devel lha-1.14i-sec2.patch,1.1,1.2 lha.spec,1.2,1.3

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/nonfree/rpms/lha/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7222

Modified Files:
	lha-1.14i-sec2.patch lha.spec 
Log Message:
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.14i-21
- Release bump for rpmfusion build


lha-1.14i-sec2.patch:

Index: lha-1.14i-sec2.patch
===================================================================
RCS file: /cvs/nonfree/rpms/lha/devel/lha-1.14i-sec2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lha-1.14i-sec2.patch	24 Jul 2008 09:47:12 -0000	1.1
+++ lha-1.14i-sec2.patch	24 Jul 2008 11:34:30 -0000	1.2
@@ -1,6 +1,6 @@
-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
+diff -up lha-114i/src/lha_macro.h.foo lha-114i/src/lha_macro.h
+--- lha-114i/src/lha_macro.h.foo	2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/lha_macro.h	2008-07-24 13:41:58.000000000 +0200
 @@ -53,7 +53,7 @@
  #define SEEK_SET		0
  #define SEEK_CUR		1
@@ -10,9 +10,9 @@
  
  
  /* 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
+diff -up lha-114i/src/lharc.c.foo lha-114i/src/lharc.c
+--- lha-114i/src/lharc.c.foo	2000-10-05 19:33:34.000000000 +0200
++++ lha-114i/src/lharc.c	2008-07-24 13:41:58.000000000 +0200
 @@ -830,9 +830,10 @@ find_files(name, v_filec, v_filev)
  	DIRENTRY       *dp;
  	struct stat     tmp_stbuf, arc_stbuf, fil_stbuf;
@@ -86,9 +86,9 @@
  	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
+diff -up lha-114i/src/lhext.c.foo lha-114i/src/lhext.c
+--- lha-114i/src/lhext.c.foo	2008-07-24 13:41:35.000000000 +0200
++++ lha-114i/src/lhext.c	2008-07-24 13:41:58.000000000 +0200
 @@ -82,7 +82,8 @@ make_parent_path(name)
  	register char  *p;
  
@@ -113,7 +113,7 @@
 +	}
  
  
- 	/* LZHDIRS_METHOD�����ĥإå��������å����� */
+ 	/* LZHDIRS_METHOD¤ò»ý¤Ä¥Ø¥Ã¥À¤ò¥Á¥§¥Ã¥¯¤¹¤ë */
 @@ -335,7 +338,8 @@ extract_one(afp, hdr)
  			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
  				char            buf[256], *bb1, *bb2;
@@ -137,9 +137,9 @@
  				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
+diff -up lha-114i/src/lhlist.c.foo lha-114i/src/lhlist.c
+--- lha-114i/src/lhlist.c.foo	2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/lhlist.c	2008-07-24 13:41:58.000000000 +0200
 @@ -250,7 +250,8 @@ list_one(hdr)
  			printf(" %s", hdr->name);
  		else {
@@ -150,9 +150,9 @@
  			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
+diff -up lha-114i/src/util.c.foo lha-114i/src/util.c
+--- lha-114i/src/util.c.foo	2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/util.c	2008-07-24 13:41:58.000000000 +0200
 @@ -276,21 +276,27 @@ rmdir(path)
  	char           *path;
  {


Index: lha.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lha/devel/lha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lha.spec	24 Jul 2008 11:22:52 -0000	1.2
+++ lha.spec	24 Jul 2008 11:34:30 -0000	1.3
@@ -25,6 +25,7 @@
 # security fixes
 %patch2 -p1 -b .sec
 %patch3 -p1 -b .sec
+exit 1
 %patch4 -p1 -b .sec
 
 # Rename doc files to better represent encoding which is EUC (jp)