[Midnightbsd-cvs] mports [16834] trunk/security/xinetd: make ipv6 optional for xinetd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 6 14:37:37 EDT 2014
Revision: 16834
http://svnweb.midnightbsd.org/mports/?rev=16834
Author: laffer1
Date: 2014-09-06 14:37:36 -0400 (Sat, 06 Sep 2014)
Log Message:
-----------
make ipv6 optional for xinetd
Modified Paths:
--------------
trunk/security/xinetd/Makefile
Added Paths:
-----------
trunk/security/xinetd/files/patch-Makefile.in
trunk/security/xinetd/files/patch-xinetd__builtins.c
trunk/security/xinetd/files/patch-xinetd__xconfig.h
Removed Paths:
-------------
trunk/security/xinetd/files/patch-ab
trunk/security/xinetd/files/patch-xinetd::xconfig.h
Modified: trunk/security/xinetd/Makefile
===================================================================
--- trunk/security/xinetd/Makefile 2014-09-06 18:34:23 UTC (rev 16833)
+++ trunk/security/xinetd/Makefile 2014-09-06 18:37:36 UTC (rev 16834)
@@ -2,7 +2,7 @@
PORTNAME= xinetd
PORTVERSION= 2.3.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security ipv6
MASTER_SITES= GENTOO/distfiles
@@ -13,15 +13,22 @@
FAKE_OPTS= prefixhack
-USES= gmake
GNU_CONFIGURE= yes
USE_RC_SUBR= xinetd
ALL_TARGET= build
-CONFIGURE_ARGS+= --with-loadavg --with-libwrap --with-ipv6
+CONFIGURE_ARGS+= --with-loadavg
+USES= shebangfix perl5
+USE_PERL5= run
+SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl
+
+OPTIONS_DEFINE= IPV6 LIBWRAP
+OPTIONS_DEFAULT= LIBWRAP
+
+IPV6_CONFIGURE_WITH= ipv6
+LIBWRAP_CONFIGURE_WITH= libwrap
+
post-patch:
- ${FIND} ${WRKSRC}/libs/src -name Makefile.in | ${XARGS} \
- ${REINPLACE_CMD} -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!'
@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h
do-install:
Copied: trunk/security/xinetd/files/patch-Makefile.in (from rev 16833, trunk/security/xinetd/files/patch-ab)
===================================================================
--- trunk/security/xinetd/files/patch-Makefile.in (rev 0)
+++ trunk/security/xinetd/files/patch-Makefile.in 2014-09-06 18:37:36 UTC (rev 16834)
@@ -0,0 +1,22 @@
+--- Makefile.in.orig Wed Jul 31 19:03:43 2002
++++ Makefile.in Mon Aug 19 11:49:58 2002
+@@ -76,16 +76,14 @@
+ for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
+ test -d $$i || mkdir -p $$i ; done
+ $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
+- $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
+- $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
++ $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(prefix)/bin/xconv
+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
+- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
+- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
++ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.8
+ @echo "You must put your xinetd.conf in /etc/xinetd.conf"
+ @echo "There is a sample config file in xinetd/sample.conf and you can"
+- @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
++ @echo "use xconv to convert your old inetd.conf file to an xinetd format"
+
+ uninstall:
+ rm -f $(DAEMONDIR)/xinetd
Deleted: trunk/security/xinetd/files/patch-ab
===================================================================
--- trunk/security/xinetd/files/patch-ab 2014-09-06 18:34:23 UTC (rev 16833)
+++ trunk/security/xinetd/files/patch-ab 2014-09-06 18:37:36 UTC (rev 16834)
@@ -1,22 +0,0 @@
---- Makefile.in.orig Wed Jul 31 19:03:43 2002
-+++ Makefile.in Mon Aug 19 11:49:58 2002
-@@ -76,16 +76,14 @@
- for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
- test -d $$i || mkdir -p $$i ; done
- $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
-- $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
-- $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
-+ $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(prefix)/bin/xconv
- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
-- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
-- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
-+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.8
- @echo "You must put your xinetd.conf in /etc/xinetd.conf"
- @echo "There is a sample config file in xinetd/sample.conf and you can"
-- @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
-+ @echo "use xconv to convert your old inetd.conf file to an xinetd format"
-
- uninstall:
- rm -f $(DAEMONDIR)/xinetd
Deleted: trunk/security/xinetd/files/patch-xinetd::xconfig.h
===================================================================
--- trunk/security/xinetd/files/patch-xinetd::xconfig.h 2014-09-06 18:34:23 UTC (rev 16833)
+++ trunk/security/xinetd/files/patch-xinetd::xconfig.h 2014-09-06 18:37:36 UTC (rev 16834)
@@ -1,11 +0,0 @@
---- xinetd/xconfig.h.orig Sun Sep 15 19:23:41 2002
-+++ xinetd/xconfig.h Sun Sep 15 19:23:55 2002
-@@ -29,7 +29,7 @@
- #endif
-
-
--#define DEFAULT_CONFIG_FILE "/etc/xinetd.conf"
-+#define DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/xinetd.conf"
-
- /*
- * This is the facility used by xinetd to log syslog messages
Added: trunk/security/xinetd/files/patch-xinetd__builtins.c
===================================================================
--- trunk/security/xinetd/files/patch-xinetd__builtins.c (rev 0)
+++ trunk/security/xinetd/files/patch-xinetd__builtins.c 2014-09-06 18:37:36 UTC (rev 16834)
@@ -0,0 +1,11 @@
+--- xinetd/builtins.c.orig 2013-10-03 16:04:32.562080623 +0400
++++ xinetd/builtins.c 2013-10-03 16:04:57.297350342 +0400
+@@ -617,7 +617,7 @@
+ if( SC_IS_INTERNAL( scp ) ) {
+ SC_INTERNAL(scp, nserp);
+ } else {
+- exec_server(nserp);
++ child_process(nserp);
+ }
+ }
+
Copied: trunk/security/xinetd/files/patch-xinetd__xconfig.h (from rev 16833, trunk/security/xinetd/files/patch-xinetd::xconfig.h)
===================================================================
--- trunk/security/xinetd/files/patch-xinetd__xconfig.h (rev 0)
+++ trunk/security/xinetd/files/patch-xinetd__xconfig.h 2014-09-06 18:37:36 UTC (rev 16834)
@@ -0,0 +1,11 @@
+--- xinetd/xconfig.h.orig Sun Sep 15 19:23:41 2002
++++ xinetd/xconfig.h Sun Sep 15 19:23:55 2002
+@@ -29,7 +29,7 @@
+ #endif
+
+
+-#define DEFAULT_CONFIG_FILE "/etc/xinetd.conf"
++#define DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/xinetd.conf"
+
+ /*
+ * This is the facility used by xinetd to log syslog messages
More information about the Midnightbsd-cvs
mailing list