mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-09 06:51:44 +00:00
security/xinetd: Make it fetchable and fix WWW
Original site is gone but code is still available on github. Changed WWW to point to github and also consumes source code from there. I've compared content of current github code and original tarball and it was just missing one function from xgetloadavg.c, now added using patch. While here, re-generate patches. PR: 270345 Reported by: diizzy
This commit is contained in:
parent
5d606e8492
commit
5af0ec0798
@ -2,25 +2,29 @@ PORTNAME= xinetd
|
||||
PORTVERSION= 2.3.15
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= GENTOO
|
||||
|
||||
MAINTAINER= garga@FreeBSD.org
|
||||
COMMENT= Replacement for inetd with better control and logging
|
||||
WWW= http://www.xinetd.org/
|
||||
WWW= https://github.com/xinetd-org/xinetd
|
||||
|
||||
LICENSE= XINETD
|
||||
LICENSE_NAME= xinetd license
|
||||
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
|
||||
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_RC_SUBR= xinetd
|
||||
ALL_TARGET= build
|
||||
CONFIGURE_ARGS= --with-loadavg
|
||||
|
||||
USES= cpe shebangfix
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= xinetd-org
|
||||
GH_TAGNAME= xinetd-2-3-15
|
||||
USE_RC_SUBR= xinetd
|
||||
|
||||
SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-loadavg
|
||||
ALL_TARGET= build
|
||||
|
||||
OPTIONS_DEFINE= IPV6 LIBWRAP XCONV
|
||||
OPTIONS_DEFAULT= LIBWRAP XCONV
|
||||
OPTIONS_SUB= yes
|
||||
|
@ -1,2 +1,3 @@
|
||||
SHA256 (xinetd-2.3.15.tar.gz) = bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
|
||||
SIZE (xinetd-2.3.15.tar.gz) = 309774
|
||||
TIMESTAMP = 1679407850
|
||||
SHA256 (xinetd-org-xinetd-2.3.15-xinetd-2-3-15_GH0.tar.gz) = 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c
|
||||
SIZE (xinetd-org-xinetd-2.3.15-xinetd-2-3-15_GH0.tar.gz) = 300870
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- Makefile.in.orig 2007-09-20 17:01:52 UTC
|
||||
--- Makefile.in.orig 2012-05-09 16:03:17 UTC
|
||||
+++ Makefile.in
|
||||
@@ -77,16 +77,14 @@ install: build
|
||||
for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- xinetd/builtins.c.orig 2012-05-09 15:40:29 UTC
|
||||
--- xinetd/builtins.c.orig 2012-05-09 16:03:17 UTC
|
||||
+++ xinetd/builtins.c
|
||||
@@ -617,7 +617,7 @@ static void tcpmux_handler( const struct
|
||||
@@ -617,7 +617,7 @@ static void tcpmux_handler( const struct server *serp
|
||||
if( SC_IS_INTERNAL( scp ) ) {
|
||||
SC_INTERNAL(scp, nserp);
|
||||
} else {
|
@ -1,6 +1,6 @@
|
||||
--- xinetd/child.c.orig 2016-07-13 19:00:31 UTC
|
||||
--- xinetd/child.c.orig 2012-05-09 16:03:17 UTC
|
||||
+++ xinetd/child.c
|
||||
@@ -168,7 +168,8 @@ void exec_server( const struct server *s
|
||||
@@ -168,7 +168,8 @@ void exec_server( const struct server *serp )
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -10,15 +10,15 @@
|
||||
|
||||
#ifndef solaris
|
||||
#if !defined(HAVE_SETSID)
|
||||
@@ -321,11 +322,6 @@ void child_process( struct server *serp
|
||||
@@ -320,11 +321,6 @@ void child_process( struct server *serp )
|
||||
}
|
||||
signals_pending[0] = -1;
|
||||
signals_pending[1] = -1;
|
||||
|
||||
-
|
||||
- Sclose(0);
|
||||
- Sclose(1);
|
||||
- Sclose(2);
|
||||
-
|
||||
-
|
||||
|
||||
#ifdef DEBUG_SERVER
|
||||
if ( debug.on )
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- xinetd/xconfig.h.orig 2003-02-19 17:29:28 UTC
|
||||
--- xinetd/xconfig.h.orig 2012-05-09 16:03:17 UTC
|
||||
+++ xinetd/xconfig.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#endif
|
24
security/xinetd/files/patch-xinetd_xgetloadavg.c
Normal file
24
security/xinetd/files/patch-xinetd_xgetloadavg.c
Normal file
@ -0,0 +1,24 @@
|
||||
--- xinetd/xgetloadavg.c.orig 2012-05-09 16:03:17 UTC
|
||||
+++ xinetd/xgetloadavg.c
|
||||
@@ -87,6 +87,21 @@ double xgetloadavg(void)
|
||||
#endif /* HAVE_KSTAT */
|
||||
#endif /* solaris */
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+
|
||||
+#include <stdio.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/fcntl.h>
|
||||
+
|
||||
+double xgetloadavg ()
|
||||
+{
|
||||
+ double ret[3];
|
||||
+
|
||||
+ getloadavg (ret, sizeof (ret) / sizeof (ret[0]));
|
||||
+
|
||||
+ return ret[0];
|
||||
+}
|
||||
+#endif /* __FreeBSD__ */
|
||||
|
||||
#if defined(bsdi) || defined(__APPLE__)
|
||||
#include <stdlib.h>
|
@ -1,6 +1,6 @@
|
||||
--- xinetd/xinetd.conf.man.orig 2015-05-23 15:05:32 UTC
|
||||
--- xinetd/xinetd.conf.man.orig 2012-05-09 16:03:17 UTC
|
||||
+++ xinetd/xinetd.conf.man
|
||||
@@ -233,7 +233,7 @@ determines the program to execute for th
|
||||
@@ -233,7 +233,7 @@ the server name should \fInot\fP be included in \fIser
|
||||
determines the arguments passed to the server. In contrast to \fBinetd\fP,
|
||||
the server name should \fInot\fP be included in \fIserver_args\fP.
|
||||
.TP
|
||||
|
Loading…
Reference in New Issue
Block a user