Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jul 2006 13:38:07 +1000 (YAKST)
From:      Alexander Logvinov <user@blg.akavia.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/100139: [update port] security/xinetd
Message-ID:  <200607120338.k6C3c7Zn075025@blg.akavia.ru>
Resent-Message-ID: <200607120340.k6C3eF5I032891@freefall.freebsd.org>

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

>Number:         100139
>Category:       ports
>Synopsis:       [update port] security/xinetd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 12 03:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:

>Description:
 
  Wrong PROVIDE string in rc.d script. Update rc.d script filename to "xinetd".
  
>How-To-Repeat:

  # grep PROVIDE xinetd.sh

>Fix:

--- xinetd.sh.tmpl      Tue Feb 21 21:01:31 2006
+++ xinetd.in   Wed Jul 12 13:11:58 2006
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/security/xinetd/files/xinetd.sh.tmpl,v 1.2 2006/02/20 20:47:40 dougb Exp $
 #
-# PROVIDE: snmpd
+# PROVIDE: xinetd
 # REQUIRE: DAEMON
 #
 # Add the following line to /etc/rc.conf to enable xinetd:
 
--- Makefile.old	Wed Jul 12 13:17:27 2006
+++ Makefile	Wed Jul 12 13:31:32 2006
@@ -16,11 +16,9 @@
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	xinetd
 ALL_TARGET=	build
 CONFIGURE_ARGS+=	--with-loadavg --with-libwrap --with-ipv6
-STARTUP_FILE=	${PREFIX}/etc/rc.d/xinetd.sh
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN5=		xinetd.conf.5
 MAN8=		xconv.8 xinetd.8 xinetd.log.8
@@ -30,14 +28,7 @@
 		${REINPLACE_CMD} -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!'
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h
 
-pre-install:
-	-@[ -f ${STARTUP_FILE} ] && \
-	(${ECHO} "Remove old ${STARTUP_FILE} before install." && exit 1)
-
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/xinetd.sh.tmpl > ${STARTUP_FILE}
-	@${CHMOD} 755 ${STARTUP_FILE}
 	@${STRIP_CMD} ${PREFIX}/sbin/xinetd
 
 .include <bsd.port.mk>

--- pkg-plist.old       Wed Jul 12 13:35:38 2006
+++ pkg-plist   Wed Jul 12 13:31:06 2006
@@ -1,3 +1,2 @@
 bin/xconv
-etc/rc.d/xinetd.sh
 sbin/xinetd
  
>Release-Note:
>Audit-Trail:
>Unformatted:



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