changeset
Renumber patch hunks to avoid almost all patch(1) warnings.
Wed, 01 Aug 2012 23:24:50 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 01 Aug 2012 23:24:50 +0200
- changeset 431
- 127559aa0c5e
- parent 430
- 9b4bbbae3a98
- child 432
- aa0488214e35
Renumber patch hunks to avoid almost all patch(1) warnings.
| openpkg/bash.patch.vendor | file | annotate | diff | comparison | revisions | |
| openpkg/libarchive.patch | file | annotate | diff | comparison | revisions | |
| openpkg/pcre.patch | file | annotate | diff | comparison | revisions | |
| openpkg/perl.patch | file | annotate | diff | comparison | revisions | |
| openpkg/popt.patch | file | annotate | diff | comparison | revisions | |
| openpkg/rpm.patch | file | annotate | diff | comparison | revisions |
1.1 --- a/openpkg/bash.patch.vendor Wed Aug 01 13:51:09 2012 +0200 1.2 +++ b/openpkg/bash.patch.vendor Wed Aug 01 23:24:50 2012 +0200 1.3 @@ -501,7 +501,7 @@ 1.4 Index: doc/bash.1 1.5 --- doc/bash.1.orig 2011-01-16 21:31:39.000000000 +0100 1.6 +++ doc/bash.1 2012-06-27 10:31:03.000000000 +0200 1.7 -@@ -8948,6 +8948,16 @@ 1.8 +@@ -8954,6 +8954,16 @@ 1.9 quoted. This is the behavior of posix mode through version 4.1. 1.10 The default bash behavior remains as in previous versions. 1.11 .TP 8
2.1 --- a/openpkg/libarchive.patch Wed Aug 01 13:51:09 2012 +0200 2.2 +++ b/openpkg/libarchive.patch Wed Aug 01 23:24:50 2012 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 Index: Makefile.in 2.5 --- Makefile.in.orig 2011-12-24 19:05:17.000000000 +0100 2.6 +++ Makefile.in 2011-12-26 08:30:54.000000000 +0100 2.7 -@@ -1091,7 +1091,7 @@ 2.8 +@@ -1094,7 +1094,7 @@ 2.9 lib_LTLIBRARIES = libarchive.la 2.10 noinst_LTLIBRARIES = libarchive_fe.la 2.11 man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
3.1 --- a/openpkg/pcre.patch Wed Aug 01 13:51:09 2012 +0200 3.2 +++ b/openpkg/pcre.patch Wed Aug 01 23:24:50 2012 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 Index: configure 3.5 --- configure.orig 2011-12-11 17:22:11.000000000 +0100 3.6 +++ configure 2011-12-24 11:54:19.000000000 +0100 3.7 -@@ -3596,10 +3596,6 @@ 3.8 +@@ -3630,10 +3630,6 @@ 3.9 $as_echo "$as_me: failed program was:" >&5 3.10 sed 's/^/| /' conftest.$ac_ext >&5 3.11 3.12 @@ -12,7 +12,7 @@ 3.13 else 3.14 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3.15 $as_echo "yes" >&6; } 3.16 -@@ -4729,10 +4725,7 @@ 3.17 +@@ -4759,10 +4759,7 @@ 3.18 if $ac_preproc_ok; then : 3.19 3.20 else
4.1 --- a/openpkg/perl.patch Wed Aug 01 13:51:09 2012 +0200 4.2 +++ b/openpkg/perl.patch Wed Aug 01 23:24:50 2012 +0200 4.3 @@ -6,7 +6,7 @@ 4.4 Index: installperl 4.5 --- installperl.orig 2011-06-09 22:04:29.000000000 +0200 4.6 +++ installperl 2011-06-17 15:20:48.000000000 +0200 4.7 -@@ -200,6 +200,8 @@ 4.8 +@@ -196,6 +196,8 @@ 4.9 my $installarchlib = "$opts{destdir}$Config{installarchlib}"; 4.10 my $installsitelib = "$opts{destdir}$Config{installsitelib}"; 4.11 my $installsitearch = "$opts{destdir}$Config{installsitearch}"; 4.12 @@ -119,7 +119,7 @@ 4.13 Index: Configure 4.14 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 4.15 +++ Configure 2011-06-17 15:20:48.000000000 +0200 4.16 -@@ -8078,9 +8058,9 @@ 4.17 +@@ -8014,9 +8014,9 @@ 4.18 ;; 4.19 linux|irix*|gnu*) dflt="-shared $optimize" ;; 4.20 next) dflt='none' ;; 4.21 @@ -139,7 +139,7 @@ 4.22 Index: sv.c 4.23 --- sv.c.orig 2011-06-17 02:06:09.000000000 +0200 4.24 +++ sv.c 2011-06-17 15:20:48.000000000 +0200 4.25 -@@ -10198,7 +10198,10 @@ 4.26 +@@ -10283,7 +10283,10 @@ 4.27 if ( (width = expect_number(&q)) ) { 4.28 if (*q == '$') { 4.29 ++q; 4.30 @@ -159,7 +159,7 @@ 4.31 Index: Configure 4.32 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 4.33 +++ Configure 2011-06-17 15:20:48.000000000 +0200 4.34 -@@ -5158,17 +5158,6 @@ 4.35 +@@ -5103,17 +5103,6 @@ 4.36 ;; 4.37 esac 4.38 4.39 @@ -177,7 +177,7 @@ 4.40 ;; 4.41 esac 4.42 4.43 -@@ -5307,15 +5296,6 @@ 4.44 +@@ -5241,15 +5241,6 @@ 4.45 ;; 4.46 *) dflt="$ldflags";; 4.47 esac 4.48 @@ -193,7 +193,7 @@ 4.49 4.50 : Try to guess additional flags to pick up local libraries. 4.51 for thislibdir in $libpth; do 4.52 -@@ -8107,14 +8087,6 @@ 4.53 +@@ -8023,14 +8023,6 @@ 4.54 ''|' ') dflt='none' ;; 4.55 esac 4.56 4.57 @@ -216,7 +216,7 @@ 4.58 Index: Configure 4.59 --- Configure.orig 2009-08-24 18:33:49 +0200 4.60 +++ Configure 2009-08-24 18:44:39 +0200 4.61 -@@ -1769,7 +1769,7 @@ 4.62 +@@ -1778,7 +1778,7 @@ 4.63 touch posthint.sh 4.64 4.65 : set package name 4.66 @@ -234,7 +234,7 @@ 4.67 Index: hints/linux.sh 4.68 --- hints/linux.sh.orig 2011-06-09 22:04:29.000000000 +0200 4.69 +++ hints/linux.sh 2011-06-17 15:20:48.000000000 +0200 4.70 -@@ -55,7 +55,9 @@ 4.71 +@@ -58,7 +58,9 @@ 4.72 libswanted="$*" 4.73 4.74 # Debian 4.0 puts ndbm in the -lgdbm_compat library.
5.1 --- a/openpkg/popt.patch Wed Aug 01 13:51:09 2012 +0200 5.2 +++ b/openpkg/popt.patch Wed Aug 01 23:24:50 2012 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 Index: popt.c 5.5 --- popt.c.orig 2009-04-12 20:14:38.000000000 +0200 5.6 +++ popt.c 2010-04-30 21:31:41.000000000 +0200 5.7 -@@ -520,6 +520,11 @@ 5.8 +@@ -519,6 +519,11 @@ 5.9 } 5.10 5.11 if (con->leftovers != NULL && con->numLeftovers > 0) { 5.12 @@ -13,7 +13,7 @@ 5.13 memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers); 5.14 argc += con->numLeftovers; 5.15 } 5.16 -@@ -697,10 +702,19 @@ 5.17 +@@ -709,10 +709,19 @@ 5.18 /*@switchbreak@*/ break; 5.19 #endif 5.20 case '!':
6.1 --- a/openpkg/rpm.patch Wed Aug 01 13:51:09 2012 +0200 6.2 +++ b/openpkg/rpm.patch Wed Aug 01 23:24:50 2012 +0200 6.3 @@ -120,7 +120,7 @@ 6.4 Index: lib/rpmfc.c 6.5 --- lib/rpmfc.c 6 Apr 2009 00:21:21 -0000 1.64 6.6 +++ lib/rpmfc.c 11 Apr 2009 14:17:58 -0000 1.65 6.7 -@@ -1836,7 +1836,7 @@ 6.8 +@@ -1834,7 +1834,7 @@ 6.9 /*@=mustmod@*/ 6.10 6.11 /*@unchecked@*/ /*@only@*/ /*@null@*/ 6.12 @@ -132,7 +132,7 @@ 6.13 Index: rpmio/rpmmg.c 6.14 --- rpmio/rpmmg.c 25 Mar 2009 20:26:47 -0000 2.10 6.15 +++ rpmio/rpmmg.c 11 Apr 2009 14:17:58 -0000 2.11 6.16 -@@ -37,7 +37,7 @@ 6.17 +@@ -36,7 +36,7 @@ 6.18 /*@=mustmod@*/ 6.19 6.20 /*@unchecked@*/ /*@only@*/ /*@null@*/
