From 377e8eaa42b94c1e9d81692aa424d047dff83f4e Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sat, 14 Jul 2018 20:04:00 -0400 Subject: [PATCH] various: no need to link against libsocket --- components/developer/git/Makefile | 2 +- components/library/glib/Makefile | 2 +- .../library/glib/patches/16-cleanup-libs.patch | 2 +- .../library/mozilla-nspr/patches/libsocket.patch | 31 ++++++++ .../library/mozilla-nss/patches/libsocket.patch | 9 +++ components/mail/postfix/patches/libsocket.patch | 12 ++++ components/python/python27/patches/02-setup.patch | 2 +- components/python/python27/patches/09-rbac.patch | 2 +- components/shell/bash/Makefile | 2 +- .../shell/bash/patches/solaris-009.configure.patch | 8 +-- .../cdrtools/patches/libsocket-removal.patch | 84 ++++++++++++++++++++++ .../net-snmp/patches/011.Makefile.in.patch | 2 +- components/sysutils/screen/patches/libsocket.patch | 78 ++++++++++++++++++++ 13 files changed, 225 insertions(+), 11 deletions(-) create mode 100644 components/library/mozilla-nspr/patches/libsocket.patch create mode 100644 components/library/mozilla-nss/patches/libsocket.patch create mode 100644 components/mail/postfix/patches/libsocket.patch create mode 100644 components/sysutils/cdrtools/patches/libsocket-removal.patch create mode 100644 components/sysutils/screen/patches/libsocket.patch diff --git a/components/developer/git/Makefile b/components/developer/git/Makefile index 3d41bc0f9..ad7a33226 100644 --- a/components/developer/git/Makefile +++ b/components/developer/git/Makefile @@ -48,7 +48,7 @@ include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk -LDFLAGS += -lnsl -lsocket +LDFLAGS += -lnsl CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32) CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib diff --git a/components/library/glib/Makefile b/components/library/glib/Makefile index e7360ec89..8267a884a 100644 --- a/components/library/glib/Makefile +++ b/components/library/glib/Makefile @@ -32,7 +32,7 @@ include $(WS_TOP)/make-rules/ips.mk PATH=/usr/gnu/bin:/usr/bin -LDFLAGS += -lsocket -lsecdb -lnsl +LDFLAGS += -lsecdb -lnsl COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -f ) diff --git a/components/library/glib/patches/16-cleanup-libs.patch b/components/library/glib/patches/16-cleanup-libs.patch index 9bd87f951..6631c0e81 100644 --- a/components/library/glib/patches/16-cleanup-libs.patch +++ b/components/library/glib/patches/16-cleanup-libs.patch @@ -5,7 +5,7 @@ ],[AC_MSG_RESULT([yes])], [save_libs="$LIBS" - LIBS="-lresolv $LIBS" -+ LIBS="-lresolv -lsocket $LIBS" ++ LIBS="-lresolv $LIBS" AC_TRY_LINK([#include #include #include diff --git a/components/library/mozilla-nspr/patches/libsocket.patch b/components/library/mozilla-nspr/patches/libsocket.patch new file mode 100644 index 000000000..12109fcc3 --- /dev/null +++ b/components/library/mozilla-nspr/patches/libsocket.patch @@ -0,0 +1,31 @@ +diff -ur nspr-4.12.orig/nspr/pr/src/Makefile.in nspr-4.12/nspr/pr/src/Makefile.in +--- nspr-4.12.orig/nspr/pr/src/Makefile.in Fri Feb 12 08:51:25 2016 ++++ nspr-4.12/nspr/pr/src/Makefile.in Sun Jul 15 13:22:07 2018 +@@ -55,9 +55,9 @@ + endif + + ifdef USE_PTHREADS +-OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc ++OS_LIBS = -lpthread ${LIBRT} -lnsl -ldl -lc + else +-OS_LIBS = -lsocket -lnsl -ldl -lc ++OS_LIBS = -lnsl -ldl -lc + endif # USE_PTHREADS + ifeq ($(CPU_ARCH),sparc) + ifndef USE_64 +diff -ur nspr-4.12.orig/nspr/pr/tests/Makefile.in nspr-4.12/nspr/pr/tests/Makefile.in +--- nspr-4.12.orig/nspr/pr/tests/Makefile.in Fri Feb 12 08:51:25 2016 ++++ nspr-4.12/nspr/pr/tests/Makefile.in Sun Jul 15 13:20:08 2018 +@@ -445,10 +445,10 @@ + ifeq ($(OS_ARCH),SunOS) + ifeq ($(USE_IPV6),1) + $(OBJDIR)/gethost: $(OBJDIR)/gethost.o +- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ ++ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -o $@ + endif + $(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o +- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ ++ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -o $@ + endif + + ifeq ($(USE_PTHREADS), 1) diff --git a/components/library/mozilla-nss/patches/libsocket.patch b/components/library/mozilla-nss/patches/libsocket.patch new file mode 100644 index 000000000..82d110bde --- /dev/null +++ b/components/library/mozilla-nss/patches/libsocket.patch @@ -0,0 +1,9 @@ +diff -ur nss-3.27.2.orig/nss/coreconf/SunOS5.mk nss-3.27.2/nss/coreconf/SunOS5.mk +--- nss-3.27.2.orig/nss/coreconf/SunOS5.mk Sun Jul 15 11:25:59 2018 ++++ nss-3.27.2/nss/coreconf/SunOS5.mk Sun Jul 15 13:10:32 2018 +@@ -141,4 +141,4 @@ + RPATH = -R '$$ORIGIN' + endif + +-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc ++OS_LIBS += -lthread -lnsl -lposix4 -ldl -lc diff --git a/components/mail/postfix/patches/libsocket.patch b/components/mail/postfix/patches/libsocket.patch new file mode 100644 index 000000000..9f5487fc4 --- /dev/null +++ b/components/mail/postfix/patches/libsocket.patch @@ -0,0 +1,12 @@ +diff -ur makedefs makedefs +--- makedefs Sun Feb 12 10:32:10 2017 ++++ makedefs Mon Jul 16 07:23:26 2018 +@@ -357,7 +357,7 @@ + ;; + SunOS.5*) SYSTYPE=SUNOS5 + RANLIB=echo +- SYSLIBS="-lresolv -lsocket -lnsl -ldl" ++ SYSLIBS="-lresolv -lnsl -ldl" + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-h,${LIB}'} diff --git a/components/python/python27/patches/02-setup.patch b/components/python/python27/patches/02-setup.patch index fca181a53..47e5841d9 100644 --- a/components/python/python27/patches/02-setup.patch +++ b/components/python/python27/patches/02-setup.patch @@ -31,7 +31,7 @@ exts.append( Extension('_csv', ['_csv.c']) ) # socket(2) -+ socket_libs = math_libs + [ 'socket', 'nsl' ] ++ socket_libs = math_libs + [ 'nsl' ] exts.append( Extension('_socket', ['socketmodule.c', 'timemodule.c'], depends=['socketmodule.h'], - libraries=math_libs) ) diff --git a/components/python/python27/patches/09-rbac.patch b/components/python/python27/patches/09-rbac.patch index f41b59ad6..919f69974 100644 --- a/components/python/python27/patches/09-rbac.patch +++ b/components/python/python27/patches/09-rbac.patch @@ -1274,7 +1274,7 @@ new file mode 100644 + ea_inc is not None and ua_inc is not None: + exts.append( Extension('rbac', ['pyrbac.c', 'authattr.c', \ + 'execattr.c', 'userattr.c'], -+ libraries = ['nsl', 'socket', 'secdb']) ) ++ libraries = ['nsl', 'secdb']) ) + # Thomas Heller's _ctypes module self.detect_ctypes(inc_dirs, lib_dirs) diff --git a/components/shell/bash/Makefile b/components/shell/bash/Makefile index 43f7b0514..5ca8ff7e6 100644 --- a/components/shell/bash/Makefile +++ b/components/shell/bash/Makefile @@ -66,7 +66,7 @@ studio_ALIGN.sparc.64 = -xmemalign=16i # configure checks for some functions, but doesn't seem to want to link in # the required libraries for them. We avoid linking with libthread.so.1 # just because we pass -mt, by explicitly passing -lc. -LIBS = -lc -lsocket -lgen +LIBS = -lc -lgen # -z redlocsym -- let's shrink the SHT_SYMTAB as much as we can LDFLAGS = $(LD_Z_REDLOCSYM) diff --git a/components/shell/bash/patches/solaris-009.configure.patch b/components/shell/bash/patches/solaris-009.configure.patch index 84829fc5d..07994265f 100644 --- a/components/shell/bash/patches/solaris-009.configure.patch +++ b/components/shell/bash/patches/solaris-009.configure.patch @@ -16,7 +16,7 @@ ## M4sh Initialization. ## ## -------------------- ## -+export LD_OPTIONS="-lc -lm -lgen -lsocket -lnsl -lresolv -lncurses -z ignore" ++export LD_OPTIONS="-lc -lm -lgen -lnsl -lresolv -lncurses -z ignore" + # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh @@ -258,9 +258,9 @@ solaris2.8*) LOCAL_CFLAGS=-DSOLARIS ;; solaris2.9*) LOCAL_CFLAGS=-DSOLARIS ;; -solaris2.10*) LOCAL_CFLAGS=-DSOLARIS ;; -+solaris2.10*) LOCAL_CFLAGS="-DSOLARIS -lsocket -lnsl -lgen" ;; -+solaris2.11*) LOCAL_CFLAGS="-DSOLARIS -lsocket -lnsl -lgen -lncurses" ;; -+solaris2.12*) LOCAL_CFLAGS="-DSOLARIS -lsocket -lnsl -lgen -lncurses" ;; ++solaris2.10*) LOCAL_CFLAGS="-DSOLARIS -lnsl -lgen" ;; ++solaris2.11*) LOCAL_CFLAGS="-DSOLARIS -lnsl -lgen -lncurses" ;; ++solaris2.12*) LOCAL_CFLAGS="-DSOLARIS -lnsl -lgen -lncurses" ;; solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading diff --git a/components/sysutils/cdrtools/patches/libsocket-removal.patch b/components/sysutils/cdrtools/patches/libsocket-removal.patch new file mode 100644 index 000000000..70517e0bc --- /dev/null +++ b/components/sysutils/cdrtools/patches/libsocket-removal.patch @@ -0,0 +1,84 @@ +diff -ur cdrtools-3.02.orig/RULES/i86pc-sunos5-cc.rul cdrtools-3.02/RULES/i86pc-sunos5-cc.rul +--- cdrtools-3.02.orig/RULES/i86pc-sunos5-cc.rul Fri Mar 28 12:43:53 2014 ++++ cdrtools-3.02/RULES/i86pc-sunos5-cc.rul Sun Jul 15 12:57:18 2018 +@@ -29,7 +29,7 @@ + KDEFINES= -DKERNEL -D_KERNEL + + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/i86pc-sunos5-clang.rul cdrtools-3.02/RULES/i86pc-sunos5-clang.rul +--- cdrtools-3.02.orig/RULES/i86pc-sunos5-clang.rul Mon Apr 7 16:28:58 2014 ++++ cdrtools-3.02/RULES/i86pc-sunos5-clang.rul Sun Jul 15 12:57:22 2018 +@@ -27,7 +27,7 @@ + OSDEFS += -D__SVR4 -DSVR4 + KDEFINES= -DKERNEL -D_KERNEL + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/i86pc-sunos5-gcc.rul cdrtools-3.02/RULES/i86pc-sunos5-gcc.rul +--- cdrtools-3.02.orig/RULES/i86pc-sunos5-gcc.rul Fri Mar 28 12:43:53 2014 ++++ cdrtools-3.02/RULES/i86pc-sunos5-gcc.rul Sun Jul 15 12:57:27 2018 +@@ -27,7 +27,7 @@ + OSDEFS += -D__SVR4 -DSVR4 + KDEFINES= -DKERNEL -D_KERNEL + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/i86pc-sunos5-pcc.rul cdrtools-3.02/RULES/i86pc-sunos5-pcc.rul +--- cdrtools-3.02.orig/RULES/i86pc-sunos5-pcc.rul Wed Jan 9 14:06:19 2013 ++++ cdrtools-3.02/RULES/i86pc-sunos5-pcc.rul Sun Jul 15 12:57:32 2018 +@@ -25,7 +25,7 @@ + OSDEFS += -D__SVR4 -DSVR4 + KDEFINES= -DKERNEL -D_KERNEL + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/sun4-sunos5-cc.rul cdrtools-3.02/RULES/sun4-sunos5-cc.rul +--- cdrtools-3.02.orig/RULES/sun4-sunos5-cc.rul Tue Apr 1 08:08:05 2014 ++++ cdrtools-3.02/RULES/sun4-sunos5-cc.rul Sun Jul 15 12:57:36 2018 +@@ -29,7 +29,7 @@ + KDEFINES= -DKERNEL -D_KERNEL + + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/sun4-sunos5-clang.rul cdrtools-3.02/RULES/sun4-sunos5-clang.rul +--- cdrtools-3.02.orig/RULES/sun4-sunos5-clang.rul Wed Apr 2 17:04:29 2014 ++++ cdrtools-3.02/RULES/sun4-sunos5-clang.rul Sun Jul 15 12:57:41 2018 +@@ -27,7 +27,7 @@ + OSDEFS += -D__SVR4 -DSVR4 + KDEFINES= -DKERNEL -D_KERNEL + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt +diff -ur cdrtools-3.02.orig/RULES/sun4-sunos5-gcc.rul cdrtools-3.02/RULES/sun4-sunos5-gcc.rul +--- cdrtools-3.02.orig/RULES/sun4-sunos5-gcc.rul Tue Apr 1 08:08:05 2014 ++++ cdrtools-3.02/RULES/sun4-sunos5-gcc.rul Sun Jul 15 12:57:46 2018 +@@ -29,7 +29,7 @@ + KDEFINES= -DKERNEL -D_KERNEL + + +-LIB_SOCKET= -lsocket -lnsl -ldl ++LIB_SOCKET= -lnsl -ldl + LIB_MATH= -lm + LIB_KVM= -lkvm -lelf + LIB_VOLMGT= -lvolmgt diff --git a/components/sysutils/net-snmp/patches/011.Makefile.in.patch b/components/sysutils/net-snmp/patches/011.Makefile.in.patch index 048e5b55d..d6233916a 100644 --- a/components/sysutils/net-snmp/patches/011.Makefile.in.patch +++ b/components/sysutils/net-snmp/patches/011.Makefile.in.patch @@ -21,7 +21,7 @@ TOBJS=$(LOBJS) +# To satisfy -zdefs -+LIB_LD_ADD =-lnsl -lsocket -L$(libdir) ++LIB_LD_ADD =-lnsl -L$(libdir) + # CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @CPPFLAGS@ diff --git a/components/sysutils/screen/patches/libsocket.patch b/components/sysutils/screen/patches/libsocket.patch new file mode 100644 index 000000000..6785e8c1c --- /dev/null +++ b/components/sysutils/screen/patches/libsocket.patch @@ -0,0 +1,78 @@ +diff -ur screen-4.5.0.orig/configure screen-4.5.0/configure +--- screen-4.5.0.orig/configure Tue Jan 17 14:29:21 2017 ++++ screen-4.5.0/configure Sun Jul 15 13:06:06 2018 +@@ -4150,7 +4150,7 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : +- LIBS="$LIBS -lsocket -linet";seqptx=1 ++ LIBS="$LIBS -linet";seqptx=1 + fi + rm -f conftest* + +@@ -4220,7 +4220,7 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : +- LIBS="$LIBS -lsocket -lnsl -lkstat" ++ LIBS="$LIBS -lnsl -lkstat" + fi + rm -f conftest* + +@@ -6022,7 +6022,7 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : +- LIBS="$LIBS -lsocket -lcrypt_i" ++ LIBS="$LIBS -lcrypt_i" + fi + rm -f conftest* + +@@ -6717,7 +6717,7 @@ + CFLAGS="-O" + fi + fi +-test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" ++test -n "$seqptx" && LIBS="-ltermcap -lc -linet -lnsl -lsec -lseq" + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +diff -ur screen-4.5.0.orig/configure.ac screen-4.5.0/configure.ac +--- screen-4.5.0.orig/configure.ac Tue Jan 17 14:28:29 2017 ++++ screen-4.5.0/configure.ac Sun Jul 15 13:05:51 2018 +@@ -200,7 +200,7 @@ + [#ifdef _SEQUENT_ + yes; + #endif +-], LIBS="$LIBS -lsocket -linet";seqptx=1) ++], LIBS="$LIBS -linet";seqptx=1) + + oldlibs="$LIBS" + LIBS="$LIBS -lelf" +@@ -217,7 +217,7 @@ + [#if defined(SVR4) && defined(sun) + yes + #endif +-], LIBS="$LIBS -lsocket -lnsl -lkstat") ++], LIBS="$LIBS -lnsl -lkstat") + + dnl + dnl **** typedefs **** +@@ -1135,7 +1135,7 @@ + [#ifdef M_UNIX + yes; + #endif +-], LIBS="$LIBS -lsocket -lcrypt_i") ++], LIBS="$LIBS -lcrypt_i") + + dnl + dnl **** misc things **** +@@ -1298,7 +1298,7 @@ + fi + fi + dnl Ptx bug workaround -- insert -lc after -ltermcap +-test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" ++test -n "$seqptx" && LIBS="-ltermcap -lc -linet -lnsl -lsec -lseq" + + AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.)) + -- 2.11.4.GIT