commit openslp for openSUSE:Factory
Hello community, here is the log from the commit of package openslp for openSUSE:Factory checked in at 2020-03-27 21:55:05 Comparing /work/SRC/openSUSE:Factory/openslp (Old) and /work/SRC/openSUSE:Factory/.openslp.new.3160 (New) Package is "openslp" Fri Mar 27 21:55:05 2020 rev:54 rq:787869 version:2.0.0 Changes: --- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2019-08-23 11:03:24.046515339 +0200 +++ /work/SRC/openSUSE:Factory/.openslp.new.3160/openslp.changes 2020-03-27 21:55:11.270719126 +0100 @@ -1,0 +2,6 @@ +Tue Mar 24 17:07:52 CET 2020 - m...@suse.de + +- Add missing openslp requires to the openslp-server package + [bnc#1165121] + +--- Other differences: -- ++ openslp.spec ++ --- /var/tmp/diff_new_pack.oVk6Kw/_old 2020-03-27 21:55:14.438720969 +0100 +++ /var/tmp/diff_new_pack.oVk6Kw/_new 2020-03-27 21:55:14.438720969 +0100 @@ -1,7 +1,7 @@ # # spec file for package openslp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -77,6 +77,7 @@ %package server Summary:The OpenSLP Implementation of the Service Location Protocol V2 Group: System/Daemons +Requires: openslp Requires(pre): group(daemon) Requires(pre): shadow Recommends: logrotate
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2019-08-23 11:03:21
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new.7948 (New)
Package is "openslp"
Fri Aug 23 11:03:21 2019 rev:53 rq:724027 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2019-06-13
22:32:59.544388186 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new.7948/openslp.changes
2019-08-23 11:03:24.046515339 +0200
@@ -1,0 +2,8 @@
+Thu Jul 25 11:11:16 UTC 2019 - matthias.gerst...@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+ firewalld, see [1].
+
+ [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
+---
Old:
openslp.SuSEfirewall2
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.M6oKim/_old 2019-08-23 11:03:24.974515187 +0200
+++ /var/tmp/diff_new_pack.M6oKim/_new 2019-08-23 11:03:24.982515187 +0200
@@ -29,7 +29,6 @@
Source3:openslp.desktop
Source4:openslp-devel.desktop
Source5:openslp.logrotate
-Source7:openslp.SuSEfirewall2
Source8:baselibs.conf
Source9:slpd.service
Source10: openslp.logrotate.systemd
@@ -188,7 +187,6 @@
mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
install -m 0644 %{SOURCE4} \
%{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
-install -D -m 644 %{SOURCE7}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openslp
install -D -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/slpd.service
@@ -242,7 +240,6 @@
%{_sbindir}/slpd
%config(noreplace) %{_sysconfdir}/slp.reg
%config(noreplace) %{_sysconfdir}/logrotate.d/openslp-server
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openslp
%{_unitdir}/slpd.service
%files devel
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2019-06-13 22:32:58
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new.4811 (New)
Package is "openslp"
Thu Jun 13 22:32:58 2019 rev:52 rq:709417 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2018-09-05
13:47:54.190191980 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new.4811/openslp.changes
2019-06-13 22:32:59.544388186 +0200
@@ -1,0 +2,37 @@
+Wed Jun 12 11:32:40 UTC 2019 - Tomáš Chvátal
+
+- Explicitely require library on develpackage and do not pull
+ in the base package with slptool binary
+
+---
+Sun Jun 9 14:53:07 UTC 2019 - Jan Engelhardt
+
+- Fixup summaries: SDK already includes "development",
+ and shared library is unspecific. Remove marketing wording
+ from descriptions.
+
+---
+Fri Jun 7 16:00:46 CEST 2019 - m...@suse.de
+
+- Use tcp connects to talk with other DAs [bnc#1117969]
+ new patch: openslp.tcpknownda.diff
+- Fix segfault in predicate match if a registered service has
+ a malformed attribute list [bnc#1136136]
+ new patch: openslp.nullattr.diff
+
+---
+Thu Jun 6 16:17:45 UTC 2019 - Tomáš Chvátal
+
+- Remove < SLE12 as it is no longer supported
+- Remove obsolete conditions/etc.
+ * dropped file: slpd.init
+- Cleanup with spec-cleaner
+- Split out shared library properly
+
+---
+Thu Jun 6 09:31:19 UTC 2019 - Tomáš Chvátal
+
+- Drop the omc config fate#301838:
+ * it is obsolete since SLE11
+
+---
Old:
slpd.init
slpd.xml
New:
openslp.nullattr.diff
openslp.tcpknownda.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.dZzny2/_old 2019-06-13 22:33:00.688387815 +0200
+++ /var/tmp/diff_new_pack.dZzny2/_new 2019-06-13 22:33:00.692387814 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,32 +16,19 @@
#
+%define libname libslp1
Name: openslp
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: libtool
-BuildRequires: openssl-devel
-%if 0%{?suse_version} > 1140
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(systemd)
-%define has_systemd 1
-%endif
-Summary:An OpenSLP Implementation of Service Location Protocol V2
-License:BSD-3-Clause
-Group: System/Daemons
Version:2.0.0
Release:0
-Url:http://www.openslp.org/
-#
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:
http://sourceforge.net/projects/openslp/files/2.0.0/%{version}/%name-%version.tar.gz
-Source1:slpd.init
+Summary:An Implementation of Service Location Protocol V2
+License:BSD-3-Clause
+Group: System/Daemons
+URL:http://www.openslp.org/
+Source0:
http://sourceforge.net/projects/openslp/files/2.0.0/%{version}/%{name}-%{version}.tar.gz
Source2:README.SUSE
Source3:openslp.desktop
Source4:openslp-devel.desktop
Source5:openslp.logrotate
-Source6:slpd.xml
Source7:openslp.SuSEfirewall2
Source8:baselibs.conf
Source9:slpd.service
@@ -67,12 +54,22 @@
Patch19:openslp.localaddr.diff
Patch20:openslp.tcpunicast.diff
Patch21:openslp-2.0.0-ifdef-slpv2.diff
+Patch22:openslp.tcpknownda.diff
+Patch23:openslp.nullattr.diff
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(zlib)
%description
Service Location Protocol is an IETF standards track protocol that
provides a framework that allows networking applications to discover
the existence, location, and configuration of networked services in
-enterprise networks.
+networks.
OpenSLP is an open source implementation of the SLPv2 protocol as
defined by RFC 2608 and RFC 2614. This package includes the slptool
@@ -81,35 +78,42 @@
%package server
Summary:The OpenSLP Implementation of the Service Location
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2018-09-05 13:47:49
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Wed Sep 5 13:47:49 2018 rev:51 rq:632857 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2018-04-16
12:42:53.158435125 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2018-09-05
13:47:54.190191980 +0200
@@ -1,0 +2,6 @@
+Mon Aug 27 22:13:24 UTC 2018 - Jason Sikes
+
+- Fixed failure to compile when ENABLE_SLPv2_SECURITY is not set
+ new patch: openslp-2.0.0-ifdef-slpv2.diff
+
+---
New:
openslp-2.0.0-ifdef-slpv2.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.gM1oBi/_old 2018-09-05 13:47:55.078193470 +0200
+++ /var/tmp/diff_new_pack.gM1oBi/_new 2018-09-05 13:47:55.078193470 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -66,6 +66,7 @@
Patch18:openslp.openssl-1.1.diff
Patch19:openslp.localaddr.diff
Patch20:openslp.tcpunicast.diff
+Patch21:openslp-2.0.0-ifdef-slpv2.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -138,6 +139,7 @@
%patch18 -p2
%patch19
%patch20
+%patch21 -p1
%build
autoreconf -fiv
++ openslp-2.0.0-ifdef-slpv2.diff ++
Index: openslp-2.0.0/slpd/slpd_process.c
===
--- openslp-2.0.0.orig/slpd/slpd_process.c
+++ openslp-2.0.0/slpd/slpd_process.c
@@ -1055,7 +1055,9 @@ RESPOND:
if (truncate && size > truncate && G_SlpdProperty.hardMTU)
{
attrlistlen = 0;
+#ifdef ENABLE_SLPv2_SECURITY
opaqueauth = 0;
+#endif
size = message->header.langtaglen + 19; /* 14 bytes for header */
truncated = 1;
}
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2018-04-16 12:42:51
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Mon Apr 16 12:42:51 2018 rev:50 rq:595666 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2018-03-20
21:51:21.857116648 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2018-04-16
12:42:53.158435125 +0200
@@ -1,0 +2,7 @@
+Wed Apr 11 14:39:03 CEST 2018 - m...@suse.de
+
+- move systemd notification before the chroot() call, otherwise
+ the notify function cannot reach systend's unix domain socket
+ [bnc#1089097]
+
+---
Other differences:
--
++ openslp.sd_notify.diff ++
--- /var/tmp/diff_new_pack.AgsGZJ/_old 2018-04-16 12:42:54.142399320 +0200
+++ /var/tmp/diff_new_pack.AgsGZJ/_new 2018-04-16 12:42:54.146399174 +0200
@@ -1,24 +1,5 @@
slpd/slpd_main.c.orig
-+++ slpd/slpd_main.c
-@@ -59,6 +59,8 @@
- #include "slp_net.h"
- #include "slp_network.h"
-
-+#include
-+
- int G_SIGALRM;
- int G_SIGTERM;
- int G_SIGHUP;
-@@ -748,6 +750,7 @@ int main(int argc, char * argv[])
-alarm(2);
-
-/* Main loop */
-+ sd_notify(0, "READY=1");
-SLPDLog("Startup complete entering main run loop ...\n\n");
-G_SIGALRM = 0;
-G_SIGTERM = 0;
configure.ac.orig
-+++ configure.ac
+--- ./configure.ac.orig2013-06-08 04:58:54.0 +
./configure.ac 2018-04-11 12:36:14.299642065 +
@@ -35,6 +35,10 @@ AC_CHECK_LIB([nsl], [gethostbyname])
AC_CHECK_LIB([m], [log10])
AC_CHECK_LIB([pthread], [pthread_create])
@@ -30,8 +11,8 @@
#
# Checks for header files
#
slpd/Makefile.am.orig
-+++ slpd/Makefile.am
+--- ./slpd/Makefile.am.orig2018-04-11 12:35:51.810698096 +
./slpd/Makefile.am 2018-04-11 12:36:14.300642062 +
@@ -95,5 +95,5 @@ noinst_HEADERS = \
slpd_initda.h
@@ -39,3 +20,24 @@
-slpd_LDADD = ../common/libcommonslpd.la ../libslpattr/libslpattr.la
+slpd_LDADD = $(SYSTEMD_LIBS) ../common/libcommonslpd.la
../libslpattr/libslpattr.la
+--- ./slpd/slpd_main.c.orig2018-04-11 12:35:51.814698086 +
./slpd/slpd_main.c 2018-04-11 12:38:04.513363806 +
+@@ -59,6 +59,8 @@
+ #include "slp_net.h"
+ #include "slp_network.h"
+
++#include
++
+ int G_SIGALRM;
+ int G_SIGTERM;
+ int G_SIGHUP;
+@@ -704,6 +706,9 @@ int main(int argc, char * argv[])
+/* init watcher */
+SLPDDatabaseWatcher();
+
++ /* tell systemd what we are ready */
++ sd_notify(0, "READY=1");
++
+/* drop privileges to reduce security risk */
+if (DropPrivileges())
+ SLPDFatal("Could not drop privileges\n");
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2018-03-20 21:51:20
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Tue Mar 20 21:51:20 2018 rev:49 rq:586340 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2017-12-03
10:04:46.021867800 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2018-03-20
21:51:21.857116648 +0100
@@ -1,0 +2,10 @@
+Thu Mar 1 16:59:01 CET 2018 - m...@suse.de
+
+- Use %license (boo#1082318)
+- fix slpd using the peer address as local address for TCP
+ connections [bnc#1076035]
+ new patch: openslp.localaddr.diff
+- use tcp connections for unicast requests [bnc#1080964]
+ new patch: openslp.tcpunicast.diff
+
+---
New:
openslp.localaddr.diff
openslp.tcpunicast.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.KEa6gK/_old 2018-03-20 21:51:24.009039157 +0100
+++ /var/tmp/diff_new_pack.KEa6gK/_new 2018-03-20 21:51:24.013039013 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -64,6 +64,8 @@
Patch16:openslp.xrealloc.diff
Patch17:openslp.foldws.diff
Patch18:openslp.openssl-1.1.diff
+Patch19:openslp.localaddr.diff
+Patch20:openslp.tcpunicast.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -134,6 +136,8 @@
%patch16
%patch17
%patch18 -p2
+%patch19
+%patch20
%build
autoreconf -fiv
@@ -158,7 +162,7 @@
cp libslp/slp.h ${RPM_BUILD_ROOT}/usr/include
mkdir -p ${RPM_BUILD_ROOT}%_defaultdocdir/%name
find . -name CVS -o -name .cvsignore -o -name .xvpics | xargs rm -rf
-cp -a AUTHORS COPYING README FAQ doc/doc/rfc doc/doc/html %SOURCE2 \
+cp -a AUTHORS README FAQ doc/doc/rfc doc/doc/html %SOURCE2 \
${RPM_BUILD_ROOT}%_defaultdocdir/%name
%if 0%{?has_systemd}
ln -s %{_sbindir}/service ${RPM_BUILD_ROOT}/usr/sbin/rcslpd
@@ -237,10 +241,10 @@
%files
%defattr(-,root,root)
+%license COPYING
%dir %_defaultdocdir/%name
%dir %_defaultdocdir/%name/html
%doc %_defaultdocdir/%name/AUTHORS
-%doc %_defaultdocdir/%name/COPYING
%doc %_defaultdocdir/%name/README
%doc %_defaultdocdir/%name/README.SUSE
%_libdir/libslp.so.*
++ openslp.localaddr.diff ++
--- ./slpd/slpd_incoming.c.orig 2018-03-01 15:55:45.008171255 +
+++ ./slpd/slpd_incoming.c 2018-03-01 15:56:23.183054003 +
@@ -354,7 +354,7 @@ static void IncomingSocketListen(SLPList
connsock->fd = fd;
memcpy(>peeraddr, ,
sizeof(struct sockaddr_storage));
-memcpy(>localaddr, ,
+memcpy(>localaddr, >localaddr,
sizeof(struct sockaddr_storage));
connsock->state = STREAM_READ_FIRST;
#ifndef _WIN32
++ openslp.tcpunicast.diff ++
--- libslp/libslp_network.c.orig2018-03-01 16:08:38.813669170 +
+++ libslp/libslp_network.c 2018-03-05 15:59:56.140618236 +
@@ -1426,7 +1426,13 @@ SLPError NetworkUcastRqstRply(SLPHandleI
/*In reality, this function just sets things up for NetworkRqstRply to
operate*/
if(handle->unicastsock == SLP_INVALID_SOCKET) /*The unicast code will
certainly reuse this socket*/
- handle->unicastsock =
SLPNetworkCreateDatagram(handle->ucaddr.ss_family);
+ {
+ struct timeval timeout;
+ int maxwait = SLPPropertyAsInteger("net.slp.unicastMaximumWait");
+ timeout.tv_sec = maxwait / 1000;
+ timeout.tv_usec = (maxwait % 1000) * 1000;
+ handle->unicastsock = SLPNetworkConnectStream(>ucaddr,
);
+ }
if (handle->unicastsock == SLP_INVALID_SOCKET)
return SLP_NETWORK_ERROR;
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2017-12-03 10:04:22
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Sun Dec 3 10:04:22 2017 rev:48 rq:546559 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2017-06-18
13:49:54.910831371 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2017-12-03
10:04:46.021867800 +0100
@@ -1,0 +2,6 @@
+Wed Nov 29 17:25:48 CET 2017 - r...@suse.de
+
+- add separate source openslp.logrotate.systemd to
+ use systemctl reload for logrotate configuration
+
+---
New:
openslp.logrotate.systemd
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.WmOTR1/_old 2017-12-03 10:04:51.153681220 +0100
+++ /var/tmp/diff_new_pack.WmOTR1/_new 2017-12-03 10:04:51.153681220 +0100
@@ -45,6 +45,7 @@
Source7:openslp.SuSEfirewall2
Source8:baselibs.conf
Source9:slpd.service
+Source10: openslp.logrotate.systemd
Patch1: openslp.audit.diff
Patch2: extensions.diff
Patch3: openslp.truncate.diff
@@ -166,13 +167,14 @@
exec /usr/sbin/rcslpd "$@"
EOF
chmod 755 ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
+install -D -m 0644 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/logrotate.d/openslp-server
%else
mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/etc/init.d/slpd
ln -sf ../../etc/init.d/slpd ${RPM_BUILD_ROOT}/usr/sbin/rcslpd
ln -sf ../../etc/init.d/slpd ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
-%endif
install -D -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}/etc/logrotate.d/openslp-server
+%endif
# install susehelp file
mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta/Administration/
install -m 0644 %SOURCE3 \
++ openslp.logrotate.systemd ++
/var/log/slpd.log {
compress
dateext
maxage 14
rotate 99
size +1024k
notifempty
missingok
create 600 root root
sharedscripts
postrotate
systemctl reload slpd.service
endscript
}
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2017-06-18 13:49:19
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Sun Jun 18 13:49:19 2017 rev:47 rq:503531 version:2.0.0
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2017-01-15
10:56:37.516712950 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2017-06-18
13:49:54.910831371 +0200
@@ -1,0 +2,6 @@
+Tue Jun 13 08:28:35 UTC 2017 - daniel.molken...@suse.com
+
+- Add support for OpenSSL 1.1. Commit from upstream [bsc#1042665]
+ new patch: openslp.openssl-1.1.diff
+
+---
New:
openslp.openssl-1.1.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.F3oJcK/_old 2017-06-18 13:49:56.266640585 +0200
+++ /var/tmp/diff_new_pack.F3oJcK/_new 2017-06-18 13:49:56.270640023 +0200
@@ -62,6 +62,7 @@
Patch15:openslp.noconvenience.diff
Patch16:openslp.xrealloc.diff
Patch17:openslp.foldws.diff
+Patch18:openslp.openssl-1.1.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -131,6 +132,7 @@
%patch15
%patch16
%patch17
+%patch18 -p2
%build
autoreconf -fiv
++ openslp.openssl-1.1.diff ++
--- a/openslp/common/slp_crypto.c
+++ b/openslp/common/slp_crypto.c
@@ -53,6 +53,80 @@
#include "slp_crypto.h"
#include "slp_message.h"
+/* 1.1.0 -> 1.0.x compatibility layer
+ * See
https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes#Compatibility_Layer
+ * for details and additiona compatibility routines if needed in the future.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x1010L
+static void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
const BIGNUM **g)
+{
+if (p != NULL)
+*p = d->p;
+if (q != NULL)
+*q = d->q;
+if (g != NULL)
+*g = d->g;
+}
+
+static int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+{
+/* If the fields p, q and g in d are NULL, the corresponding input
+ * parameters MUST be non-NULL.
+ */
+if ((d->p == NULL && p == NULL)
+|| (d->q == NULL && q == NULL)
+|| (d->g == NULL && g == NULL))
+return 0;
+
+if (p != NULL)
+{
+BN_free(d->p);
+d->p = p;
+}
+if (q != NULL)
+{
+BN_free(d->q);
+d->q = q;
+}
+if (g != NULL)
+{
+BN_free(d->g);
+d->g = g;
+}
+return 1;
+}
+
+static void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM
**priv_key)
+{
+if (pub_key != NULL)
+*pub_key = d->pub_key;
+if (priv_key != NULL)
+*priv_key = d->priv_key;
+}
+
+static int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
+{
+/* If the field pub_key in d is NULL, the corresponding input
+ * parameters MUST be non-NULL. The priv_key field may
+ * be left NULL.
+ */
+if (d->pub_key == NULL && pub_key == NULL)
+return 0;
+
+if (pub_key != NULL)
+{
+BN_free(d->pub_key);
+d->pub_key = pub_key;
+}
+if (priv_key != NULL)
+{
+BN_free(d->priv_key);
+d->priv_key = priv_key;
+}
+return 1;
+}
+#endif
+
/** Generate a SHA1 digest for the specified block data.
*
* @param[in] data - The data block to be hashed.
@@ -88,11 +162,17 @@
result = DSA_new();
if (result)
{
- result->p = BN_dup(dsa->p);
- result->q = BN_dup(dsa->q);
- result->g = BN_dup(dsa->g);
- result->priv_key = BN_dup(dsa->priv_key);
- result->pub_key = BN_dup(dsa->pub_key);
+ const BIGNUM *p, *q, *g;
+ const BIGNUM *priv_key, *pub_key;
+
+ DSA_get0_pqg(dsa, , , );
+ DSA_get0_key(dsa, _key, _key);
+
+ /* would be nice to check return values,
+ * but original code didn't do that either...
+ */
+ DSA_set0_pqg(result, BN_dup(p), BN_dup(q), BN_dup(g));
+ DSA_set0_key(result, BN_dup(pub_key), BN_dup(priv_key));
}
return result;
}
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2016-10-14 09:27:34
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2016-09-17
14:36:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2016-10-14
09:27:35.0 +0200
@@ -1,0 +2,7 @@
+Wed Oct 12 13:53:08 CEST 2016 - m...@suse.de
+
+- Fix bounds check in SLPFoldWhiteSpace
+ [bnc#1001600] [CVE-2016-7567]
+ new patch: openslp.foldws.diff
+
+---
New:
openslp.foldws.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.tyHvLR/_old 2016-10-14 09:27:36.0 +0200
+++ /var/tmp/diff_new_pack.tyHvLR/_new 2016-10-14 09:27:36.0 +0200
@@ -61,6 +61,7 @@
Patch14:openslp.doubleequal.diff
Patch15:openslp.noconvenience.diff
Patch16:openslp.xrealloc.diff
+Patch17:openslp.foldws.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -129,6 +130,7 @@
%patch14
%patch15
%patch16
+%patch17
%build
autoreconf -fiv
++ openslp.foldws.diff ++
--- ./common/slp_compare.c.orig 2016-10-12 11:44:17.925163946 +
+++ ./common/slp_compare.c 2016-10-12 11:50:22.658115399 +
@@ -204,7 +204,7 @@ static int SLPFoldWhiteSpace(size_t len,
if (isspace(*p))
{
char * ws2p = ++p; /* Point ws2p to the second ws char. */
- while (isspace(*p))/* Scan till we hit a non-ws char. */
+ while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
p++;
len -= p - ws2p; /* Reduce the length by extra ws. */
memmove(ws2p, p, ep - p); /* Overwrite the extra white space. */
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2016-09-17 14:36:50
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is "openslp"
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2015-03-23
12:14:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2016-09-17
14:36:51.0 +0200
@@ -1,0 +2,17 @@
+Mon Sep 12 14:23:15 CEST 2016 - m...@suse.de
+
+- remove convenience code as changes bytes in the message
+ buffer breaking the verification code [bnc#994989]
+ new patch: openslp.noconvenience.diff
+- fix storage handling in predicate code, it clashed with gcc's
+ fortify_source extension [bnc#909195]
+ new patch: openslp.predicatestorage.diff
+- bring back allowDoubleEqualInPredicate option
+ new patch: openslp.doubleequal.diff
+- fix bug in openslp.initda.diff patch
+- fix rcopenslp helper
+- fix _xrealloc not checking the malloc return value
+ [bnc#980722] [CVE-2016-4912]
+ new patch: openslp.xrealloc.diff
+
+---
New:
openslp.doubleequal.diff
openslp.noconvenience.diff
openslp.predicatestorage.diff
openslp.xrealloc.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.LWW0j7/_old 2016-09-17 14:36:53.0 +0200
+++ /var/tmp/diff_new_pack.LWW0j7/_new 2016-09-17 14:36:53.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -57,6 +57,10 @@
Patch10:openslp.tcplocal.diff
Patch11:openslp.localtime.diff
Patch12:openslp.sd_notify.diff
+Patch13:openslp.predicatestorage.diff
+Patch14:openslp.doubleequal.diff
+Patch15:openslp.noconvenience.diff
+Patch16:openslp.xrealloc.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -121,6 +125,11 @@
%if 0%{?has_systemd}
%patch12
%endif
+%patch13
+%patch14
+%patch15
+%patch16
+
%build
autoreconf -fiv
%configure --disable-static --with-pic --enable-slpv1 \
@@ -148,7 +157,11 @@
${RPM_BUILD_ROOT}%_defaultdocdir/%name
%if 0%{?has_systemd}
ln -s %{_sbindir}/service ${RPM_BUILD_ROOT}/usr/sbin/rcslpd
-ln -s %{_sbindir}/service ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
+cat > ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp <<'EOF'
+#!/bin/sh
+exec /usr/sbin/rcslpd "$@"
+EOF
+chmod 755 ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
%else
mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/etc/init.d/slpd
++ openslp.doubleequal.diff ++
--- ./slpd/slpd_predicate.c.orig2014-12-15 14:11:36.181812237 +
+++ ./slpd/slpd_predicate.c 2014-12-15 14:20:00.441759165 +
@@ -66,6 +66,7 @@
#include "slp_xmalloc.h"
#include "slpd_predicate.h"
+#include "slpd_property.h"
/* Parse character definitions. */
#define BRACKET_OPEN '('
@@ -1633,6 +1634,11 @@ SLPDPredicateParseResult createPredicate
op = EQUAL;
}
+ if (op == EQUAL && G_SlpdProperty.allowDoubleEqualInPredicate &&
operator[1] == '=')
+ {
+ val_start++;
+ }
+
/* Get operands. */
/ Left. /
lhs_len = operator - cur;
--- ./slpd/slpd_property.c.orig 2014-12-15 14:09:49.294246247 +
+++ ./slpd/slpd_property.c 2014-12-15 14:11:21.587871548 +
@@ -250,6 +250,7 @@ void SLPDPropertyReinit(void)
G_SlpdProperty.myHostnameLen = strlen(G_SlpdProperty.myHostname);
G_SlpdProperty.hardMTU = SLPPropertyAsBoolean("net.slp.hardMTU");
+ G_SlpdProperty.allowDoubleEqualInPredicate =
SLPPropertyAsBoolean("net.slp.allowDoubleEqualInPredicate");
G_SlpdProperty.DASyncReg = SLPPropertyAsBoolean("net.slp.DASyncReg");
G_SlpdProperty.isDABackup = SLPPropertyAsBoolean("net.slp.isDABackup");
--- ./slpd/slpd_property.h.orig 2014-12-15 14:09:43.647269171 +
+++ ./slpd/slpd_property.h 2014-12-15 14:10:24.932101603 +
@@ -118,6 +118,7 @@ typedef struct _SLPDProperty
int useDHCP;
int oversizedUDP;
int hardMTU;
+ int allowDoubleEqualInPredicate;
int DASyncReg;
int isDABackup;
++ openslp.initda.diff ++
--- /var/tmp/diff_new_pack.LWW0j7/_old 2016-09-17 14:36:53.0 +0200
+++ /var/tmp/diff_new_pack.LWW0j7/_new 2016-09-17 14:36:53.0 +0200
@@ -1,5 +1,5 @@
./common/slp_message.h.orig2014-02-19 18:05:26.154934647 +
-+++
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2015-03-23 12:14:24
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2014-09-10
07:28:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2015-03-23
12:14:25.0 +0100
@@ -1,0 +2,6 @@
+Sun Mar 8 00:39:27 UTC 2015 - p.drou...@gmail.com
+
+- Do not depend on fillup and insserv if the package build with
+ systemd support; the dependencies are not needed in that case
+
+---
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.KenZkj/_old 2015-03-23 12:14:26.0 +0100
+++ /var/tmp/diff_new_pack.KenZkj/_new 2015-03-23 12:14:26.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,10 +33,6 @@
Version:2.0.0
Release:0
Url:http://www.openslp.org/
-# bug437293
-%ifarch ppc64
-Obsoletes: openslp-64bit
-%endif
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://sourceforge.net/projects/openslp/files/2.0.0/%{version}/%name-%version.tar.gz
@@ -75,9 +71,11 @@
%package server
Summary:The OpenSLP Implementation of the Service Location Protocol V2
Group: System/Daemons
-PreReq: %fillup_prereq %insserv_prereq /usr/sbin/useradd
+PreReq: /usr/sbin/useradd
%if 0%{?has_systemd}
%{?systemd_requires}
+%else
+PreReq: %fillup_prereq %insserv_prereq
%endif
Recommends: logrotate
@@ -96,11 +94,6 @@
Requires: openssl-devel
Summary:OpenSLP Development SDK
Group: System/Daemons
-# bug437293
-%ifarch ppc64
-Obsoletes: openslp-devel-64bit
-%endif
-#
%description devel
Service Location Protocol is an IETF standards track protocol that
@@ -209,8 +202,6 @@
%endif
%postun server
-%restart_on_update slpd
-%insserv_cleanup
%if 0%{?has_systemd}
%service_del_postun slpd.service
%else
@@ -234,7 +225,7 @@
%doc %_defaultdocdir/%name/README
%doc %_defaultdocdir/%name/README.SUSE
%_libdir/libslp.so.*
-/usr/bin/slptool
+%{_bindir}/slptool
%config(noreplace) /etc/slp.conf
%config(noreplace) /etc/slp.spi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2014-09-10 07:28:30
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2014-04-23
20:35:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2014-09-10
07:28:31.0 +0200
@@ -1,0 +2,17 @@
+Mon Sep 1 15:58:06 CEST 2014 - m...@suse.de
+
+- fix last commit
+
+---
+Mon Jul 28 02:36:48 UTC 2014 - crrodrig...@opensuse.org
+
+- Do not apply previous patch to distros without systemd.
+- Limit init script usage only to legacy products.
+
+---
+Sun Jul 27 21:18:25 UTC 2014 - crrodrig...@opensuse.org
+
+- openslp.sd_notify.diff make slpd systemd service of type
+ notify instead of simple, to avoid startup races.
+
+---
New:
openslp.sd_notify.diff
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.rfXu4V/_old 2014-09-10 07:28:32.0 +0200
+++ /var/tmp/diff_new_pack.rfXu4V/_new 2014-09-10 07:28:32.0 +0200
@@ -22,6 +22,8 @@
BuildRequires: libtool
BuildRequires: openssl-devel
%if 0%{?suse_version} 1140
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(systemd)
%define has_systemd 1
%endif
@@ -58,6 +60,7 @@
Patch9: openslp.hardmtu.diff
Patch10:openslp.tcplocal.diff
Patch11:openslp.localtime.diff
+Patch12:openslp.sd_notify.diff
%description
Service Location Protocol is an IETF standards track protocol that
@@ -122,7 +125,9 @@
%patch9
%patch10
%patch11
-
+%if 0%{?has_systemd}
+%patch12
+%endif
%build
autoreconf -fiv
%configure --disable-static --with-pic --enable-slpv1 \
@@ -148,10 +153,15 @@
find . -name CVS -o -name .cvsignore -o -name .xvpics | xargs rm -rf
cp -a AUTHORS COPYING README FAQ doc/doc/rfc doc/doc/html %SOURCE2 \
${RPM_BUILD_ROOT}%_defaultdocdir/%name
+%if 0%{?has_systemd}
+ln -s %{_sbindir}/service ${RPM_BUILD_ROOT}/usr/sbin/rcslpd
+ln -s %{_sbindir}/service ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
+%else
mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/etc/init.d/slpd
ln -sf ../../etc/init.d/slpd ${RPM_BUILD_ROOT}/usr/sbin/rcslpd
ln -sf ../../etc/init.d/slpd ${RPM_BUILD_ROOT}/usr/sbin/rcopenslp
+%endif
install -D -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}/etc/logrotate.d/openslp-server
# install susehelp file
mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta/Administration/
@@ -192,13 +202,10 @@
%endif
%post server
-%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
-%{fillup_and_insserv -y slpd}
-%else
-%{fillup_and_insserv slpd}
-%endif
%if 0%{?has_systemd}
%service_add_post slpd.service
+%else
+%{fillup_and_insserv slpd}
%endif
%postun server
@@ -206,12 +213,16 @@
%insserv_cleanup
%if 0%{?has_systemd}
%service_del_postun slpd.service
+%else
+%restart_on_update slpd
+%insserv_cleanup
%endif
%preun server
-%stop_on_removal slpd
%if 0%{?has_systemd}
%service_del_preun slpd.service
+%else
+%stop_on_removal slpd
%endif
%files
@@ -243,7 +254,6 @@
/usr/sbin/rcopenslp
/usr/sbin/rcslpd
/usr/sbin/slpd
-%config /etc/init.d/slpd
%config(noreplace) /etc/slp.reg
%config(noreplace) /etc/logrotate.d/openslp-server
/usr/share/omc/svcinfo.d/slpd.xml
@@ -252,6 +262,8 @@
%endif
%if 0%{?has_systemd}
%{_unitdir}/slpd.service
+%else
+%config /etc/init.d/slpd
%endif
%files devel
++ openslp.sd_notify.diff ++
--- slpd/slpd_main.c.orig
+++ slpd/slpd_main.c
@@ -59,6 +59,8 @@
#include slp_net.h
#include slp_network.h
+#include systemd/sd-daemon.h
+
int G_SIGALRM;
int G_SIGTERM;
int G_SIGHUP;
@@ -748,6 +750,7 @@ int main(int argc, char * argv[])
alarm(2);
/* Main loop */
+ sd_notify(0, READY=1);
SLPDLog(Startup complete entering main run loop ...\n\n);
G_SIGALRM = 0;
G_SIGTERM = 0;
--- configure.ac.orig
+++ configure.ac
@@ -35,6 +35,10 @@ AC_CHECK_LIB([nsl], [gethostbyname])
AC_CHECK_LIB([m], [log10])
AC_CHECK_LIB([pthread], [pthread_create])
+PKG_PROG_PKG_CONFIG
+
+PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon])
+
#
# Checks for header files
#
--- slpd/Makefile.am.orig
+++ slpd/Makefile.am
@@ -95,5 +95,5 @@ noinst_HEADERS = \
slpd_initda.h
#if you're building on Irix, replace .la with .a below
-slpd_LDADD = ../common/libcommonslpd.la ../libslpattr/libslpattr.la
+slpd_LDADD = $(SYSTEMD_LIBS) ../common/libcommonslpd.la
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2014-04-23 20:35:37
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2014-02-22
20:44:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2014-04-23
20:35:38.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 10 16:56:24 CEST 2014 - m...@suse.de
+
+- use AI_CANONNAME when looking up the canonical name
+
+---
Other differences:
--
++ extensions.diff ++
--- /var/tmp/diff_new_pack.S7QDNt/_old 2014-04-23 20:35:39.0 +0200
+++ /var/tmp/diff_new_pack.S7QDNt/_new 2014-04-23 20:35:39.0 +0200
@@ -1,5 +1,5 @@
--- ./common/slp_compare.c.orig2012-12-12 19:12:43.0 +
-+++ ./common/slp_compare.c 2014-02-19 16:51:59.737942446 +
./common/slp_compare.c 2014-04-10 14:54:49.730301497 +
@@ -414,6 +414,16 @@ int SLPCompareNamingAuth(size_t srvtypel
if (namingauthlen == 0x)
return 0;/* match all naming authorities */
@@ -18,7 +18,7 @@
if (!namingauthlen)
return dot? 1: 0;/* IANA naming authority */
--- ./common/slp_message.h.orig2012-12-07 20:13:28.0 +
-+++ ./common/slp_message.h 2014-02-19 16:51:59.738942446 +
./common/slp_message.h 2014-04-10 14:54:49.730301497 +
@@ -127,6 +127,11 @@
#define SLP_REG_SOURCE_LOCAL 2 /* from localhost or IPC */
#define SLP_REG_SOURCE_STATIC3 /* from the slp.reg file */
@@ -41,7 +41,7 @@
} SLPSrvReg;
--- ./common/slp_property.c.orig 2012-12-10 23:31:53.0 +
-+++ ./common/slp_property.c2014-02-19 16:51:59.739942446 +
./common/slp_property.c2014-04-10 14:54:49.730301497 +
@@ -80,12 +80,17 @@ static SLPList s_PropertyList = {0, 0, 0
/** The (optional) application-specified property file - module static. */
@@ -158,8 +158,8 @@
SLPMutexDestroy(s_PropDbLock);
s_PropertiesInitialized = false;
}
./common/slp_property.h.orig 2014-02-19 16:52:45.865942364 +
-+++ ./common/slp_property.h2014-02-19 16:53:02.255942335 +
+--- ./common/slp_property.h.orig 2012-11-28 17:07:04.0 +
./common/slp_property.h2014-04-10 14:54:49.730301497 +
@@ -66,6 +66,7 @@ int SLPPropertySetAppConfFile(const char
int SLPPropertyReinit(void);
int SLPPropertyInit(const char * gconffile);
@@ -169,7 +169,7 @@
/*! Special function to access MTU configuration property value. This provides
* fast access to the MTU value both in client libraries and server program.
--- ./common/slp_spi.c.orig2012-11-28 17:07:04.0 +
-+++ ./common/slp_spi.c 2014-02-19 16:51:59.739942446 +
./common/slp_spi.c 2014-04-10 14:54:49.730301497 +
@@ -426,6 +426,17 @@ int SLPSpiCanSign(SLPSpiHandle hspi, siz
spistrlen, spistr) != 0;
}
@@ -189,7 +189,7 @@
/*=*/
--- ./common/slp_spi.h.orig2012-11-28 17:07:04.0 +
-+++ ./common/slp_spi.h 2014-02-19 16:51:59.740942446 +
./common/slp_spi.h 2014-04-10 14:54:49.730301497 +
@@ -106,6 +106,8 @@ int SLPSpiCanVerify(SLPSpiHandle hspi, s
int SLPSpiCanSign(SLPSpiHandle hspi, size_t spistrlen, const char * spistr);
@@ -200,7 +200,7 @@
/*! @} */
--- ./libslp/libslp_findsrvs.c.orig2012-11-28 17:07:04.0 +
-+++ ./libslp/libslp_findsrvs.c 2014-02-19 16:51:59.740942446 +
./libslp/libslp_findsrvs.c 2014-04-10 14:54:49.731301477 +
@@ -64,7 +64,7 @@
*/
static SLPBoolean CollateToSLPSrvURLCallback(SLPHandle hSLP,
@@ -306,7 +306,7 @@
}
SLPMessageFree(replymsg);
--- ./libslp/slp.h.orig2012-11-28 17:07:04.0 +
-+++ ./libslp/slp.h 2014-02-19 16:51:59.740942446 +
./libslp/slp.h 2014-04-10 14:54:49.731301477 +
@@ -606,6 +606,15 @@ SLPEXP SLPError SLPAPI SLPAssociateIP(
SLPHandle hSLP,
const char * unicast_ip);
@@ -324,7 +324,7 @@
}
#endif
--- ./libslpattr/libslpattr.c.orig 2012-12-10 23:31:53.0 +
-+++ ./libslpattr/libslpattr.c 2014-02-19 16:51:59.740942446 +
./libslpattr/libslpattr.c 2014-04-10 14:54:49.731301477 +
@@ -393,6 +393,9 @@ static char * unescape_into(char * dest,
(*cur)++;
}
@@ -336,7 +336,7 @@
return 1;
}
--- ./slpd/slpd_database.c.orig2012-12-10 23:31:53.0 +
-+++ ./slpd/slpd_database.c 2014-02-19 16:51:59.741942446
commit openslp for openSUSE:Factory
Hello community, here is the log from the commit of package openslp for openSUSE:Factory checked in at 2013-07-16 16:46:10 Comparing /work/SRC/openSUSE:Factory/openslp (Old) and /work/SRC/openSUSE:Factory/.openslp.new (New) Package is openslp Changes: --- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2013-04-17 07:43:22.0 +0200 +++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2013-07-16 16:46:11.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 16 13:44:12 CEST 2013 - m...@suse.de + +- fix wrong dir modifier in filelist + +--- Other differences: -- ++ openslp.spec ++ --- /var/tmp/diff_new_pack.eSAOnd/_old 2013-07-16 16:46:12.0 +0200 +++ /var/tmp/diff_new_pack.eSAOnd/_new 2013-07-16 16:46:12.0 +0200 @@ -262,7 +262,7 @@ %dir /usr/share/susehelp %dir /usr/share/susehelp/meta %dir /usr/share/susehelp/meta/Administration -%doc %dir %_defaultdocdir/%name/FAQ +%doc %_defaultdocdir/%name/FAQ %doc %_defaultdocdir/%name/html/IntroductionToSLP %doc %_defaultdocdir/%name/html/UsersGuide %doc %_defaultdocdir/%name/html/faq.html -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2013-04-17 07:43:20
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2012-10-19
08:48:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2013-04-17
07:43:22.0 +0200
@@ -1,0 +2,5 @@
+Mon Apr 15 12:50:48 UTC 2013 - idon...@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---
Old:
openslp-1.2.0.tar.bz2
New:
openslp-1.2.0.tar.gz
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.UV7CuB/_old 2013-04-17 07:43:23.0 +0200
+++ /var/tmp/diff_new_pack.UV7CuB/_new 2013-04-17 07:43:23.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,7 @@
%endif
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:%name-%version.tar.bz2
+Source0:
http://sourceforge.net/projects/openslp/files/OpenSLP/%{version}/%name-%version.tar.gz
Source1:slpd.init
Source2:README.SuSE
Source3:openslp.desktop
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2012-10-19 08:48:47
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2012-09-01
10:32:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2012-10-19
08:48:48.0 +0200
@@ -1,0 +2,6 @@
+Thu Oct 18 11:48:34 UTC 2012 - co...@suse.com
+
+- buildrequire systemd through the pkgconfig provide to get
+ systemd-mini in build environments (to break cycles)
+
+---
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.cfZ2Qe/_old 2012-10-19 08:48:51.0 +0200
+++ /var/tmp/diff_new_pack.cfZ2Qe/_new 2012-10-19 08:48:51.0 +0200
@@ -22,7 +22,7 @@
BuildRequires: libtool
BuildRequires: openssl-devel
%if 0%{?suse_version} 1140
-BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
%define has_systemd 1
%endif
Summary:An OpenSLP Implementation of Service Location Protocol V2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2012-02-08 15:33:53
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2011-11-16
17:20:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2012-02-08
15:33:54.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 22 23:42:12 UTC 2011 - crrodrig...@opensuse.org
+
+- Add native systemd unit
+
+---
New:
slpd.service
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.UaNUsU/_old 2012-02-08 15:33:55.0 +0100
+++ /var/tmp/diff_new_pack.UaNUsU/_new 2012-02-08 15:33:55.0 +0100
@@ -19,6 +19,11 @@
Name: openslp
BuildRequires: bison flex libtool openssl-devel
+%if 0%{?suse_version} 1140
+BuildRequires: systemd
+%{?systemd_requires}
+%define has_systemd 1
+%endif
Summary:An OpenSLP Implementation of Service Location Protocol V2
Version:1.2.0
Release:186
@@ -40,6 +45,7 @@
Source6:slpd.xml
Source7:openslp.SuSEfirewall2
Source8:baselibs.conf
+Source9:slpd.service
Patch1: openslp.diff
Patch2: openslp.audit.diff
Patch3: extensions.diff
@@ -225,7 +231,9 @@
install -D -m 644 %{S:7}
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openslp
%endif
-nm -C -D %{buildroot}%_libdir/libslp.so
+%if 0%{?has_systemd}
+install -D -m 644 %{S:9} %{buildroot}%{_unitdir}/slpd.service
+%endif
%post -p /sbin/ldconfig
@@ -233,6 +241,9 @@
%pre server
/usr/sbin/useradd -r -g daemon -d /var/lib/empty -s /sbin/nologin -c openslp
daemon openslp 2/dev/null || :
+%if 0%{?has_systemd}
+%service_add_pre slpd.service
+%endif
%post server
%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
@@ -240,13 +251,22 @@
%else
%{fillup_and_insserv slpd}
%endif
+%if 0%{?has_systemd}
+%service_add_post slpd.service
+%endif
%postun server
%restart_on_update slpd
%insserv_cleanup
+%if 0%{?has_systemd}
+%service_del_postun slpd.service
+%endif
%preun server
%stop_on_removal slpd
+%if 0%{?has_systemd}
+%service_del_preun slpd.service
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -287,6 +307,9 @@
%if 0%{?suse_version} 0
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openslp
%endif
+%if 0%{?has_systemd}
+%{_unitdir}/slpd.service
+%endif
%files devel
%defattr(-,root,root)
++ slpd.service ++
[Unit]
Description=OpenSLP daemon for the Service Location Protocol
After=network.target nss-lookup.target
[Service]
ExecStart=/usr/sbin/slpd -d
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2012-02-08 21:19:57
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
Package is openslp, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2012-02-08
15:33:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2012-02-08
21:19:59.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb 8 20:14:48 UTC 2012 - co...@suse.com
+
+- move the systemd requires to the server subpackage
+
+---
Other differences:
--
++ openslp.spec ++
--- /var/tmp/diff_new_pack.qBbtS9/_old 2012-02-08 21:20:11.0 +0100
+++ /var/tmp/diff_new_pack.qBbtS9/_new 2012-02-08 21:20:11.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openslp
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products 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,19 +16,20 @@
#
-
Name: openslp
-BuildRequires: bison flex libtool openssl-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: libtool
+BuildRequires: openssl-devel
%if 0%{?suse_version} 1140
BuildRequires: systemd
-%{?systemd_requires}
%define has_systemd 1
%endif
Summary:An OpenSLP Implementation of Service Location Protocol V2
-Version:1.2.0
-Release:186
License:BSD-3-Clause
Group: System/Daemons
+Version:1.2.0
+Release:0
Url:http://www.openslp.org/
# bug437293
%ifarch ppc64
@@ -81,22 +82,13 @@
defined by RFC 2608 and RFC 2614. This package includes the slptool
and runtime libraries.
-
-
-Authors:
-
-Matthew Peterson mpeter...@calderasystems.com
-Ganesan Rajagopal rgane...@myrealbox.com
-David McCormack david.mccorm...@ottawa.com
-Evan Hughes hug...@lab43.org
-Matthieu Desmons m...@ocegr.fr
-Praveen Kumar Amritaluru prav...@india.hp.com
-
%package server
-License:BSD-3-Clause
-Group: System/Daemons
Summary:The OpenSLP Implementation of the Service Location Protocol V2
+Group: System/Daemons
PreReq: %fillup_prereq %insserv_prereq /usr/sbin/useradd
+%if 0%{?has_systemd}
+%{?systemd_requires}
+%endif
Recommends: logrotate
%description server
@@ -109,22 +101,10 @@
services that should be used via an SLP client must run this server and
register the service.
-
-
-Authors:
-
-Matthew Peterson mpeter...@calderasystems.com
-Ganesan Rajagopal rgane...@myrealbox.com
-David McCormack david.mccorm...@ottawa.com
-Evan Hughes hug...@lab43.org
-Matthieu Desmons m...@ocegr.fr
-Praveen Kumar Amritaluru prav...@india.hp.com
-
%package devel
-License:BSD-3-Clause
Requires: openssl-devel openslp = %version
-Group: System/Daemons
Summary:OpenSLP Development SDK
+Group: System/Daemons
# bug437293
%ifarch ppc64
Obsoletes: openslp-devel-64bit
@@ -141,17 +121,6 @@
with SLP support. It also contains developer documentation to develop
such applications.
-
-
-Authors:
-
-Matthew Peterson mpeter...@calderasystems.com
-Ganesan Rajagopal rgane...@myrealbox.com
-David McCormack david.mccorm...@ottawa.com
-Evan Hughes hug...@lab43.org
-Matthieu Desmons m...@ocegr.fr
-Praveen Kumar Amritaluru prav...@india.hp.com
-
%prep
%setup -q
%patch1
@@ -268,9 +237,6 @@
%service_del_preun slpd.service
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%dir %_defaultdocdir/%name
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community, here is the log from the commit of package openslp for openSUSE:Factory checked in at 2011-12-06 18:34:39 Comparing /work/SRC/openSUSE:Factory/openslp (Old) and /work/SRC/openSUSE:Factory/.openslp.new (New) Package is openslp, Maintainer is m...@suse.com Changes: Other differences: -- ++ openslp.spec ++ --- /var/tmp/diff_new_pack.P7nxog/_old 2011-12-06 18:56:14.0 +0100 +++ /var/tmp/diff_new_pack.P7nxog/_new 2011-12-06 18:56:14.0 +0100 @@ -22,7 +22,7 @@ Summary:An OpenSLP Implementation of Service Location Protocol V2 Version:1.2.0 Release:186 -License:BSD3c +License:BSD-3-Clause Group: System/Daemons Url:http://www.openslp.org/ # bug437293 @@ -87,7 +87,7 @@ Praveen Kumar Amritaluru prav...@india.hp.com %package server -License:BSD3c +License:BSD-3-Clause Group: System/Daemons Summary:The OpenSLP Implementation of the Service Location Protocol V2 PreReq: %fillup_prereq %insserv_prereq /usr/sbin/useradd @@ -115,7 +115,7 @@ Praveen Kumar Amritaluru prav...@india.hp.com %package devel -License:BSD3c +License:BSD-3-Clause Requires: openssl-devel openslp = %version Group: System/Daemons Summary:OpenSLP Development SDK -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openslp for openSUSE:Factory
Hello community, here is the log from the commit of package openslp for openSUSE:Factory checked in at 2011-11-16 17:19:49 Comparing /work/SRC/openSUSE:Factory/openslp (Old) and /work/SRC/openSUSE:Factory/.openslp.new (New) Package is openslp, Maintainer is m...@suse.com Changes: --- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2011-09-23 12:20:42.0 +0200 +++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2011-11-16 17:20:27.0 +0100 @@ -1,0 +2,5 @@ +Wed Nov 16 08:19:02 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ openslp.spec ++ --- /var/tmp/diff_new_pack.OpFmxL/_old 2011-11-16 17:20:30.0 +0100 +++ /var/tmp/diff_new_pack.OpFmxL/_new 2011-11-16 17:20:30.0 +0100 @@ -18,7 +18,7 @@ Name: openslp -BuildRequires: bison flex openssl-devel +BuildRequires: bison flex libtool openssl-devel Summary:An OpenSLP Implementation of Service Location Protocol V2 Version:1.2.0 Release:186 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
