Hello community, here is the log from the commit of package xinetd for openSUSE:Factory checked in at 2015-09-03 17:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinetd (Old) and /work/SRC/openSUSE:Factory/.xinetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinetd" Changes: -------- --- /work/SRC/openSUSE:Factory/xinetd/xinetd.changes 2014-09-03 21:21:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinetd.new/xinetd.changes 2015-09-03 18:03:42.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 31 08:33:14 UTC 2015 - tchva...@suse.com + +- Update README.SUSE to put emphasis on systemd socket activation +- Remove description of ipv6 support that is in xinetd since 2004+- +- Clean-up the specfile a bit and update urls to something working + (github) +- Change tarball to github one as the upstream site seems dead + +------------------------------------------------------------------- Old: ---- xinetd-2.3.15.tar.gz New: ---- xinetd-2-3-15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinetd.spec ++++++ --- /var/tmp/diff_new_pack.T1KnWD/_old 2015-09-03 18:03:47.000000000 +0200 +++ /var/tmp/diff_new_pack.T1KnWD/_new 2015-09-03 18:03:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xinetd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,15 @@ # +%define tagver 2-3-15 Name: xinetd Version: 2.3.15 Release: 0 -Url: http://www.xinetd.org/ Summary: An 'inetd' with Expanded Functionality License: xinetd Group: Productivity/Networking/System -Source0: http://www.xinetd.org/%{name}-%{version}.tar.gz +Url: https://github.com/xinetd-org/xinetd/ +Source0: https://github.com/xinetd-org/%{name}/archive/%{name}-%{tagver}.tar.gz Source1: xinetd.service Source2: FAQ Source3: README.SUSE @@ -44,13 +45,12 @@ Patch16: xinetd-2.3.14-file-limit.patch Patch17: xinetd-2.3.14-restore-nofile-limits.patch Patch18: xinetd-deactivating-error.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: autoconf BuildRequires: systemd BuildRequires: tcpd-devel -%{systemd_requires} Provides: inet-daemon +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%systemd_requires %description xinetd takes the abilities of inetd and appends additional @@ -61,9 +61,8 @@ - Extensive logging abilities - Clear configuration file - %prep -%setup -b 0 -T -D -a 4 +%setup -q -n %{name}-%{name}-%{tagver} -b 0 -T -D -a 4 %patch0 %patch4 %patch5 @@ -82,13 +81,11 @@ # FAQ, README.SUSE and logrotate cp %{SOURCE2} %{SOURCE3} %{SOURCE5} . -%build autoconf -export CFLAGS="$RPM_OPT_FLAGS -Wformat=2" -./configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir}\ + +%build +export CFLAGS="%{optflags} -Wformat=2" +%configure \ --with-loadavg \ --with-libwrap @@ -96,7 +93,7 @@ %install install -d -m 755 %{buildroot}%{_mandir} -make install DAEMONDIR=%{buildroot}%{_sbindir} MANDIR=${RPM_BUILD_ROOT}/%{_mandir} +make install DAEMONDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}/%{_mandir} #config file and initial services install -d -m 0755 %{buildroot}%{_sysconfdir} @@ -106,7 +103,7 @@ #xinetd.service install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service -ln -sf ../../sbin/service %{buildroot}%{_sbindir}/rc%{name} +ln -sf service %{buildroot}%{_sbindir}/rc%{name} %pre %service_add_pre %{name}.service @@ -115,9 +112,6 @@ %service_add_post %{name}.service %preun -if [ -x /etc/init.d/%{name} ]; then -%stop_on_removal xinetd -fi %service_del_preun %{name}.service %postun @@ -126,8 +120,8 @@ %files %defattr(-,root,root) %doc README CHANGELOG COPYRIGHT FAQ README.SUSE logrotate -%doc %{_mandir}/man5/%{name}.conf.* -%doc %{_mandir}/man8/* +%{_mandir}/man5/%{name}.conf.* +%{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/xinetd.d/* %config(noreplace) %{_sysconfdir}/%{name}.conf %{_sbindir}/* ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.T1KnWD/_old 2015-09-03 18:03:47.000000000 +0200 +++ /var/tmp/diff_new_pack.T1KnWD/_new 2015-09-03 18:03:47.000000000 +0200 @@ -1,28 +1,12 @@ - -# Merged IPv4 and IPv6 support - -Since 2.3.4 has xinetd merged IPv4 and IPv6 support. -It means that it is possible to use both protocols simultaneously. -xined is compiled to use IPv4 by default. -IPv6 must be enabled for each service in configuration -file, see man xinetd.conf. - -Since 2.3.14 in SUSE, xinetd can create services that use either IPv6 or IPv4, -depending on the IPv6 support by the system. See man xinetd.conf as well. - -Xinetd was patched to honour disable line in service configuration files -(stored in /etc/xinetd.d). Xinetd now aborts parsing of the config file -as soon as it reads the line "disable = yes". This was made to prevent Xinetd -from dropping warnings into logs which where not relevant. -Futher information can be found at: -https://bugzilla.novell.com/show_bug.cgi?id=254613 - # Systemd SUSE distributions uses systemd as a default init system. It provides a xinetd-like capability called socket activation, where services are spawned once underlying socket get an incoming connection. +It is highly recommended for you to rather stick to socket activation than +continuing with usage of xinetd service activation. + ## Example of socket activation The xinetd configuration for ftp daemon /etc/xinetd.d/ftp
