openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2014
- 1 participants
- 1539 discussions
Hello community,
here is the log from the commit of package libxml2.2842 for openSUSE:12.3:Update checked in at 2014-05-27 13:48:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/libxml2.2842 (Old)
and /work/SRC/openSUSE:12.3:Update/.libxml2.2842.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxml2.2842"
Changes:
--------
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:12.3:Update/.libxml2.2842.new/libxml2.changes 2014-05-27 13:48:51.000000000 +0200
@@ -0,0 +1,1647 @@
+-------------------------------------------------------------------
+Fri May 23 09:27:47 UTC 2014 - vcizek(a)suse.com
+
+- update the libxml2-CVE-2014-0191.patch, because it caused xmllint
+ breakage
+
+-------------------------------------------------------------------
+Wed May 7 10:48:11 UTC 2014 - vcizek(a)suse.com
+
+- fix for CVE-2014-0191 (bnc#876652)
+ * libxml2: external parameter entity loaded when entity
+ substitution is disabled
+ * added libxml2-CVE-2014-0191.patch
+
+-------------------------------------------------------------------
+Thu Jul 11 15:31:49 UTC 2013 - vcizek(a)suse.com
+
+- fix for CVE-2013-2877 (bnc#829077)
+ * added libxml2-CVE-2013-2877.patch
+
+-------------------------------------------------------------------
+Thu Apr 18 14:07:49 UTC 2013 - vcizek(a)suse.com
+
+- fix for CVE-2013-1969 (bnc#815665)
+ * libxml2-CVE-2013-1969.patch
+
+-------------------------------------------------------------------
+Thu Mar 7 13:28:59 UTC 2013 - vcizek(a)suse.com
+
+- fix for CVE-2013-0338 (bnc#805233)
+ libxml2-CVE-2013-0338-Detect-excessive-entities-expansion-upon-replacement.patch
+
+-------------------------------------------------------------------
+Sat Dec 15 15:55:26 UTC 2012 - p.drouand(a)gmail.com
+
+- update to 2.9.0 version:
+ * please see the Changelog
+- Updated patchs to get working with new version:
+ * libxml2-2.9.0-CVE-2012-5134.patch ( libxml2-CVE-2012-5134.patch )
+ * fix-perl.diff
+
+-------------------------------------------------------------------
+Fri Dec 7 10:49:11 UTC 2012 - vcizek(a)suse.com
+
+- Add libxml2-CVE-2012-5134.patch to fix CVE-2012-5134 (bnc#793334)
+
+-------------------------------------------------------------------
+Sun Sep 23 19:40:30 UTC 2012 - dimstar(a)opensuse.org
+
+- Add a comment next to libxml2.la to make sure that anybody
+ removing it knows why it's there and reconsiders.
+
+-------------------------------------------------------------------
+Sun Sep 23 19:28:04 UTC 2012 - coolo(a)suse.com
+
+- readd .la file, python-libxml2 needs it
+
+-------------------------------------------------------------------
+Fri Sep 21 18:04:16 UTC 2012 - jengelh(a)inai.de
+
+- Remove .la files; make sure installation succeeds for
+ Fedora_17 target
+
+-------------------------------------------------------------------
+Tue Jun 12 18:10:07 UTC 2012 - chris(a)computersalat.de
+
+- update to 2.8.0
+ * please se ChangeLog for more info
+- remove obsolete bigendian64 patch
+- rebase fix-perl patch
+
+-------------------------------------------------------------------
+Sun Mar 11 21:00:19 UTC 2012 - jengelh(a)medozas.de
+
+- libxml2-2 should not require libxml2-tools. There is no trouble
+ expected, since attempting to install libxml2 will already pull
+ in libxml2-tools due to Provides tags.
+
+-------------------------------------------------------------------
+Mon Mar 5 10:18:12 UTC 2012 - coolo(a)suse.com
+
+- revert the two commits that broke perl-XML-LibXML's test case,
+ I hope the two upstreams will figure it out
+
+-------------------------------------------------------------------
+Fri Mar 2 16:47:56 UTC 2012 - coolo(a)suse.com
+
+- update to git to fix some issues
+ * Fix a logic error in Schemas Component ConstraintsHEADmaster
+ * Fix a wrong enum type use in Schemas Types
+
+-------------------------------------------------------------------
+Thu Mar 1 18:36:33 CET 2012 - meissner(a)suse.de
+
+- fixed a 64bit big endian bug in the file reader.
+
+-------------------------------------------------------------------
+Sat Feb 25 13:50:54 UTC 2012 - coolo(a)suse.com
+
+- the fallout of requiring libxml2-tools as explicit buildrequire
+ is just too large, so avoid it for now and create a cycle between
+ libxml2-2 and libxml2-tools
+
+-------------------------------------------------------------------
+Sat Feb 25 08:09:00 UTC 2012 - coolo(a)suse.com
+
+- add provide for the old name to fix packages with explicit
+ library dependency
+
+-------------------------------------------------------------------
+Thu Feb 23 10:42:16 UTC 2012 - coolo(a)suse.com
+
+- update to today's GIT snapshot:
+ include XZ support
+- split libxml2-2 according to shared library policy
+
+-------------------------------------------------------------------
+Mon Dec 26 17:08:52 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant tags/sections
+
+-------------------------------------------------------------------
+Wed Dec 21 10:24:19 UTC 2011 - coolo(a)suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Tue Dec 20 11:05:01 UTC 2011 - coolo(a)suse.com
+
+- own aclocal directory, there is no other reason to buildrequire
+ automake
+
+-------------------------------------------------------------------
+Fri Jul 8 08:52:06 UTC 2011 - saschpe(a)suse.de
+
+- update to libxml-2.7.8+git20110708
+ - several important bugfixes
+- drop upstreamed patches:
+ * libxml2-CVE-2010-4494.patch
+ * libxml2-CVE-2011-1944.patch
+ * noxref.patch
+ * symbol-versioning.patch
+
+-------------------------------------------------------------------
+Wed Jun 29 09:05:59 UTC 2011 - puzel(a)novell.com
+
+- add libxml2-CVE-2011-1944.patch (bnc#697372)
+
+-------------------------------------------------------------------
+Sun Jun 5 21:36:07 UTC 2011 - cshorler(a)googlemail.com
+
+- add symbol-versioning.patch to restore 11.3 versioned symbols
+
+-------------------------------------------------------------------
+Mon Jan 3 09:21:20 UTC 2011 - puzel(a)novell.com
+
+- add libxml2-CVE-2010-4494.patch (bnc#661471)
+
+-------------------------------------------------------------------
+Fri Dec 3 12:09:40 UTC 2010 - puzel(a)novell.com
+
+- update to libxml-2.7.8
+ - number of bufixes, documentation and portability fixes
+ - update language ID parser to RFC 5646
+ - sort python generated stubs
+ - add an HTML parser option to avoid a default doctype
+ - see http://xmlsoft.org/news.html for exact details
+- drop libxml2-xpath-ns-attr-axis.patch (in upstream)
+- clean up specfile
+
+-------------------------------------------------------------------
+Mon Nov 1 10:00:04 UTC 2010 - puzel(a)novell.com
+
+- add libxml2-xpath-ns-attr-axis.patch (bnc#648277)
+
+-------------------------------------------------------------------
+Sat Oct 30 22:45:22 UTC 2010 - cristian.rodriguez(a)opensuse.org
+
+- Use --disable-static
+
+-------------------------------------------------------------------
+Mon Sep 20 11:36:31 UTC 2010 - puzel(a)novell.com
+
+- drop libxml2-largefile64.patch (revert last change)
+ - the issue is fixed in zlib
+
+-------------------------------------------------------------------
+Fri Sep 17 16:28:46 UTC 2010 - puzel(a)novell.com
+
+- add libxml2-largefile64.patch (fixes build)
+ - debian bug#439843
+
+-------------------------------------------------------------------
+Wed Jul 14 20:05:00 UTC 2010 - jw(a)novell.com
+
+- added noxref.patch,
+ this implements a new --noxref option, which turns
++++ 1450 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.3:Update/.libxml2.2842.new/libxml2.changes
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:12.3:Update/.libxml2.2842.new/python-libxml2.changes 2014-05-27 13:48:51.000000000 +0200
@@ -0,0 +1,1489 @@
+-------------------------------------------------------------------
+Sat Dec 15 15:55:26 UTC 2012 - p.drouand(a)gmail.com
+
+- update to 2.9.0 version:
+ * please see the Changelog
+- Updated patchs to get working with new version:
+ * libxml2-2.9.0-CVE-2012-5134.patch ( libxml2-CVE-2012-5134.patch )
+ * fix-perl.diff
+
+-------------------------------------------------------------------
+Tue Jun 12 18:10:07 UTC 2012 - chris(a)computersalat.de
+
+- update to 2.8.0
+ * please see ChangeLog for more info
+
+-------------------------------------------------------------------
+Sat Feb 25 08:47:58 UTC 2012 - coolo(a)suse.com
+
+- fix version
+
+-------------------------------------------------------------------
+Thu Feb 23 11:00:21 UTC 2012 - coolo(a)suse.com
+
+- renamed to python-libxml2 to follow python naming expectations
+- do not require python but let rpm figure it out
+
+-------------------------------------------------------------------
+Mon Dec 26 17:08:59 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant tags/sections
+
+-------------------------------------------------------------------
+Fri Jul 8 08:52:06 UTC 2011 - saschpe(a)suse.de
+
+- update to libxml-2.7.8+git20110708
+ - several important bugfixes
+
+-------------------------------------------------------------------
+Mon Dec 6 09:05:53 UTC 2010 - coolo(a)novell.com
+
+- buildrequire python-xml to fix build
+
+-------------------------------------------------------------------
+Fri Dec 3 12:24:42 UTC 2010 - puzel(a)novell.com
+
+- update to libxml-2.7.8
+ - number of bufixes, documentation and portability fixes
+ - update language ID parser to RFC 5646
+ - sort python generated stubs
+ - add an HTML parser option to avoid a default doctype
+ - see http://xmlsoft.org/news.html for exact details
+- clean up specfile
+
+-------------------------------------------------------------------
+Wed Apr 7 16:34:29 UTC 2010 - coolo(a)novell.com
+
+- fix build
+
+-------------------------------------------------------------------
+Tue Mar 23 23:46:00 CET 2010 - mrdocs(a)opensuse.org
+
+- update to 2.7.7
+- add extra options to ./configure for scribus features and avoid a crash
+- updates from 2.7.3 > 2.7.7 include a number of portability, correctness
+ memory leaks and build fixes including some CVE
+- see http://xmlsoft.org/news.html for exact details
+
+-------------------------------------------------------------------
+Tue Dec 15 12:19:16 CET 2009 - jengelh(a)medozas.de
+
+- enable parallel building
+
+-------------------------------------------------------------------
+Thu Mar 19 10:16:50 CET 2009 - prusnak(a)suse.cz
+
+- updated to 2.7.2
+ * Portability fix: fix solaris compilation problem,
+ fix compilation if XPath is not configured in
+ * Bug fixes: nasty entity bug introduced in 2.7.0, restore old
+ behaviour when saving an HTML doc with an xml dump function,
+ HTML UTF-8 parsing bug, fix reader custom error handlers
+ (Riccardo Scussat)
+ * Improvement: xmlSave options for more flexibility to save
+ as XML/HTML/XHTML, handle leading BOM in HTML documents
+- updated to 2.7.3
+ * Build fix: fix build when HTML support is not included.
+ * Bug fixes: avoid memory overflow in gigantic text nodes,
+ indentation problem on the writed (Rob Richards),
+ xmlAddChildList pointer problem (Rob Richards and Kevin Milburn),
+ xmlAddChild problem with attribute (Rob Richards and Kris Breuker),
+ avoid a memory leak in an edge case (Daniel Zimmermann),
+ deallocate some pthread data (Alex Ott).
+ * Improvements: configure option to avoid rebuilding docs
+ (Adrian Bunk), limit text nodes to 10MB max by default,
+ add element traversal APIs, add a parser option to enable
+ pre 2.7 SAX behavior (Rob Richards),
+ add gcc malloc checking (Marcus Meissner),
+ add gcc printf like functions parameters checking (Marcus Meissner).
+- dropped obsoleted patches:
+ * alloc_size.patch (mainline)
+ * CVE-2008-4225.patch (mainline)
+ * CVE-2008-4226.patch (mainline)
+ * CVE-2008-4409.patch (mainline)
+ * oldsax.patch (mainline)
+ * pritnf.patch (mainline)
+ * xmlsave.patch (mainline)
+
+-------------------------------------------------------------------
+Mon Jan 12 17:21:59 CET 2009 - prusnak(a)suse.cz
+
+- added oldsax.patch to enable pre 2.7.0 sax behaviour [bnc#457056]
+
+-------------------------------------------------------------------
+Wed Dec 10 12:34:56 CET 2008 - olh(a)suse.de
+
+- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
+ (bnc#437293)
+
+-------------------------------------------------------------------
+Tue Nov 25 16:00:27 CET 2008 - prusnak(a)suse.cz
+
+- fix broken xmlsave (xmlsave.patch) [bnc#437203]
+
+-------------------------------------------------------------------
+Tue Nov 18 16:24:39 CET 2008 - prusnak(a)suse.cz
+
+- fixed CVE-2008-4225 [bnc#445677]
+
+-------------------------------------------------------------------
+Thu Nov 6 12:02:25 CET 2008 - prusnak(a)suse.cz
+
+- fixed CVE-2008-4226 [bnc#441368]
+
+-------------------------------------------------------------------
+Thu Oct 30 12:34:56 CET 2008 - olh(a)suse.de
+
+- obsolete old -XXbit packages (bnc#437293)
+
+-------------------------------------------------------------------
+Mon Oct 6 14:50:38 CEST 2008 - prusnak(a)suse.cz
+
+- fixed CVE-2008-4409 [bnc#432486]
+
+-------------------------------------------------------------------
+Tue Sep 9 17:01:12 CEST 2008 - meissner(a)suse.de
+
+- added GCC attribute alloc_size markup (alloc_size.patch)
+
+-------------------------------------------------------------------
+Wed Sep 3 16:58:23 CEST 2008 - prusnak(a)suse.cz
+
+- updated to 2.7.1
+ * Portability fix: Borland C fix (Moritz Both)
+ * Bug fixes: python serialization wrappers, XPath QName corner
+ case handking and leaks (Martin)
+ * Improvement: extend the xmlSave to handle HTML documents and trees
+ * Cleanup: python serialization wrappers
+
+-------------------------------------------------------------------
+Wed Sep 3 16:57:46 CEST 2008 - prusnak(a)suse.cz
+
+- updated to 2.7.0
+ * Documentation: switch ChangeLog to UTF-8, improve mutithreads and
+ xmlParserCleanup docs
+ * Portability fixes: Older Win32 platforms (Rob Richards), MSVC
+ porting fix (Rob Richards), Mac OS X regression tests (Sven Herzberg),
+ non GNUCC builds (Rob Richards), compilation on Haiku (Andreas Färber)
+ * Bug fixes: various realloc problems (Ashwin), potential double-free
+ (Ashwin), regexp crash, icrash with invalid whitespace facets (Rob
+ Richards), pattern fix when streaming (William Brack), various XML
+ parsing and validation fixes based on the W3C regression tests, reader
+ tree skipping function fix (Ashwin), Schemas regexps escaping fix
+ (Volker Grabsch), handling of entity push errors (Ashwin), fix a slowdown
+ when encoder cant serialize characters on output
+ * Code cleanup: compilation fix without the reader, without the output
+ (Robert Schwebel), python whitespace (Martin), many space/tabs cleanups,
+ serious cleanup of the entity handling code
+ * Improvement: switch parser to XML-1.0 5th edition, add parsing flags
+ for old versions, switch URI parsing to RFC 3986,
+ add xmlSchemaValidCtxtGetParserCtxt (Holger Kaelberer),
+ new hashing functions for dictionnaries (based on Stefan Behnel work),
+ improve handling of misplaced html/head/body in HTML parser, better
+ regression test tools and code coverage display, better algorithms
+ to detect various versions of the billion laughts attacks, make
+ arbitrary parser limits avoidable as a parser option
+- dropped obsoleted patches:
+ * billion-laughs.patch (included in update)
+
+-------------------------------------------------------------------
+Wed Aug 13 12:05:08 CEST 2008 - prusnak(a)suse.cz
+
+- fixed billion laughs vulnerability (billion-laughs.patch) [bnc#415371]
+
+-------------------------------------------------------------------
+Fri Apr 11 14:34:30 CEST 2008 - prusnak(a)suse.cz
+
+- updated to 2.6.32
++++ 1292 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.3:Update/.libxml2.2842.new/python-libxml2.changes
New:
----
baselibs.conf
fix-perl.diff
libxml2-2.9.0-CVE-2012-5134.patch
libxml2-2.9.0.tar.gz
libxml2-CVE-2013-0338-Detect-excessive-entities-expansion-upon-replacement.patch
libxml2-CVE-2013-1969.patch
libxml2-CVE-2013-2877.patch
libxml2-CVE-2014-0191.patch
libxml2.changes
libxml2.spec
python-libxml2.changes
python-libxml2.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxml2.spec ++++++
#
# spec file for package libxml2
#
# Copyright (c) 2014 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
%define lname libxml2-2
Name: libxml2
Version: 2.9.0
Release: 0
Summary: A Library to Manipulate XML Files
License: MIT
Group: System/Libraries
Url: http://xmlsoft.org
# Source ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz changes every day
Source: ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
Source2: baselibs.conf
Patch0: fix-perl.diff
# PATCH-FIX-UPSTREAM CVE-2012-5134 (bnc#793334)
Patch1: libxml2-2.9.0-CVE-2012-5134.patch
Patch4: libxml2-CVE-2013-0338-Detect-excessive-entities-expansion-upon-replacement.patch
Patch5: libxml2-CVE-2013-1969.patch
Patch6: libxml2-CVE-2013-2877.patch
Patch7: libxml2-CVE-2014-0191.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
%description
The XML C library was initially developed for the GNOME project. It is
now used by many programs to load and save extensible data structures
or manipulate any kind of XML files.
This library implements a number of existing standards related to
markup languages, including the XML standard, name spaces in XML, XML
Base, RFC 2396, XPath, XPointer, HTML4, XInclude, SGML catalogs, and
XML catalogs. In most cases, libxml tries to implement the
specification in a rather strict way. To some extent, it provides
support for the following specifications, but does not claim to
implement them: DOM, FTP client, HTTP client, and SAX.
The library also supports RelaxNG. Support for W3C XML Schemas is in
progress.
%package -n %lname
Summary: A Library to Manipulate XML Files
Group: System/Libraries
%description -n %lname
The XML C library was initially developed for the GNOME project. It is
now used by many programs to load and save extensible data structures
or manipulate any kind of XML files.
This library implements a number of existing standards related to
markup languages, including the XML standard, name spaces in XML, XML
Base, RFC 2396, XPath, XPointer, HTML4, XInclude, SGML catalogs, and
XML catalogs. In most cases, libxml tries to implement the
specification in a rather strict way. To some extent, it provides
support for the following specifications, but does not claim to
implement them: DOM, FTP client, HTTP client, and SAX.
The library also supports RelaxNG. Support for W3C XML Schemas is in
progress.
%package tools
Summary: Tools using libxml
Group: System/Libraries
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
%description tools
This package contains xmllint, a very useful tool proving libxml's power.
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Requires: %{name}-tools = %{version}
Requires: glibc-devel
Requires: readline-devel
Requires: xz-devel
Requires: zlib-devel
# bug437293
%ifarch ppc64
Obsoletes: libxml2-devel-64bit
%endif
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.
%package doc
Summary: A Library to Manipulate XML Files
Group: System/Libraries
Requires: %{lname} = %{version}
BuildArch: noarch
%description doc
The XML C library was initially developed for the GNOME project. It is
now used by many programs to load and save extensible data structures
or manipulate any kind of XML files.
This library implements a number of existing standards related to
markup languages, including the XML standard, name spaces in XML, XML
Base, RFC 2396, XPath, XPointer, HTML4, XInclude, SGML catalogs, and
XML catalogs. In most cases, libxml tries to implement the
specification in a rather strict way. To some extent, it provides
support for the following specifications, but does not claim to
implement them: DOM, FTP client, HTTP client, and SAX.
The library also supports RelaxNG. Support for W3C XML Schemas is in
progress.
%prep
%setup -q
%patch0
%patch1 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
%configure --disable-static \
--docdir=%_docdir/%name \
--with-html-dir=%_docdir/%name/html \
--with-fexceptions \
--with-history \
--without-python \
--enable-ipv6 \
--with-sax1 \
--with-regexps \
--with-threads \
--with-reader \
--with-http
make %{?_smp_mflags} BASE_DIR="%_docdir" DOC_MODULE="%name"
%install
make install DESTDIR="%buildroot" BASE_DIR="%_docdir" DOC_MODULE="%name"
mkdir -p "%buildroot/%_docdir/%name"
cp -a AUTHORS NEWS README COPYING* Copyright TODO* %{buildroot}%{_docdir}/%{name}/
ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
%check
# qemu-arm can't keep up atm, disabling check for arm
%ifnarch %arm
make check
%endif
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files -n %lname
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%doc %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/[ANRCT]*
%files tools
%defattr(-, root, root)
%{_bindir}/xmllint
%{_bindir}/xmlcatalog
%doc %{_mandir}/man1/xmllint.1*
%doc %{_mandir}/man1/xmlcatalog.1*
%files devel
%defattr(-, root, root)
%{_bindir}/xml2-config
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/libxml.m4
%{_includedir}/libxml
%{_includedir}/libxml2
%{_libdir}/lib*.so
# libxml2.la is needed for the python-libxml2 build. Deleting it breaks build of python-libxml2.
%{_libdir}/libxml2.la
%{_libdir}/*.sh
%{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man1/xml2-config.1*
%doc %{_mandir}/man3/libxml.3*
%files doc
%defattr(-, root, root)
%{_datadir}/gtk-doc/html/*
%doc %{_docdir}/%{name}/examples
%doc %{_docdir}/%{name}/html
# owning these directories prevents gtk-doc <-> libxml2 build loop:
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%changelog
++++++ python-libxml2.spec ++++++
#
# spec file for package python-libxml2
#
# Copyright (c) 2014 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
Name: python-libxml2
Version: 2.9.0
Release: 0
Summary: Python Bindings for libxml2
License: MIT
Group: Development/Libraries/Python
Url: http://xmlsoft.org
Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libxml2-devel
BuildRequires: python-devel
BuildRequires: python-xml
Requires: libxml2-2 = %{version}
# Uncomment to save space:
#NoSource: 0
Obsoletes: libxml2-python < %{version}
Provides: libxml2-python = %{version}
%description
The libxml2-python package contains a module that permits applications
written in the Python programming language to use the interface
supplied by the libxml2 library to manipulate XML files.
This library allows manipulation of XML files. It includes support for
reading, modifying, and writing XML and HTML files. There is DTD
support that includes parsing and validation even with complex DTDs,
either at parse time or later once the document has been modified.
%prep
%setup -q -n libxml2-%{version}
%build
# workaround for bnc#310196
%ifarch s390 s390x
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-O2/-O1}
%endif
export CFLAGS="%{optflags} -fno-strict-aliasing"
%configure \
--with-fexceptions \
--with-history \
--enable-ipv6 \
--with-sax1 \
--with-regexps \
--with-threads \
--with-reader \
--with-http
# use libxml2 as built by libxml2 source package
mkdir .libs
cp -v %{_libdir}/libxml2.la .
make -C python %{?_smp_mflags}
%install
make -C python install \
DESTDIR=%{buildroot} \
pythondir=%{py_sitedir} \
PYTHON_SITE_PACKAGES=%{py_sitedir}
chmod a-x python/tests/*.py
# Unwanted doc stuff
rm -fr %{buildroot}%{_datadir}/doc
rm -f python/tests/Makefile*
# #223696
rm -f %{buildroot}%{py_sitedir}/*.{la,a}
%files
%defattr(-, root, root)
%doc python/TODO
%doc python/libxml2class.txt
%doc python/tests
%{py_sitedir}/*
%changelog
++++++ baselibs.conf ++++++
libxml2-2
libxml2-devel
requires -libxml2-<targettype>
requires "libxml2-2-<targettype> = <version>"
++++++ fix-perl.diff ++++++
commit 77b77b1301e052d90e6a0967534a698506afcd86
Author: Daniel Veillard <veillard(a)redhat.com>
Date: Thu Jan 26 19:11:02 2012 +0800
Fix SAX2 builder in case of undefined element namespaces
Work as in XML-1.0 before namespaces, and use prefix:localname
as the new element name (and no namespace of course)
Also fix 3 cases in the regression tests where the prefix: was
erroneously dropped in such case
Index: SAX2.c
===================================================================
--- SAX2.c.orig 2012-09-11 08:01:01.000000000 +0200
+++ SAX2.c 2012-12-15 16:32:27.353560391 +0100
@@ -2188,7 +2188,6 @@
xmlNodePtr parent;
xmlNsPtr last = NULL, ns;
const xmlChar *uri, *pref;
- xmlChar *lname = NULL;
int i, j;
if (ctx == NULL) return;
@@ -2208,20 +2207,6 @@
}
/*
- * Take care of the rare case of an undefined namespace prefix
- */
- if ((prefix != NULL) && (URI == NULL)) {
- if (ctxt->dictNames) {
- const xmlChar *fullname;
-
- fullname = xmlDictQLookup(ctxt->dict, prefix, localname);
- if (fullname != NULL)
- localname = fullname;
- } else {
- lname = xmlBuildQName(localname, prefix, NULL, 0);
- }
- }
- /*
* allocate the node
*/
if (ctxt->freeElems != NULL) {
@@ -2234,10 +2219,7 @@
if (ctxt->dictNames)
ret->name = localname;
else {
- if (lname == NULL)
- ret->name = xmlStrdup(localname);
- else
- ret->name = lname;
+ ret->name = xmlStrdup(localname);
if (ret->name == NULL) {
xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
return;
@@ -2249,11 +2231,8 @@
if (ctxt->dictNames)
ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
(xmlChar *) localname, NULL);
- else if (lname == NULL)
- ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
else
- ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
- (xmlChar *) lname, NULL);
+ ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
if (ret == NULL) {
xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
return;
@@ -2360,31 +2339,6 @@
*/
if (nb_attributes > 0) {
for (j = 0,i = 0;i < nb_attributes;i++,j+=5) {
- /*
- * Handle the rare case of an undefined atribute prefix
- */
- if ((attributes[j+1] != NULL) && (attributes[j+2] == NULL)) {
- if (ctxt->dictNames) {
- const xmlChar *fullname;
-
- fullname = xmlDictQLookup(ctxt->dict, attributes[j+1],
- attributes[j]);
- if (fullname != NULL) {
- xmlSAX2AttributeNs(ctxt, fullname, NULL,
- attributes[j+3], attributes[j+4]);
- continue;
- }
- } else {
- lname = xmlBuildQName(attributes[j], attributes[j+1],
- NULL, 0);
- if (lname != NULL) {
- xmlSAX2AttributeNs(ctxt, lname, NULL,
- attributes[j+3], attributes[j+4]);
- xmlFree(lname);
- continue;
- }
- }
- }
xmlSAX2AttributeNs(ctxt, attributes[j], attributes[j+1],
attributes[j+3], attributes[j+4]);
}
Index: result/namespaces/err_7.xml
===================================================================
--- result/namespaces/err_7.xml.orig
+++ result/namespaces/err_7.xml
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<f:foo/>
+<foo/>
Index: result/xmlid/id_tst2.xml
===================================================================
--- result/xmlid/id_tst2.xml.orig
+++ result/xmlid/id_tst2.xml
@@ -1,6 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
-1 ELEMENT n:foo
+1 ELEMENT foo
ATTRIBUTE id
TEXT
content=bar
Index: result/xmlid/id_tst3.xml
===================================================================
--- result/xmlid/id_tst3.xml.orig
+++ result/xmlid/id_tst3.xml
@@ -1,6 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
-1 ELEMENT f:o:o
+1 ELEMENT o:o
ATTRIBUTE id
TEXT
content=bar
++++++ libxml2-2.9.0-CVE-2012-5134.patch ++++++
--- libxml2-2.9.0.orig/parser.c 2012-09-11 06:24:08.000000000 +0200
+++ libxml2-2.9.0/parser.c 2012-12-15 16:12:27.441609871 +0100
@@ -4075,7 +4075,7 @@
goto error;
if ((in_space) && (normalize)) {
- while (buf[len - 1] == 0x20) len--;
+ while ((len > 0) && (buf[len - 1] == 0x20)) len--;
}
buf[len] = 0;
if (RAW == '<') {
++++++ libxml2-CVE-2013-0338-Detect-excessive-entities-expansion-upon-replacement.patch ++++++
>From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard(a)redhat.com>
Date: Tue, 19 Feb 2013 10:21:49 +0800
Subject: [PATCH] Detect excessive entities expansion upon replacement
If entities expansion in the XML parser is asked for,
it is possble to craft relatively small input document leading
to excessive on-the-fly content generation.
This patch accounts for those replacement and stop parsing
after a given threshold. it can be bypassed as usual with the
HUGE parser option.
---
include/libxml/parser.h | 1 +
parser.c | 44 ++++++++++++++++++++++++++++++++++++++------
parserInternals.c | 2 ++
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index e1346e4..3f5730d 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -310,6 +310,7 @@ struct _xmlParserCtxt {
xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */
int input_id; /* we need to label inputs */
+ unsigned long sizeentcopy; /* volume of entity copy */
};
/**
diff --git a/parser.c b/parser.c
index 91f8c90..ddf3b5b 100644
--- a/parser.c
+++ b/parser.c
@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID,
*/
static int
xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
- xmlEntityPtr ent)
+ xmlEntityPtr ent, size_t replacement)
{
size_t consumed = 0;
@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
return (0);
if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
return (1);
- if (size != 0) {
+ if (replacement != 0) {
+ if (replacement < XML_MAX_TEXT_LENGTH)
+ return(0);
+
+ /*
+ * If the volume of entity copy reaches 10 times the
+ * amount of parsed data and over the large text threshold
+ * then that's very likely to be an abuse.
+ */
+ if (ctxt->input != NULL) {
+ consumed = ctxt->input->consumed +
+ (ctxt->input->cur - ctxt->input->base);
+ }
+ consumed += ctxt->sizeentities;
+
+ if (replacement < XML_PARSER_NON_LINEAR * consumed)
+ return(0);
+ } else if (size != 0) {
/*
* Do the check based on the replacement size of the entity
*/
@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
*/
return (0);
}
-
xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
return (1);
}
@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
while (*current != 0) { /* non input consuming loop */
buffer[nbchars++] = *current++;
if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
goto int_error;
growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
}
@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
while (*current != 0) { /* non input consuming loop */
buffer[nbchars++] = *current++;
if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
goto int_error;
growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
}
@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
xmlFreeNodeList(list);
return;
}
- if (xmlParserEntityCheck(ctxt, 0, ent)) {
+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) {
xmlFreeNodeList(list);
return;
}
@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
xmlNodePtr nw = NULL, cur, firstChild = NULL;
/*
+ * We are copying here, make sure there is no abuse
+ */
+ ctxt->sizeentcopy += ent->length;
+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
+ return;
+
+ /*
* when operating on a reader, the entities definitions
* are always owning the entities subtree.
if (ctxt->parseMode == XML_PARSE_READER)
@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
} else if ((list == NULL) || (ctxt->inputNr > 0)) {
xmlNodePtr nw = NULL, cur, next, last,
firstChild = NULL;
+
+ /*
+ * We are copying here, make sure there is no abuse
+ */
+ ctxt->sizeentcopy += ent->length;
+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
+ return;
+
/*
* Copy the entity child list and make it the new
* entity child list. The goal is to make sure any
@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
ctxt->catalogs = NULL;
ctxt->nbentities = 0;
ctxt->sizeentities = 0;
+ ctxt->sizeentcopy = 0;
xmlInitNodeInfoSeq(&ctxt->node_seq);
if (ctxt->attsDefault != NULL) {
diff --git a/parserInternals.c b/parserInternals.c
index 02032d5..f8a7041 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
ctxt->charset = XML_CHAR_ENCODING_UTF8;
ctxt->catalogs = NULL;
ctxt->nbentities = 0;
+ ctxt->sizeentities = 0;
+ ctxt->sizeentcopy = 0;
ctxt->input_id = 1;
xmlInitNodeInfoSeq(&ctxt->node_seq);
return(0);
--
1.7.10.4
++++++ libxml2-CVE-2013-1969.patch ++++++
>From de0cc20c29cb3f056062925395e0f68d2250a46f Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard(a)redhat.com>
Date: Tue, 12 Feb 2013 08:55:34 +0000
Subject: Fix some buffer conversion issues
https://bugzilla.gnome.org/show_bug.cgi?id=690202
Buffer overflow errors originating from xmlBufGetInputBase in 2.9.0
The pointers from the context input were not properly reset after
that call which can do reallocations.
---
diff --git a/HTMLparser.c b/HTMLparser.c
index a533f37..6b83654 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -6054,6 +6054,8 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
if ((in->encoder != NULL) && (in->buffer != NULL) &&
(in->raw != NULL)) {
int nbchars;
+ size_t base = xmlBufGetInputBase(in->buffer, ctxt->input);
+ size_t current = ctxt->input->cur - ctxt->input->base;
nbchars = xmlCharEncInput(in);
if (nbchars < 0) {
@@ -6061,6 +6063,7 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
"encoder error\n", NULL, NULL);
return(XML_ERR_INVALID_ENCODING);
}
+ xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
}
}
}
diff --git a/parser.c b/parser.c
index 31f90d6..1c99051 100644
--- a/parser.c
+++ b/parser.c
@@ -12126,7 +12126,7 @@ xmldecl_done:
remain = 0;
}
}
- res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+ res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
if (res < 0) {
ctxt->errNo = XML_PARSER_EOF;
ctxt->disableSAX = 1;
@@ -12143,6 +12143,8 @@ xmldecl_done:
if ((in->encoder != NULL) && (in->buffer != NULL) &&
(in->raw != NULL)) {
int nbchars;
+ size_t base = xmlBufGetInputBase(in->buffer, ctxt->input);
+ size_t current = ctxt->input->cur - ctxt->input->base;
nbchars = xmlCharEncInput(in);
if (nbchars < 0) {
@@ -12151,6 +12153,7 @@ xmldecl_done:
"xmlParseChunk: encoder error\n");
return(XML_ERR_INVALID_ENCODING);
}
+ xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
}
}
}
@@ -12190,7 +12193,14 @@ xmldecl_done:
}
if ((end_in_lf == 1) && (ctxt->input != NULL) &&
(ctxt->input->buf != NULL)) {
+ size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer,
+ ctxt->input);
+ size_t current = ctxt->input->cur - ctxt->input->base;
+
xmlParserInputBufferPush(ctxt->input->buf, 1, "\r");
+
+ xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input,
+ base, current);
}
if (terminate) {
/*
--
cgit v0.9.1
++++++ libxml2-CVE-2013-2877.patch ++++++
commit e50ba8164eee06461c73cd8abb9b46aa0be81869
Author: Daniel Veillard <veillard(a)redhat.com>
Date: Thu Apr 11 15:54:51 2013 +0800
Improve handling of xmlStopParser()
Add a specific parser error
Try to stop parsing as quickly as possible
Index: libxml2-2.9.0/include/libxml/xmlerror.h
===================================================================
--- libxml2-2.9.0.orig/include/libxml/xmlerror.h 2012-09-11 05:52:46.000000000 +0200
+++ libxml2-2.9.0/include/libxml/xmlerror.h 2013-07-11 17:31:26.572747643 +0200
@@ -208,6 +208,7 @@ typedef enum {
XML_ERR_UNKNOWN_VERSION, /* 108 */
XML_ERR_VERSION_MISMATCH, /* 109 */
XML_ERR_NAME_TOO_LONG, /* 110 */
+ XML_ERR_USER_STOP, /* 111 */
XML_NS_ERR_XML_NAMESPACE = 200,
XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */
XML_NS_ERR_QNAME, /* 202 */
Index: libxml2-2.9.0/parser.c
===================================================================
--- libxml2-2.9.0.orig/parser.c 2013-07-11 17:31:26.566747574 +0200
+++ libxml2-2.9.0/parser.c 2013-07-11 17:31:26.574747666 +0200
@@ -2548,6 +2548,8 @@ xmlParserHandlePEReference(xmlParserCtxt
NEXT;
if ((ctxt->sax != NULL) && (ctxt->sax->getParameterEntity != NULL))
entity = ctxt->sax->getParameterEntity(ctxt->userData, name);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return;
if (entity == NULL) {
/*
@@ -4999,7 +5001,8 @@ get_more:
}
if (buf != NULL)
xmlFree(buf);
- ctxt->instate = state;
+ if (ctxt->instate != XML_PARSER_EOF)
+ ctxt->instate = state;
return;
}
if (buf != NULL) {
@@ -5587,6 +5590,8 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt
}
}
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ return;
SKIP_BLANKS;
if (RAW != '>') {
xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED,
@@ -7574,6 +7579,8 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt)
ent = xmlSAX2GetEntity(ctxt, name);
}
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(NULL);
/*
* [ WFC: Entity Declared ]
* In a document without any DTD, a document with only an
@@ -7764,6 +7771,10 @@ xmlParseStringEntityRef(xmlParserCtxtPtr
ent = xmlSAX2GetEntity(ctxt, name);
}
}
+ if (ctxt->instate == XML_PARSER_EOF) {
+ xmlFree(name);
+ return;
+ }
/*
* [ WFC: Entity Declared ]
@@ -7925,8 +7936,9 @@ xmlParsePEReference(xmlParserCtxtPtr ctx
*/
if ((ctxt->sax != NULL) &&
(ctxt->sax->getParameterEntity != NULL))
- entity = ctxt->sax->getParameterEntity(ctxt->userData,
- name);
+ entity = ctxt->sax->getParameterEntity(ctxt->userData, name);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return;
if (entity == NULL) {
/*
* [ WFC: Entity Declared ]
@@ -8163,8 +8175,11 @@ xmlParseStringPEReference(xmlParserCtxtP
*/
if ((ctxt->sax != NULL) &&
(ctxt->sax->getParameterEntity != NULL))
- entity = ctxt->sax->getParameterEntity(ctxt->userData,
- name);
+ entity = ctxt->sax->getParameterEntity(ctxt->userData, name);
+ if (ctxt->instate == XML_PARSER_EOF) {
+ xmlFree(name);
+ return;
+ }
if (entity == NULL) {
/*
* [ WFC: Entity Declared ]
@@ -8266,6 +8281,8 @@ xmlParseDocTypeDecl(xmlParserCtxtPtr ctx
if ((ctxt->sax != NULL) && (ctxt->sax->internalSubset != NULL) &&
(!ctxt->disableSAX))
ctxt->sax->internalSubset(ctxt->userData, name, ExternalID, URI);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return;
/*
* Is there any internal subset declarations ?
@@ -10024,6 +10041,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
* Parse the content of the element:
*/
xmlParseContent(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return;
if (!IS_BYTE_CHAR(RAW)) {
xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED,
"Premature end of data in tag %s line %d\n",
@@ -10596,6 +10615,8 @@ xmlParseDocument(xmlParserCtxtPtr ctxt)
*/
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator))
ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
if ((ctxt->encoding == NULL) &&
((ctxt->input->end - ctxt->input->cur) >= 4)) {
@@ -10647,6 +10668,8 @@ xmlParseDocument(xmlParserCtxtPtr ctxt)
}
if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX))
ctxt->sax->startDocument(ctxt->userData);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
/*
* The Misc part of the Prolog
@@ -10666,6 +10689,8 @@ xmlParseDocument(xmlParserCtxtPtr ctxt)
if (RAW == '[') {
ctxt->instate = XML_PARSER_DTD;
xmlParseInternalSubset(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
}
/*
@@ -10676,6 +10701,8 @@ xmlParseDocument(xmlParserCtxtPtr ctxt)
(!ctxt->disableSAX))
ctxt->sax->externalSubset(ctxt->userData, ctxt->intSubName,
ctxt->extSubSystem, ctxt->extSubURI);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
ctxt->inSubset = 0;
xmlCleanSpecialAttr(ctxt);
@@ -10816,6 +10843,8 @@ xmlParseExtParsedEnt(xmlParserCtxtPtr ct
}
if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX))
ctxt->sax->startDocument(ctxt->userData);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
/*
* Doing validity checking on chunk doesn't make sense
@@ -10826,6 +10855,8 @@ xmlParseExtParsedEnt(xmlParserCtxtPtr ct
ctxt->depth = 0;
xmlParseContent(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(-1);
if ((RAW == '<') && (NXT(1) == '/')) {
xmlFatalErr(ctxt, XML_ERR_NOT_WELL_BALANCED, NULL);
@@ -11133,7 +11164,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
}
xmlParseGetLasts(ctxt, &lastlt, &lastgt);
- while (1) {
+ while (ctxt->instate != XML_PARSER_EOF) {
if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
return(0);
@@ -11369,6 +11400,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
ctxt->sax->endElement(ctxt->userData, name);
#endif /* LIBXML_SAX1_ENABLED */
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
spacePop(ctxt);
if (ctxt->nameNr == 0) {
ctxt->instate = XML_PARSER_EPILOG;
@@ -11559,6 +11592,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
ctxt->sax->characters(ctxt->userData,
ctxt->input->cur, tmp);
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
SKIPL(tmp);
ctxt->checkIndex = 0;
}
@@ -11594,6 +11629,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
ctxt->sax->characters(ctxt->userData,
ctxt->input->cur, base);
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
SKIPL(base + 3);
ctxt->checkIndex = 0;
ctxt->instate = XML_PARSER_CONTENT;
@@ -11627,6 +11664,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing PI\n");
#endif
xmlParsePI(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_MISC;
ctxt->progressive = 1;
ctxt->checkIndex = 0;
@@ -11643,6 +11682,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing Comment\n");
#endif
xmlParseComment(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_MISC;
ctxt->progressive = 1;
ctxt->checkIndex = 0;
@@ -11667,6 +11708,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
ctxt->progressive = 1;
ctxt->checkIndex = 0;
xmlParseDocTypeDecl(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
if (RAW == '[') {
ctxt->instate = XML_PARSER_DTD;
#ifdef DEBUG_PUSH
@@ -11726,6 +11769,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing PI\n");
#endif
xmlParsePI(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_PROLOG;
ctxt->progressive = 1;
} else if ((cur == '<') && (next == '!') &&
@@ -11740,6 +11785,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing Comment\n");
#endif
xmlParseComment(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_PROLOG;
ctxt->progressive = 1;
} else if ((cur == '<') && (next == '!') &&
@@ -11778,6 +11825,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing PI\n");
#endif
xmlParsePI(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_EPILOG;
ctxt->progressive = 1;
} else if ((cur == '<') && (next == '!') &&
@@ -11792,6 +11841,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctx
"PP: Parsing Comment\n");
#endif
xmlParseComment(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_EPILOG;
ctxt->progressive = 1;
} else if ((cur == '<') && (next == '!') &&
@@ -11922,6 +11973,8 @@ not_end_of_int_subset:
found_end_int_subset:
ctxt->checkIndex = 0;
xmlParseInternalSubset(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->inSubset = 2;
if ((ctxt->sax != NULL) && (!ctxt->disableSAX) &&
(ctxt->sax->externalSubset != NULL))
@@ -11929,6 +11982,8 @@ found_end_int_subset:
ctxt->extSubSystem, ctxt->extSubURI);
ctxt->inSubset = 0;
xmlCleanSpecialAttr(ctxt);
+ if (ctxt->instate == XML_PARSER_EOF)
+ goto done;
ctxt->instate = XML_PARSER_PROLOG;
ctxt->checkIndex = 0;
#ifdef DEBUG_PUSH
@@ -12205,6 +12260,9 @@ xmldecl_done:
avail - old_avail)))
xmlParseTryOrFinish(ctxt, terminate);
}
+ if (ctxt->instate == XML_PARSER_EOF)
+ return(ctxt->errNo);
+
if ((ctxt->input != NULL) &&
(((ctxt->input->end - ctxt->input->cur) > XML_MAX_LOOKUP_LIMIT) ||
((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) &&
@@ -12405,6 +12463,7 @@ xmlStopParser(xmlParserCtxtPtr ctxt) {
if (ctxt == NULL)
return;
ctxt->instate = XML_PARSER_EOF;
+ ctxt->errNo = XML_ERR_USER_STOP;
ctxt->disableSAX = 1;
if (ctxt->input != NULL) {
ctxt->input->cur = BAD_CAST"";
++++++ libxml2-CVE-2014-0191.patch ++++++
>From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard(a)redhat.com>
Date: Tue, 22 Apr 2014 15:30:56 +0800
Subject: Do not fetch external parameter entities
Unless explicitely asked for when validating or replacing entities
with their value. Problem pointed out by Daniel Berrange <berrange(a)redhat.com>
>From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino(a)gentoo.org>
Date: Fri, 16 May 2014 22:46:00 -0400
Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
entities
For https://bugzilla.gnome.org/show_bug.cgi?id=730290
Index: libxml2-2.9.1/parser.c
===================================================================
--- libxml2-2.9.1.orig/parser.c 2013-04-16 15:39:18.000000000 +0200
+++ libxml2-2.9.1/parser.c 2014-05-23 11:26:43.344897186 +0200
@@ -2595,6 +2595,20 @@ xmlParserHandlePEReference(xmlParserCtxt
xmlCharEncoding enc;
/*
+ * Note: external parsed entities will not be loaded, it is
+ * not required for a non-validating parser, unless the
+ * option of validating, or substituting entities were
+ * given. Doing so is far more secure as the parser will
+ * only process data coming from the document entity by
+ * default.
+ */
+ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
+ ((ctxt->options & XML_PARSE_NOENT) == 0) &&
+ ((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
+ (ctxt->validate == 0))
+ return;
+
+ /*
* handle the extra spaces added before and after
* c.f. http://www.w3.org/TR/REC-xml#as-PE
* this is done independently.
Index: libxml2-2.9.1/xmllint.c
===================================================================
--- libxml2-2.9.1.orig/xmllint.c 2013-03-27 04:31:47.000000000 +0100
+++ libxml2-2.9.1/xmllint.c 2014-05-23 11:26:43.344897186 +0200
@@ -3505,7 +3505,12 @@ main(int argc, char **argv) {
xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
if (noent != 0) xmlSubstituteEntitiesDefault(1);
#ifdef LIBXML_VALID_ENABLED
- if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
+ /* If we will validate only a posteriori, ensure that entities get loaded,
+ * but suppress validation messages during initial parsing */
+ if (postvalid != 0 && valid == 0)
+ options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
+ else if (valid != 0)
+ xmlDoValidityCheckingDefaultValue = 1;
#endif /* LIBXML_VALID_ENABLED */
if ((htmlout) && (!nowrap)) {
xmlGenericError(xmlGenericErrorContext,
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package whois for openSUSE:Factory checked in at 2014-05-27 12:04:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/whois (Old)
and /work/SRC/openSUSE:Factory/.whois.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whois"
Changes:
--------
--- /work/SRC/openSUSE:Factory/whois/whois.changes 2014-05-06 14:03:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.whois.new/whois.changes 2014-05-27 12:04:07.000000000 +0200
@@ -1,0 +2,9 @@
+Mon May 26 23:22:58 UTC 2014 - andreas.stieger(a)gmx.de
+
+- whois 5.1.3:
+ * Use the IANA recovered address space list.
+ * Updated the list of new gTLDs.
+ * Support hiding disclaimers until the end of the output.
+ * Fix a disclaimer hiding string.
+
+-------------------------------------------------------------------
Old:
----
whois_5.1.2.tar.xz
New:
----
whois_5.1.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ whois.spec ++++++
--- /var/tmp/diff_new_pack.sPKGg7/_old 2014-05-27 12:04:09.000000000 +0200
+++ /var/tmp/diff_new_pack.sPKGg7/_new 2014-05-27 12:04:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: whois
-Version: 5.1.2
+Version: 5.1.3
Release: 0
Summary: Intelligent WHOIS client
License: GPL-2.0+
++++++ whois.asc ++++++
--- /var/tmp/diff_new_pack.sPKGg7/_old 2014-05-27 12:04:09.000000000 +0200
+++ /var/tmp/diff_new_pack.sPKGg7/_new 2014-05-27 12:04:09.000000000 +0200
@@ -5,7 +5,7 @@
Source: whois
Binary: whois
Architecture: any
-Version: 5.1.2
+Version: 5.1.3
Maintainer: Marco d'Itri <md(a)linux.it>
Standards-Version: 3.9.5
Vcs-Browser: https://github.com/rfc1036/whois
@@ -14,23 +14,23 @@
Package-List:
whois deb net standard arch=any
Checksums-Sha1:
- 627c7437f663657db903e0cf4ee0cc1369f63e96 75696 whois_5.1.2.tar.xz
+ b730d36359b1d7d0767414da45c2e437697949f0 76472 whois_5.1.3.tar.xz
Checksums-Sha256:
- 021f76910e772fa569e299210b36e2eeb20b56dc9ca29edb7e83a21b560a5403 75696 whois_5.1.2.tar.xz
+ 65ad18fb369827aa12733b88006a0398c88f29ba2bd53732033a7668d70bd64a 76472 whois_5.1.3.tar.xz
Files:
- a103596a4da3f1795fccbd9432c59ec9 75696 whois_5.1.2.tar.xz
+ 2817d6065bbd8f274a3e5240e0bf7dd5 76472 whois_5.1.3.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQGcBAEBCAAGBQJTY40/AAoJECv1pcEixPek7q8MAIJmhRpmIEnv4WCdZahVyxmP
-sWRaw3i/yNnTFTMbDxT96JhEdFLgwGgoCnwGiS3wol4O8VBT8m6yfCDocbyuVCUT
-pGWCzShCPJuPQnoScsd99jzPWyF+lI5M6VB8NHm1ucuPWjneJNUynucLHa7YLiBn
-OPsH9V02s71mPBMb5UchNdNk/H2dDE2Hag8fFq8eiuYJqghUBsR2q64tGhXOGiKA
-to+Xz5B7CjAQdHUXKByT/RyMu79DNFpEDptQYADuMz4/DWeJGWCmxdstASGou327
-eSfEIPiqI7T/ZrrFPozeQ7anRmHYrwum2bBjTRVEWhMzf/ZBh0hUaUeAhsph3isG
-fyv8AdAfF6b6xE5GhBj6VMuelym5PldDKHiTmyHbX1x+LQuUevIrmQ8EjYrA0wDc
-sBelBBWSwqY/n4MyLE57wwLKJM7EgybwHuqTe5cdUQRlu2o99xurEebpm5su2A38
-xZSu5tQQgrptM15NU5SjYayLnoMiNxEhek1FnZ+RyA==
-=rHvB
+iQGcBAEBCAAGBQJTgqWIAAoJECv1pcEixPek3esL/1RqEjby9286iUUcCXwleP/r
+/n66tXICDxEIu3MyJr5VX0JLXlKG3fYPISa/dQWqpNbG1+dBgi6LbHx3mg4qQOQl
+BwWBDRm1CCiw6FGAiHNJ1cfuZvhyOgcReYzmp8Q+5aOHGSs61sPZRdnQcNVPv/nu
+IdrVyhkz2V/bOnizVeMGjVO6QDooVxpbgXTZZEflLD3wJNmrkM6NS4tBrMFcGPGk
+Gz7hQESZqRykCYR8cU+JKC5Oy/ljjKU3bLwkitVfRkX7+Yk3gQDQJOrdmeqKw5gv
+xG8+ExDaB5ZDafYmIFmR3M7o0w0RXoWixrWYw7bloSicLfLVZUbGZLm8z+AZjnw7
+q+Y89vfSNInmg8Ur3im3cbAWCQQSAt/kckHhPDIUczR4pUq4bCUly49qQ/sjSSpd
+NkwVvIRH1+1iZcBclpqP3DWXOOxRvWCWJSKGs/vHBQDWPfC4jW/P4S1Ql0xVYjyS
+bONUCJQUHgpIGZxz+B8v1Wb/53VicqdYa+OruY386w==
+=zw0o
-----END PGP SIGNATURE-----
++++++ whois_5.1.2.tar.xz -> whois_5.1.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/data.h new/whois-5.1.3/data.h
--- old/whois-5.1.2/data.h 2014-05-02 04:26:50.000000000 +0200
+++ new/whois-5.1.3/data.h 2014-05-21 16:24:13.000000000 +0200
@@ -40,7 +40,7 @@
"Access to America Online", "time. By accessing", /* AOL */
"# Access and use restricted", "", /* GANDI */
"% The data in the WHOIS database of 1&1 Internet", "",
- "The data in this whois database is", "", /* enom */
+ "The data in this whois database is", NULL, /* enom, activeregistrar.com */
"The Data in Moniker's WHOIS database", "of Moniker.",
"The Data in OnlineNIC", " By starting this query",
"Interdomain's WHOIS", "DOES NOT SIGNIFY",
@@ -102,6 +102,7 @@
};
const struct ip_del ip_assign[] = {
+#include "ip_del_recovered.h"
#include "ip_del.h"
{ 0, 0, NULL }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/debian/changelog new/whois-5.1.3/debian/changelog
--- old/whois-5.1.2/debian/changelog 2014-05-02 04:26:50.000000000 +0200
+++ new/whois-5.1.3/debian/changelog 2014-05-26 04:22:50.000000000 +0200
@@ -1,3 +1,12 @@
+whois (5.1.3) unstable; urgency=medium
+
+ * Use the IANA recovered address space list.
+ * Updated the list of new gTLDs.
+ * Support hiding disclaimers until the end of the output.
+ * Fix a disclaimer hiding string. (Closes: #748363)
+
+ -- Marco d'Itri <md(a)linux.it> Mon, 26 May 2014 04:19:41 +0200
+
whois (5.1.2) unstable; urgency=medium
* Always query whois.nic.$TLD for the "new" gTLDs, because the ICANN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/ip_del_recovered.h new/whois-5.1.3/ip_del_recovered.h
--- old/whois-5.1.2/ip_del_recovered.h 1970-01-01 01:00:00.000000000 +0100
+++ new/whois-5.1.3/ip_del_recovered.h 2014-05-21 15:49:06.000000000 +0200
@@ -0,0 +1,18 @@
+{ 736100352UL, 736624639UL, "whois.apnic.net" },
+{ 736886784UL, 737411071UL, "whois.apnic.net" },
+{ 737476608UL, 738000895UL, "whois.apnic.net" },
+{ 738066432UL, 738197503UL, "whois.apnic.net" },
+{ 757071872UL, 759169023UL, "whois.arin.net" },
+{ 759169024UL, 759238655UL, "whois.apnic.net" },
+{ 763363328UL, 765460479UL, "whois.ripe.net" },
+{ 765460480UL, 767557631UL, "whois.lacnic.net" },
+{ 767557632UL, 769589247UL, "whois.afrinic.net" },
+{ 2523594752UL, 2523660287UL, "whois.apnic.net" },
+{ 2525036544UL, 2525102079UL, "whois.apnic.net" },
+{ 2532442112UL, 2532507647UL, "whois.apnic.net" },
+{ 2584739840UL, 2584805375UL, "whois.afrinic.net" },
+{ 2737767424UL, 2737771263UL, "whois.apnic.net" },
+{ 2737771520UL, 2737772031UL, "whois.apnic.net" },
+{ 2737774592UL, 2737778175UL, "whois.apnic.net" },
+{ 2737778432UL, 2737831935UL, "whois.apnic.net" },
+{ 2738159616UL, 2738225151UL, "whois.apnic.net" },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/make_ip_del_recovered.pl new/whois-5.1.3/make_ip_del_recovered.pl
--- old/whois-5.1.2/make_ip_del_recovered.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/whois-5.1.3/make_ip_del_recovered.pl 2014-05-21 16:24:13.000000000 +0200
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+# https://www.iana.org/assignments/ipv4-recovered-address-space/ipv4-recovere…
+
+use warnings;
+use strict;
+use autodie;
+
+use Text::CSV;
+
+my $csv = Text::CSV->new;
+
+open(my $in, '<', 'ipv4-recovered-address-space-2.csv');
+open(my $out, '<', 'ip_del_recovered.h');
+
+while (my $row = $csv->getline($in)) {
+ next if $row->[0] eq 'Start address';
+ next if $row->[5] ne 'ALLOCATED';
+
+ my ($b1, $b2, $b3, $b4) = split(/\./, $row->[0]);
+ my ($e1, $e2, $e3, $e4) = split(/\./, $row->[1]);
+ die if not defined $b4 or not defined $e4;
+
+ print $out '{ ' .
+ (($b1 << 24) + ($b2 << 16) + ($b3 << 8) + $b4) . 'UL, ' .
+ (($e1 << 24) + ($e2 << 16) + ($e3 << 8) + $e4) . 'UL, ' .
+ '"' . $row->[4] . qq|" },\n|;
+}
+
+close($in);
+close($out);
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/new_gtlds_list new/whois-5.1.3/new_gtlds_list
--- old/whois-5.1.2/new_gtlds_list 2014-05-02 04:26:50.000000000 +0200
+++ new/whois-5.1.3/new_gtlds_list 2014-05-26 04:22:50.000000000 +0200
@@ -5,14 +5,19 @@
# be checked first.
academy
+accountants
actor
agency
airforce
archi
associates
+audio
+autos
axa
bar
bargains
+bayern
+beer
berlin
best
bid
@@ -38,7 +43,9 @@
ceo
cheap
christmas
+church
citic
+claims
cleaning
clinic
clothing
@@ -58,6 +65,7 @@
cooking
cool
country
+credit
creditcard
cruises
dance
@@ -66,6 +74,7 @@
dental
desi
diamonds
+digital
directory
discount
dnp
@@ -101,15 +110,20 @@
gallery
gift
glass
+globo
+gmo
gop
graphics
gratis
gripe
+guide
guitars
guru
haus
+hiphop
holdings
holiday
+homes
horse
house
immobilien
@@ -121,6 +135,7 @@
international
investments
jetzt
+juegos
kaufen
kim
kitchen
@@ -129,11 +144,14 @@
kred
land
lease
+life
lighting
limited
limo
link
+loans
london
+luxe
luxury
maison
management
@@ -147,6 +165,7 @@
moe
monash
moscow
+motorcycles
nagoya
net
neustar
@@ -172,6 +191,7 @@
quebec
recipes
red
+reise
reisen
ren
rentals
@@ -180,6 +200,7 @@
rest
reviews
rich
+rio
rocks
rodeo
ruhr
@@ -218,6 +239,7 @@
vacations
vegas
ventures
+versicherung
viajes
villas
vision
@@ -246,6 +268,7 @@
xn--80aswg
xn--c1avg
xn--cg4bki
+xn--czr694b
xn--czru2d
xn--d1acj3b
xn--fiq228c5hs
@@ -262,5 +285,6 @@
xn--unup4y
xn--zfr164b
xyz
+yachts
yokohama
zone
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/version.h new/whois-5.1.3/version.h
--- old/whois-5.1.2/version.h 2014-05-02 04:21:08.000000000 +0200
+++ new/whois-5.1.3/version.h 2014-05-21 16:25:04.000000000 +0200
@@ -1 +1 @@
-#define VERSION "5.1.2"
+#define VERSION "5.1.3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/whois.c new/whois-5.1.3/whois.c
--- old/whois-5.1.2/whois.c 2014-05-02 04:26:50.000000000 +0200
+++ new/whois-5.1.3/whois.c 2014-05-21 16:24:13.000000000 +0200
@@ -614,12 +614,17 @@
{
int i;
- if (*hiding == HIDE_DISABLED) {
+ if (*hiding == HIDE_TO_THE_END) {
+ return 1;
+ } else if (*hiding == HIDE_DISABLED) {
return 0;
} else if (*hiding == HIDE_NOT_STARTED) { /* looking for smtng to hide */
for (i = 0; hide_strings[i] != NULL; i += 2) {
if (strneq(line, hide_strings[i], strlen(hide_strings[i]))) {
- *hiding = i; /* start hiding */
+ if (hide_strings[i + 1] == NULL)
+ *hiding = HIDE_TO_THE_END; /* all the remaining output */
+ else
+ *hiding = i; /* start hiding */
return 1; /* and hide this line */
}
}
@@ -699,7 +704,7 @@
err_sys("fgets");
fclose(fi);
- if (hide > HIDE_NOT_STARTED)
+ if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END)
err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"));
@@ -797,7 +802,7 @@
err_sys("fgets");
fclose(fi);
- if (hide > HIDE_NOT_STARTED)
+ if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END)
err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.1.2/whois.h new/whois-5.1.3/whois.h
--- old/whois-5.1.2/whois.h 2014-05-02 04:26:50.000000000 +0200
+++ new/whois-5.1.3/whois.h 2014-05-21 16:24:13.000000000 +0200
@@ -5,7 +5,8 @@
/* Do *NOT* change it if you don't know what you are doing! */
#define IDSTRING "Md5.1"
-#define HIDE_DISABLED -2
+#define HIDE_TO_THE_END -3
+#define HIDE_DISABLED -2
#define HIDE_NOT_STARTED -1
/* prototypes */
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package weechat for openSUSE:Factory checked in at 2014-05-27 12:03:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/weechat (Old)
and /work/SRC/openSUSE:Factory/.weechat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weechat"
Changes:
--------
--- /work/SRC/openSUSE:Factory/weechat/weechat.changes 2013-10-08 11:06:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.weechat.new/weechat.changes 2014-05-27 12:03:52.000000000 +0200
@@ -1,0 +2,20 @@
+Mon May 26 14:30:57 UTC 2014 - gber(a)opensuse.org
+
+- update to version 0.4.3
+ - new command /print
+ - logical and/or for tags in /filter and hook_print
+ - gaps in buffer numbers
+ - support of italic text
+ - new options to customize default text search in buffers
+ - use of IRC monitor command for /notify (if available on server)
+ - new IRC server option "ssl_fingerprint"
+ - new option to smart-filter IRC mode messages
+ - new option for default IRC ban mask
+ - support of IPv6 for DCC chat/file
+ - auto check CRC32 of files received with DCC
+ - many bugs fixed
+- add weechat-link-pthread.patch in order to link Weechat against
+ libpthread fixing freezes/crashes with gnutls (backported from
+ upstream git)
+
+-------------------------------------------------------------------
Old:
----
weechat-0.4.2.tar.bz2
New:
----
weechat-0.4.3.tar.bz2
weechat-link-pthread.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ weechat.spec ++++++
--- /var/tmp/diff_new_pack.5pIC8a/_old 2014-05-27 12:03:54.000000000 +0200
+++ /var/tmp/diff_new_pack.5pIC8a/_new 2014-05-27 12:03:54.000000000 +0200
@@ -17,7 +17,7 @@
Name: weechat
-Version: 0.4.2
+Version: 0.4.3
Release: 0
Summary: Portable, Fast, Light and Extensible Chat Client
License: GPL-3.0+
@@ -26,6 +26,8 @@
Source1: weechat.desktop
# PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel(a)suse.de -- use system's default certificate store
Patch0: weechat-capath.patch
+# PATCH-FIX-UPSTREAM weechat-link-pthread.patch https://bugs.gentoo.org/show_bug.cgi?id=501078 gber(a)opensuse.org -- Link Weechat against libpthread
+Patch1: weechat-link-pthread.patch
Url: http://www.weechat.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
@@ -131,6 +133,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\""
@@ -157,6 +160,10 @@
%makeinstall
popd #build
+# due to an unknown race condition cmake does not always create a compatibility
+# symlink
+ln -sf %{_bindir}/weechat %{buildroot}%{_bindir}/weechat-curses
+
install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
%if 0%{?suse_version}
%suse_update_desktop_file -r "%{name}" Network IRCClient
++++++ weechat-0.4.2.tar.bz2 -> weechat-0.4.3.tar.bz2 ++++++
++++ 173743 lines of diff (skipped)
++++++ weechat-capath.patch ++++++
--- /var/tmp/diff_new_pack.5pIC8a/_old 2014-05-27 12:03:55.000000000 +0200
+++ /var/tmp/diff_new_pack.5pIC8a/_new 2014-05-27 12:03:55.000000000 +0200
@@ -9,10 +9,10 @@
src/core/wee-network.c | 6 ++++++
3 files changed, 12 insertions(+), 4 deletions(-)
-Index: weechat-0.4.2/src/core/wee-config.c
+Index: weechat-0.4.3/src/core/wee-config.c
===================================================================
---- weechat-0.4.2.orig/src/core/wee-config.c
-+++ weechat-0.4.2/src/core/wee-config.c
+--- weechat-0.4.3.orig/src/core/wee-config.c
++++ weechat-0.4.3/src/core/wee-config.c
@@ -61,7 +61,6 @@
#include "../gui/gui-window.h"
#include "../plugins/plugin.h"
@@ -21,7 +21,7 @@
struct t_config_file *weechat_config_file = NULL;
struct t_config_section *weechat_config_section_debug = NULL;
struct t_config_section *weechat_config_section_color = NULL;
-@@ -3084,7 +3083,7 @@ config_weechat_init_options ()
+@@ -3238,7 +3237,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
@@ -30,10 +30,10 @@
&config_change_network_gnutls_ca_file, NULL, NULL, NULL);
config_network_gnutls_handshake_timeout = config_file_new_option (
weechat_config_file, ptr_section,
-Index: weechat-0.4.2/src/core/wee-network.c
+Index: weechat-0.4.3/src/core/wee-network.c
===================================================================
---- weechat-0.4.2.orig/src/core/wee-network.c
-+++ weechat-0.4.2/src/core/wee-network.c
+--- weechat-0.4.3.orig/src/core/wee-network.c
++++ weechat-0.4.3/src/core/wee-network.c
@@ -103,6 +103,12 @@ network_set_gnutls_ca_file ()
}
free (ca_path);
++++++ weechat-link-pthread.patch ++++++
>From 30073b511397646b9ef06ed657fda157dd8c6209 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason(a)zx2c4.com>
Date: Thu, 13 Feb 2014 14:36:23 +0100
Subject: [PATCH] Link against pthread on all platforms.
Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com>
---
src/gui/curses/CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index 325c611..a8927bc 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
- LIST(APPEND EXTRA_LIBS "pthread")
-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+LIST(APPEND EXTRA_LIBS "pthread")
IF(ICONV_LIBRARY)
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
--
1.8.5.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vsftpd for openSUSE:Factory checked in at 2014-05-27 12:03:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vsftpd (Old)
and /work/SRC/openSUSE:Factory/.vsftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vsftpd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vsftpd/vsftpd.changes 2014-04-11 13:42:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vsftpd.new/vsftpd.changes 2014-05-27 12:03:21.000000000 +0200
@@ -1,0 +2,22 @@
+Mon May 26 13:13:44 UTC 2014 - tchvatal(a)suse.com
+
+- Cleanup with spec-cleaner
+- Remove conditions about init files as we do not build for < 12.1
+ anyway.
+- Update the README.SUSE file to describe more the listen option.
+
+-------------------------------------------------------------------
+Mon May 26 12:52:56 UTC 2014 - tchvatal(a)suse.com
+
+- Add socket service for vsftpd to avoid the need for xinetd here.
+
+-------------------------------------------------------------------
+Mon May 26 12:42:21 UTC 2014 - tchvatal(a)suse.com
+
+- Add comment about listen variables for xinetd configuration.
+ Fixes bnc#872221.
+- Add default configuration as arg to xinetd started vsftpd.
+- Updated patch:
+ * vsftpd-2.0.4-xinetd.diff
+
+-------------------------------------------------------------------
Old:
----
vsftpd.init
New:
----
vsftpd.socket
vsftpd@.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vsftpd.spec ++++++
--- /var/tmp/diff_new_pack.8QPaEd/_old 2014-05-27 12:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8QPaEd/_new 2014-05-27 12:03:22.000000000 +0200
@@ -16,19 +16,7 @@
#
-%global with_sysvinit 0
-%if 0%{?suse_version} < 1310
-%global with_sysvinit 1
-%endif
-
Name: vsftpd
-BuildRequires: gpg-offline
-BuildRequires: libcap-devel
-BuildRequires: openssl-devel
-BuildRequires: pam-devel
-%if 0%{?suse_version} > 1140
-BuildRequires: systemd
-%endif
Version: 3.0.2
Release: 0
Summary: Very Secure FTP Daemon - Written from Scratch
@@ -36,14 +24,15 @@
Group: Productivity/Networking/Ftp/Servers
Url: https://security.appspot.com/vsftpd.html
Source0: https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
-Source1: %name.pam
-Source2: %name.logrotate
-Source3: %name.init
+Source1: %{name}.pam
+Source2: %{name}.logrotate
Source4: README.SUSE
-Source5: %name.xml
-Source6: %name.firewall
+Source5: %{name}.xml
+Source6: %{name}.firewall
Source7: vsftpd.service
-Source9: %name.keyring
+Source8: vsftpd@.service
+Source9: %{name}.keyring
+Source10: vsftpd.socket
Source1000: https://security.appspot.com/downloads/%{name}-%{version}.tar.gz.asc
Patch1: vsftpd-2.0.4-lib64.diff
Patch3: vsftpd-2.0.4-xinetd.diff
@@ -67,11 +56,16 @@
Patch16: vsftpd-root-squashed-chroot.patch
#PATCH-FIX-UPSTREAM: bnc#870122
Patch17: vsftpd-enable-gettimeofday-sec.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gpg-offline
+BuildRequires: libcap-devel
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: systemd
+Requires: logrotate
+Requires(pre): %{_sbindir}/useradd
Provides: ftp-server
-Requires(pre): %insserv_prereq /usr/sbin/useradd
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
-Requires: logrotate
%description
Vsftpd is an FTP server, or daemon. The "vs" stands for Very Secure.
@@ -88,7 +82,7 @@
%gpg_verify %{S:1000}
%setup -q
%patch1
-%patch3
+%patch3 -p1
%patch4
%patch5
%patch6
@@ -105,90 +99,58 @@
%patch17 -p1
%build
-%define seccomp_opts %{nil}
-%if 0%{?suse_version} > 1030
%define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP
-%endif
rm -f dummyinc/sys/capability.h
-make CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_NO_SSL_INTERN -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector --param=ssp-buffer-size=4 %{seccomp_opts}" \
+make CFLAGS="%{optflags} -DOPENSSL_NO_SSL_INTERN -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector --param=ssp-buffer-size=4 %{seccomp_opts}" \
LDFLAGS="-fPIE -pie -Wl,-z,relro -Wl,-z,now" LINK=
%install
-mkdir -p $RPM_BUILD_ROOT/usr/share/empty
-cp %SOURCE4 .
-install -D -m 755 %name $RPM_BUILD_ROOT/usr/sbin/%name
-install -D -m 600 %name.conf $RPM_BUILD_ROOT/etc/%name.conf
-install -D -m 600 xinetd.d/%name $RPM_BUILD_ROOT/etc/xinetd.d/%name
-install -D -m 644 $RPM_SOURCE_DIR/%name.pam $RPM_BUILD_ROOT/etc/pam.d/%name
-install -D -m 644 $RPM_SOURCE_DIR/%name.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/%name
-install -D -m 644 %name.conf.5 $RPM_BUILD_ROOT/%_mandir/man5/%name.conf.5
-install -D -m 644 %name.8 $RPM_BUILD_ROOT/%_mandir/man8/%name.8
-%if %{with_sysvinit}
-install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/%name
-ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/%_prefix/sbin/rc%name
-%else
-ln -sf service $RPM_BUILD_ROOT/%{_prefix}/sbin/rc%{name}
-%endif
-install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
-install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-%if 0%{?suse_version} > 1140
-install -D -m 0644 %SOURCE7 %{buildroot}/%{_unitdir}/%{name}.service
-%endif
+mkdir -p %{buildroot}%{_datadir}/empty
+cp %{SOURCE4} .
+install -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
+install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
+install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
+install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name}
+install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -D -m 644 %{name}.conf.5 %{buildroot}/%{_mandir}/man5/%{name}.conf.5
+install -D -m 644 %{name}.8 %{buildroot}/%{_mandir}/man8/%{name}.8
+ln -sf service %{buildroot}/%{_sbindir}/rc%{name}
+install -D -m 0644 %{SOURCE7} %{buildroot}/%{_unitdir}/%{name}.service
+install -D -m 0644 %{SOURCE8} %{buildroot}/%{_unitdir}/%{name}@.service
+install -D -m 0644 %{SOURCE10} %{buildroot}/%{_unitdir}/%{name}.socket
+install -d %{buildroot}/%{_datadir}/omc/svcinfo.d/
+install -D -m 644 %{SOURCE5} %{buildroot}/%{_datadir}/omc/svcinfo.d/
+install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%pre
-/usr/sbin/useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
-%if 0%{?suse_version} > 1140
+%{_sbindir}/useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure 2> /dev/null || :
%service_add_pre %{name}.service
-%endif
%preun
-if [ -e /etc/init.d/%{name} ]; then
-%stop_on_removal %name
-fi
-
-%if 0%{?suse_version} > 1140
%service_del_preun %{name}.service
-%endif
%post
-%if %{with_sysvinit}
-%{fillup_and_insserv -f %{name}}
-%endif
-
-%if 0%{?suse_version} > 1140
%service_add_post %{name}.service
-%endif
%postun
-%if %{with_sysvinit}
-%insserv_cleanup
-%restart_on_update %name
-%endif
-
-%if 0%{?suse_version} > 1140
%service_del_postun %{name}.service
-%endif
%files
%defattr(-,root,root)
-%if 0%{?suse_version} > 1140
%{_unitdir}/%{name}.service
-%endif
-/usr/sbin/%name
-/usr/sbin/rc%name
-%if %{with_sysvinit}
-%config /etc/init.d/%name
-%endif
-%_datadir/omc/svcinfo.d/vsftpd.xml
-%dir /usr/share/empty
-%config(noreplace) /etc/xinetd.d/%name
-%config(noreplace) /etc/%name.conf
-%config /etc/pam.d/%name
-%config(noreplace) /etc/logrotate.d/%name
-%_mandir/man5/%name.conf.*
-%_mandir/man8/%name.*
+%{_unitdir}/%{name}.socket
+%{_unitdir}/%{name}@.service
+%{_sbindir}/%{name}
+%{_sbindir}/rc%{name}
+%{_datadir}/omc/svcinfo.d/vsftpd.xml
+%dir %{_datadir}/empty
+%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%config %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%{_mandir}/man5/%{name}.conf.*
+%{_mandir}/man8/%{name}.*
%doc BUGS AUDIT Changelog LICENSE README README.security
%doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE COPYING
%doc README.SUSE
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.8QPaEd/_old 2014-05-27 12:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8QPaEd/_new 2014-05-27 12:03:22.000000000 +0200
@@ -4,4 +4,9 @@
listen=NO
listen_ipv6=YES
-so no changes for xinetd (/etc/xinetd.d/vsftp) are needed by default.
+if you plan to use xinetd (/etc/xinetd.d/vsftp) you don't need to change
+anything by default, but if you have ipv6 available you have to set
+listen_ipv6=NO too in order for xinetd to work.
+Alternatively you can also use systemd socket service that listens on
+port 21 and starts the server like xinetd would. This service does
+not require you to change ANY variable in the /etc/vsftpd.conf.
++++++ vsftpd-2.0.4-xinetd.diff ++++++
--- /var/tmp/diff_new_pack.8QPaEd/_old 2014-05-27 12:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8QPaEd/_new 2014-05-27 12:03:22.000000000 +0200
@@ -1,6 +1,7 @@
---- xinetd.d/vsftpd.orig
-+++ xinetd.d/vsftpd
-@@ -1,18 +1,23 @@
+diff -urN vsftpd-3.0.2.old/xinetd.d/vsftpd vsftpd-3.0.2/xinetd.d/vsftpd
+--- vsftpd-3.0.2.old/xinetd.d/vsftpd 2014-05-26 14:38:40.717042497 +0200
++++ vsftpd-3.0.2/xinetd.d/vsftpd 2014-05-26 14:41:23.753049249 +0200
+@@ -1,18 +1,26 @@
-# default: on
+# default: off
# description:
@@ -11,6 +12,9 @@
+# NOTE: This file contains the configuration for xinetd to start vsftpd.
+# the configuration file for vsftp itself is in /etc/vsftpd.conf
+#
++# NOTE: Remember to set both listen and listen_ipv6 to NO in /etc/vsftpd.conf
++# in order to have working xinetd connection.
++#
service ftp
{
socket_type = stream
@@ -24,7 +28,7 @@
- nice = 10
- disable = no
+ server = /usr/sbin/vsftpd
-+# server_args =
++ server_args = /etc/vsftpd.conf
+# log_on_success += DURATION USERID
+# log_on_failure += USERID
+# nice = 10
++++++ vsftpd.socket ++++++
[Unit]
Conflicts=vsftpd.service
[Socket]
ListenStream=21
Accept=yes
[Install]
WantedBy=sockets.target
++++++ vsftpd@.service ++++++
[Unit]
Description=Very Secure FTP Daemon
[Service]
Type=simple
ExecStart=/usr/sbin/vsftpd /etc/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
StandardInput=socket
SuccessExitStatus=2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package spice-vdagent for openSUSE:Factory checked in at 2014-05-27 12:03:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spice-vdagent (Old)
and /work/SRC/openSUSE:Factory/.spice-vdagent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-vdagent"
Changes:
--------
--- /work/SRC/openSUSE:Factory/spice-vdagent/spice-vdagent.changes 2014-02-06 06:55:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.spice-vdagent.new/spice-vdagent.changes 2014-05-27 12:03:11.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 27 08:45:45 CEST 2014 - ohering(a)suse.de
+
+- fix /var/run handling
+ spice-vdagent-var_run.patch
+
+-------------------------------------------------------------------
New:
----
spice-vdagent-var_run.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spice-vdagent.spec ++++++
--- /var/tmp/diff_new_pack.PqqFBv/_old 2014-05-27 12:03:13.000000000 +0200
+++ /var/tmp/diff_new_pack.PqqFBv/_new 2014-05-27 12:03:13.000000000 +0200
@@ -25,6 +25,7 @@
Group: Applications/System
Url: http://spice-space.org/
Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
+Patch0: spice-vdagent-var_run.patch
BuildRequires: desktop-file-utils
BuildRequires: glib2-devel
BuildRequires: libXfixes-devel
@@ -78,7 +79,6 @@
%postun
%service_del_postun spice-vdagentd.service
-
%files
%defattr(-,root,root)
%doc COPYING ChangeLog README TODO
@@ -91,7 +91,6 @@
%{_bindir}/spice-vdagent
%{_sbindir}/spice-vdagentd
%{_sbindir}/rcspice-vdagentd
-%ghost %{_var}/run/spice-vdagentd
%{_sysconfdir}/xdg/autostart/spice-vdagent.desktop
# For /usr/share/gdm/autostart/LoginWindow/spice-vdagent.desktop
# We own the dir too, otherwise we must Require gdm
++++++ spice-vdagent-var_run.patch ++++++
---
Makefile.am | 1 -
Makefile.in | 1 -
data/spice-vdagentd | 1 +
data/spice-vdagentd.service | 1 +
4 files changed, 2 insertions(+), 2 deletions(-)
Index: spice-vdagent-0.15.0/Makefile.am
===================================================================
--- spice-vdagent-0.15.0.orig/Makefile.am
+++ spice-vdagent-0.15.0/Makefile.am
@@ -46,7 +46,6 @@ gdmautostartdir = $(datadir)/gdm/autosta
gdmautostart_DATA = $(top_srcdir)/data/spice-vdagent.desktop
install-data-local:
- $(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
rsyslogdir = $(sysconfdir)/rsyslog.d
rsyslog_DATA = $(top_srcdir)/data/rsyslog.d/spice-vdagentd.conf
Index: spice-vdagent-0.15.0/Makefile.in
===================================================================
--- spice-vdagent-0.15.0.orig/Makefile.in
+++ spice-vdagent-0.15.0/Makefile.in
@@ -1366,7 +1366,6 @@ uninstall-am: uninstall-binPROGRAMS unin
install-data-local:
- $(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: spice-vdagent-0.15.0/data/spice-vdagentd
===================================================================
--- spice-vdagent-0.15.0.orig/data/spice-vdagentd
+++ spice-vdagent-0.15.0/data/spice-vdagentd
@@ -37,6 +37,7 @@ start() {
[ -x $exec ] || exit 5
[ -c $port ] || exit 0
modprobe uinput > /dev/null 2>&1
+ mkdir -p /var/run/spice-vdagentd
# In case the previous running vdagentd crashed
rm -f /var/run/spice-vdagentd/spice-vdagent-sock
echo -n $"Starting $prog: "
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2014-05-27 12:03:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sendmail (Old)
and /work/SRC/openSUSE:Factory/.sendmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2014-04-02 17:25:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2014-05-27 12:03:05.000000000 +0200
@@ -1,0 +2,23 @@
+Mon May 26 11:54:39 UTC 2014 - werner(a)suse.de
+
+- Add patch sendmail-fd-passing-libmilter.patch from Debian sendmail
+ maintainer Mikhail Gusarov to support systemd socket activation
+ support also in libmilter (bnc#879790)
+- Be aware that /var/run is a symbolic link to /run a tmpfs file
+ system
+
+-------------------------------------------------------------------
+Fri May 23 09:03:04 UTC 2014 - werner(a)suse.de
+
+- Update to sendmail 8.14.9
+ * Properly set the close-on-exec flag for file descriptors
+ (except stdin, stdout, and stderr) before executing mailers.
+ * Fix a misformed comment in conf.c: "/*" within comment
+ which may cause a compilation error on some systems.
+ Problem reported by John Beck of Oracle.
+ * Fix regression in auto-detection of libraries when only
+ shared libraries are available. Problem reported by
+ Bryan Costales.
+- Modify patch sendmail-8.14.8.dif which is now sendmail-8.14.9.dif
+
+-------------------------------------------------------------------
Old:
----
sendmail-8.14.8.dif
sendmail.8.14.8.tar.gz
New:
----
sendmail-8.14.9.dif
sendmail-fd-passing-libmilter.patch
sendmail.8.14.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.fyVFpF/_old 2014-05-27 12:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fyVFpF/_new 2014-05-27 12:03:07.000000000 +0200
@@ -68,7 +68,7 @@
%{?systemd_requires}
Conflicts: smail postfix postfix-tls
Obsoletes: sendmail-tls
-Version: 8.14.8
+Version: 8.14.9
Release: 0
Summary: BSD Sendmail
License: SUSE-Sendmail
@@ -82,7 +82,7 @@
Source6: sendmail.systemd
Source7: sendmail-client.systemd
# PATCH-FIX-OPENSUSE: Add our m4 extensions and maintenance scripts
-Patch0: sendmail-8.14.8.dif
+Patch0: sendmail-8.14.9.dif
# PATCH-FIX-OPENSUSE: if select(2) is interrupted the timeout become undefined
Patch1: sendmail-8.14.7-select.dif
# PATCH-FIX-OPENSUSE: Do not warn about unsued variable
@@ -91,6 +91,8 @@
Patch3: sendmail-db6.diff
# PATCH-FIX-UPSTREAM: Detect shared libraries
Patch4: sendmail-8.14.8-m4header.patch
+# PATCH-FIX-DEBIAN: systemd socket activation support for libmilter
+Patch5: sendmail-fd-passing-libmilter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir}
%global _mailcnfdir %{_sysconfdir}/mail
@@ -171,11 +173,14 @@
%patch0 -p 0 -b .p0
%patch3 -p1
%patch4 -p0
+%patch5 -p1
tar --strip-components=1 -xf %{S:1}
set -f
cat <<-EOF > file-list
%%defattr(-,root,root)
+%if %{with sysvinit}
%%ghost %%dir %%attr(1750,root,root) %{_localstatedir}/run/sendmail
+%endif
%%dir %%attr(0750,root,root) %{_localstatedir}/lib/sendmail
%%attr(0600,root,root) %{_localstatedir}/lib/sendmail/statistics
%%attr(0600,root,root) %{_mailcnfdir}/statistics
@@ -283,8 +288,10 @@
chown -R root:root %{buildroot}%{_localstatedir}/spool/mqueue
chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue
chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue/.hoststat
+%if %{with sysvinit}
mkdir -p %{buildroot}%{_localstatedir}/run/sendmail
chmod 1750 %{buildroot}%{_localstatedir}/run/sendmail
+%endif
mkdir -p %{buildroot}%{_localstatedir}/lib/sendmail
chmod 0750 %{buildroot}%{_localstatedir}/lib/sendmail
touch %{buildroot}%{_localstatedir}/lib/sendmail/statistics
@@ -430,7 +437,9 @@
%if %{defined verify_permissions}
%verifyscript
+%if %{with sysvinit}
%verify_permissions -e %{_localstatedir}/run/sendmail/
+%endif
%verify_permissions -e %{_localstatedir}/spool/mqueue/
%verify_permissions -e %{_sysconfdir}/sendmail.cf
%if %{with sysvinit}
@@ -481,7 +490,9 @@
fi
%endif
%if %{defined set_permissions}
+%if %{with sysvinit}
%set_permissions %{_localstatedir}/run/sendmail/
+%endif
%set_permissions %{_localstatedir}/spool/mqueue/
%set_permissions %{_sysconfdir}/sendmail.cf
%if %{with sysvinit}
++++++ sendmail-8.14.8.dif -> sendmail-8.14.9.dif ++++++
--- /work/SRC/openSUSE:Factory/sendmail/sendmail-8.14.8.dif 2014-04-02 17:25:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail-8.14.9.dif 2014-05-27 12:03:04.000000000 +0200
@@ -89,7 +89,7 @@
R< > $+ $: < $H > $1 try hub', `dnl')
ifdef(`LOCAL_RELAY', `dnl
--- cf/mailer/cyrus.m4
-+++ cf/mailer/cyrus.m4 2014-04-01 08:36:47.290235545 +0000
++++ cf/mailer/cyrus.m4 2014-05-23 09:36:13.158235601 +0000
@@ -36,7 +36,7 @@ PUSHDIVERT(-1)
#
@@ -101,27 +101,27 @@
_DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `u')
@@ -51,6 +51,7 @@ POPDIVERT
- VERSIONID(`$Id: cyrus.m4,v 8.24 2013/11/22 20:51:14 ca Exp $ (Carnegie Mellon)')
+ VERSIONID(`$Id: cyrus.m4,v 8.24 2013-11-22 20:51:14 ca Exp $ (Carnegie Mellon)')
+MAILER_DEFINITIONS
Mcyrus, P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL,
ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
A=CYRUS_MAILER_ARGS
--- cf/mailer/fax.m4
-+++ cf/mailer/fax.m4 2014-04-01 08:37:48.618235495 +0000
++++ cf/mailer/fax.m4 2014-05-23 09:36:31.514966633 +0000
@@ -30,6 +30,7 @@ POPDIVERT
- VERSIONID(`$Id: fax.m4,v 8.17 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: fax.m4,v 8.17 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24,
M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,_FAX_QGRP
A=FAX_MAILER_ARGS
--- cf/mailer/local.m4
-+++ cf/mailer/local.m4 2014-04-01 08:38:11.646235238 +0000
++++ cf/mailer/local.m4 2014-05-23 09:36:42.562235682 +0000
@@ -34,6 +34,7 @@ POPDIVERT
- VERSIONID(`$Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -136,7 +136,7 @@
_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE,_LOCAL_QGRP
A=LOCAL_MAILER_ARGS
--- cf/mailer/mail11.m4
-+++ cf/mailer/mail11.m4 2014-04-01 08:38:33.114235312 +0000
++++ cf/mailer/mail11.m4 2014-05-23 09:36:55.046735686 +0000
@@ -34,7 +34,7 @@ R$* < @ $=w .DECNET. > $#_LOCAL_ $: $1
R$+ < @ $+ .DECNET. > $#mail11 $@ $2 $: $1 DECnet user
POPDIVERT
@@ -148,7 +148,7 @@
@@ -44,6 +44,7 @@ POPDIVERT
- VERSIONID(`$Id: mail11.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: mail11.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
SMail11To
@@ -166,50 +166,50 @@
+ T=DNS/X-DECnet/X-Unix,_MAIL11_QGRP
+ A=MAIL11_MAILER_ARGS
--- cf/mailer/phquery.m4
-+++ cf/mailer/phquery.m4 2014-04-01 08:38:53.871265702 +0000
++++ cf/mailer/phquery.m4 2014-05-23 09:37:04.554235775 +0000
@@ -27,6 +27,7 @@ POPDIVERT
- VERSIONID(`$Id: phquery.m4,v 8.18 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: phquery.m4,v 8.18 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mph, P=PH_MAILER_PATH, F=_MODMF_(CONCAT(`nrDFM', PH_MAILER_FLAGS), `PH'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_PH_QGRP
A=PH_MAILER_ARGS
--- cf/mailer/pop.m4
-+++ cf/mailer/pop.m4 2014-04-01 08:39:15.539000680 +0000
++++ cf/mailer/pop.m4 2014-05-23 09:37:15.726235076 +0000
@@ -25,6 +25,7 @@ POPDIVERT
- VERSIONID(`$Id: pop.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: pop.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mpop, P=POP_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMq', POP_MAILER_FLAGS), `POP'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_POP_QGRP
A=POP_MAILER_ARGS
--- cf/mailer/procmail.m4
-+++ cf/mailer/procmail.m4 2014-04-01 08:39:33.366236087 +0000
++++ cf/mailer/procmail.m4 2014-05-23 09:37:25.958235560 +0000
@@ -29,6 +29,7 @@ POPDIVERT
- VERSIONID(`$Id: procmail.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: procmail.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mprocmail, P=PROCMAIL_MAILER_PATH, F=_MODMF_(CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), `PROCMAIL'), S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP,
ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')T=DNS/RFC822/X-Unix,_PROCMAIL_QGRP
A=PROCMAIL_MAILER_ARGS
--- cf/mailer/qpage.m4
-+++ cf/mailer/qpage.m4 2014-04-01 08:40:04.398735589 +0000
++++ cf/mailer/qpage.m4 2014-05-23 09:37:35.702235284 +0000
@@ -26,6 +26,7 @@ POPDIVERT
- VERSIONID(`$Id: qpage.m4,v 8.11 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: qpage.m4,v 8.11 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mqpage, P=QPAGE_MAILER_PATH, F=_MODMF_(QPAGE_MAILER_FLAGS, `QPAGE'),
M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix,_QPAGE_QGRP
A=QPAGE_MAILER_ARGS
--- cf/mailer/smtp.m4
-+++ cf/mailer/smtp.m4 2014-04-01 08:40:24.995107993 +0000
++++ cf/mailer/smtp.m4 2014-05-23 09:37:58.482235124 +0000
@@ -33,6 +33,7 @@ POPDIVERT
- VERSIONID(`$Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -224,20 +224,20 @@
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_SMTP_QGRP
A=SMTP_MAILER_ARGS
--- cf/mailer/usenet.m4
-+++ cf/mailer/usenet.m4 2014-04-01 08:40:57.818235720 +0000
++++ cf/mailer/usenet.m4 2014-05-23 09:38:08.798236154 +0000
@@ -23,6 +23,7 @@ POPDIVERT
- VERSIONID(`$Id: usenet.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: usenet.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Musenet, P=USENET_MAILER_PATH, F=_MODMF_(USENET_MAILER_FLAGS, `USENET'), S=EnvFromL, R=EnvToL,
_OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,_USENET_QGRP
A=USENET_MAILER_ARGS $u
--- cf/mailer/uucp.m4
-+++ cf/mailer/uucp.m4 2014-04-01 08:41:20.952951026 +0000
++++ cf/mailer/uucp.m4 2014-05-23 09:38:19.742235616 +0000
@@ -26,6 +26,7 @@ POPDIVERT
- VERSIONID(`$Id: uucp.m4,v 8.45 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: uucp.m4,v 8.45 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -470,7 +470,7 @@
# End of $RCSfile: CC-M.m4,v $
--- devtools/M4/header.m4
+++ devtools/M4/header.m4 2008-09-30 13:06:57.000000000 +0000
-@@ -34,3 +34,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
+@@ -35,3 +35,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
@@ -742,7 +742,7 @@
nothing can replace looking at what your own system generates.
.)f
--- include/sm/conf.h
-+++ include/sm/conf.h 2014-04-01 08:43:11.106236552 +0000
++++ include/sm/conf.h 2014-04-01 08:43:11.000000000 +0000
@@ -1457,23 +1457,47 @@ extern void *malloc();
# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
# endif /* !defined(KERNEL_VERSION) */
@@ -864,7 +864,7 @@
define(`bldSOURCES', `main.c engine.c listener.c worker.c handler.c comm.c smfi.c signal.c sm_gethost.c monitor.c LIBMILTER_EXTRAS ')
define(`confBEFORE', `LIBMILTER_EXTRAS')
--- libsm/Makefile.m4
-+++ libsm/Makefile.m4 2014-04-01 08:45:20.686235313 +0000
++++ libsm/Makefile.m4 2014-04-01 08:45:21.000000000 +0000
@@ -4,8 +4,11 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
define(`confREQUIRE_LIBSM', `true')
++++++ sendmail-client.systemd ++++++
--- /var/tmp/diff_new_pack.fyVFpF/_old 2014-05-27 12:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fyVFpF/_new 2014-05-27 12:03:07.000000000 +0200
@@ -30,17 +30,17 @@
done
#
-# Make sure that configuration is uptodate
-#
-if test -x /usr/bin/make ; then
- /usr/bin/make -C /etc/mail > /dev/null 2>&1
-fi
-
-#
# Create /var/run/sendmail if not exit
#
-test -d /var/run || /bin/mkdir --mode 0755 /var/run
-test -d /var/run/sendmail || /bin/mkdir --mode 1750 /var/run/sendmail
+if test ! -d /var/run ; then
+ if test -d /run ; then
+ /bin/ln -sf /run /var/run
+ else
+ /bin/mkdir -m 0755 /var/run
+ fi
+fi
+test -d /var/run/sendmail || /bin/mkdir --mode 1750 /var/run/sendmail
+test -x /usr/bin/chkstat && /usr/bin/chkstat -n --set --system /var/run/sendmail
#
# Some default permissions
@@ -50,6 +50,11 @@
/bin/chmod 0600 $pidfile
#
+# Make sure that configuration is uptodate
+#
+test -x /usr/bin/make && /usr/bin/make -C /etc/mail > /dev/null 2>&1
+
+#
# Check for DaemonPortOptions
#
PortOpts=$($sed -rn '/^O[[:blank:]]+DaemonPortOptions=.*Name=MTA.*$/I {
++++++ sendmail-fd-passing-libmilter.patch ++++++
Description: systemd-like socket activation support for libmilter
Author: Mikhail Gusarov <dottedmag(a)debian.org
diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html
index 70a510e..013f04e 100644
--- a/libmilter/docs/smfi_setconn.html
+++ b/libmilter/docs/smfi_setconn.html
@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail.
<LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe.
<LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket.
<LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket.
+ <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor.
</UL>
</TD></TR>
</TABLE>
diff --git a/libmilter/listener.c b/libmilter/listener.c
index 48c552f..2249a1f 100644
--- a/libmilter/listener.c
+++ b/libmilter/listener.c
@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name)
L_socksize = sizeof addr.sin6;
}
#endif /* NETINET6 */
+ else if (strcasecmp(p, "fd") == 0)
+ {
+ addr.sa.sa_family = AF_UNSPEC;
+ L_socksize = sizeof (_SOCK_ADDR);
+ }
else
{
smi_log(SMI_LOG_ERR, "%s: unknown socket type %s",
@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name)
}
#endif /* NETINET || NETINET6 */
- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
+ if (addr.sa.sa_family == AF_UNSPEC)
+ {
+ char *end;
+ sock = strtol(colon, &end, 10);
+ if (*end != '\0' || sock < 0)
+ {
+ smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon);
+ return INVALID_SOCKET;
+ }
+ }
+ else
+ {
+ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
+ }
+
if (!ValidSocket(sock))
{
smi_log(SMI_LOG_ERR,
@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name)
#if NETUNIX
addr.sa.sa_family != AF_UNIX &&
#endif /* NETUNIX */
+ addr.sa.sa_family != AF_UNSPEC &&
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt,
sizeof(sockopt)) == -1)
{
@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name)
}
#endif /* NETUNIX */
- if (bind(sock, &addr.sa, L_socksize) < 0)
+ if (addr.sa.sa_family != AF_UNSPEC &&
+ bind(sock, &addr.sa, L_socksize) < 0)
{
smi_log(SMI_LOG_ERR,
"%s: Unable to bind to port %s: %s",
@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
# ifdef BSD4_4_SOCKADDR
cliaddr.sa.sa_len == 0 ||
# endif /* BSD4_4_SOCKADDR */
- cliaddr.sa.sa_family != L_family))
+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family)))
{
(void) closesocket(connfd);
connfd = INVALID_SOCKET;
++++++ sendmail.8.14.8.tar.gz -> sendmail.8.14.9.tar.gz ++++++
++++ 9062 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package SDL2 for openSUSE:Factory checked in at 2014-05-27 12:02:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/SDL2 (Old)
and /work/SRC/openSUSE:Factory/.SDL2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SDL2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/SDL2/SDL2.changes 2014-03-21 13:51:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.SDL2.new/SDL2.changes 2014-05-27 12:02:44.000000000 +0200
@@ -1,0 +2,16 @@
+Mon May 26 07:48:54 UTC 2014 - mailaender(a)opensuse.org
+
+- Added missing build dependencies
+ * arts
+ * dbus
+ * udev
+ * tslib
+- Removed unrecognized options: --disable-video-svga, --disable-video-ps3
+
+-------------------------------------------------------------------
+Mon May 26 07:00:15 UTC 2014 - mailaender(a)opensuse.org
+
+- Use pkgconfig everywhere
+- Fix the build on SLE using prjconf
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ SDL2.spec ++++++
--- /var/tmp/diff_new_pack.X0CZdw/_old 2014-05-27 12:02:45.000000000 +0200
+++ /var/tmp/diff_new_pack.X0CZdw/_new 2014-05-27 12:02:45.000000000 +0200
@@ -30,27 +30,38 @@
Source3: %name.keyring
Source4: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: Mesa-libEGL-devel
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLESv1_CM-devel
-BuildRequires: Mesa-libGLESv2-devel
+BuildRequires: arts-devel
BuildRequires: alsa-devel >= 0.9.0
BuildRequires: dos2unix
BuildRequires: esound-devel >= 0.2.8
-BuildRequires: libICE-devel
-BuildRequires: libX11-devel
-BuildRequires: libXScrnSaver-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXext-devel
-BuildRequires: libXi-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXxf86vm-devel
+BuildRequires: gcc gcc-c++
BuildRequires: nasm
BuildRequires: pkgconfig
+BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(gl)
+%if 0%{?suse_version} > 1120
+BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(glesv1_cm)
+BuildRequires: pkgconfig(glesv2)
+%endif
+BuildRequires: pkgconfig(ice)
+%if 0%{?suse_version} > 1220
+BuildRequires: pkgconfig(tslib)
+%endif
+BuildRequires: pkgconfig(x11)
+%if 0%{?suse_version} > 1120
+BuildRequires: pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xxf86vm)
+%endif
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(libpulse-simple) >= 0.9
+BuildRequires: pkgconfig(udev)
%ifarch ppc ppc64
BuildRequires: libspe2-devel
%endif
@@ -104,8 +115,6 @@
--with-pic \
--disable-rpath \
--disable-alsa-shared \
- --disable-video-svga \
- --disable-video-ps3 \
--disable-video-directfb
make %{?_smp_mflags}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-pybtex for openSUSE:Factory checked in at 2014-05-27 12:02:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pybtex (Old)
and /work/SRC/openSUSE:Factory/.python-pybtex.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pybtex"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pybtex/python-pybtex.changes 2012-05-16 21:09:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-pybtex.new/python-pybtex.changes 2014-05-27 12:02:39.000000000 +0200
@@ -1,0 +2,32 @@
+Mon May 26 15:17:17 UTC 2014 - gber(a)opensuse.org
+
+- update to version 0.17
+ - Added pybtex-format utility for formatting bibliography files
+ as HTML, LaTeX, and other supported human-readable formats.
+ - Added --strict command line option (all warnings become
+ errors).
+ - Added alpha label style, and alpha and unsrtalpha formatting
+ styles.
+ - Added support for url, eprint, doi, and pubmed fields in unsrt
+ style.
+ - Names with hyphens are now abbreviated correctly
+ ("Jean-Baptiste" becomes "J.-B.").
+ - width$ now uses cmr10 font metrics, like in BibTeX. Non-latin
+ characters are also supported.
+ - Pythonic style engine now supports @preamble commands.
+ - Warning on missing fields are now more human-readable.
+ - When writing BibTeX files, put entry key on the same line with
+ entry type. Fixes warnings in Jabref.
+ - When using multiple .bib files, macros defined in earlier files
+ are available in subsequent ones (like in BibTeX).
+ - Fixed parsing .bst files with lines consisting of a single %
+ character.
+ - Fixed sorting entries without author in author_year_title
+ sorting style.
+ - Fixed broken CaseInsensitiveDict.get().
+ - CaseInsensitiveDict is now pickleable.
+ - Added support for registering plugins at runtime with
+ pybtex.plugin.register_plugin() - useful for using pybtex as a
+ library.
+
+-------------------------------------------------------------------
Old:
----
pybtex-0.16.tar.bz2
New:
----
pybtex-0.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pybtex.spec ++++++
--- /var/tmp/diff_new_pack.A0vmcV/_old 2014-05-27 12:02:40.000000000 +0200
+++ /var/tmp/diff_new_pack.A0vmcV/_new 2014-05-27 12:02:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pybtex
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: python-pybtex
-Version: 0.16
+Version: 0.17
Release: 0
Summary: BibTeX-compatible Bibliography Processor in Python
License: MIT
++++++ pybtex-0.16.tar.bz2 -> pybtex-0.17.tar.bz2 ++++++
++++ 8722 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python3-pycurl for openSUSE:Factory checked in at 2014-05-27 12:02:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pycurl (Old)
and /work/SRC/openSUSE:Factory/.python3-pycurl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pycurl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pycurl/python3-pycurl.changes 2014-05-21 16:21:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-pycurl.new/python3-pycurl.changes 2014-05-27 12:02:18.000000000 +0200
@@ -1,0 +2,7 @@
+Mon May 26 14:17:15 UTC 2014 - toddrme2178(a)gmail.com
+
+- Removed part of patch that breaks now necessary things:
+ pycurl-no-runtime-curlvercheck.patch
+- Specify ssl type since it is not automatically detected.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pycurl.spec ++++++
--- /var/tmp/diff_new_pack.EyWvHc/_old 2014-05-27 12:02:19.000000000 +0200
+++ /var/tmp/diff_new_pack.EyWvHc/_new 2014-05-27 12:02:19.000000000 +0200
@@ -57,10 +57,10 @@
%build
2to3 -w --no-diffs -n .
-CFLAGS="%{optflags}" python3 setup.py build
+CFLAGS="%{optflags}" python3 setup.py build --with-ssl
%install
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --with-ssl
rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk
%files
++++++ pycurl-no-runtime-curlvercheck.patch ++++++
--- /var/tmp/diff_new_pack.EyWvHc/_old 2014-05-27 12:02:19.000000000 +0200
+++ /var/tmp/diff_new_pack.EyWvHc/_new 2014-05-27 12:02:19.000000000 +0200
@@ -1,21 +1,5 @@
--- a/src/pycurl.c 2014-02-06 10:27:56.000000000 +0100
+++ b/src/pycurl.c 2014-05-20 16:09:57.513592172 +0200
-@@ -4440,6 +4440,7 @@
- const char *libcurl_version, *runtime_ssl_lib;
- int libcurl_version_len, pycurl_version_len;
-
-+#if 0
- /* Check the version, as this has caused nasty problems in
- * some cases. */
- vi = curl_version_info(CURLVERSION_NOW);
-@@ -4451,6 +4452,7 @@
- PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time version (%s) is older than compile-time version (%s)", vi->version, LIBCURL_VERSION);
- PYCURL_MODINIT_RETURN_NULL;
- }
-+#endif
-
- /* Our compiled crypto locks should correspond to runtime ssl library. */
- if (vi->ssl_version == NULL) {
@@ -4526,7 +4528,7 @@
#undef PYCURL_VERSION_PREFIX_SIZE
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pycarddav for openSUSE:Factory checked in at 2014-05-27 12:02:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pycarddav (Old)
and /work/SRC/openSUSE:Factory/.pycarddav.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pycarddav"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pycarddav/pycarddav.changes 2013-12-18 16:54:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pycarddav.new/pycarddav.changes 2014-05-27 12:02:02.000000000 +0200
@@ -1,0 +2,11 @@
+Mon May 26 15:23:21 UTC 2014 - gber(a)opensuse.org
+
+- update to version 0.7.0
+ - searching in the vcard chooser when merging addresses (press
+ '/')
+ - nice speedup in pc_query, thanks to Leandro Lucarella
+ - better support for broken vcards
+ - auto creating missing db directories
+ - more bugfixes
+
+-------------------------------------------------------------------
Old:
----
pyCardDAV-0.6.1.tar.gz
New:
----
pyCardDAV-0.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pycarddav.spec ++++++
--- /var/tmp/diff_new_pack.3FlMNz/_old 2014-05-27 12:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.3FlMNz/_new 2014-05-27 12:02:03.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pycarddav
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Guido Berhoerster <gber(a)opensuse.org>.
#
# All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
%define orig_name pyCardDAV
Name: pycarddav
-Version: 0.6.1
+Version: 0.7.0
Release: 0
Summary: Simple to Use CardDAV CLI Client
License: MIT
++++++ pyCardDAV-0.6.1.tar.gz -> pyCardDAV-0.7.0.tar.gz ++++++
++++ 1623 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0