OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   28-Mar-2008 15:28:21
  Branch: HEAD                             Handle: 2008032814282100

  Modified files:
    openpkg-src/perl        perl.patch perl.spec

  Log:
    update patch file to fit exactly fitout fuzzy matching requirements

  Summary:
    Revision    Changes     Path
    1.26        +29 -29     openpkg-src/perl/perl.patch
    1.126       +1  -1      openpkg-src/perl/perl.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.patch
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 perl.patch
  --- openpkg-src/perl/perl.patch       19 Dec 2007 13:17:30 -0000      1.25
  +++ openpkg-src/perl/perl.patch       28 Mar 2008 14:28:21 -0000      1.26
  @@ -4,8 +4,8 @@
   area is.
   
   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 @@
    my $installarchlib = "$destdir$Config{installarchlib}";
    my $installsitelib = "$destdir$Config{installsitelib}";
  @@ -15,7 +15,7 @@
    my $installman1dir = "$destdir$Config{installman1dir}";
    my $man1ext = $Config{man1ext};
    my $libperl = $Config{libperl};
  -@@ -403,6 +405,8 @@
  +@@ -372,6 +374,8 @@
    mkpath($installarchlib, $verbose, 0777);
    mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
    mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
  @@ -36,9 +36,9 @@
   PERL[5]LIB, site, vendor, perl, other".
   
   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);
    #endif
    
  @@ -78,7 +78,7 @@
    #ifdef SITEARCH_EXP
        /* sitearch is always relative to sitelib on Windows for
         * DLL-based path intuition to work correctly */
  -@@ -4824,6 +4791,39 @@
  +@@ -4828,6 +4795,39 @@
        incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
    #endif
    
  @@ -135,8 +135,8 @@
      related to the non-standard "__private_extern__" attribute.
   
   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 @@
      *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" 
;;
    esac
  @@ -158,9 +158,9 @@
    cat > UU/archname.cbu <<'EOCBU'
    # This script UU/archname.cbu will get 'called-back' by Configure 
   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>
    #endif
    #ifdef HAS_MMAP
  @@ -176,8 +176,8 @@
    
    void
   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 @@
    
    #undef environ
  @@ -205,7 +205,7 @@
   
   Index: hints/dec_osf.sh
   --- 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 @@
    *)            if $test "X$optimize" = "X$undef"; then
                          lddlflags="$lddlflags -msym"
  @@ -231,9 +231,9 @@
       users to overwrite files via a symlink attack on temporary files.
   
   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
    form using the parse() class method:
    
  @@ -243,9 +243,9 @@
    
    If you are in a mod_perl environment, you can save some overhead by
   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);
       $passwd = cat('</etc/passwd');
       @pslines = ps('-ww'),
  @@ -258,11 +258,11 @@
   -----------------------------------------------------------------------------
   
   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' ;;
   -                    solaris) dflt='-G' ;;
   +                    solaris) dflt='-shared' ;;
  @@ -275,9 +275,9 @@
   Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
   
   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 (*q == '$') {
                ++q;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.spec
  ============================================================================
  $ cvs diff -u -r1.125 -r1.126 perl.spec
  --- openpkg-src/perl/perl.spec        17 Feb 2008 16:45:38 -0000      1.125
  +++ openpkg-src/perl/perl.spec        28 Mar 2008 14:28:21 -0000      1.126
  @@ -32,7 +32,7 @@
   Group:        Perl
   License:      GPL/Artistic
   Version:      5.10.0
  -Release:      20080217
  +Release:      20080328
   
   #   list of sources
   Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to