Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at 2016-06-20 10:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxslt (Old) and /work/SRC/openSUSE:Factory/.libxslt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxslt" Changes: -------- --- /work/SRC/openSUSE:Factory/libxslt/libxslt-python.changes 2016-05-25 21:21:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxslt.new/libxslt-python.changes 2016-06-20 10:55:12.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 11 12:03:15 UTC 2016 - [email protected] + +- Version update to 1.1.29 to match libxslt main package +- Sort out with spec-cleaner +- BuildIgnore python to avoid cycles +- Run tests and do not install them as docs + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libxslt/libxslt.changes 2016-05-25 21:21:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxslt.new/libxslt.changes 2016-06-20 10:55:12.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jun 11 11:42:29 UTC 2016 - [email protected] + +- Update to 1.1.29: + * new release after 4 years with few bugfies all around +- Refresh patch 0009-Make-generate-id-deterministic.patch to apply +- Remove cve patch that was integrated upstream: + libxslt-1.1.28-type_confusion_preprocess_attr.patch +- Unpack the manpage as the compression is set by buildbot not always gz + +------------------------------------------------------------------- Old: ---- libxslt-1.1.28-type_confusion_preprocess_attr.patch libxslt-1.1.28.tar.gz xslt-config.1.gz New: ---- libxslt-1.1.29.tar.gz xslt-config.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.86IMTr/_old 2016-06-20 10:55:13.000000000 +0200 +++ /var/tmp/diff_new_pack.86IMTr/_new 2016-06-20 10:55:13.000000000 +0200 @@ -16,39 +16,30 @@ # +%define libname libxslt1 Name: libxslt-python +Version: 1.1.29 +Release: 0 Summary: Python Bindings for libxslt License: MIT Group: Development/Libraries/Python -Version: 1.1.28 -Release: 0 +Url: http://xmlsoft.org/XSLT/ Source: ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz -# Uncomment to save space: -#NoSource: 0 Patch0: libxslt-1.1.24-linkflags.patch # pbleser: don't build the doc subdir as it's broken and we don't install # it anyway; neither build the xsltproc subdir (not packaged here, faster) Patch1: libxslt-do_not_build_doc_nor_xsltproc.patch -# PATCH-FIX-UPSTREAM bnc#952474 CVE-2015-7995 [email protected] -- fix for type confusion in preprocessing attributes -Patch2: libxslt-1.1.28-type_confusion_preprocess_attr.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -Url: http://xmlsoft.org/XSLT/ -#BuildArch: noarch BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: libxml2-python +BuildRequires: libxslt-tools +#!BuildIgnore: python BuildRequires: python-devel BuildRequires: python-xml -%if 0%{?suse_version} >= 1220 -BuildRequires: libxslt-tools -Requires: libxslt1 = %{version} -%else -BuildRequires: libxslt1 -Requires: libxslt1 = %{version} -%endif +Requires: %{libname} = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The libxslt-python package contains a module that permits applications @@ -64,31 +55,34 @@ %setup -q -n libxslt-%{version} %patch0 %patch1 -%patch2 -p1 %build -autoreconf --force --install -%configure --with-python=%__python --with-pic --disable-static --disable-silent-rules +autoreconf -fvi +%configure \ + --with-python=python \ + --with-pic \ + --disable-static \ + --disable-silent-rules make %{?_smp_mflags} PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} %install -make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR=$RPM_BUILD_ROOT +make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR=%{buildroot} # Unwanted doc stuff -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc +rm -fr %{buildroot}%{_datadir}/doc # #223696 -find %{buildroot} -type f -name "*.la" -print -delete +find %{buildroot} -type f -name "*.la" -delete -print # Stuff we won't package rm -rf %{buildroot}/%{_bindir}/* %{buildroot}/%{_libdir}/lib** %{buildroot}/%{_includedir}/* rm -rf %{buildroot}/%{_mandir}/* %{buildroot}/%{_libdir}/pkgconfig/* rm -rf %{buildroot}/%{_libdir}/xsltConf.sh %{buildroot}/%{_datadir}/aclocal/libxslt.m4 +%check +make %{?_smp_mflags} tests -C python + %files %defattr(-, root, root) %{py_sitedir}/* %doc python/libxslt-python-api.xml -%doc python/tests/*.py -%doc python/tests/*.xml -%doc python/tests/*.xsl %changelog ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.86IMTr/_old 2016-06-20 10:55:13.000000000 +0200 +++ /var/tmp/diff_new_pack.86IMTr/_new 2016-06-20 10:55:13.000000000 +0200 @@ -16,34 +16,27 @@ # +%define libname %{name}1 +%define exname libexslt0 Name: libxslt -%define soname 1 -%define exslt_soname 0 -Version: 1.1.28 +Version: 1.1.29 Release: 0 Summary: XSL Transformation Library License: MIT and GPL-2.0+ Group: System/Libraries -# Url: http://xmlsoft.org/XSLT/ Source: ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz Source2: baselibs.conf -Source3: xslt-config.1.gz +Source3: xslt-config.1 Patch0: %{name}-1.1.24-no-net-autobuild.patch Patch1: libxslt-config-fixes.patch Patch2: 0009-Make-generate-id-deterministic.patch -# PATCH-FIX-UPSTREAM bnc#952474 CVE-2015-7995 [email protected] -- fix for type confusion in preprocessing attributes -Patch3: libxslt-1.1.28-type_confusion_preprocess_attr.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: pkg-config -# bug437293 -%ifarch ppc64 -Obsoletes: libxslt-64bit -%endif +BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This C library allows you to transform XML files into other XML files @@ -58,17 +51,12 @@ the EXSLT set of extension functions as well as some common extensions present in other XSLT engines. -%package -n %{name}%{soname} +%package -n %{libname} Summary: XSL Transformation Library License: LGPL-2.1+ Group: System/Libraries -%if 0%{?suse_version} < 1220 -Provides: %{name}-tools = %{version} -Obsoletes: %{name} < %version-%release -Provides: %{name} = %version-%release -%endif -%description -n %{name}%{soname} +%description -n %{libname} This C library allows you to transform XML files into other XML files (or HTML, text, and more) using the standard XSLT stylesheet transformation mechanism. @@ -81,90 +69,74 @@ the EXSLT set of extension functions as well as some common extensions present in other XSLT engines. -The package comes with xsltproc, a command line interface to the XSLT -engine. - %package devel Summary: Include Files and Libraries mandatory for Development License: LGPL-2.1+ Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: %{name}-devel-64bit -%endif -%if 0%{?suse_version} >= 1220 -Requires: %{name}-tools = %version -%endif -Requires: %{name}%{soname} = %{version} +Requires: %{libname} = %{version} +Requires: %{name}-tools = %{version} Requires: glibc-devel Requires: libgcrypt-devel Requires: libgpg-error-devel -#libxml is automatically required with pkgconfig %description devel This package contains all necessary include files and libraries needed to develop applications that require these. -%if 0%{?suse_version} >= 1220 %package tools Summary: Extended Stylesheet Language (XSL) Transformation utilities License: MIT and GPL-2.0+ -Group: Development/Tools -Provides: xsltproc = %version-%release -# O/P added during 12.2 dev: -Obsoletes: %{name} < %version-%release -Provides: %{name} = %version-%release +Group: Development/Tools/Other +Provides: %{name} = %{version} +Provides: xsltproc = %{version} %description tools This package contains xsltproc, a command line interface to the XSLT engine. -%endif +xtend the %prep %setup -q %patch0 %patch1 %patch2 -p1 -%patch3 -p1 %build -autoreconf --force --install --verbose -%configure --disable-static --with-pic --without-python --disable-silent-rules +autoreconf -fvi +%configure \ + --disable-static \ + --with-pic \ + --without-python \ + --disable-silent-rules make %{?_smp_mflags} %check %if ! 0%{?qemu_user_space_build} -make check +make %{?_smp_mflags} check %endif %install -%makeinstall +make %{?_smp_mflags} DESTDIR=%{buildroot} install # Unwanted doc stuff rm -fr %{buildroot}%{_datadir}/doc - # the manual page is required -install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' - +install -D -m0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/xslt-config.1 #kill all "la" files -find %{buildroot} -type f -name "*.la" -print -delete +find %{buildroot} -type f -name "*.la" -delete -print -%post -n %{name}%{soname} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%postun -n %{name}%{soname} -p /sbin/ldconfig - -%files -n %{name}%{soname} +%files -n %{libname} %defattr(-, root, root) -%{_libdir}/libxslt.so.%{soname} -%{_libdir}/libxslt.so.%{soname}.* -%{_libdir}/libexslt.so.%{exslt_soname} -%{_libdir}/libexslt.so.%{exslt_soname}.* -%if 0%{?suse_version} >= 1220 +%{_libdir}/libxslt.so.* +%{_libdir}/libexslt.so.* + %files tools %defattr(-,root,root) -%endif %doc AUTHORS NEWS README COPYING* Copyright TODO FEATURES %{_bindir}/xsltproc -%doc %{_mandir}/man1/xsltproc.* +%{_mandir}/man1/xsltproc.1%{ext_man} %files devel %defattr(-, root, root) @@ -176,9 +148,8 @@ %{_includedir}/* %{_datadir}/aclocal/* %{_bindir}/xslt-config -%doc %{_mandir}/man1/xslt-config.* -%doc %{_mandir}/man3/* -# not available doc/*.png +%{_mandir}/man1/xslt-config.1%{ext_man} +%{_mandir}/man3/* %doc doc/*.html doc/html doc/tutorial doc/*.gif %changelog ++++++ 0009-Make-generate-id-deterministic.patch ++++++ --- /var/tmp/diff_new_pack.86IMTr/_old 2016-06-20 10:55:13.000000000 +0200 +++ /var/tmp/diff_new_pack.86IMTr/_new 2016-06-20 10:55:13.000000000 +0200 @@ -5,9 +5,11 @@ value in the node _private on the first invocation of generate-id(). Author: Jérémy Bobbio <[email protected]> ---- libxslt-1.1.28.orig/libxslt/functions.c -+++ libxslt-1.1.28/libxslt/functions.c -@@ -660,12 +660,11 @@ xsltFormatNumberFunction(xmlXPathParserC +Index: libxslt-1.1.29/libxslt/functions.c +=================================================================== +--- libxslt-1.1.29.orig/libxslt/functions.c ++++ libxslt-1.1.29/libxslt/functions.c +@@ -661,10 +661,10 @@ xsltFormatNumberFunction(xmlXPathParserC */ void xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ @@ -18,38 +20,17 @@ - long val; + unsigned long val; xmlChar str[30]; -- xmlDocPtr doc; if (nargs == 0) { - cur = ctxt->context->node; -@@ -698,31 +697,20 @@ xsltGenerateIdFunction(xmlXPathParserCon - ctxt->error = XPATH_INVALID_ARITY; - return; - } -- /* -- * Okay this is ugly but should work, use the NodePtr address -- * to forge the ID -- */ -- if (cur->type != XML_NAMESPACE_DECL) -- doc = cur->doc; -- else { -- xmlNsPtr ns = (xmlNsPtr) cur; -- -- if (ns->context != NULL) -- doc = ns->context; -- else -- doc = ctxt->context->doc; -- -- } - +@@ -702,12 +702,16 @@ xsltGenerateIdFunction(xmlXPathParserCon if (obj) xmlXPathFreeObject(obj); - val = (long)((char *)cur - (char *)&base_address); - if (val >= 0) { -- sprintf((char *)str, "idp%ld", val); +- snprintf((char *)str, sizeof(str), "idp%ld", val); - } else { -- sprintf((char *)str, "idm%ld", -val); +- snprintf((char *)str, sizeof(str), "idm%ld", -val); + if (cur->_private == NULL) { + cur->_private = xmlMalloc(sizeof (unsigned long)); + if (cur->_private == NULL) { ++++++ libxslt-1.1.28.tar.gz -> libxslt-1.1.29.tar.gz ++++++ ++++ 42957 lines of diff (skipped) ++++++ xslt-config.1 ++++++ +++ empty output from diff against xslt-config.1.gz
