rpms/openslp/EL-5 openslp-1.2.1-nullauth.patch, NONE, 1.1 openslp.spec, 1.15, 1.16

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/openslp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19292

Modified Files:
	openslp.spec 
Added Files:
	openslp-1.2.1-nullauth.patch 
Log Message:
* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)


openslp-1.2.1-nullauth.patch:
 slpd_log.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE openslp-1.2.1-nullauth.patch ---
diff -up openslp-1.2.1/slpd/slpd_log.c.orig openslp-1.2.1/slpd/slpd_log.c
--- openslp-1.2.1/slpd/slpd_log.c.orig	2005-02-08 05:34:31.000000000 +0000
+++ openslp-1.2.1/slpd/slpd_log.c	2009-09-15 19:39:23.000000000 +0100
@@ -179,7 +179,8 @@ void SLPDLogBuffer(const char* prefix, i
     if (G_SlpdLogFile)
     {
         fprintf(G_SlpdLogFile,"%s",prefix);
-        fwrite(buf,bufsize,1,G_SlpdLogFile);
+        if (buf && (bufsize > 0))
+            fwrite(buf,bufsize,1,G_SlpdLogFile);
         fprintf(G_SlpdLogFile,"\n");
         fflush(G_SlpdLogFile);
     }
@@ -275,7 +276,21 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp
 /*-------------------------------------------------------------------------*/
 {
     SLPDLog("Message SRVTYPERQST:\n");
-    SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+
+    if (srvtyperqst->namingauthlen == 0xffff)
+    {
+        /* Naming authority matches all */
+        SLPDLog("   namingauth = (all)\n");
+    }
+    else if (srvtyperqst->namingauthlen == 0)
+    {
+        SLPDLog("   namingauth = (empty)\n");
+    }
+    else
+    {
+        /* Naming authority has been provided */
+        SLPDLogBuffer("   namingauth = ", srvtyperqst->namingauthlen, srvtyperqst->namingauth);
+    }
     SLPDLogBuffer("   scope = ", srvtyperqst->scopelistlen, srvtyperqst->scopelist);
 }
 


Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/EL-5/openslp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openslp.spec	29 Aug 2006 18:00:20 -0000	1.15
+++ openslp.spec	16 Sep 2009 13:41:54 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 6%{?dist}
+Release: 14%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -11,10 +11,13 @@ Source:  http://dl.sourceforge.net/sourc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: slpd.init
+
 Patch1:  openslp-1.2.1-optflags.patch
+# slpd crashes if slptool findsrvtypes is run, when message logging is on
+# http://bugzilla.redhat.com/523609
+Patch2:  openslp-1.2.1-nullauth.patch
 
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex 
 BuildRequires: openssl-devel
@@ -31,7 +34,7 @@ by RFC 2608 and RFC 2614.
 %package devel
 Summary: OpenSLP headers and libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 OpenSLP header files and libraries.
 
@@ -50,12 +53,14 @@ OpenSLP server daemon to dynamically reg
 %setup -q
 
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .nullauth
 
 # tarball goof (?), it wants to re-automake anyway, so let's do it right.
-libtoolize --force
-aclocal
-autoconf
-automake --add-missing
+#libtoolize --force
+#aclocal
+#autoconf
+#automake --add-missing
+autoreconf -f -i
 
 # remove CVS leftovers...
 find . -name "CVS" | xargs rm -rf
@@ -118,15 +123,15 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
 %config(noreplace) %{_sysconfdir}/slp.conf
-%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_bindir}/slptool
+%{_libdir}/libslp.so.1*
 
 %files server
 %defattr(-,root,root)
 %doc doc/html/IntroductionToSLP
 %doc doc/html/UsersGuide
 %doc doc/html/faq*
-%{_sbindir}/*
+%{_sbindir}/slpd
 %config(noreplace) %{_sysconfdir}/slp.reg
 %config(noreplace) %{_sysconfdir}/slp.spi
 %config(noreplace) %{_initrddir}/slpd
@@ -135,11 +140,35 @@ fi
 %defattr(-,root,root)
 %doc doc/html/ProgrammersGuide
 %doc doc/rfc
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/slp.h
+%{_libdir}/libslp.so
 
 
 %changelog
+* Wed Sep 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-14
+- slpd crashes if slptool findsrvtypes is run, when message logging is on (#523609)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-13
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-10
+- rebuild with new openssl
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-9
+- Autorebuild for GCC 4.3
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.1-8
+- respin for openssl
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.1-7
+- respin (buildID)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.1-6
 - fc6 respin