Hello community,
here is the log from the commit of package xinetd for openSUSE:Factory checked
in at 2014-06-19 13:19:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-05
16:50:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xinetd.new/xinetd.changes 2014-06-19
13:19:37.000000000 +0200
@@ -1,0 +2,21 @@
+Sat Jun 14 10:58:10 UTC 2014 - tchva...@suse.com
+
+- Drop xinetd.conf not used in spec and we use upstream one anyway.
+
+-------------------------------------------------------------------
+Fri Jun 13 13:16:38 UTC 2014 - tchva...@suse.com
+
+- Revert the syslog target as it is obsolete.
+
+-------------------------------------------------------------------
+Fri Jun 13 08:36:19 UTC 2014 - tchva...@suse.com
+
+- Fix error in logs when disabling service and reloading; bnc#870904
+ * xinetd-deactivating-error.patch
+
+-------------------------------------------------------------------
+Wed Jun 11 13:32:35 UTC 2014 - tchva...@suse.com
+
+- Wait for the syslog target too.
+
+-------------------------------------------------------------------
Old:
----
xinetd.conf
New:
----
xinetd-deactivating-error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xinetd.spec ++++++
--- /var/tmp/diff_new_pack.WoK3kk/_old 2014-06-19 13:19:38.000000000 +0200
+++ /var/tmp/diff_new_pack.WoK3kk/_new 2014-06-19 13:19:38.000000000 +0200
@@ -43,6 +43,7 @@
Patch15: xinetd-CVE-2013-4342.patch
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
@@ -76,6 +77,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
# FAQ, README.SUSE and logrotate
cp %{SOURCE2} %{SOURCE3} %{SOURCE5} .
++++++ xinetd-deactivating-error.patch ++++++
diff -urN xinetd-2.3.15.old/xinetd/reconfig.c xinetd-2.3.15/xinetd/reconfig.c
--- xinetd-2.3.15.old/xinetd/reconfig.c 2014-06-12 16:03:13.023755512 +0200
+++ xinetd-2.3.15/xinetd/reconfig.c 2014-06-12 16:27:01.691887621 +0200
@@ -151,10 +151,12 @@
*/
psi_remove( iter ) ;
msg( LOG_NOTICE, func, "service %s deactivated", sid ) ;
- if ( SVC_RELE( osp ) == 0 ) {
+ /*
+ * If the refcount is > 0 release also all the members
+ */
+ if ( SVC_RELE( osp ) > 0 ) {
svc_release( osp );
- } else
- msg( LOG_ERR, func, "Errors deactivating service %s", sid ) ;
+ }
dropped_services++ ;
}
}
Binární soubory xinetd-2.3.15.old/xinetd/.service.c.swp a
xinetd-2.3.15/xinetd/.service.c.swp jsou rozdílné
Binární soubory xinetd-2.3.15.old/xinetd/.service.h.swp a
xinetd-2.3.15/xinetd/.service.h.swp jsou rozdílné
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
