Hello community, here is the log from the commit of package htmldoc for openSUSE:Factory checked in at 2015-03-03 11:15:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htmldoc (Old) and /work/SRC/openSUSE:Factory/.htmldoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "htmldoc" Changes: -------- --- /work/SRC/openSUSE:Factory/htmldoc/htmldoc.changes 2013-04-22 14:06:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.htmldoc.new/htmldoc.changes 2015-03-03 11:15:55.000000000 +0100 @@ -1,0 +2,39 @@ +Wed Feb 25 19:49:30 UTC 2015 - benoit.monin@gmx.fr + +- update to version 1.8.28: + * Updated default PDF version to 1.4. + * SECURITY: Fixed three buffer overflow issues when reading AFM + files and parsing page sizes. + * Fixed incompatibility with Fortify's version of strcpy, which + does not work properly with variable-length arrays (STR #235) + * Fixed compilation against PNG library 1.5 or later (STR #243) + * Fixed documentation errors (PR #6593, PR #6595) + * Marked Zapf-Dingbats as a standard font (STR #198) + * Fixed GPL license text in GUI (STR #222) + * Fixed a table formatting problem when a column has multiple + colspan values (PR #6709) + * Fixed parsing of HTML comments (STR #181) + * Fixed potential out-of-bounds read in table-of-contents + rendering code (STR #183) + * Fixed handling of image URLs with ampersands in them (STR #186) + * Fixed top/bottom margins for logo and header/footer images + (STR #174) + * Fixed image alignment bug (Bug #231) + * Fixed X11 build problem (Bug #243) +- add source url +- drop the following patches after upstream fix: + * htmldoc_CVE-2009-3050_535943.diff + * htmldoc-fortify.diff + * htmldoc-libpng15.diff + * htmldoc-link-x11.patch +- refresh patch htmldoc-docpath.diff +- add patch htmldoc-cups_rand.patch to work around a build error + (upstream bug #510) +- remove now unused --with-fltk configure options +- set datadir for make install +- do not package doc/ source directory: documentation is already + provided by htmldoc.pdf +- remove COMPILE.txt from doc: useless in a rpm +- add -q to %setup to avoid spamming the build log + +------------------------------------------------------------------- Old: ---- htmldoc-1.8.27-source.tar.bz2 htmldoc-fortify.diff htmldoc-libpng15.diff htmldoc-link-x11.patch htmldoc_CVE-2009-3050_535943.diff New: ---- htmldoc-1.8.28-source.tar.bz2 htmldoc-cups_rand.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htmldoc.spec ++++++ --- /var/tmp/diff_new_pack.Vl40N9/_old 2015-03-03 11:15:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Vl40N9/_new 2015-03-03 11:15:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package htmldoc # -# Copyright (c) 2013 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 @@ -26,18 +26,15 @@ BuildRequires: libpng-devel BuildRequires: openssl-devel Url: http://htmldoc.org/ -Version: 1.8.27 +Version: 1.8.28 Release: 0 Summary: HTML Processor that Generates HTML, PostScript, and PDF Files License: LGPL-2.1+ Group: Productivity/Publishing/HTML/Tools -Source: %{name}-%{version}-source.tar.bz2 +Source: http://www.msweet.org/files/project1/%{name}-%{version}-source.tar.bz2 Patch: %{name}-docpath.diff -Patch1: htmldoc_CVE-2009-3050_535943.diff -Patch2: htmldoc-fortify.diff -# link to libpng15.patch sent to mike@easysw.com -Patch3: htmldoc-libpng15.diff -Patch4: htmldoc-link-x11.patch +# PATCH-FIX-UPSTREAM htmldoc-cups_rand.patch upstream bug #510 +Patch1: htmldoc-cups_rand.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define DOCDIR %{_datadir}/doc/packages/%{name} @@ -47,12 +44,9 @@ printed. %prep -%setup +%setup -q %patch %patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 %build export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" @@ -61,28 +55,23 @@ --bindir=%{_bindir} \ --prefix=%{_usr} \ --mandir=%{_mandir} \ - --with-fltk-libs=/usr/X11R6/lib \ - --with-fltk-includes=/usr/X11R6/include \ --with-gui make %install [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" -mkdir -p \ - ${RPM_BUILD_ROOT}/%{_bindir} \ - ${RPM_BUILD_ROOT}/%{_mandir} make \ bindir=${RPM_BUILD_ROOT}/%{_bindir} \ prefix=${RPM_BUILD_ROOT}/%{_usr} \ mandir=${RPM_BUILD_ROOT}/%{_mandir} \ + datadir=${RPM_BUILD_ROOT}/%{_datadir} \ install -rm -v doc/Makefile %files %defattr(-,root,root) %{_bindir}/htmldoc %{_datadir}/htmldoc %doc %{_mandir}/man1/htmldoc.1.gz -%doc doc/ cgi-bin/ CHANGES.txt COMPILE.txt COPYING.txt README.txt +%doc cgi-bin/ CHANGES.txt COPYING.txt README.txt %changelog ++++++ htmldoc-1.8.27-source.tar.bz2 -> htmldoc-1.8.28-source.tar.bz2 ++++++ ++++ 152549 lines of diff (skipped) ++++++ htmldoc-cups_rand.patch ++++++ bug#510: Fix undefined symbols CUPS_SRAND and CUPS_RAND https://www.msweet.org/bugs.php?U510 Index: htmldoc-1.8.28/htmldoc/http.c =================================================================== --- htmldoc-1.8.28.orig/htmldoc/http.c +++ htmldoc-1.8.28/htmldoc/http.c @@ -1229,10 +1229,10 @@ httpInitialize(void) * it is the best we can do (on others, this seed isn't even used...) */ - CUPS_SRAND(time(NULL)); + srand(time(NULL)); for (i = 0; i < sizeof(data); i ++) - data[i] = CUPS_RAND(); + data[i] = rand(); RAND_seed(data, sizeof(data)); #endif /* HAVE_GNUTLS */ ++++++ htmldoc-docpath.diff ++++++ --- /var/tmp/diff_new_pack.Vl40N9/_old 2015-03-03 11:15:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Vl40N9/_new 2015-03-03 11:15:58.000000000 +0100 @@ -5,7 +5,7 @@ =================================================================== --- config.h.in.orig +++ config.h.in -@@ -54,7 +54,7 @@ +@@ -42,7 +42,7 @@ * Locations of files... */ @@ -14,36 +14,23 @@ #define HTML_DATA "/usr/share/htmldoc" -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -316,7 +316,7 @@ if test "$bindir" = "\${exec_prefix}/bin - bindir="$exec_prefix/bin" - fi - --AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc") -+AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/packages/htmldoc/doc") - AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc") - - dnl Update compiler options... Index: doc/Makefile =================================================================== --- doc/Makefile.orig +++ doc/Makefile -@@ -57,11 +57,11 @@ all: $(DOCUMENTS) +@@ -44,11 +44,11 @@ all: $(DOCUMENTS) # install: $(DOCUMENTS) -- if [ ! -d $(datadir)/doc/htmldoc ]; then\ +- if test ! -d $(datadir)/doc/htmldoc; then\ - $(MKDIR) $(datadir)/doc/htmldoc;\ -+ if [ ! -d $(datadir)/doc/packages/htmldoc ]; then\ ++ if test ! -d $(datadir)/doc/packages/htmldoc; then\ + $(MKDIR) $(datadir)/doc/packages/htmldoc;\ fi - $(CP) $(DOCFILES) $(datadir)/doc/htmldoc - $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* + $(CP) $(DOCFILES) $(datadir)/doc/packages/htmldoc + $(CHMOD) ugo+r $(datadir)/doc/packages/htmldoc/* - if [ ! -d $(mandir)/man1 ]; then\ + if test ! -d $(mandir)/man1; then\ $(MKDIR) $(mandir)/man1;\ fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org