This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via be8c754c0720c3eca6bf02b6dedc1615d5738301 (commit) via c54afe72f48bddcef7f435bd7ad411e9ff3ac473 (commit) via 4a2495b5c4361cbe5448b951637b44bb6d9fbae5 (commit) via 6075b57542ee15ba80eebf15403cb2b6169adcd7 (commit) via c0020b2a1867931e855dcb5d4ba339d6e433c120 (commit) via bebf2a68cc70eda967e792c72c200d864e35b03a (commit) via 4b63ca5eec4d215e88960029483f5d3ed1016cd6 (commit) via a817eff2940cd62892671d417b003a5f37b130f6 (commit) via 51dccdc90606da37df04351aa747528250160272 (commit) from 2dc05f75b6927b088656f277dc10f56f2b0859d1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit be8c754c0720c3eca6bf02b6dedc1615d5738301 Merge: c54afe72f48bddcef7f435bd7ad411e9ff3ac473 2dc05f75b6927b088656f277dc10f56f2b0859d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 16:06:27 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit c54afe72f48bddcef7f435bd7ad411e9ff3ac473 Merge: 4a2495b5c4361cbe5448b951637b44bb6d9fbae5 bebf2a68cc70eda967e792c72c200d864e35b03a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 16:06:05 2010 +0200
Merge commit 'stevee/perl' into next
commit 4a2495b5c4361cbe5448b951637b44bb6d9fbae5 Merge: 6075b57542ee15ba80eebf15403cb2b6169adcd7 c0020b2a1867931e855dcb5d4ba339d6e433c120 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 16:05:04 2010 +0200
Merge commit 'stevee/libjpeg' into next
commit 6075b57542ee15ba80eebf15403cb2b6169adcd7 Author: Schantl Stefan Stevee@ipfire.org Date: Wed Mar 31 15:48:47 2010 +0200
pciutils: Update to version 3.1.7.
Fixes issue #599.
commit c0020b2a1867931e855dcb5d4ba339d6e433c120 Author: Schantl Stefan Stevee@ipfire.org Date: Wed Mar 31 15:43:15 2010 +0200
libjpeg: Update to version 8a.
Fixes issue #601.
commit bebf2a68cc70eda967e792c72c200d864e35b03a Author: Schantl Stefan Stevee@ipfire.org Date: Tue Mar 23 23:47:10 2010 +0100
toolchain: Add security patches from core/perl.
commit 4b63ca5eec4d215e88960029483f5d3ed1016cd6 Author: Schantl Stefan Stevee@ipfire.org Date: Tue Mar 23 23:41:57 2010 +0100
perl: Add several patches to improve security.
commit a817eff2940cd62892671d417b003a5f37b130f6 Author: Schantl Stefan Stevee@ipfire.org Date: Tue Mar 23 23:29:35 2010 +0100
perl: Add iana-etc as dependency.
This fixes issue #596.
commit 51dccdc90606da37df04351aa747528250160272 Author: Schantl Stefan Stevee@ipfire.org Date: Tue Mar 23 23:29:01 2010 +0100
perl: Clean up naoki-makefile.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/libjpeg/libjpeg.nm | 4 +- pkgs/core/pciutils/pciutils.nm | 2 +- .../patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch | 109 ++++++++++++++++++++ pkgs/core/perl/patches/perl-5.10.1-libresolv.patch | 12 ++ .../core/perl/patches/perl-5.10.1-rpath-make.patch | 32 ++++++ pkgs/core/perl/perl.nm | 16 ++-- .../patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch | 109 ++++++++++++++++++++ .../perl/patches/perl-5.10.1-libresolv.patch | 12 ++ .../perl/patches/perl-5.10.1-rpath-make.patch | 32 ++++++ 9 files changed, 318 insertions(+), 10 deletions(-) create mode 100644 pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch create mode 100644 pkgs/core/perl/patches/perl-5.10.1-libresolv.patch create mode 100644 pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch create mode 100644 pkgs/toolchain/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch create mode 100644 pkgs/toolchain/perl/patches/perl-5.10.1-libresolv.patch create mode 100644 pkgs/toolchain/perl/patches/perl-5.10.1-rpath-make.patch
Difference in files: diff --git a/pkgs/core/libjpeg/libjpeg.nm b/pkgs/core/libjpeg/libjpeg.nm index 2644605..2c2e3d5 100644 --- a/pkgs/core/libjpeg/libjpeg.nm +++ b/pkgs/core/libjpeg/libjpeg.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = libjpeg -PKG_VER = 7 +PKG_VER = 8a PKG_REL = 0
PKG_MAINTAINER = @@ -42,7 +42,7 @@ endef
PKG_TARBALL = jpegsrc.v$(PKG_VER).tar.gz
-DIR_APP = /usr/src/jpeg-7 +DIR_APP = /usr/src/jpeg-$(PKG_VER)
CONFIGURE_OPTIONS += \ --enable-shared diff --git a/pkgs/core/pciutils/pciutils.nm b/pkgs/core/pciutils/pciutils.nm index 0a27064..d98e034 100644 --- a/pkgs/core/pciutils/pciutils.nm +++ b/pkgs/core/pciutils/pciutils.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = pciutils -PKG_VER = 3.1.4 +PKG_VER = 3.1.7 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch b/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..adedbb1 --- /dev/null +++ b/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,109 @@ +diff -up perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath perl-5.10.1/lib/ExtUtils/MM_Unix.pm +--- perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/MM_Unix.pm 2009-11-18 16:09:32.000000000 +0100 +@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ + } + + my $ld_run_path_shell = ""; +- if ($self->{LD_RUN_PATH} ne "") { ++ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { + $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; + } + +diff -up perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath perl-5.10.1/lib/ExtUtils/Liblist.pm +--- perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/Liblist.pm 2009-11-18 16:09:32.000000000 +0100 +@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ + in LDLOADLIBS. It is passed as an environment variable to the process + that links the shared library. + ++Fedora extension: This generation of LD_RUN_PATH is disabled by default. ++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH ++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH ++environment variable). ++ + =head2 BSLOADLIBS + + List of those libraries that are needed but can be linked in +diff -up perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath perl-5.10.1/lib/ExtUtils/MakeMaker.pm +--- perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/MakeMaker.pm 2009-11-18 16:32:50.000000000 +0100 +@@ -262,7 +262,7 @@ sub full_setup { + PERL_SRC PERM_DIR PERM_RW PERM_RWX + PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC + PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ +- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG ++ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit + +@@ -406,7 +406,27 @@ sub new { + # PRINT_PREREQ is RedHatism. + if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { + $self->_PRINT_PREREQ; +- } ++ } ++ ++ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation ++ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) ++ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) ++ ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) ++ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) ++ ) ++ ) ++ ) ++ { ++ my $v = $1; ++ if( $v ) ++ { ++ $v = ($v=~/=([01])$/)[0]; ++ }else ++ { ++ $v = 1; ++ }; ++ $self->{USE_MM_LD_RUN_PATH}=$v; ++ }; + + print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; + if (-f "MANIFEST" && ! -f "Makefile"){ +@@ -2319,6 +2339,40 @@ precedence. A typemap in the current di + precedence, even if it isn't listed in TYPEMAPS. The default system + typemap has lowest precedence. + ++=item USE_MM_LD_RUN_PATH ++ ++boolean ++The Fedora perl MakeMaker distribution differs from the standard ++upstream release in that it disables use of the MakeMaker generated ++LD_RUN_PATH by default, UNLESS this attribute is specified , or the ++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. ++ ++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH ++to the concatenation of every -L ld(1) option directory in which a -l ld(1) ++option library is found, which is used as the ld(1) -rpath option if none ++is specified. This means that, if your application builds shared libraries ++and your MakeMaker application links to them, that the absolute paths of the ++libraries in the build tree will be inserted into the RPATH header of all ++MakeMaker generated binaries, and that such binaries will be unable to link ++to these libraries if they do not still reside in the build tree directories ++(unlikely) or in the system library directories (/lib or /usr/lib), regardless ++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and ++ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, ++ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH ++is set to include /some_directory_other_than_usr_lib, because RPATH overrides ++LD_LIBRARY_PATH. ++ ++So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for ++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH ++environment variable during the build to generate an RPATH for the binaries. ++ ++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command ++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH ++for every link command. ++ ++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the ++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. ++ + =item VENDORPREFIX + + Like PERLPREFIX, but only for the vendor install locations. diff --git a/pkgs/core/perl/patches/perl-5.10.1-libresolv.patch b/pkgs/core/perl/patches/perl-5.10.1-libresolv.patch new file mode 100644 index 0000000..7676bbb --- /dev/null +++ b/pkgs/core/perl/patches/perl-5.10.1-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/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch b/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch new file mode 100644 index 0000000..9d24326 --- /dev/null +++ b/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch @@ -0,0 +1,32 @@ +--- perl-5.8.8-RC1/Makefile.SH.makerpath 2006-01-20 16:41:26.000000000 -0500 ++++ perl-5.8.8-RC1/Makefile.SH 2006-01-20 16:41:57.000000000 -0500 +@@ -125,26 +125,10 @@ + esac + + case "$osname" in +- linux) +- # If there is a pre-existing $libperl from a previous +- # installation, Linux needs to use LD_PRELOAD to +- # override the LD_LIBRARY_PATH setting. See the +- # INSTALL file, under "Building a shared perl library". +- # If there is no pre-existing $libperl, we don't need +- # to do anything further. +- if test -f $archlib/CORE/$libperl; then +- rm -f preload +- cat <<'EOT' > preload +-#! /bin/sh +-lib=$1 +-shift +-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" +-exec "$@" +-EOT +- chmod 755 preload +- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" +- fi ++ linux*) ++ ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth" + ;; ++ + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; + esac diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm index 4a3c525..c5275f1 100644 --- a/pkgs/core/perl/perl.nm +++ b/pkgs/core/perl/perl.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.perl.org/ PKG_LICENSE = GPL+ or Artistic and GPLv2+ or Artistic PKG_SUMMARY = Practical Extraction and Report Language.
-PKG_DEPS += zlib +PKG_DEPS += iana-etc zlib
define PKG_DESCRIPTION Perl is a high-level programming language with roots in C, sed, awk \ @@ -55,10 +55,6 @@ define QUALITY_AGENT_WHITELIST_RPATH /usr/lib/perl*/auto/Compress/Raw/Zlib/Zlib.so endef
-############################################################################### -# Installation Details -############################################################################### - define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH endef @@ -69,9 +65,15 @@ define STAGE_BUILD -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \ ext/Compress-Raw-Zlib/config.in
- cd $(DIR_APP) && ./configure.gnu --prefix=/usr \ - -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 \ + cd $(DIR_APP) && ./configure.gnu -Dprefix=/usr \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ -Dpager="/usr/bin/less -isR"
cd $(DIR_APP) && make #$(PARALLELISMFLAGS) endef + +define STAGE_TEST + cd $(DIR_APP) && make test +endef + diff --git a/pkgs/toolchain/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch b/pkgs/toolchain/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..adedbb1 --- /dev/null +++ b/pkgs/toolchain/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,109 @@ +diff -up perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath perl-5.10.1/lib/ExtUtils/MM_Unix.pm +--- perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/MM_Unix.pm 2009-11-18 16:09:32.000000000 +0100 +@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ + } + + my $ld_run_path_shell = ""; +- if ($self->{LD_RUN_PATH} ne "") { ++ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { + $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; + } + +diff -up perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath perl-5.10.1/lib/ExtUtils/Liblist.pm +--- perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/Liblist.pm 2009-11-18 16:09:32.000000000 +0100 +@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ + in LDLOADLIBS. It is passed as an environment variable to the process + that links the shared library. + ++Fedora extension: This generation of LD_RUN_PATH is disabled by default. ++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH ++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH ++environment variable). ++ + =head2 BSLOADLIBS + + List of those libraries that are needed but can be linked in +diff -up perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath perl-5.10.1/lib/ExtUtils/MakeMaker.pm +--- perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath 2009-11-18 16:08:45.000000000 +0100 ++++ perl-5.10.1/lib/ExtUtils/MakeMaker.pm 2009-11-18 16:32:50.000000000 +0100 +@@ -262,7 +262,7 @@ sub full_setup { + PERL_SRC PERM_DIR PERM_RW PERM_RWX + PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC + PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ +- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG ++ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit + +@@ -406,7 +406,27 @@ sub new { + # PRINT_PREREQ is RedHatism. + if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { + $self->_PRINT_PREREQ; +- } ++ } ++ ++ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation ++ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) ++ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) ++ ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) ++ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) ++ ) ++ ) ++ ) ++ { ++ my $v = $1; ++ if( $v ) ++ { ++ $v = ($v=~/=([01])$/)[0]; ++ }else ++ { ++ $v = 1; ++ }; ++ $self->{USE_MM_LD_RUN_PATH}=$v; ++ }; + + print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; + if (-f "MANIFEST" && ! -f "Makefile"){ +@@ -2319,6 +2339,40 @@ precedence. A typemap in the current di + precedence, even if it isn't listed in TYPEMAPS. The default system + typemap has lowest precedence. + ++=item USE_MM_LD_RUN_PATH ++ ++boolean ++The Fedora perl MakeMaker distribution differs from the standard ++upstream release in that it disables use of the MakeMaker generated ++LD_RUN_PATH by default, UNLESS this attribute is specified , or the ++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. ++ ++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH ++to the concatenation of every -L ld(1) option directory in which a -l ld(1) ++option library is found, which is used as the ld(1) -rpath option if none ++is specified. This means that, if your application builds shared libraries ++and your MakeMaker application links to them, that the absolute paths of the ++libraries in the build tree will be inserted into the RPATH header of all ++MakeMaker generated binaries, and that such binaries will be unable to link ++to these libraries if they do not still reside in the build tree directories ++(unlikely) or in the system library directories (/lib or /usr/lib), regardless ++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and ++ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, ++ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH ++is set to include /some_directory_other_than_usr_lib, because RPATH overrides ++LD_LIBRARY_PATH. ++ ++So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for ++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH ++environment variable during the build to generate an RPATH for the binaries. ++ ++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command ++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH ++for every link command. ++ ++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the ++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. ++ + =item VENDORPREFIX + + Like PERLPREFIX, but only for the vendor install locations. diff --git a/pkgs/toolchain/perl/patches/perl-5.10.1-libresolv.patch b/pkgs/toolchain/perl/patches/perl-5.10.1-libresolv.patch new file mode 100644 index 0000000..7676bbb --- /dev/null +++ b/pkgs/toolchain/perl/patches/perl-5.10.1-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/pkgs/toolchain/perl/patches/perl-5.10.1-rpath-make.patch b/pkgs/toolchain/perl/patches/perl-5.10.1-rpath-make.patch new file mode 100644 index 0000000..9d24326 --- /dev/null +++ b/pkgs/toolchain/perl/patches/perl-5.10.1-rpath-make.patch @@ -0,0 +1,32 @@ +--- perl-5.8.8-RC1/Makefile.SH.makerpath 2006-01-20 16:41:26.000000000 -0500 ++++ perl-5.8.8-RC1/Makefile.SH 2006-01-20 16:41:57.000000000 -0500 +@@ -125,26 +125,10 @@ + esac + + case "$osname" in +- linux) +- # If there is a pre-existing $libperl from a previous +- # installation, Linux needs to use LD_PRELOAD to +- # override the LD_LIBRARY_PATH setting. See the +- # INSTALL file, under "Building a shared perl library". +- # If there is no pre-existing $libperl, we don't need +- # to do anything further. +- if test -f $archlib/CORE/$libperl; then +- rm -f preload +- cat <<'EOT' > preload +-#! /bin/sh +-lib=$1 +-shift +-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" +-exec "$@" +-EOT +- chmod 755 preload +- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" +- fi ++ linux*) ++ ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth" + ;; ++ + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; + esac
hooks/post-receive -- IPFire 3.x development tree