瀏覽代碼

update patch file to fit exactly fitout fuzzy matching requirements

Ralf S. Engelschall 17 年之前
父節點
當前提交
627feb9086
共有 4 個文件被更改,包括 42 次插入42 次删除
  1. 11 11
      bash/bash.patch
  2. 1 1
      bash/bash.spec
  3. 29 29
      perl/perl.patch
  4. 1 1
      perl/perl.spec

+ 11 - 11
bash/bash.patch

@@ -2,8 +2,8 @@ This patch documents two implemented and classical command
 line options "-v" and "-x". It is derived from Debian GNU/Linux.
 line options "-v" and "-x". It is derived from Debian GNU/Linux.
 
 
 Index: doc/bash.1
 Index: doc/bash.1
---- doc/bash.1.orig	2004-07-12 17:27:08 +0200
-+++ doc/bash.1	2004-07-27 19:47:10 +0200
+--- doc/bash.1.orig	2006-10-03 14:54:26 +0200
++++ doc/bash.1	2008-03-28 15:28:44 +0100
 @@ -116,6 +116,12 @@
 @@ -116,6 +116,12 @@
  This option allows the positional parameters to be set
  This option allows the positional parameters to be set
  when invoking an interactive shell.
  when invoking an interactive shell.
@@ -16,15 +16,15 @@ Index: doc/bash.1
 +.TP
 +.TP
  .B \-D
  .B \-D
  A list of all double-quoted strings preceded by \fB$\fP
  A list of all double-quoted strings preceded by \fB$\fP
- is printed on the standard ouput.
+ is printed on the standard output.
 
 
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 
 
 Port to HP-UX 11i and similar less smart platforms.
 Port to HP-UX 11i and similar less smart platforms.
 
 
 Index: configure
 Index: configure
---- configure.orig	2004-07-21 22:18:56 +0200
-+++ configure	2004-07-27 19:47:10 +0200
+--- configure.orig	2006-09-26 17:06:01 +0200
++++ configure	2008-03-28 15:28:44 +0100
 @@ -1517,6 +1517,7 @@
 @@ -1517,6 +1517,7 @@
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
  *-cygwin*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN environment
  *-cygwin*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN environment
@@ -43,8 +43,8 @@ Index: configure
  	MALLOC_DEP=
  	MALLOC_DEP=
  fi
  fi
 Index: syntax.h
 Index: syntax.h
---- syntax.h.orig	2004-04-15 05:19:36 +0200
-+++ syntax.h	2004-07-27 19:47:10 +0200
+--- syntax.h.orig	2006-06-22 19:45:22 +0200
++++ syntax.h	2008-03-28 15:28:44 +0100
 @@ -21,6 +21,8 @@
 @@ -21,6 +21,8 @@
  #ifndef _SYNTAX_H_
  #ifndef _SYNTAX_H_
  #define _SYNTAX_H_
  #define _SYNTAX_H_
@@ -60,8 +60,8 @@ Index: syntax.h
 This adds the OpenPKG packaging brand.
 This adds the OpenPKG packaging brand.
 
 
 Index: version.c
 Index: version.c
---- version.c.orig	2003-12-19 22:34:02 +0100
-+++ version.c	2004-07-27 19:47:10 +0200
+--- version.c.orig	2005-05-16 17:58:34 +0200
++++ version.c	2008-03-28 15:28:44 +0100
 @@ -77,7 +77,7 @@
 @@ -77,7 +77,7 @@
  show_shell_version (extended)
  show_shell_version (extended)
       int extended;
       int extended;
@@ -69,7 +69,7 @@ Index: version.c
 -  printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
 -  printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
 +  printf ("GNU bash, version %s (%s) [@l_openpkg_release@]\n", shell_version_string (), MACHTYPE);
 +  printf ("GNU bash, version %s (%s) [@l_openpkg_release@]\n", shell_version_string (), MACHTYPE);
    if (extended)
    if (extended)
-     printf (_("Copyright (C) 2004 Free Software Foundation, Inc.\n"));
+     printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
  }
  }
 
 
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ Ensure that Autoconf and friends are not run.
 
 
 Index: Makefile.in
 Index: Makefile.in
 --- Makefile.in.orig	2006-08-17 20:03:35 +0200
 --- Makefile.in.orig	2006-08-17 20:03:35 +0200
-+++ Makefile.in	2007-07-10 18:50:38 +0200
++++ Makefile.in	2008-03-28 15:28:44 +0100
 @@ -687,7 +687,6 @@
 @@ -687,7 +687,6 @@
  
  
  # comment out for distribution
  # comment out for distribution

+ 1 - 1
bash/bash.spec

@@ -38,7 +38,7 @@ Class:        CORE
 Group:        Shell
 Group:        Shell
 License:      GPL
 License:      GPL
 Version:      %{V_base_real}.%{V_plvl_raw}
 Version:      %{V_base_real}.%{V_plvl_raw}
-Release:      20080101
+Release:      20080328
 
 
 #   list of sources
 #   list of sources
 Source0:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
 Source0:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz

+ 29 - 29
perl/perl.patch

@@ -4,8 +4,8 @@ the "vendor" area, so make sure it is created the same way the "site"
 area is.
 area is.
 
 
 Index: installperl
 Index: installperl
---- installperl.orig	2006-08-15 14:37:41 +0200
-+++ installperl	2006-08-18 21:05:05 +0200
+--- installperl.orig	2007-12-18 11:47:07 +0100
++++ installperl	2008-03-28 15:23:47 +0100
 @@ -211,6 +211,8 @@
 @@ -211,6 +211,8 @@
  my $installarchlib = "$destdir$Config{installarchlib}";
  my $installarchlib = "$destdir$Config{installarchlib}";
  my $installsitelib = "$destdir$Config{installsitelib}";
  my $installsitelib = "$destdir$Config{installsitelib}";
@@ -15,7 +15,7 @@ Index: installperl
  my $installman1dir = "$destdir$Config{installman1dir}";
  my $installman1dir = "$destdir$Config{installman1dir}";
  my $man1ext = $Config{man1ext};
  my $man1ext = $Config{man1ext};
  my $libperl = $Config{libperl};
  my $libperl = $Config{libperl};
-@@ -403,6 +405,8 @@
+@@ -372,6 +374,8 @@
  mkpath($installarchlib, $verbose, 0777);
  mkpath($installarchlib, $verbose, 0777);
  mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
  mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
  mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
  mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
@@ -36,9 +36,9 @@ the search order to a more reasonable one for OpenPKG: "use lib, -I,
 PERL[5]LIB, site, vendor, perl, other".
 PERL[5]LIB, site, vendor, perl, other".
 
 
 Index: perl.c
 Index: perl.c
---- perl.c.orig	2006-08-15 14:37:41 +0200
-+++ perl.c	2006-08-18 21:08:14 +0200
-@@ -4749,39 +4749,6 @@
+--- perl.c.orig	2007-12-18 11:47:08 +0100
++++ perl.c	2008-03-28 15:23:47 +0100
+@@ -4753,39 +4753,6 @@
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
  #endif
  #endif
  
  
@@ -78,7 +78,7 @@ Index: perl.c
  #ifdef SITEARCH_EXP
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
      /* sitearch is always relative to sitelib on Windows for
       * DLL-based path intuition to work correctly */
       * DLL-based path intuition to work correctly */
-@@ -4824,6 +4791,39 @@
+@@ -4828,6 +4795,39 @@
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
  #endif
  #endif
  
  
@@ -135,8 +135,8 @@ Port to [Open]Darwin 6.6.2:
    related to the non-standard "__private_extern__" attribute.
    related to the non-standard "__private_extern__" attribute.
 
 
 Index: hints/darwin.sh
 Index: hints/darwin.sh
---- hints/darwin.sh.orig	2006-08-15 14:37:41 +0200
-+++ hints/darwin.sh	2006-08-18 21:05:05 +0200
+--- hints/darwin.sh.orig	2007-12-18 11:47:07 +0100
++++ hints/darwin.sh	2008-03-28 15:23:47 +0100
 @@ -120,9 +120,6 @@
 @@ -120,9 +120,6 @@
    *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;;
    *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;;
  esac
  esac
@@ -158,9 +158,9 @@ Index: hints/darwin.sh
  cat > UU/archname.cbu <<'EOCBU'
  cat > UU/archname.cbu <<'EOCBU'
  # This script UU/archname.cbu will get 'called-back' by Configure 
  # This script UU/archname.cbu will get 'called-back' by Configure 
 Index: perlio.c
 Index: perlio.c
---- perlio.c.orig	2006-08-15 14:37:41 +0200
-+++ perlio.c	2006-08-18 21:05:05 +0200
-@@ -461,7 +461,14 @@
+--- perlio.c.orig	2007-12-18 11:47:08 +0100
++++ perlio.c	2008-03-28 15:23:47 +0100
+@@ -472,7 +472,14 @@
  #include <unistd.h>
  #include <unistd.h>
  #endif
  #endif
  #ifdef HAS_MMAP
  #ifdef HAS_MMAP
@@ -176,8 +176,8 @@ Index: perlio.c
  
  
  void
  void
 Index: ext/DynaLoader/dl_dyld.xs
 Index: ext/DynaLoader/dl_dyld.xs
---- ext/DynaLoader/dl_dyld.xs.orig	2006-08-15 14:37:40 +0200
-+++ ext/DynaLoader/dl_dyld.xs	2006-08-18 21:05:05 +0200
+--- ext/DynaLoader/dl_dyld.xs.orig	2007-12-18 11:47:07 +0100
++++ ext/DynaLoader/dl_dyld.xs	2008-03-28 15:23:47 +0100
 @@ -45,7 +45,13 @@
 @@ -45,7 +45,13 @@
  
  
  #undef environ
  #undef environ
@@ -205,7 +205,7 @@ it works at all.
 
 
 Index: hints/dec_osf.sh
 Index: hints/dec_osf.sh
 --- hints/dec_osf.sh.orig	2007-12-18 11:47:07 +0100
 --- hints/dec_osf.sh.orig	2007-12-18 11:47:07 +0100
-+++ hints/dec_osf.sh	2007-12-19 12:31:37 +0100
++++ hints/dec_osf.sh	2008-03-28 15:23:47 +0100
 @@ -73,15 +73,6 @@
 @@ -73,15 +73,6 @@
  *)            if $test "X$optimize" = "X$undef"; then
  *)            if $test "X$optimize" = "X$undef"; then
                        lddlflags="$lddlflags -msym"
                        lddlflags="$lddlflags -msym"
@@ -231,9 +231,9 @@ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0976
     users to overwrite files via a symlink attack on temporary files.
     users to overwrite files via a symlink attack on temporary files.
 
 
 Index: lib/CGI/Cookie.pm
 Index: lib/CGI/Cookie.pm
---- lib/CGI/Cookie.pm.orig	2006-08-15 14:37:41 +0200
-+++ lib/CGI/Cookie.pm	2006-08-18 21:05:05 +0200
-@@ -444,7 +444,7 @@
+--- lib/CGI/Cookie.pm.orig	2007-12-18 11:47:07 +0100
++++ lib/CGI/Cookie.pm	2008-03-28 15:23:47 +0100
+@@ -470,7 +470,7 @@
  You may also retrieve cookies that were stored in some external
  You may also retrieve cookies that were stored in some external
  form using the parse() class method:
  form using the parse() class method:
  
  
@@ -243,9 +243,9 @@ Index: lib/CGI/Cookie.pm
  
  
  If you are in a mod_perl environment, you can save some overhead by
  If you are in a mod_perl environment, you can save some overhead by
 Index: lib/Shell.pm
 Index: lib/Shell.pm
---- lib/Shell.pm.orig	2006-08-15 14:37:41 +0200
-+++ lib/Shell.pm	2006-08-18 21:05:05 +0200
-@@ -154,7 +154,7 @@
+--- lib/Shell.pm.orig	2007-12-18 11:47:07 +0100
++++ lib/Shell.pm	2008-03-28 15:23:47 +0100
+@@ -151,7 +151,7 @@
     use Shell qw(cat ps cp);
     use Shell qw(cat ps cp);
     $passwd = cat('</etc/passwd');
     $passwd = cat('</etc/passwd');
     @pslines = ps('-ww'),
     @pslines = ps('-ww'),
@@ -258,11 +258,11 @@ Index: lib/Shell.pm
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 
 
 Index: Configure
 Index: Configure
---- Configure.orig	2006-08-15 14:37:40 +0200
-+++ Configure	2006-08-18 21:05:05 +0200
-@@ -7787,7 +7787,7 @@
- 			      ;;	
- 			linux|irix*|gnu*)	dflt='-shared' ;;
+--- Configure.orig	2007-12-18 11:47:07 +0100
++++ Configure	2008-03-28 15:23:47 +0100
+@@ -7871,7 +7871,7 @@
+ 			      ;;
+ 			linux|irix*|gnu*)  dflt="-shared $optimize" ;;
  			next)  dflt='none' ;;
  			next)  dflt='none' ;;
 -			solaris) dflt='-G' ;;
 -			solaris) dflt='-G' ;;
 +			solaris) dflt='-shared' ;;
 +			solaris) dflt='-shared' ;;
@@ -275,9 +275,9 @@ Index: Configure
 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
 
 
 Index: sv.c
 Index: sv.c
---- sv.c.orig	2006-08-15 14:37:41 +0200
-+++ sv.c	2006-08-18 21:05:05 +0200
-@@ -8595,7 +8595,10 @@
+--- sv.c.orig	2007-12-18 11:47:08 +0100
++++ sv.c	2008-03-28 15:23:47 +0100
+@@ -8667,7 +8667,10 @@
  	if ( (width = expect_number(&q)) ) {
  	if ( (width = expect_number(&q)) ) {
  	    if (*q == '$') {
  	    if (*q == '$') {
  		++q;
  		++q;

+ 1 - 1
perl/perl.spec

@@ -32,7 +32,7 @@ Class:        CORE
 Group:        Perl
 Group:        Perl
 License:      GPL/Artistic
 License:      GPL/Artistic
 Version:      5.10.0
 Version:      5.10.0
-Release:      20080217
+Release:      20080328
 
 
 #   list of sources
 #   list of sources
 Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
 Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz