# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1343856290 -7200
# Node ID 127559aa0c5e8ee08b256039830d1d081b55c542
# Parent  9b4bbbae3a987066b5f07fda93d33e4c1b7c1c48
Renumber patch hunks to avoid almost all patch(1) warnings.

diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/bash.patch.vendor
--- a/openpkg/bash.patch.vendor	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/bash.patch.vendor	Wed Aug 01 23:24:50 2012 +0200
@@ -501,7 +501,7 @@
 Index: doc/bash.1
 --- doc/bash.1.orig	2011-01-16 21:31:39.000000000 +0100
 +++ doc/bash.1	2012-06-27 10:31:03.000000000 +0200
-@@ -8948,6 +8948,16 @@
+@@ -8954,6 +8954,16 @@
  quoted.  This is the behavior of posix mode through version 4.1.
  The default bash behavior remains as in previous versions.
  .TP 8
diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/libarchive.patch
--- a/openpkg/libarchive.patch	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/libarchive.patch	Wed Aug 01 23:24:50 2012 +0200
@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig	2011-12-24 19:05:17.000000000 +0100
 +++ Makefile.in	2011-12-26 08:30:54.000000000 +0100
-@@ -1091,7 +1091,7 @@
+@@ -1094,7 +1094,7 @@
  lib_LTLIBRARIES = libarchive.la
  noinst_LTLIBRARIES = libarchive_fe.la
  man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/pcre.patch
--- a/openpkg/pcre.patch	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/pcre.patch	Wed Aug 01 23:24:50 2012 +0200
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig	2011-12-11 17:22:11.000000000 +0100
 +++ configure	2011-12-24 11:54:19.000000000 +0100
-@@ -3596,10 +3596,6 @@
+@@ -3630,10 +3630,6 @@
  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12,7 +12,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -4729,10 +4725,7 @@
+@@ -4759,10 +4759,7 @@
  if $ac_preproc_ok; then :
  
  else
diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/perl.patch
--- a/openpkg/perl.patch	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/perl.patch	Wed Aug 01 23:24:50 2012 +0200
@@ -6,7 +6,7 @@
 Index: installperl
 --- installperl.orig	2011-06-09 22:04:29.000000000 +0200
 +++ installperl	2011-06-17 15:20:48.000000000 +0200
-@@ -200,6 +200,8 @@
+@@ -196,6 +196,8 @@
  my $installarchlib = "$opts{destdir}$Config{installarchlib}";
  my $installsitelib = "$opts{destdir}$Config{installsitelib}";
  my $installsitearch = "$opts{destdir}$Config{installsitearch}";
@@ -119,7 +119,7 @@
 Index: Configure
 --- Configure.orig	2011-06-09 22:04:29.000000000 +0200
 +++ Configure	2011-06-17 15:20:48.000000000 +0200
-@@ -8078,9 +8058,9 @@
+@@ -8014,9 +8014,9 @@
  			      ;;
  			linux|irix*|gnu*)  dflt="-shared $optimize" ;;
  			next)  dflt='none' ;;
@@ -139,7 +139,7 @@
 Index: sv.c
 --- sv.c.orig	2011-06-17 02:06:09.000000000 +0200
 +++ sv.c	2011-06-17 15:20:48.000000000 +0200
-@@ -10198,7 +10198,10 @@
+@@ -10283,7 +10283,10 @@
  	if ( (width = expect_number(&q)) ) {
  	    if (*q == '$') {
  		++q;
@@ -159,7 +159,7 @@
 Index: Configure
 --- Configure.orig	2011-06-09 22:04:29.000000000 +0200
 +++ Configure	2011-06-17 15:20:48.000000000 +0200
-@@ -5158,17 +5158,6 @@
+@@ -5103,17 +5103,6 @@
  		;;
  	esac
  
@@ -177,7 +177,7 @@
  	;;
  esac
  
-@@ -5307,15 +5296,6 @@
+@@ -5241,15 +5241,6 @@
  	;;
  *) dflt="$ldflags";;
  esac
@@ -193,7 +193,7 @@
  
  : Try to guess additional flags to pick up local libraries.
  for thislibdir in $libpth; do
-@@ -8107,14 +8087,6 @@
+@@ -8023,14 +8023,6 @@
  	''|' ') dflt='none' ;;
  	esac
  
@@ -216,7 +216,7 @@
 Index: Configure
 --- Configure.orig	2009-08-24 18:33:49 +0200
 +++ Configure	2009-08-24 18:44:39 +0200
-@@ -1769,7 +1769,7 @@
+@@ -1778,7 +1778,7 @@
  touch posthint.sh
  
  : set package name
@@ -234,7 +234,7 @@
 Index: hints/linux.sh
 --- hints/linux.sh.orig	2011-06-09 22:04:29.000000000 +0200
 +++ hints/linux.sh	2011-06-17 15:20:48.000000000 +0200
-@@ -55,7 +55,9 @@
+@@ -58,7 +58,9 @@
  libswanted="$*"
  
  # Debian 4.0 puts ndbm in the -lgdbm_compat library.
diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/popt.patch
--- a/openpkg/popt.patch	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/popt.patch	Wed Aug 01 23:24:50 2012 +0200
@@ -1,7 +1,7 @@
 Index: popt.c
 --- popt.c.orig	2009-04-12 20:14:38.000000000 +0200
 +++ popt.c	2010-04-30 21:31:41.000000000 +0200
-@@ -520,6 +520,11 @@
+@@ -519,6 +519,11 @@
      }
  
      if (con->leftovers != NULL && con->numLeftovers > 0) {
@@ -13,7 +13,7 @@
  	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
  	argc += con->numLeftovers;
      }
-@@ -697,10 +702,19 @@
+@@ -709,10 +709,19 @@
  	    /*@switchbreak@*/ break;
  #endif
  	case '!':
diff -r 9b4bbbae3a98 -r 127559aa0c5e openpkg/rpm.patch
--- a/openpkg/rpm.patch	Wed Aug 01 13:51:09 2012 +0200
+++ b/openpkg/rpm.patch	Wed Aug 01 23:24:50 2012 +0200
@@ -120,7 +120,7 @@
 Index: lib/rpmfc.c
 --- lib/rpmfc.c	6 Apr 2009 00:21:21 -0000	1.64
 +++ lib/rpmfc.c	11 Apr 2009 14:17:58 -0000	1.65
-@@ -1836,7 +1836,7 @@
+@@ -1834,7 +1834,7 @@
  /*@=mustmod@*/
  
  /*@unchecked@*/ /*@only@*/ /*@null@*/
@@ -132,7 +132,7 @@
 Index: rpmio/rpmmg.c
 --- rpmio/rpmmg.c	25 Mar 2009 20:26:47 -0000	2.10
 +++ rpmio/rpmmg.c	11 Apr 2009 14:17:58 -0000	2.11
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
  /*@=mustmod@*/
  
  /*@unchecked@*/ /*@only@*/ /*@null@*/