summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2002-05-11 11:29:27 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2002-05-11 11:29:27 +0000
commitd3d7d97a24a3b4e262c1fcf6478ecbf8f78863ef (patch)
tree536f0f8d487597f50c38d1b0a566f8d31e7433c1
parentMASTER_SITE went away; host locally (diff)
Upgrade to 2.3.4.
Submitted by: ijliao
-rw-r--r--security/xinetd/Makefile15
-rw-r--r--security/xinetd/distinfo2
-rw-r--r--security/xinetd/files/patch-ad16
-rw-r--r--security/xinetd/files/patch-af11
4 files changed, 15 insertions, 29 deletions
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index a961059c71a5..55ee47f19c17 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinetd
-PORTVERSION= 2.3.3
+PORTVERSION= 2.3.4
CATEGORIES= security
MASTER_SITES= http://www.xinetd.org/
@@ -15,23 +15,20 @@ MAINTAINER= vanilla@FreeBSD.org
USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= build
-CONFIGURE_ARGS+= --with-loadavg --with-libwrap
-# --with-inet6 "ipv6's code seens buggy.."
+CONFIGURE_ARGS+= --with-loadavg --with-libwrap --with-inet6
MAN5= xinetd.conf.5
MAN8= xinetd.8 xinetd.log.8
post-patch:
-.for dir in sio str misc xlog pset pq timer
- ${PERL} -pi -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!' \
- ${WRKSRC}/libs/src/${dir}/Makefile.in
-.endfor
+ ${FIND} ${WRKSRC}/libs/src -name Makefile.in | ${XARGS} \
+ ${PERL} -pi -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!'
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \
- ${ECHO} "Install ${PREFIX}/etc/rc.d/xinetd.sh startup file."; \
+ ${ECHO_CMD} "Install ${PREFIX}/etc/rc.d/xinetd.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${FILESDIR}/xinetd.sh ${PREFIX}/etc/rc.d/xinetd.sh; \
fi
- strip ${PREFIX}/sbin/xinetd
+ @${STRIP_CMD} ${PREFIX}/sbin/xinetd
.include <bsd.port.mk>
diff --git a/security/xinetd/distinfo b/security/xinetd/distinfo
index a51215c54ee9..378357b6dd8d 100644
--- a/security/xinetd/distinfo
+++ b/security/xinetd/distinfo
@@ -1 +1 @@
-MD5 (xinetd-2.3.3.tar.gz) = 6bbf329e3c101fbd25b68fa933250d74
+MD5 (xinetd-2.3.4.tar.gz) = 8f7ac612910aaf811c4554f4ab40fd65
diff --git a/security/xinetd/files/patch-ad b/security/xinetd/files/patch-ad
index 160a5b55d232..51a095c22621 100644
--- a/security/xinetd/files/patch-ad
+++ b/security/xinetd/files/patch-ad
@@ -1,11 +1,11 @@
---- configure.orig Wed Aug 16 01:32:49 2000
-+++ configure Sat Nov 11 14:48:08 2000
-@@ -1970,7 +1970,7 @@
- fi
-
+--- configure.orig Fri May 10 00:24:38 2002
++++ configure Fri May 10 00:25:20 2002
+@@ -7096,7 +7096,7 @@
+ echo "${ECHO_T}no" >&6
+ fi;
;;
-linux*)
+linux*|freebsd*)
- echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
- echo "configure:1976: checking for main in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
+
+ echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
+ echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
diff --git a/security/xinetd/files/patch-af b/security/xinetd/files/patch-af
deleted file mode 100644
index a75032d403dd..000000000000
--- a/security/xinetd/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- xinetd/child.c.orig Wed Jun 20 07:50:44 2001
-+++ xinetd/child.c Sat Jun 30 15:47:05 2001
-@@ -367,7 +367,7 @@
- "(%s service) %s", program_name, SC_ID( scp ) ) ;
-
- #ifdef INET6
-- if ( SC_ACCEPTS_CONNECTIONS( scp ) && !IN6_IS_ADDR_UNSPECIFIED(sinp) )
-+ if ( SC_ACCEPTS_CONNECTIONS( scp ) && !IN6_IS_ADDR_UNSPECIFIED(&(sinp->sin6_addr)) )
- strx_print( INT_NULL, &name[ len ], namelen - len,
- " %s" , xntoa( SA(sinp) ) ) ;
- #else