From 049782e5835682651cb0ee0e84cdb2a9a6972ebb Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Sun, 12 Nov 2000 02:45:08 +0000 Subject: Upgrade to 2.1.8.9pre12. --- security/xinetd/Makefile | 2 +- security/xinetd/distinfo | 2 +- security/xinetd/files/patch-aa | 6 ++--- security/xinetd/files/patch-ab | 10 ++++----- security/xinetd/files/patch-ac | 13 +++++++---- security/xinetd/files/patch-ad | 51 +++++------------------------------------- security/xinetd/files/patch-ae | 9 +++++--- security/xinetd/files/patch-af | 6 ++--- 8 files changed, 33 insertions(+), 66 deletions(-) (limited to 'security') diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile index c6b251fe3721..ad80d865ede3 100644 --- a/security/xinetd/Makefile +++ b/security/xinetd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xinetd -PORTVERSION= 2.1.8.8p3 +PORTVERSION= 2.1.8.9pre12 CATEGORIES= security MASTER_SITES= http://www.xinetd.org/ \ http://synack.net/xinetd/ diff --git a/security/xinetd/distinfo b/security/xinetd/distinfo index 38a1d75d5073..db0968f7107c 100644 --- a/security/xinetd/distinfo +++ b/security/xinetd/distinfo @@ -1 +1 @@ -MD5 (xinetd-2.1.8.8p3.tar.gz) = 5d1f4d5bab29d9e68dc8850b4cb90969 +MD5 (xinetd-2.1.8.9pre12.tar.gz) = 037cad699c49cb902cfff997bb81edb0 diff --git a/security/xinetd/files/patch-aa b/security/xinetd/files/patch-aa index 0722a9b574c7..cb264e0a5072 100644 --- a/security/xinetd/files/patch-aa +++ b/security/xinetd/files/patch-aa @@ -1,6 +1,6 @@ ---- xinetd/defs.h.orig Tue Nov 3 00:05:53 1998 -+++ xinetd/defs.h Tue May 11 00:47:03 1999 -@@ -99,7 +99,7 @@ +--- xinetd/defs.h.orig Wed Aug 16 01:32:49 2000 ++++ xinetd/defs.h Sat Nov 11 14:42:24 2000 +@@ -105,7 +105,7 @@ /* * Used for listen(2) */ diff --git a/security/xinetd/files/patch-ab b/security/xinetd/files/patch-ab index 42a9e05ad626..f34909301e8a 100644 --- a/security/xinetd/files/patch-ab +++ b/security/xinetd/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Oct 18 13:27:18 1999 -+++ Makefile.in Fri Nov 12 17:45:17 1999 +--- Makefile.in.orig Wed Aug 16 01:32:49 2000 ++++ Makefile.in Sat Nov 11 14:45:15 2000 @@ -32,26 +32,24 @@ LIBS="$(LIBS)" \ "DEFS=$(PROG_DEFS)" \ @@ -9,11 +9,11 @@ makelibs: for lib in $(MANDATORY_LIBS) ; do \ -- ( cd libs/src/$$lib ; make install "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=true "CC=$(CC)" DEBUG=-O ) \ -+ ( cd libs/src/$$lib ; make install "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=true "CC=$(CC)" "DEBUG=$(CLAGS)" ) \ +- ( cd libs/src/$$lib ; make install "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=$(RANLIB) "CC=$(CC)" DEBUG=-O ) \ ++ ( cd libs/src/$$lib ; make install "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=$(RANLIB) "CC=$(CC)" "DEBUG=$(CFLAGS)" ) \ ; done - install: + install: build for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ test -d $$i || mkdir -p $$i ; done $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR) diff --git a/security/xinetd/files/patch-ac b/security/xinetd/files/patch-ac index c5e6de36c4f3..7cac3e3c2f0a 100644 --- a/security/xinetd/files/patch-ac +++ b/security/xinetd/files/patch-ac @@ -1,6 +1,11 @@ ---- xinetd/xconv.pl Mon Oct 18 01:27:18 1999 -+++ xinetd/xconv.pl Fri Feb 25 16:30:16 2000 -@@ -43 +43 @@ +--- xinetd/xconv.pl.orig Wed Aug 16 01:32:49 2000 ++++ xinetd/xconv.pl Sat Nov 11 14:46:21 2000 +@@ -40,7 +40,7 @@ + } else { + print "\twait = yes\n"; + } - @user = split /\./, $command[4]; + @user = split /[:\.]/, $command[4]; - + print "\tuser = $user[0]\n"; + if( defined $user[1] ) { + print "\tgroup = $user[1]\n"; diff --git a/security/xinetd/files/patch-ad b/security/xinetd/files/patch-ad index bc4cfbf29287..160a5b55d232 100644 --- a/security/xinetd/files/patch-ad +++ b/security/xinetd/files/patch-ad @@ -1,52 +1,11 @@ ---- configure.orig Sat Dec 11 08:02:56 1999 -+++ configure Mon Sep 4 02:56:08 2000 -@@ -1768,7 +1768,7 @@ - EOF +--- configure.orig Wed Aug 16 01:32:49 2000 ++++ configure Sat Nov 11 14:48:08 2000 +@@ -1970,7 +1970,7 @@ + fi ;; -linux*) +linux*|freebsd*) echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 - echo "configure:1774: checking for main in -lcrypt" >&5 + echo "configure:1976: checking for main in -lcrypt" >&5 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` -@@ -3016,40 +3016,6 @@ - EOF - - fi -- --echo $ac_n "checking for R_OK""... $ac_c" 1>&6 --echo "configure:3022: checking for R_OK" >&5 --if eval "test \"`echo '$''{'ac_cv_type_R_OK'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --#if STDC_HEADERS --#include --#include --#endif --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "(^|[^a-zA-Z_0-9])R_OK[^a-zA-Z_0-9]" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_type_R_OK=yes --else -- rm -rf conftest* -- ac_cv_type_R_OK=no --fi --rm -f conftest* -- --fi --echo "$ac_t""$ac_cv_type_R_OK" 1>&6 --if test $ac_cv_type_R_OK = no; then -- cat >> confdefs.h <<\EOF --#define R_OK 4 --EOF -- --fi -- - - for ac_hdr in sys/types.h sys/termios.h termios.h sys/select.h rpc/rpc.h rpc/rpcent.h sys/file.h ftw.h machine/reg.h linux/time.h netdb.h - do diff --git a/security/xinetd/files/patch-ae b/security/xinetd/files/patch-ae index edf97c8a8cac..8aceb7d3f2f9 100644 --- a/security/xinetd/files/patch-ae +++ b/security/xinetd/files/patch-ae @@ -1,6 +1,6 @@ ---- xinetd/xgetloadavg.c.orig Sun Mar 26 12:17:16 2000 -+++ xinetd/xgetloadavg.c Sun Mar 26 12:19:37 2000 -@@ -79,3 +79,18 @@ +--- xinetd/xgetloadavg.c.orig Wed Aug 16 01:32:49 2000 ++++ xinetd/xgetloadavg.c Sat Nov 11 14:48:29 2000 +@@ -77,6 +77,21 @@ } #endif /* HAVE_KSTAT */ #endif /* solaris */ @@ -19,3 +19,6 @@ + return ret[0]; +} +#endif /* __FreeBSD__ */ + + #ifdef __osf__ + diff --git a/security/xinetd/files/patch-af b/security/xinetd/files/patch-af index 46f406a3c1b5..d0bee5a1187d 100644 --- a/security/xinetd/files/patch-af +++ b/security/xinetd/files/patch-af @@ -1,6 +1,6 @@ ---- xinetd/child.c.orig Sun Apr 30 16:13:07 2000 -+++ xinetd/child.c Sun Apr 30 16:13:47 2000 -@@ -320,7 +320,7 @@ +--- xinetd/child.c.orig Wed Aug 16 01:42:39 2000 ++++ xinetd/child.c Sat Nov 11 14:48:54 2000 +@@ -318,7 +318,7 @@ "(%s service) %s", program_name, SC_ID( scp ) ) ; #ifdef INET6 -- cgit v1.2.3