[packages/xinetd] Up to 2.3.15.4; drop obsolete stuff
arekm
arekm at pld-linux.org
Sun Aug 23 21:13:56 CEST 2026
commit b8972e35517c43859777e3222e595aa3930595eb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Aug 23 21:13:22 2026 +0200
Up to 2.3.15.4; drop obsolete stuff
xinetd-2.3.15-remove-deprecated-flask.h.patch | 20 --------
xinetd-bind-ipv6.patch | 29 -----------
xinetd-howl.patch | 29 -----------
xinetd-man.patch | 11 ----
xinetd-no_libnsl.patch | 20 --------
xinetd.spec | 74 ++++++++++-----------------
6 files changed, 27 insertions(+), 156 deletions(-)
---
diff --git a/xinetd.spec b/xinetd.spec
index f26687a..b8b7dc5 100644
--- a/xinetd.spec
+++ b/xinetd.spec
@@ -1,32 +1,21 @@
-#
-# Conditional build:
-%bcond_with howl # mdns/howl service registration support
-#
Summary: Xinetd - a powerful replacement for inetd
Summary(pl.UTF-8): Xinetd - rozbudowany zamiennik inetd
Summary(pt_BR.UTF-8): O xinetd é um substituto poderoso e seguro para o inetd
Summary(ru.UTF-8): xinetd - богатая возможностями замена inetd
Summary(uk.UTF-8): xinetd - багата можливостями заміна inetd
Name: xinetd
-Version: 2.3.15
-Release: 3
+Version: 2.3.15.4
+Release: 1
License: BSD-like
Group: Networking/Daemons
-Source0: http://www.xinetd.org/%{name}-%{version}.tar.gz
-# Source0-md5: 77358478fd58efa6366accae99b8b04c
+Source0: https://github.com/openSUSE/xinetd/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: cbdb8e10a7ccb047c08ac1922e670318
Source1: %{name}.inet.sh
-Patch0: %{name}-no_libnsl.patch
-Patch1: %{name}-howl.patch
-Patch2: %{name}-man.patch
-Patch3: %{name}-bind-ipv6.patch
-Patch4: xinetd-2.3.15-remove-deprecated-flask.h.patch
-URL: http://www.xinetd.org/
-BuildRequires: autoconf
-BuildRequires: automake
-%{?with_howl:BuildRequires: howl-devel >= 1.0.0-4}
+URL: https://github.com/openSUSE/xinetd/
BuildRequires: libselinux-devel
+BuildRequires: libtirpc-devel
BuildRequires: libwrap-devel
-%{?with_howl:BuildRequires: pkgconfig}
+BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): rc-inetd
Requires: rc-inetd
@@ -114,43 +103,32 @@ xinetd также имеет возможность привязывать ко
%prep
%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
%build
-%{__aclocal}
-%{__autoconf}
-cp -f /usr/share/automake/config.sub .
+# empty parameter lists mean (void) since C23, which gcc 15 defaults to
%configure \
- CFLAGS="%{rpmcppflags} %{rpmcflags} $(pkg-config --cflags libtirpc)" \
- %{?with_howl:--with-howl} \
+ CFLAGS="%{rpmcflags} -std=gnu17" \
+ --disable-silent-rules \
--with-labeled-networking \
--with-libwrap \
- --with-loadavg
-%{__make} \
- LDFLAGS="%{rpmldflags} $(pkg-config --libs libtirpc)"
+ --with-loadavg \
+ --with-rpc
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sbindir} \
- $RPM_BUILD_ROOT%{_mandir}/man{5,8} \
- $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-
-install xinetd/xinetd $RPM_BUILD_ROOT%{_sbindir}
-install xinetd/itox $RPM_BUILD_ROOT%{_sbindir}
-install xinetd/xinetd.conf.man $RPM_BUILD_ROOT%{_mandir}/man5/xinetd.conf.5
-install xinetd/xinetd.log.man $RPM_BUILD_ROOT%{_mandir}/man8/xinetd.log.8
-install xinetd/xinetd.man $RPM_BUILD_ROOT%{_mandir}/man8/xinetd.8
-install xinetd/itox.8 $RPM_BUILD_ROOT%{_mandir}/man8/itox.8
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+
+# rc-inetd regenerates %{_sysconfdir}/xinetd.conf on every start, so upstream's
+# xinetd.conf and xinetd.d/ would only be dead files here
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ sysconf_DATA= \
+ xinetconf_DATA=
+
install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inet.script
:> $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.conf
-cp xinetd/sample.conf .
-cp xinetd/xconv.pl .
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -164,12 +142,14 @@ fi
%files
%defattr(644,root,root,755)
-%doc README CHANGELOG sample.conf xconv.pl
-%attr(755,root,root) %{_sbindir}/itox
+%doc CHANGELOG COPYRIGHT README.md contrib/xinetd.conf
+%attr(755,root,root) %{_bindir}/itox
+%attr(755,root,root) %{_bindir}/xconv.pl
%attr(755,root,root) %{_sbindir}/xinetd
%attr(640,root,root) %ghost %{_sysconfdir}/xinetd.conf
%attr(640,root,root) /etc/sysconfig/rc-inet.script
%{_mandir}/man5/xinetd.conf.5*
+%{_mandir}/man5/xinetd.log.5*
%{_mandir}/man8/itox.8*
+%{_mandir}/man8/xconv.pl.8*
%{_mandir}/man8/xinetd.8*
-%{_mandir}/man8/xinetd.log.8*
diff --git a/xinetd-2.3.15-remove-deprecated-flask.h.patch b/xinetd-2.3.15-remove-deprecated-flask.h.patch
deleted file mode 100644
index 1cb4e54..0000000
--- a/xinetd-2.3.15-remove-deprecated-flask.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up xinetd-2.3.15/xinetd/child.c.remove-flaskh xinetd-2.3.15/xinetd/child.c
---- xinetd-2.3.15/xinetd/child.c.remove-flaskh 2020-04-07 12:28:52.538123162 +0200
-+++ xinetd-2.3.15/xinetd/child.c 2020-04-07 12:28:58.980980069 +0200
-@@ -33,7 +33,6 @@
- #endif
- #ifdef LABELED_NET
- #include <selinux/selinux.h>
--#include <selinux/flask.h>
- #include <selinux/context.h>
- #endif
-
-@@ -551,7 +550,7 @@ static int set_context_from_socket( cons
- if (!(new_context = context_str(bcon)))
- goto fail;
-
-- if (security_compute_create(new_context, exec_context, SECCLASS_PROCESS,
-+ if (security_compute_create(new_context, exec_context, string_to_security_class("process"),
- &new_exec_context) < 0)
- goto fail;
-
diff --git a/xinetd-bind-ipv6.patch b/xinetd-bind-ipv6.patch
deleted file mode 100644
index 4bce76f..0000000
--- a/xinetd-bind-ipv6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xinetd-2.3.14/xinetd/service.c.old 2007-05-16 15:33:41.000000000 +0200
-+++ xinetd-2.3.14/xinetd/service.c 2007-05-16 15:29:53.000000000 +0200
-@@ -335,6 +335,15 @@
-
- if ( SVC_FD(sp) == -1 )
- {
-+ if (SC_BIND_ADDR(scp) == NULL && SC_IPV6( scp ))
-+ {
-+ /* there was no bind address configured and IPv6 fails. Try IPv4 */
-+ msg( LOG_NOTICE, func, "IPv6 socket creation failed for service %s, trying IPv4", SC_ID( scp ) ) ;
-+ M_CLEAR(SC_XFLAGS(scp), SF_IPV6);
-+ M_SET(SC_XFLAGS(scp), SF_IPV4);
-+ return svc_activate(sp);
-+ }
-+
- msg( LOG_ERR, func,
- "socket creation failed (%m). service = %s", SC_ID( scp ) ) ;
- return( FAILED ) ;
---- xinetd-2.3.14/xinetd/confparse.c.old 2007-05-16 15:33:26.000000000 +0200
-+++ xinetd-2.3.14/xinetd/confparse.c 2007-05-16 15:15:22.000000000 +0200
-@@ -245,7 +245,7 @@
- M_SET(SC_XFLAGS(scp), SF_IPV6);
- }
- else
-- M_SET(SC_XFLAGS(scp), SF_IPV4);
-+ M_SET(SC_XFLAGS(scp), SF_IPV6); /*try bind IPv6 by default*/
- }
-
- if (SC_ORIG_BIND_ADDR(scp))
diff --git a/xinetd-howl.patch b/xinetd-howl.patch
deleted file mode 100644
index 27bd545..0000000
--- a/xinetd-howl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xinetd-2.3.14/configure.in.orig 2005-03-31 01:15:28.000000000 +0200
-+++ xinetd-2.3.14/configure.in 2006-03-12 12:10:15.375690250 +0100
-@@ -52,12 +52,10 @@
- AC_ARG_WITH(howl, [ --with-howl=PATH Compile in howl support.
- PATH is the prefix where howl is installed,
- and is not optional.],
-- [ OLDCFLAGS=$CFLAGS; CFLAGS="-I$withval/include/howl/ $CFLAGS";
-- OLDLDFLAGS=$LDFLAGS; LDFLAGS="-L$withval/lib/ $LDFLAGS";
-- OLDCPPFLAGS=$CPPFLAGS; CPPFLAGS="-I$withval/include/howl/ $CPPFLAGS";
-- AC_CHECK_HEADER($withval/include/howl/howl.h,
-+ [ OLDCFLAGS=$CFLAGS; CFLAGS="`pkg-config --cflags howl` $CFLAGS";
-+ AC_CHECK_HEADER(howl.h,
- [AC_DEFINE(HAVE_HOWL) AC_DEFINE(HAVE_MDNS)],
-- [CFLAGS=$OLDCFLAGS; LDFLAGS=$OLDLDFLAGS; CPPFLAGS=$OLDCPPFLAGS;])
-+ [CFLAGS=$OLDCFLAGS;])
- AC_CHECK_LIB(howl, sw_discovery_publish, [LIBS="-lhowl $LIBS"], [
- OLDLIBS=$LIBS; LIBS="-lpthread $LIBS";
- AC_CHECK_LIB(howl, main, [LIBS="-lhowl $LIBS"],
---- xinetd-2.3.14/xinetd/xmdns.c.orig 2005-04-08 23:23:07.000000000 +0200
-+++ xinetd-2.3.14/xinetd/xmdns.c 2006-03-12 12:40:36.541506000 +0100
-@@ -139,7 +139,7 @@
-
- int xinetd_mdns_poll(void) {
- #ifdef HAVE_HOWL
-- if( sw_discovery_read_socket(*(sw_discovery *)ps.rws.mdns_state) == SW_OKAY )
-+ if(ps.rws.mdns_state && (sw_discovery_read_socket(*(sw_discovery *)ps.rws.mdns_state) == SW_OKAY))
- return 0;
- #endif
- return -1;
diff --git a/xinetd-man.patch b/xinetd-man.patch
deleted file mode 100644
index 8bb5f6b..0000000
--- a/xinetd-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xinetd-2.3.14/xinetd/xinetd.conf.man.orig 2005-10-05 19:15:33.000000000 +0200
-+++ xinetd-2.3.14/xinetd/xinetd.conf.man 2006-03-12 11:34:00.147747000 +0100
-@@ -228,7 +228,7 @@
- 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
--+.B libwrap
-+.B libwrap
- overrides the service name passed to libwrap (which defaults to the
- server name, the first server_args component with NAMEINARGS, the id
- for internal services and the service name for redirected services).
diff --git a/xinetd-no_libnsl.patch b/xinetd-no_libnsl.patch
deleted file mode 100644
index 7dadb61..0000000
--- a/xinetd-no_libnsl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xinetd-2.3.7/configure.in~ Tue Aug 13 10:56:03 2002
-+++ xinetd-2.3.7/configure.in Tue Aug 13 10:56:03 2002
-@@ -270,8 +270,6 @@
- AC_DEFINE(LIBWRAP)
- WRAPLIBS="-lwrap"
- AC_DEFINE(HAVE_LIBWRAP) ])
-- AC_CHECK_LIB(nsl, yp_get_default_domain, [
-- WRAPLIBS="$WRAPLIBS -lnsl" ])
- LIBS="$WRAPLIBS $LIBS"
- ;;
- *)
-@@ -282,8 +280,6 @@
- else
- WRAPLIBS="$withval"
- fi
-- AC_CHECK_LIB(nsl, yp_get_default_domain, [
-- WRAPLIBS="$WRAPLIBS -lnsl" ])
- OLDLIBS="$LIBS"
- LIBS="$WRAPLIBS $LIBS"
- AC_TRY_LINK([ int allow_severity; int deny_severity; ],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xinetd.git/commitdiff/b8972e35517c43859777e3222e595aa3930595eb
More information about the pld-cvs-commit
mailing list