Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libupnpp for openSUSE:Factory checked in at 2021-01-20 18:28:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libupnpp (Old) and /work/SRC/openSUSE:Factory/.libupnpp.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libupnpp" Wed Jan 20 18:28:19 2021 rev:2 rq:864631 version:0.20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libupnpp/libupnpp.changes 2020-11-29 12:28:29.930006461 +0100 +++ /work/SRC/openSUSE:Factory/.libupnpp.new.28504/libupnpp.changes 2021-01-20 18:28:50.859596005 +0100 @@ -1,0 +2,6 @@ +Wed Jan 20 10:08:31 UTC 2021 - Martin Pluskal <[email protected]> + +- Update to version 0.20.2: + * No upstream changelog available + +------------------------------------------------------------------- Old: ---- libupnpp-0.20.0.tar.gz New: ---- libupnpp-0.20.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libupnpp.spec ++++++ --- /var/tmp/diff_new_pack.cjstwk/_old 2021-01-20 18:28:51.735596808 +0100 +++ /var/tmp/diff_new_pack.cjstwk/_new 2021-01-20 18:28:51.739596812 +0100 @@ -1,7 +1,7 @@ # # spec file for package libupnpp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define so_ver 9 Name: libupnpp -Version: 0.20.0 +Version: 0.20.2 Release: 0 Summary: Library providing a higher level C++ API over libnpupnp or libupnp License: GPL-2.0-or-later @@ -59,7 +59,7 @@ %install %make_install -find %{buildroot} -type f -name "*.la" -delete -print +find %{buildroot} -type f -name "*a" -delete -print %post -p /sbin/ldconfig -n %{name}%{so_ver} %postun -p /sbin/ldconfig -n %{name}%{so_ver} ++++++ libupnpp-0.20.0.tar.gz -> libupnpp-0.20.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/Makefile.am new/libupnpp-0.20.2/Makefile.am --- old/libupnpp-0.20.0/Makefile.am 2020-11-06 10:43:36.000000000 +0100 +++ new/libupnpp-0.20.2/Makefile.am 2020-12-19 14:01:00.000000000 +0100 @@ -17,12 +17,13 @@ # and could not make it work. So, as automake only supports per-target # flags, have to use a separate utility static lib for compiling log.cpp # This generates a bogus warning about linking a .a into a .so -noinst_LIBRARIES = libutility.a -libutility_a_SOURCES = \ +instdir=${libdir} +inst_LIBRARIES = libupnpputil.a +libupnpputil_a_SOURCES = \ libupnpp/log.cpp \ libupnpp/log.h \ libupnpp/log.hxx -libutility_a_CXXFLAGS = -fPIC -DPIC +libupnpputil_a_CXXFLAGS = -fPIC -DPIC endif libupnpp_la_SOURCES = \ @@ -146,7 +147,7 @@ libupnpp_la_LDFLAGS = -Wl,-zdefs -no-undefined -version-info $(VERSION_INFO) endif -libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) libutility.a +libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) libupnpputil.a if FREEBSD pkgconfigdir=${prefix}/libdata/pkgconfig @@ -161,6 +162,6 @@ nm -g --defined-only --demangle .libs/libupnpp.so | grep ' T ' | \ awk '{print $$3}' | diff - $(top_srcdir)/symbols-reference endif - test -z "`git status -s | egrep -v '?? libupnpp-.*/'`" + test -z "`git status -s | egrep -v '?? libupnpp-.*/|?? libupnpputil.a'`" vers=`echo $(VERSION) | sed -e 's/~/_/g'`;\ git tag -a libupnpp-v$$vers -m "version $$vers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/Makefile.in new/libupnpp-0.20.2/Makefile.in --- old/libupnpp-0.20.0/Makefile.in 2020-11-15 11:52:41.000000000 +0100 +++ new/libupnpp-0.20.2/Makefile.in 2020-12-30 15:06:37.000000000 +0100 @@ -110,7 +110,6 @@ CONFIG_HEADER = $(top_builddir)/libupnpp/config.h CONFIG_CLEAN_FILES = libupnpp.pc CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -138,24 +137,25 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(includedir)" +am__installdirs = "$(DESTDIR)$(instdir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" +LIBRARIES = $(inst_LIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES) ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 = @echo " AR " $@; am__v_AR_1 = -libutility_a_AR = $(AR) $(ARFLAGS) -libutility_a_LIBADD = -am__libutility_a_SOURCES_DIST = libupnpp/log.cpp libupnpp/log.h \ +libupnpputil_a_AR = $(AR) $(ARFLAGS) +libupnpputil_a_LIBADD = +am__libupnpputil_a_SOURCES_DIST = libupnpp/log.cpp libupnpp/log.h \ libupnpp/log.hxx am__dirstamp = $(am__leading_dot)dirstamp -@LINUX_TRUE@am_libutility_a_OBJECTS = \ -@LINUX_TRUE@ libupnpp/libutility_a-log.$(OBJEXT) -libutility_a_OBJECTS = $(am_libutility_a_OBJECTS) +@LINUX_TRUE@am_libupnpputil_a_OBJECTS = \ +@LINUX_TRUE@ libupnpp/libupnpputil_a-log.$(OBJEXT) +libupnpputil_a_OBJECTS = $(am_libupnpputil_a_OBJECTS) am__DEPENDENCIES_1 = -libupnpp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libutility.a +libupnpp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libupnpputil.a am__libupnpp_la_SOURCES_DIST = libupnpp/control/avlastchg.cxx \ libupnpp/control/avlastchg.hxx \ libupnpp/control/avtransport.cxx \ @@ -256,7 +256,7 @@ libupnpp/$(DEPDIR)/la-soaphelp.Plo \ libupnpp/$(DEPDIR)/la-upnpavutils.Plo \ libupnpp/$(DEPDIR)/la-upnpplib.Plo \ - libupnpp/$(DEPDIR)/libutility_a-log.Po \ + libupnpp/$(DEPDIR)/libupnpputil_a-log.Po \ libupnpp/control/$(DEPDIR)/la-avlastchg.Plo \ libupnpp/control/$(DEPDIR)/la-avtransport.Plo \ libupnpp/control/$(DEPDIR)/la-cdircontent.Plo \ @@ -320,8 +320,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libutility_a_SOURCES) $(libupnpp_la_SOURCES) -DIST_SOURCES = $(am__libutility_a_SOURCES_DIST) \ +SOURCES = $(libupnpputil_a_SOURCES) $(libupnpp_la_SOURCES) +DIST_SOURCES = $(am__libupnpputil_a_SOURCES_DIST) \ $(am__libupnpp_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -518,13 +518,14 @@ # and could not make it work. So, as automake only supports per-target # flags, have to use a separate utility static lib for compiling log.cpp # This generates a bogus warning about linking a .a into a .so -@LINUX_TRUE@noinst_LIBRARIES = libutility.a -@LINUX_TRUE@libutility_a_SOURCES = \ +@LINUX_TRUE@instdir = ${libdir} +@LINUX_TRUE@inst_LIBRARIES = libupnpputil.a +@LINUX_TRUE@libupnpputil_a_SOURCES = \ @LINUX_TRUE@ libupnpp/log.cpp \ @LINUX_TRUE@ libupnpp/log.h \ @LINUX_TRUE@ libupnpp/log.hxx -@LINUX_TRUE@libutility_a_CXXFLAGS = -fPIC -DPIC +@LINUX_TRUE@libupnpputil_a_CXXFLAGS = -fPIC -DPIC libupnpp_la_SOURCES = libupnpp/control/avlastchg.cxx \ libupnpp/control/avlastchg.hxx \ libupnpp/control/avtransport.cxx \ @@ -609,7 +610,7 @@ # Curiously, -no-undefined seems to do nothing?? -Wl,-zdefs works though. # automake 1.14.1 @LINUX_TRUE@libupnpp_la_LDFLAGS = -Wl,-zdefs -no-undefined -version-info $(VERSION_INFO) -libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) libutility.a +libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) libupnpputil.a @FREEBSD_FALSE@pkgconfigdir = $(libdir)/pkgconfig @FREEBSD_TRUE@pkgconfigdir = ${prefix}/libdata/pkgconfig pkgconfig_DATA = libupnpp.pc @@ -667,9 +668,37 @@ -rm -f libupnpp/config.h libupnpp/stamp-h1 libupnpp.pc: $(top_builddir)/config.status $(srcdir)/libupnpp.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +install-instLIBRARIES: $(inst_LIBRARIES) + @$(NORMAL_INSTALL) + @list='$(inst_LIBRARIES)'; test -n "$(instdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(instdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(instdir)" || exit 1; \ + echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(instdir)'"; \ + $(INSTALL_DATA) $$list2 "$(DESTDIR)$(instdir)" || exit $$?; } + @$(POST_INSTALL) + @list='$(inst_LIBRARIES)'; test -n "$(instdir)" || list=; \ + for p in $$list; do \ + if test -f $$p; then \ + $(am__strip_dir) \ + echo " ( cd '$(DESTDIR)$(instdir)' && $(RANLIB) $$f )"; \ + ( cd "$(DESTDIR)$(instdir)" && $(RANLIB) $$f ) || exit $$?; \ + else :; fi; \ + done + +uninstall-instLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(inst_LIBRARIES)'; test -n "$(instdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(instdir)'; $(am__uninstall_files_from_dir) -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +clean-instLIBRARIES: + -test -z "$(inst_LIBRARIES)" || rm -f $(inst_LIBRARIES) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -711,13 +740,13 @@ libupnpp/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libupnpp/$(DEPDIR) @: > libupnpp/$(DEPDIR)/$(am__dirstamp) -libupnpp/libutility_a-log.$(OBJEXT): libupnpp/$(am__dirstamp) \ +libupnpp/libupnpputil_a-log.$(OBJEXT): libupnpp/$(am__dirstamp) \ libupnpp/$(DEPDIR)/$(am__dirstamp) -libutility.a: $(libutility_a_OBJECTS) $(libutility_a_DEPENDENCIES) $(EXTRA_libutility_a_DEPENDENCIES) - $(AM_V_at)-rm -f libutility.a - $(AM_V_AR)$(libutility_a_AR) libutility.a $(libutility_a_OBJECTS) $(libutility_a_LIBADD) - $(AM_V_at)$(RANLIB) libutility.a +libupnpputil.a: $(libupnpputil_a_OBJECTS) $(libupnpputil_a_DEPENDENCIES) $(EXTRA_libupnpputil_a_DEPENDENCIES) + $(AM_V_at)-rm -f libupnpputil.a + $(AM_V_AR)$(libupnpputil_a_AR) libupnpputil.a $(libupnpputil_a_OBJECTS) $(libupnpputil_a_LIBADD) + $(AM_V_at)$(RANLIB) libupnpputil.a libupnpp/control/$(am__dirstamp): @$(MKDIR_P) libupnpp/control @: > libupnpp/control/$(am__dirstamp) @@ -821,7 +850,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/$(DEPDIR)/la-soaphelp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/$(DEPDIR)/la-upnpavutils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/$(DEPDIR)/la-upnpplib.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@libupnpp/$(DEPDIR)/libutility_a-log.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libupnpp/$(DEPDIR)/libupnpputil_a-log.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/control/$(DEPDIR)/la-avlastchg.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/control/$(DEPDIR)/la-avtransport.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libupnpp/control/$(DEPDIR)/la-cdircontent.Plo@am__quote@ # am--include-marker @@ -879,19 +908,19 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -libupnpp/libutility_a-log.o: libupnpp/log.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutility_a_CXXFLAGS) $(CXXFLAGS) -MT libupnpp/libutility_a-log.o -MD -MP -MF libupnpp/$(DEPDIR)/libutility_a-log.Tpo -c -o libupnpp/libutility_a-log.o `test -f 'libupnpp/log.cpp' || echo '$(srcdir)/'`libupnpp/log.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libupnpp/$(DEPDIR)/libutility_a-log.Tpo libupnpp/$(DEPDIR)/libutility_a-log.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libupnpp/log.cpp' object='libupnpp/libutility_a-log.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutility_a_CXXFLAGS) $(CXXFLAGS) -c -o libupnpp/libutility_a-log.o `test -f 'libupnpp/log.cpp' || echo '$(srcdir)/'`libupnpp/log.cpp - -libupnpp/libutility_a-log.obj: libupnpp/log.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutility_a_CXXFLAGS) $(CXXFLAGS) -MT libupnpp/libutility_a-log.obj -MD -MP -MF libupnpp/$(DEPDIR)/libutility_a-log.Tpo -c -o libupnpp/libutility_a-log.obj `if test -f 'libupnpp/log.cpp'; then $(CYGPATH_W) 'libupnpp/log.cpp'; else $(CYGPATH_W) '$(srcdir)/libupnpp/log.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libupnpp/$(DEPDIR)/libutility_a-log.Tpo libupnpp/$(DEPDIR)/libutility_a-log.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libupnpp/log.cpp' object='libupnpp/libutility_a-log.obj' libtool=no @AMDEPBACKSLASH@ +libupnpp/libupnpputil_a-log.o: libupnpp/log.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libupnpputil_a_CXXFLAGS) $(CXXFLAGS) -MT libupnpp/libupnpputil_a-log.o -MD -MP -MF libupnpp/$(DEPDIR)/libupnpputil_a-log.Tpo -c -o libupnpp/libupnpputil_a-log.o `test -f 'libupnpp/log.cpp' || echo '$(srcdir)/'`libupnpp/log.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libupnpp/$(DEPDIR)/libupnpputil_a-log.Tpo libupnpp/$(DEPDIR)/libupnpputil_a-log.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libupnpp/log.cpp' object='libupnpp/libupnpputil_a-log.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libupnpputil_a_CXXFLAGS) $(CXXFLAGS) -c -o libupnpp/libupnpputil_a-log.o `test -f 'libupnpp/log.cpp' || echo '$(srcdir)/'`libupnpp/log.cpp + +libupnpp/libupnpputil_a-log.obj: libupnpp/log.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libupnpputil_a_CXXFLAGS) $(CXXFLAGS) -MT libupnpp/libupnpputil_a-log.obj -MD -MP -MF libupnpp/$(DEPDIR)/libupnpputil_a-log.Tpo -c -o libupnpp/libupnpputil_a-log.obj `if test -f 'libupnpp/log.cpp'; then $(CYGPATH_W) 'libupnpp/log.cpp'; else $(CYGPATH_W) '$(srcdir)/libupnpp/log.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libupnpp/$(DEPDIR)/libupnpputil_a-log.Tpo libupnpp/$(DEPDIR)/libupnpputil_a-log.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libupnpp/log.cpp' object='libupnpp/libupnpputil_a-log.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutility_a_CXXFLAGS) $(CXXFLAGS) -c -o libupnpp/libutility_a-log.obj `if test -f 'libupnpp/log.cpp'; then $(CYGPATH_W) 'libupnpp/log.cpp'; else $(CYGPATH_W) '$(srcdir)/libupnpp/log.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libupnpputil_a_CXXFLAGS) $(CXXFLAGS) -c -o libupnpp/libupnpputil_a-log.obj `if test -f 'libupnpp/log.cpp'; then $(CYGPATH_W) 'libupnpp/log.cpp'; else $(CYGPATH_W) '$(srcdir)/libupnpp/log.cpp'; fi` libupnpp/control/la-avlastchg.lo: libupnpp/control/avlastchg.cxx @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libupnpp_la_CXXFLAGS) $(CXXFLAGS) -MT libupnpp/control/la-avlastchg.lo -MD -MP -MF libupnpp/control/$(DEPDIR)/la-avlastchg.Tpo -c -o libupnpp/control/la-avlastchg.lo `test -f 'libupnpp/control/avlastchg.cxx' || echo '$(srcdir)/'`libupnpp/control/avlastchg.cxx @@ -1437,7 +1466,7 @@ check: check-am all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(instdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1478,8 +1507,8 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLIBRARIES mostlyclean-am +clean-am: clean-generic clean-instLIBRARIES clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1490,7 +1519,7 @@ -rm -f libupnpp/$(DEPDIR)/la-soaphelp.Plo -rm -f libupnpp/$(DEPDIR)/la-upnpavutils.Plo -rm -f libupnpp/$(DEPDIR)/la-upnpplib.Plo - -rm -f libupnpp/$(DEPDIR)/libutility_a-log.Po + -rm -f libupnpp/$(DEPDIR)/libupnpputil_a-log.Po -rm -f libupnpp/control/$(DEPDIR)/la-avlastchg.Plo -rm -f libupnpp/control/$(DEPDIR)/la-avtransport.Plo -rm -f libupnpp/control/$(DEPDIR)/la-cdircontent.Plo @@ -1533,7 +1562,8 @@ info-am: -install-data-am: install-nobase_includeHEADERS install-pkgconfigDATA +install-data-am: install-instLIBRARIES install-nobase_includeHEADERS \ + install-pkgconfigDATA install-dvi: install-dvi-am @@ -1571,7 +1601,7 @@ -rm -f libupnpp/$(DEPDIR)/la-soaphelp.Plo -rm -f libupnpp/$(DEPDIR)/la-upnpavutils.Plo -rm -f libupnpp/$(DEPDIR)/la-upnpplib.Plo - -rm -f libupnpp/$(DEPDIR)/libutility_a-log.Po + -rm -f libupnpp/$(DEPDIR)/libupnpputil_a-log.Po -rm -f libupnpp/control/$(DEPDIR)/la-avlastchg.Plo -rm -f libupnpp/control/$(DEPDIR)/la-avtransport.Plo -rm -f libupnpp/control/$(DEPDIR)/la-cdircontent.Plo @@ -1614,14 +1644,14 @@ ps-am: -uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \ - uninstall-pkgconfigDATA +uninstall-am: uninstall-instLIBRARIES uninstall-libLTLIBRARIES \ + uninstall-nobase_includeHEADERS uninstall-pkgconfigDATA .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ - check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstLIBRARIES cscope cscopelist-am ctags \ + check-am clean clean-cscope clean-generic clean-instLIBRARIES \ + clean-libLTLIBRARIES clean-libtool cscope cscopelist-am ctags \ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ distclean distclean-compile distclean-generic distclean-hdr \ @@ -1630,14 +1660,15 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ + install-instLIBRARIES install-libLTLIBRARIES install-man \ install-nobase_includeHEADERS install-pdf install-pdf-am \ install-pkgconfigDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-nobase_includeHEADERS uninstall-pkgconfigDATA + tags tags-am uninstall uninstall-am uninstall-instLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \ + uninstall-pkgconfigDATA .PRECIOUS: Makefile @@ -1645,7 +1676,7 @@ dist-hook: @LINUX_TRUE@ nm -g --defined-only --demangle .libs/libupnpp.so | grep ' T ' | \ @LINUX_TRUE@ awk '{print $$3}' | diff - $(top_srcdir)/symbols-reference - test -z "`git status -s | egrep -v '?? libupnpp-.*/'`" + test -z "`git status -s | egrep -v '?? libupnpp-.*/|?? libupnpputil.a'`" vers=`echo $(VERSION) | sed -e 's/~/_/g'`;\ git tag -a libupnpp-v$$vers -m "version $$vers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/configure new/libupnpp-0.20.2/configure --- old/libupnpp-0.20.0/configure 2020-11-07 14:29:31.000000000 +0100 +++ new/libupnpp-0.20.2/configure 2020-12-30 15:06:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libupnpp 0.20.0. +# Generated by GNU Autoconf 2.69 for libupnpp 0.20.2. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libupnpp' PACKAGE_TARNAME='libupnpp' -PACKAGE_VERSION='0.20.0' -PACKAGE_STRING='libupnpp 0.20.0' +PACKAGE_VERSION='0.20.2' +PACKAGE_STRING='libupnpp 0.20.2' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.lesbonscomptes.com/upmpdcli' @@ -1362,7 +1362,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libupnpp 0.20.0 to adapt to many kinds of systems. +\`configure' configures libupnpp 0.20.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1433,7 +1433,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libupnpp 0.20.0:";; + short | recursive ) echo "Configuration of libupnpp 0.20.2:";; esac cat <<\_ACEOF @@ -1559,7 +1559,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libupnpp configure 0.20.0 +libupnpp configure 0.20.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2012,7 +2012,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libupnpp $as_me 0.20.0, which was +It was created by libupnpp $as_me 0.20.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3006,7 +3006,7 @@ # Define the identity of the package. PACKAGE='libupnpp' - VERSION='0.20.0' + VERSION='0.20.2' # Some tools Automake needs. @@ -16930,7 +16930,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libupnpp $as_me 0.20.0, which was +This file was extended by libupnpp $as_me 0.20.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16997,7 +16997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libupnpp config.status 0.20.0 +libupnpp config.status 0.20.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/configure.ac new/libupnpp-0.20.2/configure.ac --- old/libupnpp-0.20.0/configure.ac 2020-11-07 14:29:20.000000000 +0100 +++ new/libupnpp-0.20.2/configure.ac 2020-12-30 15:05:49.000000000 +0100 @@ -4,7 +4,7 @@ # occur with revision (3rd number) changes. # !!!! When changing the version, also change the defines in upnpplib.hxx !!! -AC_INIT([libupnpp], [0.20.0], [[email protected]], +AC_INIT([libupnpp], [0.20.2], [[email protected]], [libupnpp], [http://www.lesbonscomptes.com/upmpdcli]) # Lib version info. See: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp/control/cdirectory.cxx new/libupnpp-0.20.2/libupnpp/control/cdirectory.cxx --- old/libupnpp-0.20.0/libupnpp/control/cdirectory.cxx 2020-09-20 14:48:34.000000000 +0200 +++ new/libupnpp-0.20.2/libupnpp/control/cdirectory.cxx 2020-12-28 15:39:42.000000000 +0100 @@ -176,9 +176,9 @@ Service::registerCallback(bind(&ContentDirectory::evtCallback, this, _1)); } -int ContentDirectory::readDirSlice(const string& objectId, int offset, - int count, UPnPDirContent& dirbuf, - int *didread, int *total) +int ContentDirectory::readDirSlice( + const string& objectId, int offset, int count, + UPnPDirContent& dirbuf, int *didread, int *total) { LOGDEB("CDService::readDirSlice: objId [" << objectId << "] offset " << offset << " count " << count << endl); @@ -213,7 +213,7 @@ } LOGDEB0("ContentDirectory::readDirSlice: got count " << count << - " offset " << offset << " total " << *total << "Data:\n" << + " offset " << offset << " total " << *total << " Data:\n" << tbuf << "\n"); dirbuf.parse(tbuf); @@ -221,17 +221,16 @@ return UPNP_E_SUCCESS; } -int ContentDirectory::readDir(const string& objectId, - UPnPDirContent& dirbuf) +int ContentDirectory::readDir(const string& objectId, UPnPDirContent& dirbuf) { LOGDEB("CDService::readDir: url [" << getActionURL() << "] type [" << getServiceType() << "] udn [" << getDeviceId() << "] objId [" << objectId << endl); int offset = 0; - int total = 1000;// Updated on first read. + int total = 0;// Updated on first read. - while (offset < total) { + while (total == 0 || (offset < total)) { int count; int error = readDirSlice(objectId, offset, m_rdreqcnt, dirbuf, &count, &total); @@ -239,15 +238,16 @@ return error; offset += count; + if (count != m_rdreqcnt) + break; } return UPNP_E_SUCCESS; } -int ContentDirectory::searchSlice(const string& objectId, - const string& ss, - int offset, int count, UPnPDirContent& dirbuf, - int *didread, int *total) +int ContentDirectory::searchSlice( + const string& objectId, const string& ss, int offset, int count, + UPnPDirContent& dirbuf, int *didread, int *total) { LOGDEB("CDService::searchSlice: objId [" << objectId << "] offset " << offset << " count " << count << endl); @@ -287,24 +287,24 @@ return UPNP_E_SUCCESS; } -int ContentDirectory::search(const string& objectId, - const string& ss, - UPnPDirContent& dirbuf) +int ContentDirectory::search( + const string& objectId, const string& ss, UPnPDirContent& dirbuf) { LOGDEB("CDService::search: url [" << getActionURL() << "] type [" << getServiceType() << "] udn [" << getDeviceId() << "] objid [" << objectId << "] search [" << ss << "]" << endl); int offset = 0; - int total = 1000;// Updated on first read. + int total = 0;// Updated on first read. - while (offset < total) { + while (total == 0 || (offset < total)) { int count; int error = searchSlice(objectId, ss, offset, m_rdreqcnt, dirbuf, &count, &total); if (error != UPNP_E_SUCCESS) return error; - + if (count != m_rdreqcnt) + break; offset += count; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp/control/ohinfo.cxx new/libupnpp-0.20.2/libupnpp/control/ohinfo.cxx --- old/libupnpp-0.20.0/libupnpp/control/ohinfo.cxx 2020-07-28 13:25:22.000000000 +0200 +++ new/libupnpp-0.20.2/libupnpp/control/ohinfo.cxx 2020-11-26 09:26:06.000000000 +0100 @@ -95,6 +95,10 @@ LOGERR("OHInfo::Read: missing Value in response" << endl); return UPNP_E_BAD_RESPONSE; } + if (didl.empty()) { + *dirent = UPnPDirObject(); + return UPNP_E_SUCCESS; + } return OHRadio::decodeMetadata("OHInfo::metatext", didl, dirent); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp/smallut.cpp new/libupnpp-0.20.2/libupnpp/smallut.cpp --- old/libupnpp-0.20.0/libupnpp/smallut.cpp 2020-11-10 14:03:08.000000000 +0100 +++ new/libupnpp-0.20.2/libupnpp/smallut.cpp 2020-12-03 10:28:43.000000000 +0100 @@ -15,6 +15,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ +#ifdef _WIN32 +// needed for localtime_r under mingw. Has to exist before the other +// includes from smallut.h +#define _POSIX_THREAD_SAFE_FUNCTIONS +#ifdef _MSC_VER +#define localtime_r(a,b) localtime_s(b,a) +#endif /* _MSC_VER */ +#endif /* _WIN32 */ + #include "smallut.h" #include <algorithm> @@ -25,7 +34,6 @@ #include <cstdio> #include <cstdlib> #include <cstring> -#include <ctime> #include <iostream> #include <list> #include <numeric> @@ -33,15 +41,7 @@ #include <string> #include <unordered_map> #include <unordered_set> - -#ifdef _WIN32 -// needed for localtime_r under mingw? -#define _POSIX_THREAD_SAFE_FUNCTIONS -#ifdef _MSC_VER -#define localtime_r(a,b) localtime_s(b,a) -#endif /* _MSC_VER */ -#endif /* _WIN32 */ - +#include <ctime> // Older compilers don't support stdc++ regex, but Windows does not // have the Linux one. Have a simple class to solve the simple cases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp/upnpplib.hxx new/libupnpp-0.20.2/libupnpp/upnpplib.hxx --- old/libupnpp-0.20.0/libupnpp/upnpplib.hxx 2020-11-14 15:17:13.000000000 +0100 +++ new/libupnpp-0.20.2/libupnpp/upnpplib.hxx 2020-12-30 15:06:13.000000000 +0100 @@ -26,7 +26,7 @@ /** Version components. */ #define LIBUPNPP_VERSION_MAJOR 0 #define LIBUPNPP_VERSION_MINOR 20 -#define LIBUPNPP_VERSION_REVISION 0 +#define LIBUPNPP_VERSION_REVISION 2 /// Got this from Xapian... #define LIBUPNPP_AT_LEAST(A,B,C) \ (LIBUPNPP_VERSION_MAJOR > (A) || \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp/workqueue.h new/libupnpp-0.20.2/libupnpp/workqueue.h --- old/libupnpp-0.20.0/libupnpp/workqueue.h 2020-06-23 12:43:30.000000000 +0200 +++ new/libupnpp-0.20.2/libupnpp/workqueue.h 2020-11-26 09:26:06.000000000 +0100 @@ -193,7 +193,7 @@ m_clients_waiting--; } - LOGINFO("" << m_name << ": tasks " << m_tottasks << " nowakes " << + LOGDEB("" << m_name << ": tasks " << m_tottasks << " nowakes " << m_nowake << " wsleeps " << m_workersleeps << " csleeps " << m_clientsleeps << "\n"); // Perform the thread joins and compute overall status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnpp-0.20.0/libupnpp.pc.in new/libupnpp-0.20.2/libupnpp.pc.in --- old/libupnpp-0.20.0/libupnpp.pc.in 2020-07-01 17:18:31.000000000 +0200 +++ new/libupnpp-0.20.2/libupnpp.pc.in 2020-12-19 14:01:18.000000000 +0100 @@ -8,5 +8,5 @@ Version: @PACKAGE_VERSION@ Requires: libcurl Libs: -L${libdir} -lupnpp -Libs.private: @LIBUPNPP_LIBS@ +Libs.private: @LIBUPNPP_LIBS@ -lupnpputil Cflags: -I${includedir}
