From 77b4c35a5905b527cb9d8971cf23e67d3b4c4602 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 12 Oct 2019 11:50:07 -0700 Subject: [PATCH 1/8] Apply m4-1.4.18 patch to fix builds on CentOS 8 This pulls in a patch from the CentOS 8 m4 spec files [1] to fix m4 builds. Without this patch, it fails to build on CentOS 8 with the following error: ``` Error: freadahead.c: In function 'freadahead': freadahead.c:92:3: error: #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, " #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your sy" ^~~~~ fseeko.c: In function 'rpl_fseeko': fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report" #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." ^~~~~ gmake[3]: *** [Makefile:1910: freadahead.o] Error 1 gmake[3]: *** Waiting for unfinished jobs.... gmake[3]: *** [Makefile:1910: fseeko.o] Error 1 gmake[2]: *** [Makefile:1674: all] Error 2 gmake[1]: *** [Makefile:1572: all-recursive] Error 1 gmake: *** [Makefile:1528: all] Error 2 ``` [1] https://git.centos.org/rpms/m4/blob/c8/f/SOURCES/m4-1.4.18-glibc-change-work-around.patch Signed-off-by: Lance Albertson --- .../m4-1.4.18-glibc-change-work-around.patch | 115 ++++++++++++++++++ config/software/m4.rb | 2 + 2 files changed, 117 insertions(+) create mode 100644 config/patches/m4/m4-1.4.18-glibc-change-work-around.patch diff --git a/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch b/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch new file mode 100644 index 000000000..582ae9b53 --- /dev/null +++ b/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch @@ -0,0 +1,115 @@ +diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c +--- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200 ++++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200 +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c +--- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200 ++++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200 +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c +--- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200 ++++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200 +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c +--- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100 ++++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200 +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c +--- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200 ++++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200 +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c +--- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200 ++++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200 +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h +--- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100 ++++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200 +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/config/software/m4.rb b/config/software/m4.rb index c6fc42e38..edf041487 100644 --- a/config/software/m4.rb +++ b/config/software/m4.rb @@ -31,6 +31,8 @@ build do env = with_standard_compiler_flags(with_embedded_path) + patch source: "m4-1.4.18-glibc-change-work-around.patch", plevel: 1, env: env if version == "1.4.18" + command "./configure --prefix=#{install_dir}/embedded", env: env make "-j #{workers}", env: env From 12994bfb7559e6726710892bef3378058766c9b8 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 15 Oct 2019 09:24:30 -0400 Subject: [PATCH 2/8] Update perl to 5.30.0 Building the current versions of Perl fails on newer platforms such as CentOS 8 but seem to be fixed using 5.30.0. I've also updated the patch that was used in the previous versions. Also setting the default version to this new version since it will required for installing the latest version of automake on CentOS 8. Signed-off-by: Lance Albertson --- .../perl/perl-5.30.0-remove_lnsl.patch | 518 ++++++++++++++++++ config/software/perl.rb | 11 +- 2 files changed, 522 insertions(+), 7 deletions(-) create mode 100644 config/patches/perl/perl-5.30.0-remove_lnsl.patch diff --git a/config/patches/perl/perl-5.30.0-remove_lnsl.patch b/config/patches/perl/perl-5.30.0-remove_lnsl.patch new file mode 100644 index 000000000..48b63f567 --- /dev/null +++ b/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/config/software/perl.rb b/config/software/perl.rb index 8f625972d..082baa84a 100644 --- a/config/software/perl.rb +++ b/config/software/perl.rb @@ -20,14 +20,11 @@ license_file "Artistic" skip_transitive_dependency_licensing true -default_version "5.18.1" +default_version "5.30.0" -version "5.22.1" do - source md5: "19295bbb775a3c36123161b9bf4892f1" -end -version "5.18.1" do - source md5: "304cb5bd18e48c44edd6053337d3386d" -end +version("5.30.0") { source md5: "9770584cdf9b5631c38097645ce33549" } +version("5.22.1") { source md5: "19295bbb775a3c36123161b9bf4892f1" } +version("5.18.1") { source md5: "304cb5bd18e48c44edd6053337d3386d" } source url: "http://www.cpan.org/src/5.0/perl-#{version}.tar.gz" relative_path "perl-#{version}" From 1a12208483b8e1394e917372d594b732c1329ad1 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 14 Oct 2019 16:00:21 -0400 Subject: [PATCH 3/8] Adding perl-thread-queue as a dependency for building automake Signed-off-by: Lance Albertson --- config/software/perl-thread-queue.rb | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 config/software/perl-thread-queue.rb diff --git a/config/software/perl-thread-queue.rb b/config/software/perl-thread-queue.rb new file mode 100644 index 000000000..19f530630 --- /dev/null +++ b/config/software/perl-thread-queue.rb @@ -0,0 +1,39 @@ +# +# Copyright 2019 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-thread-queue" +default_version "3.13" + +dependency "perl" + +version "3.13" do + source md5: "0fada5b474e9c97d6262059cf62cfc88" +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 From e7aae886480aa14848163b2ba5503fa8044c68ab Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 12 Oct 2019 19:11:35 -0400 Subject: [PATCH 4/8] Add automake-1.16 This is needed to get chef-dk to build properly on CentOS 8. Some other fixes include: - 1.16 seems to rename the ``bootstrap.sh`` script back to ``bootstrap`` - Add build dependency of ``perl-thread-queue`` - Set default to 1.16 to ensure compatibility with CentOS 8 Signed-off-by: Lance Albertson --- config/software/automake.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/config/software/automake.rb b/config/software/automake.rb index 181fa4376..db1ae60d0 100644 --- a/config/software/automake.rb +++ b/config/software/automake.rb @@ -15,21 +15,18 @@ # name "automake" -default_version "1.11.2" +default_version "1.16" dependency "autoconf" +dependency "perl-thread-queue" license "GPL-2.0" license_file "COPYING" skip_transitive_dependency_licensing true -version "1.15" do - source md5: "716946a105ca228ab545fc37a70df3a3" -end - -version "1.11.2" do - source md5: "79ad64a9f6e83ea98d6964cef8d8a0bc" -end +version("1.16") { source md5: "7fb7155e553dc559ac39cf525f0bb5de" } +version("1.15") { source md5: "716946a105ca228ab545fc37a70df3a3" } +version("1.11.2") { source md5: "79ad64a9f6e83ea98d6964cef8d8a0bc" } source url: "https://ftp.gnu.org/gnu/automake/automake-#{version}.tar.gz" @@ -38,7 +35,7 @@ build do env = with_standard_compiler_flags(with_embedded_path) - if version.satisfies?(">= 1.15") + if version.satisfies?(">= 1.15") && version.satisfies?("< 1.16") command "./bootstrap.sh", env: env else command "./bootstrap", env: env From d3f7a37522f55b3e1bc629abb6166d074bd70d9f Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 15 Oct 2019 16:37:46 -0400 Subject: [PATCH 5/8] Simplify logic for automake-1.15 Co-Authored-By: Tim Smith Signed-off-by: Lance Albertson --- config/software/automake.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/automake.rb b/config/software/automake.rb index db1ae60d0..4c927a415 100644 --- a/config/software/automake.rb +++ b/config/software/automake.rb @@ -35,7 +35,7 @@ build do env = with_standard_compiler_flags(with_embedded_path) - if version.satisfies?(">= 1.15") && version.satisfies?("< 1.16") + if version == "1.15" command "./bootstrap.sh", env: env else command "./bootstrap", env: env From 39ee2446bc43d7c5f6e6586f6c40b4606085cdfa Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 15 Oct 2019 16:47:21 -0400 Subject: [PATCH 6/8] Switch to sha256 hashes Signed-off-by: Lance Albertson --- config/software/automake.rb | 6 +++--- config/software/perl-thread-queue.rb | 2 +- config/software/perl.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/software/automake.rb b/config/software/automake.rb index 4c927a415..69d8d626c 100644 --- a/config/software/automake.rb +++ b/config/software/automake.rb @@ -24,9 +24,9 @@ license_file "COPYING" skip_transitive_dependency_licensing true -version("1.16") { source md5: "7fb7155e553dc559ac39cf525f0bb5de" } -version("1.15") { source md5: "716946a105ca228ab545fc37a70df3a3" } -version("1.11.2") { source md5: "79ad64a9f6e83ea98d6964cef8d8a0bc" } +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" diff --git a/config/software/perl-thread-queue.rb b/config/software/perl-thread-queue.rb index 19f530630..81ce3ceb1 100644 --- a/config/software/perl-thread-queue.rb +++ b/config/software/perl-thread-queue.rb @@ -20,7 +20,7 @@ dependency "perl" version "3.13" do - source md5: "0fada5b474e9c97d6262059cf62cfc88" + source sha256: "6ba3dacddd2fbb66822b4aa1d11a0a5273cd04c825cb3ff31c20d7037cbfdce8" end source url: "http://search.cpan.org/CPAN/authors/id/J/JD/JDHEDDEN/Thread-Queue-#{version}.tar.gz" diff --git a/config/software/perl.rb b/config/software/perl.rb index 082baa84a..00e4f346d 100644 --- a/config/software/perl.rb +++ b/config/software/perl.rb @@ -22,9 +22,9 @@ default_version "5.30.0" -version("5.30.0") { source md5: "9770584cdf9b5631c38097645ce33549" } -version("5.22.1") { source md5: "19295bbb775a3c36123161b9bf4892f1" } -version("5.18.1") { source md5: "304cb5bd18e48c44edd6053337d3386d" } +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" relative_path "perl-#{version}" From 9e18e91660722aa5538747d98d6272fdea3e6ac4 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 15 Oct 2019 17:28:38 -0400 Subject: [PATCH 7/8] Update default version to 2.69 which is required for automake-1.16 Also update to using sha256 checksums. Signed-off-by: Lance Albertson --- config/software/autoconf.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/software/autoconf.rb b/config/software/autoconf.rb index da15e63ff..2c2118e8d 100644 --- a/config/software/autoconf.rb +++ b/config/software/autoconf.rb @@ -15,7 +15,7 @@ # name "autoconf" -default_version "2.68" +default_version "2.69" license "GPL-3.0" license_file "COPYING" @@ -25,10 +25,10 @@ dependency "m4" version "2.69" do - source md5: "82d05e03b93e45f5a39b828dc9c6c29b" + source sha256: "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" end version "2.68" do - source md5: "c3b5247592ce694f7097873aa07d66fe" + source sha256: "eff70a2916f2e2b3ed7fe8a2d7e63d72cf3a23684b56456b319c3ebce0705d99" end source url: "https://ftp.gnu.org/gnu/autoconf/autoconf-#{version}.tar.gz" From a4dcb41dfcb2c8224471e08b4bb0e73a04cbbfe6 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 15 Oct 2019 17:46:29 -0400 Subject: [PATCH 8/8] Update Copyright to OSU Signed-off-by: Lance Albertson --- config/software/perl-thread-queue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/perl-thread-queue.rb b/config/software/perl-thread-queue.rb index 81ce3ceb1..7cfc53efd 100644 --- a/config/software/perl-thread-queue.rb +++ b/config/software/perl-thread-queue.rb @@ -1,5 +1,5 @@ # -# Copyright 2019 Chef Software, Inc. +# 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.