From 4eaf8a189b9e1c22161990754d288c9433e7a71d Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Wed, 11 Aug 2021 20:54:00 +0000 Subject: [PATCH] checkpoint readline --- .../perl/perl-5.18.1-remove_lnsl.patch | 441 +++++++++++++++ .../perl/perl-5.22.1-remove_lnsl.patch | 512 +++++++++++++++++ .../perl/perl-5.30.0-remove_lnsl.patch | 518 ++++++++++++++++++ .../perl/perl-5.32.1-remove_lnsl.patch | 456 +++++++++++++++ .../perl/perl-5.34.0-remove_lnsl.patch | 516 +++++++++++++++++ omnibus/config/software/autoconf.rb | 46 ++ omnibus/config/software/automake.rb | 49 ++ omnibus/config/software/compile_release.rb | 11 +- omnibus/config/software/flex.rb | 5 +- omnibus/config/software/gettext.rb | 6 +- omnibus/config/software/libiconv.rb | 53 ++ omnibus/config/software/libossp-uuid.rb | 45 ++ omnibus/config/software/nftables.rb | 3 +- omnibus/config/software/perl-thread-queue.rb | 40 ++ omnibus/config/software/perl.rb | 74 +++ omnibus/config/software/postgresql.rb | 3 +- .../software/{readline.rb => readline.rb} | 0 17 files changed, 2772 insertions(+), 6 deletions(-) create mode 100644 omnibus/config/patches/perl/perl-5.18.1-remove_lnsl.patch create mode 100644 omnibus/config/patches/perl/perl-5.22.1-remove_lnsl.patch create mode 100644 omnibus/config/patches/perl/perl-5.30.0-remove_lnsl.patch create mode 100644 omnibus/config/patches/perl/perl-5.32.1-remove_lnsl.patch create mode 100644 omnibus/config/patches/perl/perl-5.34.0-remove_lnsl.patch create mode 100644 omnibus/config/software/autoconf.rb create mode 100644 omnibus/config/software/automake.rb create mode 100644 omnibus/config/software/libiconv.rb create mode 100644 omnibus/config/software/libossp-uuid.rb create mode 100644 omnibus/config/software/perl-thread-queue.rb create mode 100644 omnibus/config/software/perl.rb rename omnibus/config/software/{readline.rb => readline.rb} (100%) diff --git a/omnibus/config/patches/perl/perl-5.18.1-remove_lnsl.patch b/omnibus/config/patches/perl/perl-5.18.1-remove_lnsl.patch new file mode 100644 index 000000000..6cf59a718 --- /dev/null +++ b/omnibus/config/patches/perl/perl-5.18.1-remove_lnsl.patch @@ -0,0 +1,441 @@ +diff -ru perl-5.18.1.orig/Configure perl-5.18.1/Configure +--- perl-5.18.1.orig/Configure 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/Configure 2019-08-21 09:07:10.876345427 -0600 +@@ -1381,7 +1381,7 @@ + : 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 bind inet 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 -ru perl-5.18.1.orig/configure.com perl-5.18.1/configure.com +--- perl-5.18.1.orig/configure.com 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/configure.com 2019-08-21 09:07:10.878345427 -0600 +@@ -121,7 +121,7 @@ + $!: full support for void wanted by default !sfn + $!defvoidused=15 !sfn + $!: List of libraries we want. !sfn +-$!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn ++$!libswanted='net socket inet nm ndbm gdbm dbm db malloc dl' !sfn + $!libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt" !sfn + $!libswanted="$libswanted ucb bsd BSD PW x" !sfn + $!: We probably want to search /usr/shlib before most other libraries. !sfn +diff -ru perl-5.18.1.orig/cpan/Config-Perl-V/t/20_plv.t perl-5.18.1/cpan/Config-Perl-V/t/20_plv.t +--- perl-5.18.1.orig/cpan/Config-Perl-V/t/20_plv.t 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/cpan/Config-Perl-V/t/20_plv.t 2019-08-21 09:07:10.879345427 -0600 +@@ -48,8 +48,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.6.1.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.6.1' + Dynamic Linking: +diff -ru perl-5.18.1.orig/Cross/config.sh-arm-linux perl-5.18.1/Cross/config.sh-arm-linux +--- perl-5.18.1.orig/Cross/config.sh-arm-linux 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/Cross/config.sh-arm-linux 2019-08-21 09:08:35.251345202 -0600 +@@ -777,12 +777,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.so' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='sfio socket bind inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -865,7 +865,7 @@ + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff -ru perl-5.18.1.orig/Cross/config.sh-arm-linux-n770 perl-5.18.1/Cross/config.sh-arm-linux-n770 +--- perl-5.18.1.orig/Cross/config.sh-arm-linux-n770 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/Cross/config.sh-arm-linux-n770 2019-08-21 09:08:35.252345202 -0600 +@@ -748,12 +748,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.arma' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='sfio socket bind inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -835,7 +835,7 @@ + perl='' + perl_patchlevel='' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff -ru perl-5.18.1.orig/hints/aix_4.sh perl-5.18.1/hints/aix_4.sh +--- perl-5.18.1.orig/hints/aix_4.sh 2013-04-30 20:52:55.000000000 -0600 ++++ perl-5.18.1/hints/aix_4.sh 2019-08-21 09:07:10.880345427 -0600 +@@ -583,7 +583,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -591,7 +591,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ru perl-5.18.1.orig/hints/aix.sh perl-5.18.1/hints/aix.sh +--- perl-5.18.1.orig/hints/aix.sh 2013-08-11 20:44:48.000000000 -0600 ++++ perl-5.18.1/hints/aix.sh 2019-08-21 09:07:10.880345427 -0600 +@@ -505,7 +505,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -513,7 +513,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ru perl-5.18.1.orig/hints/dgux.sh perl-5.18.1/hints/dgux.sh +--- perl-5.18.1.orig/hints/dgux.sh 2013-08-11 20:44:48.000000000 -0600 ++++ perl-5.18.1/hints/dgux.sh 2019-08-21 09:07:10.880345427 -0600 +@@ -154,7 +154,7 @@ + #libswanted="dbm posix $libswanted" + # Do *NOT* add there the malloc native + # DG/UX library! +-libswanted="dbm posix resolv socket nsl dl m" ++libswanted="dbm posix resolv socket dl m" + + ##################################### + # +@@ -203,7 +203,7 @@ + # DG/UX's sched_yield is in -lrte + # Do *NOT* add there the malloc native + # DG/UX library! +- libswanted="dbm posix resolv socket nsl dl m rte" ++ libswanted="dbm posix resolv socket dl m rte" + archname="ix86-dgux-thread" + sitearch="$prefix/lib/perl518/$archname" + sitelib="$prefix/lib/perl518" +diff -ru perl-5.18.1.orig/hints/epix.sh perl-5.18.1/hints/epix.sh +--- perl-5.18.1.orig/hints/epix.sh 2013-04-30 20:52:55.000000000 -0600 ++++ perl-5.18.1/hints/epix.sh 2019-08-21 09:07:10.880345427 -0600 +@@ -37,7 +37,7 @@ + # Old version had this, but I'm not sure why since the old version + # also mucked around with libswanted. This is also definitely wrong + # if the user is trying to use DB_File or GDBM_File. +-# libs='-lsocket -lnsl -ldbm -ldl -lc -lcrypt -lm -lucb' ++# libs='-lsocket -ldbm -ldl -lc -lcrypt -lm -lucb' + + # We include support for using libraries in /usr/ucblib, but the setting + # of libswanted excludes some libraries found there. You may want to +diff -ru perl-5.18.1.orig/hints/gnu.sh perl-5.18.1/hints/gnu.sh +--- perl-5.18.1.orig/hints/gnu.sh 2013-05-23 17:38:10.000000000 -0600 ++++ perl-5.18.1/hints/gnu.sh 2019-08-21 09:07:10.880345427 -0600 +@@ -4,7 +4,7 @@ + + # libnsl is unusable on the Hurd. + # XXX remove this once SUNRPC is implemented. +-set `echo X "$libswanted "| sed -e 's/ nsl / /' -e 's/ c / pthread /'` ++set `echo X "$libswanted "| sed -e 's/ c / pthread /'` + shift + libswanted="$*" + +diff -ru perl-5.18.1.orig/hints/irix_5.sh perl-5.18.1/hints/irix_5.sh +--- perl-5.18.1.orig/hints/irix_5.sh 2013-02-26 14:28:27.000000000 -0700 ++++ perl-5.18.1/hints/irix_5.sh 2019-08-21 09:07:10.881345427 -0600 +@@ -27,9 +27,9 @@ + esac + + lddlflags="-shared" +-# For some reason we don't want -lsocket -lnsl or -ldl. Can anyone ++# For some reason we don't want -lsocket or -ldl. Can anyone + # contribute an explanation? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + +diff -ru perl-5.18.1.orig/hints/irix_6_0.sh perl-5.18.1/hints/irix_6_0.sh +--- perl-5.18.1.orig/hints/irix_6_0.sh 2013-02-26 14:28:27.000000000 -0700 ++++ perl-5.18.1/hints/irix_6_0.sh 2019-08-21 09:07:10.881345427 -0600 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ru perl-5.18.1.orig/hints/irix_6_1.sh perl-5.18.1/hints/irix_6_1.sh +--- perl-5.18.1.orig/hints/irix_6_1.sh 2013-02-26 14:28:27.000000000 -0700 ++++ perl-5.18.1/hints/irix_6_1.sh 2019-08-21 09:07:10.881345427 -0600 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ru perl-5.18.1.orig/hints/irix_6.sh perl-5.18.1/hints/irix_6.sh +--- perl-5.18.1.orig/hints/irix_6.sh 2013-04-30 20:52:55.000000000 -0600 ++++ perl-5.18.1/hints/irix_6.sh 2019-08-21 09:07:10.881345427 -0600 +@@ -359,7 +359,7 @@ + # Socket networking is in libc, these are not installed by default, + # and just slow perl down. (scotth@sgi.com) + # librt contains nothing we need (some places need it for Time::HiRes) --jhi +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /' -e 's/ rt / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /' -e 's/ rt / /'` + shift + libswanted="$*" + +diff -ru perl-5.18.1.orig/hints/powerux.sh perl-5.18.1/hints/powerux.sh +--- perl-5.18.1.orig/hints/powerux.sh 2013-04-30 20:52:55.000000000 -0600 ++++ perl-5.18.1/hints/powerux.sh 2019-08-21 09:07:10.882345427 -0600 +@@ -27,11 +27,11 @@ + exit 2 + fi + +-# We DO NOT want -lmalloc or -lPW, we DO need -lgen to follow -lnsl, so ++# We DO NOT want -lmalloc or -lPW, we DO need -lgen to follow, so + # fixup libswanted to reflect that desire (also need -lresolv if you want + # DNS name lookup to work, which seems desirable :-). + # +-libswanted=`echo ' '$libswanted' ' | sed -e 's/ malloc / /' -e 's/ PW / /' -e 's/ nsl / nsl gen resolv /'` ++libswanted=`echo ' '$libswanted' ' | sed -e 's/ malloc / /' -e 's/ PW / /'` + + # We DO NOT want /usr/ucblib in glibpth + # +diff -ru perl-5.18.1.orig/hints/titanos.sh perl-5.18.1/hints/titanos.sh +--- perl-5.18.1.orig/hints/titanos.sh 2013-02-26 14:28:27.000000000 -0700 ++++ perl-5.18.1/hints/titanos.sh 2019-08-21 09:07:10.882345427 -0600 +@@ -17,14 +17,14 @@ + stdchar='unsigned char' + # + # Apparently there are some harmful libs in Configure's $libswanted. +-# Perl5.000 had: libs='-lnsl -ldbm -lPW -lmalloc -lm' ++# Perl5.000 had: libs='-ldbm -lPW -lmalloc -lm' + # Unfortunately, this line prevents users from including things like + # -lgdbm and -ldb, which they may or may not have or want. + # We should probably fiddle with libswanted instead of libs. + # And even there, we should only bother to delete harmful libraries. + # However, I don't know what they are or why they should be deleted, + # so this will have to do for now. --AD 28 Mar 1995 +-libswanted='sfio nsl dbm gdbm db PW malloc m' ++libswanted='sfio dbm gdbm db PW malloc m' + # + # Extensions: This system can not compile POSIX. We'll let Configure + # figure out the others. +diff -ru perl-5.18.1.orig/INSTALL perl-5.18.1/INSTALL +--- perl-5.18.1.orig/INSTALL 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/INSTALL 2019-08-21 09:07:10.883345427 -0600 +@@ -1583,7 +1583,7 @@ + undefined symbols, check the libs variable in the config.sh file. It + should look something like + +- libs='-lsocket -lnsl -ldl -lm -lc' ++ libs='-lsocket -ldl -lm -lc' + + The exact libraries will vary from system to system, but you typically + need to include at least the math library -lm. Normally, Configure +diff -ru perl-5.18.1.orig/NetWare/config.wc perl-5.18.1/NetWare/config.wc +--- perl-5.18.1.orig/NetWare/config.wc 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/NetWare/config.wc 2019-08-21 09:07:10.883345427 -0600 +@@ -757,7 +757,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.18.1.orig/plan9/config_sh.sample perl-5.18.1/plan9/config_sh.sample +--- perl-5.18.1.orig/plan9/config_sh.sample 2013-08-11 20:44:48.000000000 -0600 ++++ perl-5.18.1/plan9/config_sh.sample 2019-08-21 09:07:10.883345427 -0600 +@@ -764,7 +764,7 @@ + libsfiles='' + libsfound='' + libspath=' /lib' +-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' ++libswanted='sfio socket bind inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' + libswanted_uselargefiles='' + line='' + lint='' +diff -ru perl-5.18.1.orig/pod/perlrun.pod perl-5.18.1/pod/perlrun.pod +--- perl-5.18.1.orig/pod/perlrun.pod 2013-08-11 20:44:48.000000000 -0600 ++++ perl-5.18.1/pod/perlrun.pod 2019-08-21 09:07:10.884345427 -0600 +@@ -862,11 +862,11 @@ + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib. +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib.* + libpth='/usr/local/lib /lib /usr/lib'; +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + lib_ext='.a'; + libc='/lib/libc-2.2.4.so'; + libperl='libperl.a'; +diff -ru perl-5.18.1.orig/Porting/bisect-runner.pl perl-5.18.1/Porting/bisect-runner.pl +--- perl-5.18.1.orig/Porting/bisect-runner.pl 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/Porting/bisect-runner.pl 2019-08-21 09:07:10.885345427 -0600 +@@ -922,7 +922,7 @@ + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh +- foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ++ foreach my $lib (qw(sfio socket inet nm ndbm gdbm dbm db malloc dl dld + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + next unless -f "$dir/lib$lib.so"; +diff -ru perl-5.18.1.orig/Porting/config.sh perl-5.18.1/Porting/config.sh +--- perl-5.18.1.orig/Porting/config.sh 2013-08-11 20:44:47.000000000 -0600 ++++ perl-5.18.1/Porting/config.sh 2019-08-21 09:08:35.252345202 -0600 +@@ -795,12 +795,12 @@ + libc='/lib/libc-2.7.so' + libperl='libperl.a' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' ++libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so' ++libsfiles=' libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' ++libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='sfio socket inet nsl nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' ++libswanted='sfio socket inet nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' + libswanted_uselargefiles='' + line='' + lint='' +@@ -886,7 +886,7 @@ + perl_patchlevel='34948' + perl_static_inline='static __inline__' + perladmin='yourname@yourhost.yourplace.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/opt/perl/bin/perl5.18.1' + pg='pg' + phostname='' +diff -ru perl-5.18.1.orig/win32/config.ce perl-5.18.1/win32/config.ce +--- perl-5.18.1.orig/win32/config.ce 2013-08-11 20:44:49.000000000 -0600 ++++ perl-5.18.1/win32/config.ce 2019-08-21 09:07:10.886345427 -0600 +@@ -749,7 +749,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.18.1.orig/win32/config.gc perl-5.18.1/win32/config.gc +--- perl-5.18.1.orig/win32/config.gc 2013-08-11 20:44:49.000000000 -0600 ++++ perl-5.18.1/win32/config.gc 2019-08-21 09:07:10.886345427 -0600 +@@ -775,8 +775,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.18.1.orig/win32/config.vc perl-5.18.1/win32/config.vc +--- perl-5.18.1.orig/win32/config.vc 2013-08-11 20:44:49.000000000 -0600 ++++ perl-5.18.1/win32/config.vc 2019-08-21 09:07:10.887345427 -0600 +@@ -774,8 +774,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' diff --git a/omnibus/config/patches/perl/perl-5.22.1-remove_lnsl.patch b/omnibus/config/patches/perl/perl-5.22.1-remove_lnsl.patch new file mode 100644 index 000000000..d232c003b --- /dev/null +++ b/omnibus/config/patches/perl/perl-5.22.1-remove_lnsl.patch @@ -0,0 +1,512 @@ +diff -ru perl-5.22.1.orig/Configure perl-5.22.1/Configure +--- perl-5.22.1.orig/Configure 2015-10-17 06:38:37.000000000 -0600 ++++ perl-5.22.1/Configure 2019-08-21 09:12:01.271379908 -0600 +@@ -1454,7 +1454,7 @@ + : 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="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld" ++libswanted="cl pthread socket bind inet nm ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun 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 -ru perl-5.22.1.orig/configure.com perl-5.22.1/configure.com +--- perl-5.22.1.orig/configure.com 2015-10-17 06:38:37.000000000 -0600 ++++ perl-5.22.1/configure.com 2019-08-21 09:12:01.271379908 -0600 +@@ -119,7 +119,7 @@ + $!: machines, like the mips. Usually, it should be empty. !sfn + $!plibpth='' !sfn + $!: List of libraries we want. !sfn +-$!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn ++$!libswanted='net socket inet nm ndbm gdbm dbm db malloc dl' !sfn + $!libswanted="$libswanted ld sun m c cposix posix ndir dir crypt" !sfn + $!libswanted="$libswanted ucb bsd BSD PW x" !sfn + $!: We probably want to search /usr/shlib before most other libraries. !sfn +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/20_plv56.t perl-5.22.1/cpan/Config-Perl-V/t/20_plv56.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/20_plv56.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/20_plv56.t 2019-08-21 09:12:01.272379909 -0600 +@@ -58,8 +58,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lc -lcrypt -lutil +- perllibs=-lnsl -ldl -lm -lc -lcrypt -lutil ++ libs=-lgdbm -ldb -ldl -lm -lc -lcrypt -lutil ++ perllibs=-ldl -lm -lc -lcrypt -lutil + libc=/lib/libc-2.10.1.so, so=so, useshrplib=false, libperl=libperl.a + Dynamic Linking: + dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-rdynamic' +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/21_plv58.t perl-5.22.1/cpan/Config-Perl-V/t/21_plv58.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/21_plv58.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/21_plv58.t 2019-08-21 09:12:01.272379909 -0600 +@@ -62,8 +62,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=/lib/libc-2.11.2.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.11.2' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/22_plv510.t perl-5.22.1/cpan/Config-Perl-V/t/22_plv510.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/22_plv510.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/22_plv510.t 2019-08-21 09:12:01.272379909 -0600 +@@ -52,8 +52,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.6.1.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.6.1' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/23_plv512.t perl-5.22.1/cpan/Config-Perl-V/t/23_plv512.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/23_plv512.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/23_plv512.t 2019-08-21 09:12:01.272379909 -0600 +@@ -63,8 +63,8 @@ + Linker and Libraries: + ld='/usr/bin/ld', ldflags ='-L/pro/local/lib +DD64 -L/usr/lib/hpux64' + libpth=/pro/local/lib /usr/lib/hpux64 /lib /usr/lib /usr/ccs/lib /usr/local/lib +- libs=-lcl -lpthread -lnsl -lnm -ldb -ldl -ldld -lm -lsec -lc +- perllibs=-lcl -lpthread -lnsl -lnm -ldl -ldld -lm -lsec -lc ++ libs=-lcl -lpthread -lnm -ldb -ldl -ldld -lm -lsec -lc ++ perllibs=-lcl -lpthread -lnm -ldl -ldld -lm -lsec -lc + libc=/usr/lib/hpux64/libc.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/24_plv514.t perl-5.22.1/cpan/Config-Perl-V/t/24_plv514.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/24_plv514.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/24_plv514.t 2019-08-21 09:12:01.272379909 -0600 +@@ -64,8 +64,8 @@ + Linker and Libraries: + ld='ld', ldflags ='-L/usr/local/ppc64/lib64 -b64 -q64 -L/pro/local/lib -brtl -bdynamic -b64' + libpth=/usr/local/ppc64/lib64 /lib /usr/lib /usr/ccs/lib /usr/local/lib /usr/lib64 +- libs=-lbind -lnsl -ldbm -ldb -ldl -lld -lm -lcrypt -lc +- perllibs=-lbind -lnsl -ldl -lld -lm -lcrypt -lc ++ libs=-lbind -ldbm -ldb -ldl -lld -lm -lcrypt -lc ++ perllibs=-lbind -ldl -lld -lm -lcrypt -lc + libc=/lib/libc.a, so=a, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/25_plv516.t perl-5.22.1/cpan/Config-Perl-V/t/25_plv516.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/25_plv516.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/25_plv516.t 2019-08-21 09:12:01.272379909 -0600 +@@ -64,8 +64,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.15.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.15' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/26_plv5182.t perl-5.22.1/cpan/Config-Perl-V/t/26_plv5182.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/26_plv5182.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/26_plv5182.t 2019-08-21 09:12:01.272379909 -0600 +@@ -89,8 +89,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/26_plv518.t perl-5.22.1/cpan/Config-Perl-V/t/26_plv518.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/26_plv518.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/26_plv518.t 2019-08-21 09:12:01.272379909 -0600 +@@ -89,8 +89,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.17.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.17' + Dynamic Linking: +diff -ru perl-5.22.1.orig/cpan/Config-Perl-V/t/27_plv5200.t perl-5.22.1/cpan/Config-Perl-V/t/27_plv5200.t +--- perl-5.22.1.orig/cpan/Config-Perl-V/t/27_plv5200.t 2015-10-17 06:31:54.000000000 -0600 ++++ perl-5.22.1/cpan/Config-Perl-V/t/27_plv5200.t 2019-08-21 09:12:01.272379909 -0600 +@@ -91,8 +91,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff -ru perl-5.22.1.orig/Cross/config.sh-arm-linux perl-5.22.1/Cross/config.sh-arm-linux +--- perl-5.22.1.orig/Cross/config.sh-arm-linux 2015-10-18 11:26:26.000000000 -0600 ++++ perl-5.22.1/Cross/config.sh-arm-linux 2019-08-21 09:12:19.907386879 -0600 +@@ -838,12 +838,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.so' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -927,7 +927,7 @@ + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff -ru perl-5.22.1.orig/Cross/config.sh-arm-linux-n770 perl-5.22.1/Cross/config.sh-arm-linux-n770 +--- perl-5.22.1.orig/Cross/config.sh-arm-linux-n770 2015-10-18 11:26:52.000000000 -0600 ++++ perl-5.22.1/Cross/config.sh-arm-linux-n770 2019-08-21 09:12:19.907386879 -0600 +@@ -744,12 +744,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.arma' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -831,7 +831,7 @@ + perl='' + perl_patchlevel='' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff -ru perl-5.22.1.orig/hints/aix_4.sh perl-5.22.1/hints/aix_4.sh +--- perl-5.22.1.orig/hints/aix_4.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/aix_4.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -583,7 +583,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -591,7 +591,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ru perl-5.22.1.orig/hints/aix.sh perl-5.22.1/hints/aix.sh +--- perl-5.22.1.orig/hints/aix.sh 2015-10-17 06:38:37.000000000 -0600 ++++ perl-5.22.1/hints/aix.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -504,7 +504,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -512,7 +512,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ru perl-5.22.1.orig/hints/epix.sh perl-5.22.1/hints/epix.sh +--- perl-5.22.1.orig/hints/epix.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/epix.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -37,7 +37,7 @@ + # Old version had this, but I'm not sure why since the old version + # also mucked around with libswanted. This is also definitely wrong + # if the user is trying to use DB_File or GDBM_File. +-# libs='-lsocket -lnsl -ldbm -ldl -lc -lcrypt -lm -lucb' ++# libs='-lsocket -ldbm -ldl -lc -lcrypt -lm -lucb' + + # We include support for using libraries in /usr/ucblib, but the setting + # of libswanted excludes some libraries found there. You may want to +diff -ru perl-5.22.1.orig/hints/gnu.sh perl-5.22.1/hints/gnu.sh +--- perl-5.22.1.orig/hints/gnu.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/gnu.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -4,7 +4,7 @@ + + # libnsl is unusable on the Hurd. + # XXX remove this once SUNRPC is implemented. +-set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ nsl / /' -e 's/ c / pthread /'` ++set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ c / pthread /'` + shift + libswanted="$*" + +diff -ru perl-5.22.1.orig/hints/irix_5.sh perl-5.22.1/hints/irix_5.sh +--- perl-5.22.1.orig/hints/irix_5.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/irix_5.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -27,9 +27,9 @@ + esac + + lddlflags="-shared" +-# For some reason we don't want -lsocket -lnsl or -ldl. Can anyone ++# For some reason we don't want -lsocket or -ldl. Can anyone + # contribute an explanation? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + +diff -ru perl-5.22.1.orig/hints/irix_6_0.sh perl-5.22.1/hints/irix_6_0.sh +--- perl-5.22.1.orig/hints/irix_6_0.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/irix_6_0.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ru perl-5.22.1.orig/hints/irix_6_1.sh perl-5.22.1/hints/irix_6_1.sh +--- perl-5.22.1.orig/hints/irix_6_1.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/irix_6_1.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ru perl-5.22.1.orig/hints/irix_6.sh perl-5.22.1/hints/irix_6.sh +--- perl-5.22.1.orig/hints/irix_6.sh 2015-10-18 06:40:25.000000000 -0600 ++++ perl-5.22.1/hints/irix_6.sh 2019-08-21 09:12:01.273379909 -0600 +@@ -388,7 +388,7 @@ + # Socket networking is in libc, these are not installed by default, + # and just slow perl down. (scotth@sgi.com) + # librt contains nothing we need (some places need it for Time::HiRes) --jhi +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /' -e 's/ rt / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /' -e 's/ rt / /'` + shift + libswanted="$*" + +diff -ru perl-5.22.1.orig/hints/powerux.sh perl-5.22.1/hints/powerux.sh +--- perl-5.22.1.orig/hints/powerux.sh 2015-10-17 06:32:14.000000000 -0600 ++++ perl-5.22.1/hints/powerux.sh 2019-08-21 09:12:01.274379910 -0600 +@@ -27,11 +27,11 @@ + exit 2 + fi + +-# We DO NOT want -lmalloc or -lPW, we DO need -lgen to follow -lnsl, so ++# We DO NOT want -lmalloc or -lPW, we DO need -lgen to follow, so + # fixup libswanted to reflect that desire (also need -lresolv if you want + # DNS name lookup to work, which seems desirable :-). + # +-libswanted=`echo ' '$libswanted' ' | sed -e 's/ malloc / /' -e 's/ PW / /' -e 's/ nsl / nsl gen resolv /'` ++libswanted=`echo ' '$libswanted' ' | sed -e 's/ malloc / /' -e 's/ PW / /'` + + # We DO NOT want /usr/ucblib in glibpth + # +diff -ru perl-5.22.1.orig/INSTALL perl-5.22.1/INSTALL +--- perl-5.22.1.orig/INSTALL 2015-10-18 11:46:25.000000000 -0600 ++++ perl-5.22.1/INSTALL 2019-08-21 09:12:01.274379910 -0600 +@@ -1617,7 +1617,7 @@ + undefined symbols, check the libs variable in the config.sh file. It + should look something like + +- libs='-lsocket -lnsl -ldl -lm -lc' ++ libs='-lsocket -ldl -lm -lc' + + The exact libraries will vary from system to system, but you typically + need to include at least the math library -lm. Normally, Configure +diff -ru perl-5.22.1.orig/NetWare/config.wc perl-5.22.1/NetWare/config.wc +--- perl-5.22.1.orig/NetWare/config.wc 2015-10-17 06:38:37.000000000 -0600 ++++ perl-5.22.1/NetWare/config.wc 2019-08-21 09:12:01.274379910 -0600 +@@ -818,7 +818,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.22.1.orig/plan9/config_sh.sample perl-5.22.1/plan9/config_sh.sample +--- perl-5.22.1.orig/plan9/config_sh.sample 2015-10-18 11:39:19.000000000 -0600 ++++ perl-5.22.1/plan9/config_sh.sample 2019-08-21 09:12:01.274379910 -0600 +@@ -825,7 +825,7 @@ + libsfiles='' + libsfound='' + libspath=' /lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' + libswanted_uselargefiles='' + line='' + lint='' +diff -ru perl-5.22.1.orig/pod/perlrun.pod perl-5.22.1/pod/perlrun.pod +--- perl-5.22.1.orig/pod/perlrun.pod 2015-10-17 06:32:18.000000000 -0600 ++++ perl-5.22.1/pod/perlrun.pod 2019-08-21 09:12:01.274379910 -0600 +@@ -874,11 +874,11 @@ + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib. +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib.* + libpth='/usr/local/lib /lib /usr/lib'; +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + lib_ext='.a'; + libc='/lib/libc-2.2.4.so'; + libperl='libperl.a'; +diff -ru perl-5.22.1.orig/Porting/bisect-runner.pl perl-5.22.1/Porting/bisect-runner.pl +--- perl-5.22.1.orig/Porting/bisect-runner.pl 2015-10-17 06:38:37.000000000 -0600 ++++ perl-5.22.1/Porting/bisect-runner.pl 2019-08-21 09:12:01.275379910 -0600 +@@ -1269,7 +1269,7 @@ + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh +- foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl ++ foreach my $lib (qw(sfio socket inet nm ndbm gdbm dbm db malloc dl + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + # Note the wonderful consistency of dot-or-not in the config vars: +diff -ru perl-5.22.1.orig/Porting/config.sh perl-5.22.1/Porting/config.sh +--- perl-5.22.1.orig/Porting/config.sh 2015-10-18 11:34:00.000000000 -0600 ++++ perl-5.22.1/Porting/config.sh 2019-08-21 09:12:19.908386879 -0600 +@@ -856,12 +856,12 @@ + libc='libc-2.18.so' + libperl='libperl.a' + libpth='/usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib' +-libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' ++libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so' ++libsfiles=' libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' ++libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so' + libspath=' /usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib' +-libswanted='socket inet nsl nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' ++libswanted='socket inet nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' + libswanted_uselargefiles='' + line='' + lint='' +@@ -945,7 +945,7 @@ + perl_patchlevel='' + perl_static_inline='static __inline__' + perladmin='hmbrand@cpan.org' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/pro/bin/perl5.22.1' + pg='pg' + phostname='hostname' +diff -ru perl-5.22.1.orig/win32/config.ce perl-5.22.1/win32/config.ce +--- perl-5.22.1.orig/win32/config.ce 2015-10-17 06:38:38.000000000 -0600 ++++ perl-5.22.1/win32/config.ce 2019-08-21 09:12:01.275379910 -0600 +@@ -810,7 +810,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.22.1.orig/win32/config.gc perl-5.22.1/win32/config.gc +--- perl-5.22.1.orig/win32/config.gc 2015-10-17 06:38:38.000000000 -0600 ++++ perl-5.22.1/win32/config.gc 2019-08-21 09:12:01.275379910 -0600 +@@ -836,8 +836,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff -ru perl-5.22.1.orig/win32/config.vc perl-5.22.1/win32/config.vc +--- perl-5.22.1.orig/win32/config.vc 2015-10-17 06:38:38.000000000 -0600 ++++ perl-5.22.1/win32/config.vc 2019-08-21 09:12:01.275379910 -0600 +@@ -835,8 +835,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' diff --git a/omnibus/config/patches/perl/perl-5.30.0-remove_lnsl.patch b/omnibus/config/patches/perl/perl-5.30.0-remove_lnsl.patch new file mode 100644 index 000000000..48b63f567 --- /dev/null +++ b/omnibus/config/patches/perl/perl-5.30.0-remove_lnsl.patch @@ -0,0 +1,518 @@ +diff -ur perl-5.30.0.orig/Configure perl-5.30.0/Configure +--- perl-5.30.0.orig/Configure 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/Configure 2019-10-14 17:37:29.512567849 -0400 +@@ -1487,7 +1487,7 @@ + usereentrant='undef' + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" ++libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun 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 -ur perl-5.30.0.orig/configure.com perl-5.30.0/configure.com +--- perl-5.30.0.orig/configure.com 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/configure.com 2019-10-14 17:35:46.608063565 -0400 +@@ -117,7 +117,7 @@ + $!: machines, like the mips. Usually, it should be empty. !sfn + $!plibpth='' !sfn + $!: List of libraries we want. !sfn +-$!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn ++$!libswanted='net socket inet nm ndbm gdbm dbm db malloc dl' !sfn + $!libswanted="$libswanted ld sun m c cposix posix ndir dir crypt" !sfn + $!libswanted="$libswanted ucb bsd BSD PW x" !sfn + $!: We probably want to search /usr/shlib before most other libraries. !sfn +Only in perl-5.30.0/: configure.com.orig +Only in perl-5.30.0/: Configure.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/20_plv56.t perl-5.30.0/cpan/Config-Perl-V/t/20_plv56.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/20_plv56.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/20_plv56.t 2019-10-14 17:35:46.612063373 -0400 +@@ -63,8 +63,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lc -lcrypt -lutil +- perllibs=-lnsl -ldl -lm -lc -lcrypt -lutil ++ libs=-lgdbm -ldb -ldl -lm -lc -lcrypt -lutil ++ perllibs=-ldl -lm -lc -lcrypt -lutil + libc=/lib/libc-2.10.1.so, so=so, useshrplib=false, libperl=libperl.a + Dynamic Linking: + dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-rdynamic' +Only in perl-5.30.0/cpan/Config-Perl-V/t: 20_plv56.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/21_plv58.t perl-5.30.0/cpan/Config-Perl-V/t/21_plv58.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/21_plv58.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/21_plv58.t 2019-10-14 17:35:46.612063373 -0400 +@@ -67,8 +67,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=/lib/libc-2.11.2.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.11.2' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 21_plv58.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/22_plv510.t perl-5.30.0/cpan/Config-Perl-V/t/22_plv510.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/22_plv510.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/22_plv510.t 2019-10-14 17:35:46.612063373 -0400 +@@ -57,8 +57,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.6.1.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.6.1' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 22_plv510.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/23_plv512.t perl-5.30.0/cpan/Config-Perl-V/t/23_plv512.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/23_plv512.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/23_plv512.t 2019-10-14 17:35:46.612063373 -0400 +@@ -68,8 +68,8 @@ + Linker and Libraries: + ld='/usr/bin/ld', ldflags ='-L/pro/local/lib +DD64 -L/usr/lib/hpux64' + libpth=/pro/local/lib /usr/lib/hpux64 /lib /usr/lib /usr/ccs/lib /usr/local/lib +- libs=-lcl -lpthread -lnsl -lnm -ldb -ldl -ldld -lm -lsec -lc +- perllibs=-lcl -lpthread -lnsl -lnm -ldl -ldld -lm -lsec -lc ++ libs=-lcl -lpthread -lnm -ldb -ldl -ldld -lm -lsec -lc ++ perllibs=-lcl -lpthread -lnm -ldl -ldld -lm -lsec -lc + libc=/usr/lib/hpux64/libc.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 23_plv512.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/24_plv514.t perl-5.30.0/cpan/Config-Perl-V/t/24_plv514.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/24_plv514.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/24_plv514.t 2019-10-14 17:35:46.612063373 -0400 +@@ -69,8 +69,8 @@ + Linker and Libraries: + ld='ld', ldflags ='-L/usr/local/ppc64/lib64 -b64 -q64 -L/pro/local/lib -brtl -bdynamic -b64' + libpth=/usr/local/ppc64/lib64 /lib /usr/lib /usr/ccs/lib /usr/local/lib /usr/lib64 +- libs=-lbind -lnsl -ldbm -ldb -ldl -lld -lm -lcrypt -lc +- perllibs=-lbind -lnsl -ldl -lld -lm -lcrypt -lc ++ libs=-lbind -ldbm -ldb -ldl -lld -lm -lcrypt -lc ++ perllibs=-lbind -ldl -lld -lm -lcrypt -lc + libc=/lib/libc.a, so=a, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 24_plv514.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/25_plv516.t perl-5.30.0/cpan/Config-Perl-V/t/25_plv516.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/25_plv516.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/25_plv516.t 2019-10-14 17:35:46.612063373 -0400 +@@ -69,8 +69,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.15.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.15' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 25_plv516.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/26_plv5182.t perl-5.30.0/cpan/Config-Perl-V/t/26_plv5182.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/26_plv5182.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/26_plv5182.t 2019-10-14 17:35:46.612063373 -0400 +@@ -94,8 +94,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 26_plv5182.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/26_plv518.t perl-5.30.0/cpan/Config-Perl-V/t/26_plv518.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/26_plv518.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/26_plv518.t 2019-10-14 17:35:46.616063181 -0400 +@@ -94,8 +94,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.17.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.17' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 26_plv518.t.orig +diff -ur perl-5.30.0.orig/cpan/Config-Perl-V/t/27_plv5200.t perl-5.30.0/cpan/Config-Perl-V/t/27_plv5200.t +--- perl-5.30.0.orig/cpan/Config-Perl-V/t/27_plv5200.t 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/cpan/Config-Perl-V/t/27_plv5200.t 2019-10-14 17:35:46.620062988 -0400 +@@ -96,8 +96,8 @@ + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +Only in perl-5.30.0/cpan/Config-Perl-V/t: 27_plv5200.t.orig +diff -ur perl-5.30.0.orig/Cross/config.sh-arm-linux perl-5.30.0/Cross/config.sh-arm-linux +--- perl-5.30.0.orig/Cross/config.sh-arm-linux 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/Cross/config.sh-arm-linux 2019-10-14 17:35:46.620062988 -0400 +@@ -866,12 +866,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.so' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -959,7 +959,7 @@ + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff -ur perl-5.30.0.orig/Cross/config.sh-arm-linux-n770 perl-5.30.0/Cross/config.sh-arm-linux-n770 +--- perl-5.30.0.orig/Cross/config.sh-arm-linux-n770 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/Cross/config.sh-arm-linux-n770 2019-10-14 17:35:46.620062988 -0400 +@@ -864,12 +864,12 @@ + libc='/lib/libc-2.2.2.so' + libperl='libperl.arma' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -957,7 +957,7 @@ + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +Only in perl-5.30.0/Cross: config.sh-arm-linux-n770.orig +Only in perl-5.30.0/Cross: config.sh-arm-linux.orig +diff -ur perl-5.30.0.orig/hints/aix_4.sh perl-5.30.0/hints/aix_4.sh +--- perl-5.30.0.orig/hints/aix_4.sh 2018-06-27 07:17:56.000000000 -0400 ++++ perl-5.30.0/hints/aix_4.sh 2019-10-14 17:35:46.620062988 -0400 +@@ -583,7 +583,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -591,7 +591,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ur perl-5.30.0.orig/hints/aix.sh perl-5.30.0/hints/aix.sh +--- perl-5.30.0.orig/hints/aix.sh 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/hints/aix.sh 2019-10-14 17:35:46.620062988 -0400 +@@ -504,7 +504,7 @@ + + *** + *** You seem to be compiling in AIX for the OS/400 PASE environment. +-*** I'm not going to use the AIX bind, nsl, and possible util libraries, then. ++*** I'm not going to use the AIX bind, and possible util libraries, then. + *** I'm also not going to install perl as /usr/bin/perl. + *** Perl will be installed under $prefix. + *** For instructions how to install this build from AIX to PASE, +@@ -512,7 +512,7 @@ + *** about "Operating system name". + *** + EOF +- set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ nsl @ @' -e 's@ util @ @'` ++ set `echo " $libswanted " | sed -e 's@ bind @ @' -e 's@ util @ @'` + shift + libswanted="$*" + installusrbinperl="$undef" +diff -ur perl-5.30.0.orig/hints/epix.sh perl-5.30.0/hints/epix.sh +--- perl-5.30.0.orig/hints/epix.sh 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/hints/epix.sh 2019-10-14 17:35:46.620062988 -0400 +@@ -37,7 +37,7 @@ + # Old version had this, but I'm not sure why since the old version + # also mucked around with libswanted. This is also definitely wrong + # if the user is trying to use DB_File or GDBM_File. +-# libs='-lsocket -lnsl -ldbm -ldl -lc -lcrypt -lm -lucb' ++# libs='-lsocket -ldbm -ldl -lc -lcrypt -lm -lucb' + + # We include support for using libraries in /usr/ucblib, but the setting + # of libswanted excludes some libraries found there. You may want to +diff -ur perl-5.30.0.orig/hints/gnu.sh perl-5.30.0/hints/gnu.sh +--- perl-5.30.0.orig/hints/gnu.sh 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/hints/gnu.sh 2019-10-14 17:35:46.620062988 -0400 +@@ -3,7 +3,7 @@ + + # libnsl is unusable on the Hurd. + # XXX remove this once SUNRPC is implemented. +-set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ nsl / /' -e 's/ c / pthread /'` ++set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ c / pthread /'` + shift + libswanted="$*" + +Only in perl-5.30.0/hints: gnu.sh.orig +diff -ur perl-5.30.0.orig/hints/irix_5.sh perl-5.30.0/hints/irix_5.sh +--- perl-5.30.0.orig/hints/irix_5.sh 2018-06-27 07:17:56.000000000 -0400 ++++ perl-5.30.0/hints/irix_5.sh 2019-10-14 17:35:46.624062797 -0400 +@@ -27,9 +27,9 @@ + esac + + lddlflags="-shared" +-# For some reason we don't want -lsocket -lnsl or -ldl. Can anyone ++# For some reason we don't want -lsocket or -ldl. Can anyone + # contribute an explanation? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + +diff -ur perl-5.30.0.orig/hints/irix_6_0.sh perl-5.30.0/hints/irix_6_0.sh +--- perl-5.30.0.orig/hints/irix_6_0.sh 2018-06-27 07:17:56.000000000 -0400 ++++ perl-5.30.0/hints/irix_6_0.sh 2019-10-14 17:35:46.624062797 -0400 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ur perl-5.30.0.orig/hints/irix_6_1.sh perl-5.30.0/hints/irix_6_1.sh +--- perl-5.30.0.orig/hints/irix_6_1.sh 2018-06-27 07:17:56.000000000 -0400 ++++ perl-5.30.0/hints/irix_6_1.sh 2019-10-14 17:35:46.624062797 -0400 +@@ -19,7 +19,7 @@ + lddlflags="-32 -shared" + + # We don't want these libraries. Anyone know why? +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /'` + shift + libswanted="$*" + # +@@ -29,7 +29,7 @@ + # taken from irix_5.sh . Changes from irix_5.sh: + # Olimit and nested comments (warning 1009) no longer accepted + # -OPT:fold_arith_limit so POSIX module will optimize +-# no 64bit versions of sun, crypt, nsl, socket, dl dso's available ++# no 64bit versions of sun, crypt, socket, dl dso's available + # as of IRIX 6.0.1 so omit those from libswanted line via `sed'. + + # perl 5 built with this hints file passes most tests (`make test'). +@@ -38,7 +38,7 @@ + # i_time='define' + # ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -woff 1009 -OPT:fold_arith_limit=1046" + # lddlflags="-shared" +-# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ nsl / /' -e 's/ dl / /'` ++# set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ sun / /' -e 's/ crypt / /' -e 's/ dl / /'` + # shift + # libswanted="$*" + +diff -ur perl-5.30.0.orig/hints/irix_6.sh perl-5.30.0/hints/irix_6.sh +--- perl-5.30.0.orig/hints/irix_6.sh 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/hints/irix_6.sh 2019-10-14 17:35:46.624062797 -0400 +@@ -388,7 +388,7 @@ + # Socket networking is in libc, these are not installed by default, + # and just slow perl down. (scotth@sgi.com) + # librt contains nothing we need (some places need it for Time::HiRes) --jhi +-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /' -e 's/ rt / /'` ++set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ dl / /' -e 's/ rt / /'` + shift + libswanted="$*" + +diff -ur perl-5.30.0.orig/INSTALL perl-5.30.0/INSTALL +--- perl-5.30.0.orig/INSTALL 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/INSTALL 2019-10-14 17:36:13.034898813 -0400 +@@ -1623,7 +1623,7 @@ + undefined symbols, check the libs variable in the config.sh file. It + should look something like + +- libs='-lsocket -lnsl -ldl -lm -lc' ++ libs='-lsocket -ldl -lm -lc' + + The exact libraries will vary from system to system, but you typically + need to include at least the math library -lm. Normally, Configure +Only in perl-5.30.0/: INSTALL.orig +diff -ur perl-5.30.0.orig/NetWare/config.wc perl-5.30.0/NetWare/config.wc +--- perl-5.30.0.orig/NetWare/config.wc 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/NetWare/config.wc 2019-10-14 17:36:13.034898813 -0400 +@@ -846,7 +846,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +Only in perl-5.30.0/NetWare: config.wc.orig +diff -ur perl-5.30.0.orig/plan9/config_sh.sample perl-5.30.0/plan9/config_sh.sample +--- perl-5.30.0.orig/plan9/config_sh.sample 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/plan9/config_sh.sample 2019-10-14 17:36:13.038898652 -0400 +@@ -853,7 +853,7 @@ + libsfiles='' + libsfound='' + libspath=' /lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' + libswanted_uselargefiles='' + line='' + lint='' +Only in perl-5.30.0/plan9: config_sh.sample.orig +diff -ur perl-5.30.0.orig/pod/perlrun.pod perl-5.30.0/pod/perlrun.pod +--- perl-5.30.0.orig/pod/perlrun.pod 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/pod/perlrun.pod 2019-10-14 17:36:13.038898652 -0400 +@@ -887,11 +887,11 @@ + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib. +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib.* + libpth='/usr/local/lib /lib /usr/lib'; +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + lib_ext='.a'; + libc='/lib/libc-2.2.4.so'; + libperl='libperl.a'; +Only in perl-5.30.0/pod: perlrun.pod.orig +diff -ur perl-5.30.0.orig/Porting/bisect-runner.pl perl-5.30.0/Porting/bisect-runner.pl +--- perl-5.30.0.orig/Porting/bisect-runner.pl 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/Porting/bisect-runner.pl 2019-10-14 17:36:13.038898652 -0400 +@@ -1384,7 +1384,7 @@ + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh +- foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl ++ foreach my $lib (qw(sfio socket inet nm ndbm gdbm dbm db malloc dl + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + # Note the wonderful consistency of dot-or-not in the config vars: +Only in perl-5.30.0/Porting: bisect-runner.pl.orig +diff -ur perl-5.30.0.orig/Porting/config.sh perl-5.30.0/Porting/config.sh +--- perl-5.30.0.orig/Porting/config.sh 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/Porting/config.sh 2019-10-14 17:38:20.815713492 -0400 +@@ -891,12 +891,12 @@ + libc='libc-2.19.so' + libperl='libperl.a' + libpth='/usr/local/lib /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib' +-libs='-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' ++libs='-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' + libsdirs=' /usr/lib/x86_64-linux-gnu' +-libsfiles=' libpthread.so libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' +-libsfound=' /usr/lib/x86_64-linux-gnu/libpthread.so /usr/lib/x86_64-linux-gnu/libnsl.so /usr/lib/x86_64-linux-gnu/libgdbm.so /usr/lib/x86_64-linux-gnu/libdb.so /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/x86_64-linux-gnu/libm.so /usr/lib/x86_64-linux-gnu/libcrypt.so /usr/lib/x86_64-linux-gnu/libutil.so /usr/lib/x86_64-linux-gnu/libc.so /usr/lib/x86_64-linux-gnu/libgdbm_compat.so' ++libsfiles=' libpthread.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' ++libsfound=' /usr/lib/x86_64-linux-gnu/libpthread.so /usr/lib/x86_64-linux-gnu/libgdbm.so /usr/lib/x86_64-linux-gnu/libdb.so /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/x86_64-linux-gnu/libm.so /usr/lib/x86_64-linux-gnu/libcrypt.so /usr/lib/x86_64-linux-gnu/libutil.so /usr/lib/x86_64-linux-gnu/libc.so /usr/lib/x86_64-linux-gnu/libgdbm_compat.so' + libspath=' /usr/local/lib /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib' +-libswanted='cl pthread cl pthread socket inet nsl gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' ++libswanted='cl pthread cl pthread socket inet gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' + libswanted_uselargefiles='' + line='' + lint='' +@@ -983,7 +983,7 @@ + perl_patchlevel='' + perl_static_inline='static __inline__' + perladmin='yourname@yourhost.yourplace.com' +-perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-lpthread -ldl -lm -lcrypt -lutil -lc' + perlpath='/opt/perl/bin/perl5.30.0' + pg='pg' + phostname='' +Only in perl-5.30.0/Porting: config.sh.orig +diff -ur perl-5.30.0.orig/win32/config.ce perl-5.30.0/win32/config.ce +--- perl-5.30.0.orig/win32/config.ce 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/win32/config.ce 2019-10-14 17:36:13.090896568 -0400 +@@ -839,7 +839,7 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +Only in perl-5.30.0/win32: config.ce.orig +diff -ur perl-5.30.0.orig/win32/config.gc perl-5.30.0/win32/config.gc +--- perl-5.30.0.orig/win32/config.gc 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/win32/config.gc 2019-10-14 17:36:13.090896568 -0400 +@@ -865,8 +865,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +Only in perl-5.30.0/win32: config.gc.orig +diff -ur perl-5.30.0.orig/win32/config.vc perl-5.30.0/win32/config.vc +--- perl-5.30.0.orig/win32/config.vc 2019-05-11 05:50:20.000000000 -0400 ++++ perl-5.30.0/win32/config.vc 2019-10-14 17:36:13.094896407 -0400 +@@ -864,8 +864,8 @@ + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +Only in perl-5.30.0/win32: config.vc.orig diff --git a/omnibus/config/patches/perl/perl-5.32.1-remove_lnsl.patch b/omnibus/config/patches/perl/perl-5.32.1-remove_lnsl.patch new file mode 100644 index 000000000..fdc63aa0b --- /dev/null +++ b/omnibus/config/patches/perl/perl-5.32.1-remove_lnsl.patch @@ -0,0 +1,456 @@ +diff --git a/Configure b/Configure +index fbc2258..14d9eba 100755 +--- a/Configure ++++ b/Configure +@@ -1491,7 +1491,7 @@ archname='' + usereentrant='undef' + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" ++libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun 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/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux +index d97a698..0eec85e 100644 +--- a/Cross/config.sh-arm-linux ++++ b/Cross/config.sh-arm-linux +@@ -869,12 +869,12 @@ lib_ext='.a' + libc='/lib/libc-2.2.2.so' + libperl='libperl.so' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -962,7 +962,7 @@ perl='' + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 +index 3ad709f..b3752bb 100644 +--- a/Cross/config.sh-arm-linux-n770 ++++ b/Cross/config.sh-arm-linux-n770 +@@ -867,12 +867,12 @@ lib_ext='.arma' + libc='/lib/libc-2.2.2.so' + libperl='libperl.arma' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -960,7 +960,7 @@ perl='' + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff --git a/INSTALL b/INSTALL +index 76edeec..6a039a2 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -1629,7 +1629,7 @@ If the build of miniperl fails with a long list of missing functions or + undefined symbols, check the libs variable in the config.sh file. It + should look something like + +- libs='-lsocket -lnsl -ldl -lm -lc' ++ libs='-lsocket -ldl -lm -lc' + + The exact libraries will vary from system to system, but you typically + need to include at least the math library -lm. Normally, Configure +diff --git a/NetWare/config.wc b/NetWare/config.wc +index b0a02f5..f699a65 100644 +--- a/NetWare/config.wc ++++ b/NetWare/config.wc +@@ -849,7 +849,7 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl +index b6c75a9..33de0c0 100755 +--- a/Porting/bisect-runner.pl ++++ b/Porting/bisect-runner.pl +@@ -1550,7 +1550,7 @@ unless (extract_from_file('Configure', 'ignore_versioned_solibs')) { + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh +- foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl ++ foreach my $lib (qw(sfio socket inet nm ndbm gdbm dbm db malloc dl + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + # Note the wonderful consistency of dot-or-not in the config vars: +diff --git a/Porting/config.sh b/Porting/config.sh +index 2d2287c..c8fab58 100644 +--- a/Porting/config.sh ++++ b/Porting/config.sh +@@ -894,12 +894,12 @@ lib_ext='.a' + libc='libc-2.19.so' + libperl='libperl.a' + libpth='/usr/local/lib /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib' +-libs='-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' ++libs='-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' + libsdirs=' /usr/lib/x86_64-linux-gnu' +-libsfiles=' libpthread.so libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' +-libsfound=' /usr/lib/x86_64-linux-gnu/libpthread.so /usr/lib/x86_64-linux-gnu/libnsl.so /usr/lib/x86_64-linux-gnu/libgdbm.so /usr/lib/x86_64-linux-gnu/libdb.so /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/x86_64-linux-gnu/libm.so /usr/lib/x86_64-linux-gnu/libcrypt.so /usr/lib/x86_64-linux-gnu/libutil.so /usr/lib/x86_64-linux-gnu/libc.so /usr/lib/x86_64-linux-gnu/libgdbm_compat.so' ++libsfiles=' libpthread.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' ++libsfound=' /usr/lib/x86_64-linux-gnu/libpthread.so /usr/lib/x86_64-linux-gnu/libgdbm.so /usr/lib/x86_64-linux-gnu/libdb.so /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/x86_64-linux-gnu/libm.so /usr/lib/x86_64-linux-gnu/libcrypt.so /usr/lib/x86_64-linux-gnu/libutil.so /usr/lib/x86_64-linux-gnu/libc.so /usr/lib/x86_64-linux-gnu/libgdbm_compat.so' + libspath=' /usr/local/lib /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib' +-libswanted='cl pthread cl pthread socket inet nsl gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' ++libswanted='cl pthread cl pthread socket inet gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' + libswanted_uselargefiles='' + line='' + lint='' +@@ -986,7 +986,7 @@ perl='perl' + perl_patchlevel='' + perl_static_inline='static __inline__' + perladmin='yourname@yourhost.yourplace.com' +-perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-lpthread -ldl -lm -lcrypt -lutil -lc' + perlpath='/opt/perl/bin/perl5.32.1' + pg='pg' + phostname='' +diff --git a/configure.com b/configure.com +index 713e875..6273d5d 100644 +--- a/configure.com ++++ b/configure.com +@@ -117,7 +117,7 @@ $!: is prepended to libpth. This variable takes care of special !sfn + $!: machines, like the mips. Usually, it should be empty. !sfn + $!plibpth='' !sfn + $!: List of libraries we want. !sfn +-$!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn ++$!libswanted='net socket inet nm ndbm gdbm dbm db malloc dl' !sfn + $!libswanted="$libswanted ld sun m c cposix posix ndir dir crypt" !sfn + $!libswanted="$libswanted ucb bsd BSD PW x" !sfn + $!: We probably want to search /usr/shlib before most other libraries. !sfn +diff --git a/cpan/Config-Perl-V/t/20_plv56.t b/cpan/Config-Perl-V/t/20_plv56.t +index 252a162..5004c9a 100644 +--- a/cpan/Config-Perl-V/t/20_plv56.t ++++ b/cpan/Config-Perl-V/t/20_plv56.t +@@ -63,8 +63,8 @@ Summary of my perl5 (revision 5.0 version 6 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lc -lcrypt -lutil +- perllibs=-lnsl -ldl -lm -lc -lcrypt -lutil ++ libs=-lgdbm -ldb -ldl -lm -lc -lcrypt -lutil ++ perllibs=-ldl -lm -lc -lcrypt -lutil + libc=/lib/libc-2.10.1.so, so=so, useshrplib=false, libperl=libperl.a + Dynamic Linking: + dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-rdynamic' +diff --git a/cpan/Config-Perl-V/t/21_plv58.t b/cpan/Config-Perl-V/t/21_plv58.t +index b354e24..d747355 100644 +--- a/cpan/Config-Perl-V/t/21_plv58.t ++++ b/cpan/Config-Perl-V/t/21_plv58.t +@@ -67,8 +67,8 @@ Summary of my perl5 (revision 5 version 8 subversion 9) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=/lib/libc-2.11.2.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.11.2' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/22_plv510.t b/cpan/Config-Perl-V/t/22_plv510.t +index bec688c..4641d12 100644 +--- a/cpan/Config-Perl-V/t/22_plv510.t ++++ b/cpan/Config-Perl-V/t/22_plv510.t +@@ -57,8 +57,8 @@ Summary of my perl5 (revision 5 version 10 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.6.1.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.6.1' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/23_plv512.t b/cpan/Config-Perl-V/t/23_plv512.t +index 03c69cb..47d7f97 100644 +--- a/cpan/Config-Perl-V/t/23_plv512.t ++++ b/cpan/Config-Perl-V/t/23_plv512.t +@@ -68,8 +68,8 @@ Summary of my perl5 (revision 5 version 12 subversion 2) configuration: + Linker and Libraries: + ld='/usr/bin/ld', ldflags ='-L/pro/local/lib +DD64 -L/usr/lib/hpux64' + libpth=/pro/local/lib /usr/lib/hpux64 /lib /usr/lib /usr/ccs/lib /usr/local/lib +- libs=-lcl -lpthread -lnsl -lnm -ldb -ldl -ldld -lm -lsec -lc +- perllibs=-lcl -lpthread -lnsl -lnm -ldl -ldld -lm -lsec -lc ++ libs=-lcl -lpthread -lnm -ldb -ldl -ldld -lm -lsec -lc ++ perllibs=-lcl -lpthread -lnm -ldl -ldld -lm -lsec -lc + libc=/usr/lib/hpux64/libc.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/24_plv514.t b/cpan/Config-Perl-V/t/24_plv514.t +index 3377b41..fdd8046 100644 +--- a/cpan/Config-Perl-V/t/24_plv514.t ++++ b/cpan/Config-Perl-V/t/24_plv514.t +@@ -69,8 +69,8 @@ Summary of my perl5 (revision 5 version 14 subversion 2) configuration: + Linker and Libraries: + ld='ld', ldflags ='-L/usr/local/ppc64/lib64 -b64 -q64 -L/pro/local/lib -brtl -bdynamic -b64' + libpth=/usr/local/ppc64/lib64 /lib /usr/lib /usr/ccs/lib /usr/local/lib /usr/lib64 +- libs=-lbind -lnsl -ldbm -ldb -ldl -lld -lm -lcrypt -lc +- perllibs=-lbind -lnsl -ldl -lld -lm -lcrypt -lc ++ libs=-lbind -ldbm -ldb -ldl -lld -lm -lcrypt -lc ++ perllibs=-lbind -ldl -lld -lm -lcrypt -lc + libc=/lib/libc.a, so=a, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/25_plv516.t b/cpan/Config-Perl-V/t/25_plv516.t +index 5505245..5bad2ce 100644 +--- a/cpan/Config-Perl-V/t/25_plv516.t ++++ b/cpan/Config-Perl-V/t/25_plv516.t +@@ -69,8 +69,8 @@ Summary of my perl5 (revision 5 version 16 subversion 3) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.15.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.15' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/26_plv518.t b/cpan/Config-Perl-V/t/26_plv518.t +index a255797..d3ab0b6 100644 +--- a/cpan/Config-Perl-V/t/26_plv518.t ++++ b/cpan/Config-Perl-V/t/26_plv518.t +@@ -94,8 +94,8 @@ Summary of my perl5 (revision 5 version 18 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.17.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.17' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/26_plv5182.t b/cpan/Config-Perl-V/t/26_plv5182.t +index 25e52bb..fc24cd1 100644 +--- a/cpan/Config-Perl-V/t/26_plv5182.t ++++ b/cpan/Config-Perl-V/t/26_plv5182.t +@@ -94,8 +94,8 @@ Summary of my perl5 (revision 5 version 18 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/27_plv5200.t b/cpan/Config-Perl-V/t/27_plv5200.t +index f44273d..ca84b18 100644 +--- a/cpan/Config-Perl-V/t/27_plv5200.t ++++ b/cpan/Config-Perl-V/t/27_plv5200.t +@@ -96,8 +96,8 @@ Summary of my perl5 (revision 5 version 20 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/27_plv5202.t b/cpan/Config-Perl-V/t/27_plv5202.t +index 83c3cb0..13b58a2 100644 +--- a/cpan/Config-Perl-V/t/27_plv5202.t ++++ b/cpan/Config-Perl-V/t/27_plv5202.t +@@ -97,8 +97,8 @@ Summary of my perl5 (revision 5 version 20 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.19.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.19' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/28_plv5220.t b/cpan/Config-Perl-V/t/28_plv5220.t +index 885445b..26506c3 100644 +--- a/cpan/Config-Perl-V/t/28_plv5220.t ++++ b/cpan/Config-Perl-V/t/28_plv5220.t +@@ -97,8 +97,8 @@ Summary of my perl5 (revision 5 version 22 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.19.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.19' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/30_plv5240.t b/cpan/Config-Perl-V/t/30_plv5240.t +index 2d6c0fd..c4a8e13 100644 +--- a/cpan/Config-Perl-V/t/30_plv5240.t ++++ b/cpan/Config-Perl-V/t/30_plv5240.t +@@ -102,8 +102,8 @@ Summary of my perl5 (revision 5 version 24 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/5/include-fixed /usr/lib64/gcc/x86_64-suse-linux/5/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.23.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.23' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/31_plv52511.t b/cpan/Config-Perl-V/t/31_plv52511.t +index a5b39ca..bcceca7 100644 +--- a/cpan/Config-Perl-V/t/31_plv52511.t ++++ b/cpan/Config-Perl-V/t/31_plv52511.t +@@ -131,8 +131,8 @@ Summary of my perl5 (revision 5 version 25 subversion 11) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/6/include-fixed /usr/lib64/gcc/x86_64-suse-linux/6/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.24.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/32_plv5261rc1.t b/cpan/Config-Perl-V/t/32_plv5261rc1.t +index 9db16b2..57b1e11 100644 +--- a/cpan/Config-Perl-V/t/32_plv5261rc1.t ++++ b/cpan/Config-Perl-V/t/32_plv5261rc1.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 26 subversion 1) configuration: + ld='ccache cc' + ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.19.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/33_plv52711r.t b/cpan/Config-Perl-V/t/33_plv52711r.t +index c6940d2..d7f2147 100644 +--- a/cpan/Config-Perl-V/t/33_plv52711r.t ++++ b/cpan/Config-Perl-V/t/33_plv52711r.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 27 subversion 11) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed /usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.27.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/34_plv5280.t b/cpan/Config-Perl-V/t/34_plv5280.t +index f6c38df..47a1e0e 100644 +--- a/cpan/Config-Perl-V/t/34_plv5280.t ++++ b/cpan/Config-Perl-V/t/34_plv5280.t +@@ -129,8 +129,8 @@ Summary of my perl5 (revision 5 version 28 subversion 0) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.27.so + so=so + useshrplib=false +diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample +index cd494c4..cf0d41b 100644 +--- a/plan9/config_sh.sample ++++ b/plan9/config_sh.sample +@@ -856,7 +856,7 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath=' /lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' + libswanted_uselargefiles='' + line='' + lint='' +diff --git a/pod/perlrun.pod b/pod/perlrun.pod +index 89a7aa8..f92a2a5 100644 +--- a/pod/perlrun.pod ++++ b/pod/perlrun.pod +@@ -895,11 +895,11 @@ non-letters). For example: + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib. +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib.* + libpth='/usr/local/lib /lib /usr/lib'; +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + lib_ext='.a'; + libc='/lib/libc-2.2.4.so'; + libperl='libperl.a'; +diff --git a/win32/config.gc b/win32/config.gc +index 793b455..bb6ea3f 100644 +--- a/win32/config.gc ++++ b/win32/config.gc +@@ -868,8 +868,8 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff --git a/win32/config.vc b/win32/config.vc +index a2c3f5a..f223095 100644 +--- a/win32/config.vc ++++ b/win32/config.vc +@@ -867,8 +867,8 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' diff --git a/omnibus/config/patches/perl/perl-5.34.0-remove_lnsl.patch b/omnibus/config/patches/perl/perl-5.34.0-remove_lnsl.patch new file mode 100644 index 000000000..c8e2e81c3 --- /dev/null +++ b/omnibus/config/patches/perl/perl-5.34.0-remove_lnsl.patch @@ -0,0 +1,516 @@ +diff --git a/Configure b/Configure +index 913e080..a015175 100755 +--- a/Configure ++++ b/Configure +@@ -1493,7 +1493,7 @@ archname='' + usereentrant='undef' + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" ++libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun 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/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux +index 33bab37..910e834 100644 +--- a/Cross/config.sh-arm-linux ++++ b/Cross/config.sh-arm-linux +@@ -870,12 +870,12 @@ lib_ext='.a' + libc='/lib/libc-2.2.2.so' + libperl='libperl.so' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -963,7 +963,7 @@ perl='' + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 +index 73567fb..08288ce 100644 +--- a/Cross/config.sh-arm-linux-n770 ++++ b/Cross/config.sh-arm-linux-n770 +@@ -868,12 +868,12 @@ lib_ext='.arma' + libc='/lib/libc-2.2.2.so' + libperl='libperl.arma' + libpth='/usr/local/lib /lib /usr/lib' +-libs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++libs='-ldl -lm -lcrypt -lutil -lc' + libsdirs=' /usr/lib' +-libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' ++libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' ++libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' + libspath=' /usr/local/lib /lib /usr/lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' + libswanted_uselargefiles='' + line='' + lint='' +@@ -961,7 +961,7 @@ perl='' + perl_patchlevel='' + perl_static_inline='static' + perladmin='red@criticalintegration.com' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-ldl -lm -lcrypt -lutil -lc' + perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' +diff --git a/INSTALL b/INSTALL +index ce5ad45..da89b58 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -1653,7 +1653,7 @@ If the build of miniperl fails with a long list of missing functions or + undefined symbols, check the libs variable in the config.sh file. It + should look something like + +- libs='-lsocket -lnsl -ldl -lm -lc' ++ libs='-lsocket -ldl -lm -lc' + + The exact libraries will vary from system to system, but you typically + need to include at least the math library -lm. Normally, Configure +diff --git a/NetWare/config.wc b/NetWare/config.wc +index 26c1755..5fd4985 100644 +--- a/NetWare/config.wc ++++ b/NetWare/config.wc +@@ -850,7 +850,7 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl +index b6c75a9..33de0c0 100755 +--- a/Porting/bisect-runner.pl ++++ b/Porting/bisect-runner.pl +@@ -1550,7 +1550,7 @@ unless (extract_from_file('Configure', 'ignore_versioned_solibs')) { + my @libs; + # This is the current libswanted list from Configure, less the libs removed + # by current hints/linux.sh +- foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl ++ foreach my $lib (qw(sfio socket inet nm ndbm gdbm dbm db malloc dl + ld sun m crypt sec util c cposix posix ucb BSD)) { + foreach my $dir (@paths) { + # Note the wonderful consistency of dot-or-not in the config vars: +diff --git a/Porting/config.sh b/Porting/config.sh +index d1f54f2..f126291 100644 +--- a/Porting/config.sh ++++ b/Porting/config.sh +@@ -900,12 +900,12 @@ lib_ext='.a' + libc='libc-2.31.so' + libperl='libperl.a' + libpth='/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/10/include-fixed /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/lib /usr/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64' +-libs='-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' ++libs='-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat' + libsdirs=' /usr/lib/../lib64' +-libsfiles=' libpthread.so libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' +-libsfound=' /usr/lib/../lib64/libpthread.so /usr/lib/../lib64/libnsl.so /usr/lib/../lib64/libgdbm.so /usr/lib/../lib64/libdb.so /usr/lib/../lib64/libdl.so /usr/lib/../lib64/libm.so /usr/lib/../lib64/libcrypt.so /usr/lib/../lib64/libutil.so /usr/lib/../lib64/libc.so /usr/lib/../lib64/libgdbm_compat.so' ++libsfiles=' libpthread.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' ++libsfound=' /usr/lib/../lib64/libpthread.so /usr/lib/../lib64/libgdbm.so /usr/lib/../lib64/libdb.so /usr/lib/../lib64/libdl.so /usr/lib/../lib64/libm.so /usr/lib/../lib64/libcrypt.so /usr/lib/../lib64/libutil.so /usr/lib/../lib64/libc.so /usr/lib/../lib64/libgdbm_compat.so' + libspath=' /usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/10/include-fixed /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/lib /usr/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64' +-libswanted='cl pthread cl pthread socket inet nsl gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' ++libswanted='cl pthread cl pthread socket inet gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' + libswanted_uselargefiles='' + line='' + lint='' +@@ -992,7 +992,7 @@ perl='perl' + perl_patchlevel='' + perl_static_inline='static __inline__' + perladmin='yourname@yourhost.yourplace.com' +-perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-lpthread -ldl -lm -lcrypt -lutil -lc' + perlpath='/opt/perl/bin/perl5.34.0' + pg='pg' + phostname='' +diff --git a/configure.com b/configure.com +index df29582..0171264 100644 +--- a/configure.com ++++ b/configure.com +@@ -117,7 +117,7 @@ $!: is prepended to libpth. This variable takes care of special !sfn + $!: machines, like the mips. Usually, it should be empty. !sfn + $!plibpth='' !sfn + $!: List of libraries we want. !sfn +-$!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn ++$!libswanted='net socket inet nm ndbm gdbm dbm db malloc dl' !sfn + $!libswanted="$libswanted ld sun m c cposix posix ndir dir crypt" !sfn + $!libswanted="$libswanted ucb bsd BSD PW x" !sfn + $!: We probably want to search /usr/shlib before most other libraries. !sfn +diff --git a/cpan/Config-Perl-V/t/20_plv56.t b/cpan/Config-Perl-V/t/20_plv56.t +index 252a162..5004c9a 100644 +--- a/cpan/Config-Perl-V/t/20_plv56.t ++++ b/cpan/Config-Perl-V/t/20_plv56.t +@@ -63,8 +63,8 @@ Summary of my perl5 (revision 5.0 version 6 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lc -lcrypt -lutil +- perllibs=-lnsl -ldl -lm -lc -lcrypt -lutil ++ libs=-lgdbm -ldb -ldl -lm -lc -lcrypt -lutil ++ perllibs=-ldl -lm -lc -lcrypt -lutil + libc=/lib/libc-2.10.1.so, so=so, useshrplib=false, libperl=libperl.a + Dynamic Linking: + dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-rdynamic' +diff --git a/cpan/Config-Perl-V/t/21_plv58.t b/cpan/Config-Perl-V/t/21_plv58.t +index b354e24..d747355 100644 +--- a/cpan/Config-Perl-V/t/21_plv58.t ++++ b/cpan/Config-Perl-V/t/21_plv58.t +@@ -67,8 +67,8 @@ Summary of my perl5 (revision 5 version 8 subversion 9) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=/lib/libc-2.11.2.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.11.2' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/22_plv510.t b/cpan/Config-Perl-V/t/22_plv510.t +index bec688c..4641d12 100644 +--- a/cpan/Config-Perl-V/t/22_plv510.t ++++ b/cpan/Config-Perl-V/t/22_plv510.t +@@ -57,8 +57,8 @@ Summary of my perl5 (revision 5 version 10 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.6.1.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.6.1' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/23_plv512.t b/cpan/Config-Perl-V/t/23_plv512.t +index 03c69cb..47d7f97 100644 +--- a/cpan/Config-Perl-V/t/23_plv512.t ++++ b/cpan/Config-Perl-V/t/23_plv512.t +@@ -68,8 +68,8 @@ Summary of my perl5 (revision 5 version 12 subversion 2) configuration: + Linker and Libraries: + ld='/usr/bin/ld', ldflags ='-L/pro/local/lib +DD64 -L/usr/lib/hpux64' + libpth=/pro/local/lib /usr/lib/hpux64 /lib /usr/lib /usr/ccs/lib /usr/local/lib +- libs=-lcl -lpthread -lnsl -lnm -ldb -ldl -ldld -lm -lsec -lc +- perllibs=-lcl -lpthread -lnsl -lnm -ldl -ldld -lm -lsec -lc ++ libs=-lcl -lpthread -lnm -ldb -ldl -ldld -lm -lsec -lc ++ perllibs=-lcl -lpthread -lnm -ldl -ldld -lm -lsec -lc + libc=/usr/lib/hpux64/libc.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/24_plv514.t b/cpan/Config-Perl-V/t/24_plv514.t +index 3377b41..fdd8046 100644 +--- a/cpan/Config-Perl-V/t/24_plv514.t ++++ b/cpan/Config-Perl-V/t/24_plv514.t +@@ -69,8 +69,8 @@ Summary of my perl5 (revision 5 version 14 subversion 2) configuration: + Linker and Libraries: + ld='ld', ldflags ='-L/usr/local/ppc64/lib64 -b64 -q64 -L/pro/local/lib -brtl -bdynamic -b64' + libpth=/usr/local/ppc64/lib64 /lib /usr/lib /usr/ccs/lib /usr/local/lib /usr/lib64 +- libs=-lbind -lnsl -ldbm -ldb -ldl -lld -lm -lcrypt -lc +- perllibs=-lbind -lnsl -ldl -lld -lm -lcrypt -lc ++ libs=-lbind -ldbm -ldb -ldl -lld -lm -lcrypt -lc ++ perllibs=-lbind -ldl -lld -lm -lcrypt -lc + libc=/lib/libc.a, so=a, useshrplib=false, libperl=libperl.a + gnulibc_version='' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/25_plv516.t b/cpan/Config-Perl-V/t/25_plv516.t +index 5505245..5bad2ce 100644 +--- a/cpan/Config-Perl-V/t/25_plv516.t ++++ b/cpan/Config-Perl-V/t/25_plv516.t +@@ -69,8 +69,8 @@ Summary of my perl5 (revision 5 version 16 subversion 3) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.15.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.15' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/26_plv518.t b/cpan/Config-Perl-V/t/26_plv518.t +index a255797..d3ab0b6 100644 +--- a/cpan/Config-Perl-V/t/26_plv518.t ++++ b/cpan/Config-Perl-V/t/26_plv518.t +@@ -94,8 +94,8 @@ Summary of my perl5 (revision 5 version 18 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.17.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.17' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/26_plv5182.t b/cpan/Config-Perl-V/t/26_plv5182.t +index 25e52bb..fc24cd1 100644 +--- a/cpan/Config-Perl-V/t/26_plv5182.t ++++ b/cpan/Config-Perl-V/t/26_plv5182.t +@@ -94,8 +94,8 @@ Summary of my perl5 (revision 5 version 18 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/27_plv5200.t b/cpan/Config-Perl-V/t/27_plv5200.t +index f44273d..ca84b18 100644 +--- a/cpan/Config-Perl-V/t/27_plv5200.t ++++ b/cpan/Config-Perl-V/t/27_plv5200.t +@@ -96,8 +96,8 @@ Summary of my perl5 (revision 5 version 20 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/lib /usr/lib /pro/local/lib /lib +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.18.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.18' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/27_plv5202.t b/cpan/Config-Perl-V/t/27_plv5202.t +index 83c3cb0..13b58a2 100644 +--- a/cpan/Config-Perl-V/t/27_plv5202.t ++++ b/cpan/Config-Perl-V/t/27_plv5202.t +@@ -97,8 +97,8 @@ Summary of my perl5 (revision 5 version 20 subversion 2) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat +- perllibs=-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc ++ libs=-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat ++ perllibs=-ldl -lm -lcrypt -lutil -lpthread -lc + libc=libc-2.19.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.19' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/28_plv5220.t b/cpan/Config-Perl-V/t/28_plv5220.t +index 885445b..26506c3 100644 +--- a/cpan/Config-Perl-V/t/28_plv5220.t ++++ b/cpan/Config-Perl-V/t/28_plv5220.t +@@ -97,8 +97,8 @@ Summary of my perl5 (revision 5 version 22 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.19.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.19' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/30_plv5240.t b/cpan/Config-Perl-V/t/30_plv5240.t +index 2d6c0fd..c4a8e13 100644 +--- a/cpan/Config-Perl-V/t/30_plv5240.t ++++ b/cpan/Config-Perl-V/t/30_plv5240.t +@@ -102,8 +102,8 @@ Summary of my perl5 (revision 5 version 24 subversion 0) configuration: + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/5/include-fixed /usr/lib64/gcc/x86_64-suse-linux/5/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.23.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.23' + Dynamic Linking: +diff --git a/cpan/Config-Perl-V/t/31_plv52511.t b/cpan/Config-Perl-V/t/31_plv52511.t +index a5b39ca..bcceca7 100644 +--- a/cpan/Config-Perl-V/t/31_plv52511.t ++++ b/cpan/Config-Perl-V/t/31_plv52511.t +@@ -131,8 +131,8 @@ Summary of my perl5 (revision 5 version 25 subversion 11) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/6/include-fixed /usr/lib64/gcc/x86_64-suse-linux/6/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.24.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/32_plv5261rc1.t b/cpan/Config-Perl-V/t/32_plv5261rc1.t +index 9db16b2..57b1e11 100644 +--- a/cpan/Config-Perl-V/t/32_plv5261rc1.t ++++ b/cpan/Config-Perl-V/t/32_plv5261rc1.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 26 subversion 1) configuration: + ld='ccache cc' + ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -ldb -ldl -lm -lcrypt -lutil -lc +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -ldb -ldl -lm -lcrypt -lutil -lc ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.19.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/33_plv52711r.t b/cpan/Config-Perl-V/t/33_plv52711r.t +index c6940d2..d7f2147 100644 +--- a/cpan/Config-Perl-V/t/33_plv52711r.t ++++ b/cpan/Config-Perl-V/t/33_plv52711r.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 27 subversion 11) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed /usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.27.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/34_plv5280.t b/cpan/Config-Perl-V/t/34_plv5280.t +index f6c38df..47a1e0e 100644 +--- a/cpan/Config-Perl-V/t/34_plv5280.t ++++ b/cpan/Config-Perl-V/t/34_plv5280.t +@@ -129,8 +129,8 @@ Summary of my perl5 (revision 5 version 28 subversion 0) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.27.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/35_plv52910g.t b/cpan/Config-Perl-V/t/35_plv52910g.t +index 6d822d1..383d146 100644 +--- a/cpan/Config-Perl-V/t/35_plv52910g.t ++++ b/cpan/Config-Perl-V/t/35_plv52910g.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 29 subversion 10) configuration: + ld='g++' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/include/c++/8 /usr/include/c++/8/x86_64-suse-linux /usr/include/c++/8/backward /usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.29.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/36_plv5300.t b/cpan/Config-Perl-V/t/36_plv5300.t +index 6db7512..b3e26e3 100644 +--- a/cpan/Config-Perl-V/t/36_plv5300.t ++++ b/cpan/Config-Perl-V/t/36_plv5300.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 30 subversion 0) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.29.so + so=so + useshrplib=true +diff --git a/cpan/Config-Perl-V/t/37_plv53111qm.t b/cpan/Config-Perl-V/t/37_plv53111qm.t +index f566f76..f94c275 100644 +--- a/cpan/Config-Perl-V/t/37_plv53111qm.t ++++ b/cpan/Config-Perl-V/t/37_plv53111qm.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 31 subversion 11) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/10/include-fixed /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat -lquadmath +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc -lquadmath ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat -lquadmath ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc -lquadmath + libc=libc-2.31.so + so=so + useshrplib=false +diff --git a/cpan/Config-Perl-V/t/38_plv5320tld.t b/cpan/Config-Perl-V/t/38_plv5320tld.t +index a8f0d73..b1ba340 100644 +--- a/cpan/Config-Perl-V/t/38_plv5320tld.t ++++ b/cpan/Config-Perl-V/t/38_plv5320tld.t +@@ -130,8 +130,8 @@ Summary of my perl5 (revision 5 version 32 subversion 0) configuration: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/10/include-fixed /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 /lib /lib64 /usr/lib64 /usr/local/lib64 +- libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat +- perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc ++ libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat ++ perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=libc-2.31.so + so=so + useshrplib=true +diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample +index b761363..ad711d5 100644 +--- a/plan9/config_sh.sample ++++ b/plan9/config_sh.sample +@@ -857,7 +857,7 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath=' /lib' +-libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' ++libswanted='socket bind inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' + libswanted_uselargefiles='' + line='' + lint='' +diff --git a/pod/perlrun.pod b/pod/perlrun.pod +index 5d3aa3e..e632e0a 100644 +--- a/pod/perlrun.pod ++++ b/pod/perlrun.pod +@@ -895,11 +895,11 @@ non-letters). For example: + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib. +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + libc='/lib/libc-2.2.4.so'; + $ perl -V:lib.* + libpth='/usr/local/lib /lib /usr/lib'; +- libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; ++ libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; + lib_ext='.a'; + libc='/lib/libc-2.2.4.so'; + libperl='libperl.a'; +diff --git a/win32/config.gc b/win32/config.gc +index af6fed9..111d4ad 100644 +--- a/win32/config.gc ++++ b/win32/config.gc +@@ -869,8 +869,8 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' +diff --git a/win32/config.vc b/win32/config.vc +index f4625bf..cfa1c8a 100644 +--- a/win32/config.vc ++++ b/win32/config.vc +@@ -868,8 +868,8 @@ libsdirs='' + libsfiles='' + libsfound='' + libspath='' +-libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +-libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' ++libswanted_uselargefiles='net socket inet nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' + line='line' + lint='' + lkflags='' diff --git a/omnibus/config/software/autoconf.rb b/omnibus/config/software/autoconf.rb new file mode 100644 index 000000000..10948e7b2 --- /dev/null +++ b/omnibus/config/software/autoconf.rb @@ -0,0 +1,46 @@ +# +# Copyright:: Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# expeditor/ignore: deprecated 2021-04 + +name "autoconf" +default_version "2.69" + +license "GPL-3.0" +license_file "COPYING" +license_file "COPYING.EXCEPTION" +skip_transitive_dependency_licensing true + +dependency "m4" + +version("2.69") { source sha256: "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" } + +source url: "https://ftp.gnu.org/gnu/autoconf/autoconf-#{version}.tar.gz" + +relative_path "autoconf-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + + if solaris2? + env["M4"] = "#{install_dir}/embedded/bin/m4" + end + + command "./configure" \ + " --prefix=#{install_dir}/embedded", env: env + + make "-j #{workers}", env: env + make "install", env: env +end diff --git a/omnibus/config/software/automake.rb b/omnibus/config/software/automake.rb new file mode 100644 index 000000000..a59544d79 --- /dev/null +++ b/omnibus/config/software/automake.rb @@ -0,0 +1,49 @@ +# +# Copyright 2012-2014 Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# expeditor/ignore: deprecated 2021-04 + +name "automake" +default_version "1.16" + +dependency "autoconf" +dependency "perl-thread-queue" + +license "GPL-2.0" +license_file "COPYING" +skip_transitive_dependency_licensing true + +version("1.16") { source sha256: "80da43bb5665596ee389e6d8b64b4f122ea4b92a685b1dbd813cd1f0e0c2d83f" } +version("1.15") { source sha256: "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" } +version("1.11.2") { source sha256: "c339e3871d6595620760725da61de02cf1c293af8a05b14592d6587ac39ce546" } + +source url: "https://ftp.gnu.org/gnu/automake/automake-#{version}.tar.gz" + +relative_path "automake-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + + if version == "1.15" + command "./bootstrap.sh", env: env + else + command "./bootstrap", env: env + end + command "./configure" \ + " --prefix=#{install_dir}/embedded", env: env + + make "-j #{workers}", env: env + make "install", env: env +end diff --git a/omnibus/config/software/compile_release.rb b/omnibus/config/software/compile_release.rb index 1d70bd876..2b2715ed6 100644 --- a/omnibus/config/software/compile_release.rb +++ b/omnibus/config/software/compile_release.rb @@ -22,7 +22,16 @@ default_version "1.0.0" dependency "elixir" source path: File.expand_path("../", Omnibus::Config.project_root), - options: { exclude: ["_build", "deps", "apps/fz_http/assets/node_modules"] } + options: { exclude: [ + ".env", + ".git", + ".ci", + ".vagrant", + ".github", + "_build", + "deps", + "apps/fz_http/assets/node_modules" + ] } license :project_license skip_transitive_dependency_licensing true diff --git a/omnibus/config/software/flex.rb b/omnibus/config/software/flex.rb index e2ed8ef18..21fe29f1c 100644 --- a/omnibus/config/software/flex.rb +++ b/omnibus/config/software/flex.rb @@ -26,11 +26,14 @@ relative_path "#{name}-#{version}" dependency "bison" dependency "m4" dependency "gettext" +dependency "libtool" +dependency "autoconf" +dependency "automake" build do env = with_standard_compiler_flags(with_embedded_path) - command "./autogen.sh" + command "./autogen.sh", env: env command "./configure --prefix=#{install_dir}/embedded", env: env make "-j #{workers}", env: env make "-j #{workers} install", env: env diff --git a/omnibus/config/software/gettext.rb b/omnibus/config/software/gettext.rb index a3720a63f..cf5852457 100644 --- a/omnibus/config/software/gettext.rb +++ b/omnibus/config/software/gettext.rb @@ -18,9 +18,11 @@ name "gettext" license "GPL-3.0" license_file "COPYING" +default_version "0.21" + source url: "https://ftp.gnu.org/pub/gnu/gettext/gettext-#{version}.tar.gz" version("0.21") do - source sha256: "492ad61202de893ca21a99b621d63fa5389da58804ad79d3f226b8d04b803998" + source sha256: "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12" end relative_path "#{name}-#{version}" @@ -28,7 +30,7 @@ relative_path "#{name}-#{version}" build do env = with_standard_compiler_flags(with_embedded_path) - command ".configure --prefix=#{install_dir}/embedded", env: env + command "./configure --prefix=#{install_dir}/embedded", env: env make "-j #{workers}", env: env make "-j #{workers} install", env: env end diff --git a/omnibus/config/software/libiconv.rb b/omnibus/config/software/libiconv.rb new file mode 100644 index 000000000..76a4d48a1 --- /dev/null +++ b/omnibus/config/software/libiconv.rb @@ -0,0 +1,53 @@ +# +# Copyright:: Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# CAUTION - although its not used, external libraries such as nokogiri may pick up an optional dep on +# libiconv such that removal of libiconv will break those libraries on upgrade. With an better story around +# external gem handling when chef-client is upgraded libconv could be dropped. +name "libiconv" +default_version "1.16" + +license "LGPL-2.1" +license_file "COPYING.LIB" +skip_transitive_dependency_licensing true + +dependency "config_guess" + +# versions_list: https://ftp.gnu.org/pub/gnu/libiconv/ filter=*.tar.gz +version("1.15") { source sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178" } +version("1.16") { source sha256: "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04" } + +source url: "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{version}.tar.gz" + +relative_path "libiconv-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + + # freebsd 10 needs to be build PIC + env["CFLAGS"] << " -fPIC" if freebsd? + + update_config_guess(target: "build-aux") + update_config_guess(target: "libcharset/build-aux") + + configure(env: env) + + pmake = "-j #{workers}" + make "#{pmake}", env: env + make "#{pmake} install-lib" \ + " libdir=#{install_dir}/embedded/lib" \ + " includedir=#{install_dir}/embedded/include", env: env +end diff --git a/omnibus/config/software/libossp-uuid.rb b/omnibus/config/software/libossp-uuid.rb new file mode 100644 index 000000000..2d625916a --- /dev/null +++ b/omnibus/config/software/libossp-uuid.rb @@ -0,0 +1,45 @@ +# +# Copyright 2012-2014 Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name "libossp-uuid" +default_version "1.6.2" + +license "MIT" +license_file "README" +skip_transitive_dependency_licensing true + +dependency "config_guess" + +# version_list: url=https://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/ filter=*.tar.gz + +version("1.6.2") { source sha256: "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" } + +# ftp on ftp.ossp.org is unavaiable so we must use another mirror site. +source url: "https://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-#{version}.tar.gz" + +relative_path "uuid-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + + update_config_guess + + command "./configure" \ + " --prefix=#{install_dir}/embedded", env: env + + make "-j #{workers}", env: env + make "install", env: env +end diff --git a/omnibus/config/software/nftables.rb b/omnibus/config/software/nftables.rb index 63ce3b19a..3a6d98300 100644 --- a/omnibus/config/software/nftables.rb +++ b/omnibus/config/software/nftables.rb @@ -29,13 +29,14 @@ dependency "bison" dependency "flex" dependency "libmnl" dependency "libnftnl" +dependency "ncurses" dependency "libtool" dependency "readline" dependency "pkg-config" build do env = with_standard_compiler_flags(with_embedded_path) - command "./autogen.sh" + update_config_guess command "./configure --prefix=#{install_dir}/embedded", env: env make "-j #{workers}", env: env make "-j #{workers} install", env: env diff --git a/omnibus/config/software/perl-thread-queue.rb b/omnibus/config/software/perl-thread-queue.rb new file mode 100644 index 000000000..bd5461084 --- /dev/null +++ b/omnibus/config/software/perl-thread-queue.rb @@ -0,0 +1,40 @@ +# +# Copyright 2019 Oregon State University +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# expeditor/ignore: deprecated 2021-04 + +name "perl-thread-queue" +default_version "3.13" + +dependency "perl" + +version "3.13" do + source sha256: "6ba3dacddd2fbb66822b4aa1d11a0a5273cd04c825cb3ff31c20d7037cbfdce8" +end + +source url: "http://search.cpan.org/CPAN/authors/id/J/JD/JDHEDDEN/Thread-Queue-#{version}.tar.gz" + +relative_path "Thread-Queue-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path).merge( + "INSTALL_BASE" => "#{install_dir}/embedded" + ) + + command "#{install_dir}/embedded/bin/perl Makefile.PL", env: env + + make env: env + make "install", env: env +end diff --git a/omnibus/config/software/perl.rb b/omnibus/config/software/perl.rb new file mode 100644 index 000000000..2cb55bec7 --- /dev/null +++ b/omnibus/config/software/perl.rb @@ -0,0 +1,74 @@ +# +# Copyright:: Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name "perl" + +license "Artistic-2.0" +license_file "Artistic" +skip_transitive_dependency_licensing true + +default_version "5.34.0" + +# versions_list: http://www.cpan.org/src/ filter=*.tar.gz +version("5.34.0") { source sha256: "551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a" } +version("5.32.1") { source sha256: "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c" } +version("5.30.0") { source sha256: "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2" } +version("5.22.1") { source sha256: "2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27" } +version("5.18.1") { source sha256: "655e11a8ffba8853efcdce568a142c232600ed120ac24aaebb4e6efe74e85b2b" } +source url: "http://www.cpan.org/src/5.0/perl-#{version}.tar.gz" + +# perl builds perl as libraries into a special directory. We need to include +# that directory in lib_dirs so omnibus can sign them during macOS deep signing. +lib_dirs lib_dirs.concat ["#{install_dir}/embedded/lib/perl5/**"] + +relative_path "perl-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + + patch source: "perl-#{version}-remove_lnsl.patch", plevel: 1, env: env + + if solaris2? + cc_command = "-Dcc='gcc -m64 -static-libgcc'" + elsif aix? + cc_command = "-Dcc='/opt/IBM/xlc/13.1.0/bin/cc_r -q64'" + elsif freebsd? && ohai["os_version"].to_i >= 1000024 + cc_command = "-Dcc='clang'" + elsif mac_os_x? + cc_command = "-Dcc='clang'" + else + cc_command = "-Dcc='gcc -static-libgcc'" + end + + configure_command = ["sh Configure", + " -de", + " -Dprefix=#{install_dir}/embedded", + " -Duseshrplib", + " -Dusethreads", + " #{cc_command}", + " -Dnoextensions='DB_File GDBM_File NDBM_File ODBM_File'"] + + if aix? + configure_command << "-Dmake=gmake" + configure_command << "-Duse64bitall" + end + + command configure_command.join(" "), env: env + make "-j #{workers}", env: env + # using the install.perl target lets + # us skip install the manpages + make "install.perl", env: env +end diff --git a/omnibus/config/software/postgresql.rb b/omnibus/config/software/postgresql.rb index d610feefb..2fa76fa2d 100644 --- a/omnibus/config/software/postgresql.rb +++ b/omnibus/config/software/postgresql.rb @@ -25,6 +25,7 @@ skip_transitive_dependency_licensing true dependency "zlib" dependency "openssl" dependency "libedit" +dependency "libossp-uuid" dependency "ncurses" dependency "config_guess" @@ -55,7 +56,7 @@ build do " --with-libedit-preferred" \ " --with-openssl" \ " --enable-thread-safety" \ - " --with-uuid=e2fs" \ + " --with-uuid=ossp" \ " --with-includes=#{install_dir}/embedded/include" \ " --with-libraries=#{install_dir}/embedded/lib", env: env diff --git a/omnibus/config/software/readline.rb b/omnibus/config/software/readline.rb similarity index 100% rename from omnibus/config/software/readline.rb rename to omnibus/config/software/readline.rb