Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Jun 2001 22:47:28 -0400 (EDT)
From:      Pete Fritchman <petef@databits.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/28561: Update security/xinetd to 2.3.0
Message-ID:  <200107010247.f612lSx24014@electron.databits.net>

next in thread | raw e-mail | index | archive | help

>Number:         28561
>Category:       ports
>Synopsis:       Update security/xinetd to 2.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 30 19:50:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Pete Fritchman
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
Databits Network Services, Inc.
>Environment:
System: FreeBSD electron.databits.net 4.3-STABLE FreeBSD 4.3-STABLE #7: Mon Jun 11 10:15:45 EDT 2001 root@electron.databits.net:/usr/obj/usr/src/sys/ELECTRON i386

>Description:

- update to version 2.3.0
- adjust master_sites (synack.net == xinetd.org)
- change = to += in CONFIGURE_ARGS
- add magic to allow build as a non-root user
- improve pkg-comment
- add WWW: to pkg-descr
- adjust patches (offsets, indentation, etc)

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile	2001/04/02 09:24:28	1.32
+++ Makefile	2001/07/01 02:36:49
@@ -6,20 +6,25 @@
 #
 
 PORTNAME=	xinetd
-PORTVERSION=	2.1.8.9pre14
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	http://www.xinetd.org/ \
-		http://synack.net/xinetd/
+MASTER_SITES=	http://www.xinetd.org/
 
 MAINTAINER=	vanilla@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	build
-CONFIGURE_ARGS=	--with-loadavg --with-libwrap
+CONFIGURE_ARGS+=	--with-loadavg --with-libwrap
 # --with-inet6 "ipv6's code seens buggy.."
 
 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
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	2001/02/09 14:28:35	1.15
+++ distinfo	2001/06/30 23:34:46
@@ -1 +1 @@
-MD5 (xinetd-2.1.8.9pre14.tar.gz) = 2108c46dd370a70925daecc67dea864d
+MD5 (xinetd-2.3.0.tar.gz) = f9e4363a0838ae3e5065b1c0c2b307a8
Index: pkg-comment
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/pkg-comment,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-comment
--- pkg-comment	1996/07/10 22:18:38	1.1.1.1
+++ pkg-comment	2001/07/01 02:43:20
@@ -1 +1 @@
-Replacement for inetd with control and logging
+Replacement for inetd with better control and logging
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/pkg-descr,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-descr
--- pkg-descr	1996/07/10 22:18:38	1.1.1.1
+++ pkg-descr	2001/07/01 02:09:14
@@ -42,3 +42,5 @@
       it can log the user name and command for the rsh service)
 
 6) No limit on number of server arguments
+
+WWW: http://www.xinetd.org/
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/files/patch-aa,v
retrieving revision 1.5
diff -u -r1.5 patch-aa
--- files/patch-aa	2000/11/12 02:45:08	1.5
+++ files/patch-aa	2001/07/01 01:57:56
@@ -1,11 +1,11 @@
---- 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 @@
+--- xinetd/defs.h.orig	Thu Jun 14 11:29:09 2001
++++ xinetd/defs.h	Sat Jun 30 21:57:36 2001
+@@ -96,7 +96,7 @@
  /*
   * Used for listen(2)
   */
--#define LISTEN_BACKLOG					7
-+#define LISTEN_BACKLOG					64
+-#define LISTEN_BACKLOG               7
++#define LISTEN_BACKLOG               64
  
  /*
   * When explicit values are given for enum's, that is because the structures 
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/files/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- files/patch-ac	2000/11/12 02:45:08	1.2
+++ files/patch-ac	2001/07/01 02:05:06
@@ -1,6 +1,6 @@
---- 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 @@
+--- xinetd/xconv.pl.orig	Mon May 14 15:06:01 2001
++++ xinetd/xconv.pl	Sat Jun 30 21:58:07 2001
+@@ -45,7 +45,7 @@
  	} else {
  		print "\twait        = yes\n";
  	}
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/files/patch-ad,v
retrieving revision 1.3
diff -u -r1.3 patch-ad
--- files/patch-ad	2000/11/12 02:45:08	1.3
+++ files/patch-ad	2001/07/01 02:05:20
@@ -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 @@
+--- configure.orig	Mon Jun 18 19:57:13 2001
++++ configure	Sat Jun 30 21:58:07 2001
+@@ -2203,7 +2203,7 @@
  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
+ echo "configure:2209: checking for main in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
Index: files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/files/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- files/patch-ae	2000/11/12 02:45:08	1.2
+++ files/patch-ae	2001/07/01 02:05:39
@@ -1,6 +1,6 @@
---- 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 @@
+--- xinetd/xgetloadavg.c.orig	Wed May 16 18:48:48 2001
++++ xinetd/xgetloadavg.c	Sat Jun 30 21:58:07 2001
+@@ -84,6 +84,21 @@
  }
  #endif /* HAVE_KSTAT */
  #endif /* solaris */
@@ -20,5 +20,5 @@
 +}
 +#endif /* __FreeBSD__ */
  
- #ifdef __osf__
+ #ifdef bsdi
  
Index: files/patch-af
===================================================================
RCS file: /home/ncvs/ports/security/xinetd/files/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- files/patch-af	2000/11/12 02:45:08	1.2
+++ files/patch-af	2001/07/01 02:06:59
@@ -1,11 +1,11 @@
---- 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 ) ) ;
- 			
+--- xinetd/child.c.orig	Wed Jun 20 07:50:44 2001
++++ xinetd/child.c	Sat Jun 30 22:06:40 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( *sinp ) ) ;
+-         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
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107010247.f612lSx24014>