From aa813884ece3e14d2a183724179df1431f198932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 21 Jul 2008 09:23:38 +0000 Subject: [PATCH] - 455933 update to CGI-3.38 - fix fuzz problems (patch6) - 217833 pos() function handle unicode characters correct --- perl-5.10.0-libresolv.patch | 12 ++++++++++++ perl-5.10.0-pos.patch | 4 ++-- perl.spec | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 perl-5.10.0-libresolv.patch diff --git a/perl-5.10.0-libresolv.patch b/perl-5.10.0-libresolv.patch new file mode 100644 index 0000000..7676bbb --- /dev/null +++ b/perl-5.10.0-libresolv.patch @@ -0,0 +1,12 @@ +diff -up perl-5.10.0/Configure.didi perl-5.10.0/Configure +--- perl-5.10.0/Configure.didi 2007-12-18 11:47:07.000000000 +0100 ++++ perl-5.10.0/Configure 2008-07-21 10:51:16.000000000 +0200 +@@ -1327,7 +1327,7 @@ libswanted_uselargefiles='' + : set usesocks on the Configure command line to enable socks. + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" ++libswanted="sfio socket resolv inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. diff --git a/perl-5.10.0-pos.patch b/perl-5.10.0-pos.patch index f00c5df..0067d3c 100644 --- a/perl-5.10.0-pos.patch +++ b/perl-5.10.0-pos.patch @@ -17,8 +17,8 @@ diff -up perl-5.10.0/pp_ctl.c.pos perl-5.10.0/pp_ctl.c - if (DO_UTF8(sv)) - sv_pos_b2u(sv, &i); - mg->mg_len = i; - } -+ mg->mg_len = m - orig; ++ mg->mg_len = m - orig; + } if (old != rx) (void)ReREFCNT_inc(rx); cx->sb_rxtainted |= RX_MATCH_TAINTED(rx); diff --git a/perl.spec b/perl.spec index 18786c7..17ed9c0 100644 --- a/perl.spec +++ b/perl.spec @@ -810,7 +810,7 @@ upstream tarball from perl.org. %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 +#%patch20 -p1 # # Candidates for doc recoding (need case by case review): # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'