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
July 2013
- 1 participants
- 2024 discussions
Hello community,
here is the log from the commit of package perl-XML-LibXML for openSUSE:Factory checked in at 2013-07-30 19:10:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-XML-LibXML (Old)
and /work/SRC/openSUSE:Factory/.perl-XML-LibXML.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-XML-LibXML"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-XML-LibXML/perl-XML-LibXML.changes 2012-05-29 11:44:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-XML-LibXML.new/perl-XML-LibXML.changes 2013-07-30 19:10:57.000000000 +0200
@@ -1,0 +2,39 @@
+Sat Jul 27 11:59:01 UTC 2013 - coolo(a)suse.com
+
+- updated to 2.0019
+ - Correct typos reported in RT #86599.
+ - https://rt.cpan.org/Ticket/Display.html?id=86599
+ - Thanks to dsteinbrunner.
+
+ - Revert previous change of minimal version of libxml2.
+ - This change proved to be unpopular and didn't prevent
+ the CPAN test failures.
+ - By SHLOMIF
+
+ - Made the minimal version of libxml2 2.9.0 as previous versions were
+ too buggy due to spuriourous CPAN test failures.
+ - Please upgrade.
+ - By SHLOMIF
+
+ - Don't enable XML_PARSE_HUGE by default.
+ - Fix the previous version due to a mercurial SNAFU.
+
+ - Don't enable XML_PARSE_HUGE by default.
+ - https://bitbucket.org/shlomif/perl-xml-libxml/pull-request/19
+ - Thanks to Grant McLean ( https://metacpan.org/author/GRANTM ) for
+ the bug report and patch.
+
+ - Got 40reader_mem_error.t to not fetch the external DTDs.
+ - https://rt.cpan.org/Public/Bug/Display.html?id=81703
+ - Thanks to Alexandr Ciornii (CHORNY) for the report and Slaven
+ Rezic (SREZIC) for the analysis and a proposed fix.
+
+ - Fix a memory error (double-free) in XML::LibXML::Reader if we reached
+ EOF and
+ then called destroy.
+ - discovered by Shlomi Fish.
+ - Fixed by Shlomi Fish.
+ - see t/40reader_mem_error.t
+- remove upstreamed perl-XML-LibXML-bigendian.patch
+
+-------------------------------------------------------------------
Old:
----
XML-LibXML-1.95.tar.gz
perl-XML-LibXML-bigendian.patch
New:
----
XML-LibXML-2.0019.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-XML-LibXML.spec ++++++
--- /var/tmp/diff_new_pack.t70A0h/_old 2013-07-30 19:10:58.000000000 +0200
+++ /var/tmp/diff_new_pack.t70A0h/_new 2013-07-30 19:10:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-XML-LibXML
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -16,28 +16,26 @@
#
-
Name: perl-XML-LibXML
-Version: 1.95
+Version: 2.0019
Release: 0
-License: GPL-1.0+ or Artistic-1.0
%define cpan_name XML-LibXML
Summary: Perl Binding for libxml2
-Url: http://search.cpan.org/dist/XML-LibXML/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/XML-LibXML/
Source: http://www.cpan.org/authors/id/S/SH/SHLOMIF/%{cpan_name}-%{version}.tar.gz
BuildRequires: perl
+BuildRequires: perl-macros
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.56
BuildRequires: perl(XML::NamespaceSupport) >= 1.07
BuildRequires: perl(XML::SAX) >= 0.11
-BuildRequires: perl-macros
-BuildRequires: pkgconfig(libxml-2.0) >= 2.6.16
+BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0
Requires: perl(XML::NamespaceSupport) >= 1.07
Requires: perl(XML::SAX) >= 0.11
Provides: perl-XML-LibXML-Common = %{version}
Obsoletes: perl-XML-LibXML-Common < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch: perl-XML-LibXML-bigendian.patch
%{perl_requires}
%description
@@ -48,7 +46,6 @@
%prep
%setup -q -n %{cpan_name}-%{version}
-%patch -p1
%build
# [2,7,1,0], # broken release, broken utf-16
++++++ XML-LibXML-1.95.tar.gz -> XML-LibXML-2.0019.tar.gz ++++++
++++ 11316 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 perl-Try-Tiny for openSUSE:Factory checked in at 2013-07-30 18:48:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Try-Tiny (Old)
and /work/SRC/openSUSE:Factory/.perl-Try-Tiny.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Try-Tiny"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Try-Tiny/perl-Try-Tiny.changes 2013-06-13 20:25:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Try-Tiny.new/perl-Try-Tiny.changes 2013-07-30 18:48:28.000000000 +0200
@@ -1,0 +2,19 @@
+Sat Jul 27 11:57:46 UTC 2013 - coolo(a)suse.com
+
+- updated to 0.16
+ - remove accidental Sub::Name test dep
+ - optionally use Sub::Name to name the try/catch/finally blocks, if available
+ (Mark Fowler)
+ - also throw an exception for catch/finally in scalar context (RT#81070)
+ - fix tests failing on 5.6.x due to differing DESTROY semantics
+ - excise superfluous local($@) call - 7% speedup
+ - fix (fsvo) broken URLs (RT#55659)
+ - proper exception on erroneous usage of bare catch/finally (RT#81070)
+ - proper exception on erroneous use of multiple catch{} blocks
+ - clarify exception occuring on unterminated try block (RT#75712)
+ - fix the prototypes shown in docs to match code (RT#79590; thanks, Pushtaev
+ Vadim)
+ - warn loudly on exceptions in finally() blocks
+ - dzilify
+
+-------------------------------------------------------------------
Old:
----
Try-Tiny-0.12.tar.gz
New:
----
Try-Tiny-0.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Try-Tiny.spec ++++++
--- /var/tmp/diff_new_pack.Fd0Ohi/_old 2013-07-30 18:48:29.000000000 +0200
+++ /var/tmp/diff_new_pack.Fd0Ohi/_new 2013-07-30 18:48:29.000000000 +0200
@@ -17,10 +17,10 @@
Name: perl-Try-Tiny
-Version: 0.12
+Version: 0.16
Release: 0
%define cpan_name Try-Tiny
-Summary: Minimal try/catch with proper localization of $@
+Summary: minimal try/catch with proper preservation of $@
License: MIT
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Try-Tiny/
@@ -29,6 +29,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
+#BuildRequires: perl(Benchmark::Dumb)
+#BuildRequires: perl(Sub::Name)
+#BuildRequires: perl(Try::Tiny)
%{perl_requires}
%description
@@ -91,6 +94,6 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes
+%doc Changes LICENSE maint README
%changelog
++++++ Try-Tiny-0.12.tar.gz -> Try-Tiny-0.16.tar.gz ++++++
++++ 2407 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 perl-Tree-DAG_Node for openSUSE:Factory checked in at 2013-07-30 18:46:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Tree-DAG_Node (Old)
and /work/SRC/openSUSE:Factory/.perl-Tree-DAG_Node.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Tree-DAG_Node"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Tree-DAG_Node/perl-Tree-DAG_Node.changes 2013-06-06 14:00:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Tree-DAG_Node.new/perl-Tree-DAG_Node.changes 2013-07-30 18:46:33.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Jul 27 11:58:09 UTC 2013 - coolo(a)suse.com
+
+- updated to 1.12
+ - Change text in README referring to licence to match text in body of source, since it was in conflict
+ with the Artistic Licence V 2.0.
+ This was requested by Petr Pisar who packages stuff for Red Hat.
+ - Rename CHANGES to Changes as per CPAN::Changes::SPEC.
+ - Various spelling fixes in the docs, as kindly reported by dsteinbrunner.
+
+-------------------------------------------------------------------
Old:
----
Tree-DAG_Node-1.11.tgz
New:
----
Tree-DAG_Node-1.12.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Tree-DAG_Node.spec ++++++
--- /var/tmp/diff_new_pack.KFSA1Q/_old 2013-07-30 18:46:34.000000000 +0200
+++ /var/tmp/diff_new_pack.KFSA1Q/_new 2013-07-30 18:46:34.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Tree-DAG_Node
-Version: 1.11
+Version: 1.12
Release: 0
%define cpan_name Tree-DAG_Node
Summary: An N-ary tree
@@ -122,6 +122,6 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changelog.ini CHANGES README scripts
+%doc Changelog.ini Changes README scripts
%changelog
++++++ Tree-DAG_Node-1.11.tgz -> Tree-DAG_Node-1.12.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/CHANGES new/Tree-DAG_Node-1.12/CHANGES
--- old/Tree-DAG_Node-1.11/CHANGES 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/CHANGES 1970-01-01 01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-Revision history for Perl module Tree::DAG_Node.
-
-1.11 Mon Feb 4 09:50:00 2013
- - Correct the date (2012 -> 2013) in this file used for V 1.10.
- - Correct the text at L<Tree::DAG_Node/AUTHOR> so it refers to Artistic License 2.0,
- which now matches what it says in Build.PL and Makefile.PL. Resolves RT#83088.
-
-1.10 Fri Feb 1 08:53:00 2013
- - Change t/pod.t to look for Test::Pod 1.45, but comment out Test::Pod in Build.PL and Makefile.PL.
- This means Test::Pod is not used at all if it is not installed. As per RT#83077.
-
-1.09 Thu Nov 8 12:38:00 2012
- - No code changes.
- - Oops. The changes in V 1.08 we made in the other 10 distros, but not in this one. My apologies.
-
-1.08 Thu Nov 8 12:38:00 2012
- - No code changes.
- - For pre-reqs such as strict, warnings, etc, which ship with Perl, set the version # to 0.
- Reported as RT#80663 by Father Chrysostomos for Tree::DAG_Node.
-
-1.07 Thu Nov 1 12:47:00 2012
- - New maintainer: Ron Savage
- - Pre-emptive apologies for any changes which are not back-compat. No such problems are expected, but the
- introduction of new methods may disconcert some viewers.
- - Fix RT#78858, reported by Gene Boggs. Audit code for similar problems.
- - Fix RT#79506. reported by Ron Savage.
- - Rename ChangeLog to CHANGES, and add Changelog.ini.
- - Replace all uses of cyclicity_fault() and Carp::croak with die.
- - Remove unused methods: decommission_root(), cyclicity_allowed(), cyclicity_fault(), inaugurate_root(),
- no_cyclicity() and _update_links(). OK - cyclicity_fault() was called once. It just died.
- - Add methods: format_node(), hashref2string(), is_root(), node2string(), tree2string().
- tree2string($opts, $node) - unlike draw_ascii_tree() - can optionally print the tree starting at any node.
- Override format_node(), hashref2string(), and node2string() if desired.
- - Reformat the POD big-time.
- - Add Build.PL.
- - Re-write Makefile.PL.
- - Remove use vars(@ISA $Debug $VERSION). Replace latter 2 with 'our ...'.
- - Rename t/00_about_verbose.t to t/about.perl.t.
- - Add scripts/cut.and.paste.subtrees.pl. Warning: Some trees get into an infinite loop.
- - Add t/cut.and.paste.subtrees.t. Warning: Some trees get into an infinite loop.
- - Document the options (discouraged by Sean) supported in the call to new($hashref).
-
-1.06 Sun Dec 2 12:00:00 1998
- - New maintainer: David Hand.
- - No code changes.
-
-1.05 Wed Dec 29 12:00:00 1998
- - Just repackaging.
- - No code changes.
-
-1.04 Fri Feb 23 12:00:00 1998
- - Bugfix: Olegt(a)dreamtime.net notes a bug in
- depth_under that apparently always makes it return 0.
-
-1.03 Sat May 13 12:00:00 1998
- - Superficial changes:
- Minor doc spiffing-up.
- Noting my new email address.
- - In order to keep its symbol table clean, DAG_Node no longer
- imports routines from Carp and UNIVERSAL. Should have no effect on existing code.
- - I went and commented out all the places where I have asserts for
- non-cyclicity. I once had the idea that DAG_Node could be a base
- class for graphs that /could/ allow cyclicity, or something like
- that, so those assertions would apply for methods that work only
- for acyclic networks. But, in time, I realized that almost
- everything in DAG_Node would have to have such assertions. Moral
- of the story: DAG_Node has nearly no code that it could share with
- a class for anything but DAGs. And since DAG_Node does everything it
- can to /keep/ you from making cyclicities, there's no point in
- constantly having assertions of noncyclicity (especially when
- these assertions are rather expensive to check).
-
-1.02 Sun Mar 05 12:00:00 1998
- - Minor bugfixes:
- Fixed a typo in the docs: corrected one "right_sisters" to "right_sister"
- Initialized a variable to '' to avoid warnings under -w. Thanks to Gilles Lamiral.
-
-1.01 Fri May 14 12:00:00 1998
- - Major additions:
- Scads of new methods. Still (as far as I know) backward
- compatible with all previous versions. Some minor changes in
- coding, not affecting the interface.
- - Hopefully more friendly to users that use -w (warnings).
- - Cautionary tale: I started making big changes to this right around
- mid-November 1998. But I kept thinking "oh, ONE MORE change and
- then I'll release it." Famous last words! Other things came up,
- I forgot what was new and what was different in this module
- (which is why you don't see a detailed list of differences here),
- altho apparently somehow I managed to document all the new methods.
-
-0.75 Tue Nov 3 12:00:00 1998
- - Minor changes:
- New methods new_daughter, new_daughter_left.
- $obj->new constructor syntax now documented.
- Internal accesses to "daughter" and "mother" attribs are now direct, for efficiency's sake.
- - Minor improvements to the docs.
-
-0.74 Wed Oct 28 12:00:00 1998
- - Whoops, forgot to bundle the README.
- - No change in the code.
-
-0.73 Tue Oct 27 12:00:00 1998
- - First release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/Changelog.ini new/Tree-DAG_Node-1.12/Changelog.ini
--- old/Tree-DAG_Node-1.11/Changelog.ini 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/Changelog.ini 2013-07-03 08:43:17.000000000 +0200
@@ -1,8 +1,18 @@
[Module]
Name=Tree::DAG_Node
-Changelog.Creator=Module::Metadata::Changes V 2.04
+Changelog.Creator=Module::Metadata::Changes V 2.05
Changelog.Parser=Config::IniFiles V 2.78
+[V 1.12]
+Date=2013-07-03T16:38:00
+Comments= <<EOT
+- Change text in README referring to licence to match text in body of source, since it was in conflict
+with the Artistic Licence V 2.0.
+This was requested by Petr Pisar who packages stuff for Red Hat.
+- Rename CHANGES to Changes as per CPAN::Changes::SPEC.
+- Various spelling fixes in the docs, as kindly reported by dsteinbrunner.
+EOT
+
[V 1.11]
Date=2013-02-04T09:50:00
Comments= <<EOT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/Changes new/Tree-DAG_Node-1.12/Changes
--- old/Tree-DAG_Node-1.11/Changes 1970-01-01 01:00:00.000000000 +0100
+++ new/Tree-DAG_Node-1.12/Changes 2013-07-03 08:43:17.000000000 +0200
@@ -0,0 +1,110 @@
+Revision history for Perl module Tree::DAG_Node.
+
+1.12 Wed Jul 3 16:38:00 2013
+ - Change text in README referring to licence to match text in body of source, since it was in conflict
+ with the Artistic Licence V 2.0.
+ This was requested by Petr Pisar who packages stuff for Red Hat.
+ - Rename CHANGES to Changes as per CPAN::Changes::SPEC.
+ - Various spelling fixes in the docs, as kindly reported by dsteinbrunner.
+
+1.11 Mon Feb 4 09:50:00 2013
+ - Correct the date (2012 -> 2013) in this file used for V 1.10.
+ - Correct the text at L<Tree::DAG_Node/AUTHOR> so it refers to Artistic License 2.0,
+ which now matches what it says in Build.PL and Makefile.PL. Resolves RT#83088.
+
+1.10 Fri Feb 1 08:53:00 2013
+ - Change t/pod.t to look for Test::Pod 1.45, but comment out Test::Pod in Build.PL and Makefile.PL.
+ This means Test::Pod is not used at all if it is not installed. As per RT#83077.
+
+1.09 Thu Nov 8 12:38:00 2012
+ - No code changes.
+ - Oops. The changes in V 1.08 we made in the other 10 distros, but not in this one. My apologies.
+
+1.08 Thu Nov 8 12:38:00 2012
+ - No code changes.
+ - For pre-reqs such as strict, warnings, etc, which ship with Perl, set the version # to 0.
+ Reported as RT#80663 by Father Chrysostomos for Tree::DAG_Node.
+
+1.07 Thu Nov 1 12:47:00 2012
+ - New maintainer: Ron Savage
+ - Pre-emptive apologies for any changes which are not back-compat. No such problems are expected, but the
+ introduction of new methods may disconcert some viewers.
+ - Fix RT#78858, reported by Gene Boggs. Audit code for similar problems.
+ - Fix RT#79506. reported by Ron Savage.
+ - Rename ChangeLog to CHANGES, and add Changelog.ini.
+ - Replace all uses of cyclicity_fault() and Carp::croak with die.
+ - Remove unused methods: decommission_root(), cyclicity_allowed(), cyclicity_fault(), inaugurate_root(),
+ no_cyclicity() and _update_links(). OK - cyclicity_fault() was called once. It just died.
+ - Add methods: format_node(), hashref2string(), is_root(), node2string(), tree2string().
+ tree2string($opts, $node) - unlike draw_ascii_tree() - can optionally print the tree starting at any node.
+ Override format_node(), hashref2string(), and node2string() if desired.
+ - Reformat the POD big-time.
+ - Add Build.PL.
+ - Re-write Makefile.PL.
+ - Remove use vars(@ISA $Debug $VERSION). Replace latter 2 with 'our ...'.
+ - Rename t/00_about_verbose.t to t/about.perl.t.
+ - Add scripts/cut.and.paste.subtrees.pl. Warning: Some trees get into an infinite loop.
+ - Add t/cut.and.paste.subtrees.t. Warning: Some trees get into an infinite loop.
+ - Document the options (discouraged by Sean) supported in the call to new($hashref).
+
+1.06 Sun Dec 2 12:00:00 1998
+ - New maintainer: David Hand.
+ - No code changes.
+
+1.05 Wed Dec 29 12:00:00 1998
+ - Just repackaging.
+ - No code changes.
+
+1.04 Fri Feb 23 12:00:00 1998
+ - Bugfix: Olegt(a)dreamtime.net notes a bug in
+ depth_under that apparently always makes it return 0.
+
+1.03 Sat May 13 12:00:00 1998
+ - Superficial changes:
+ Minor doc spiffing-up.
+ Noting my new email address.
+ - In order to keep its symbol table clean, DAG_Node no longer
+ imports routines from Carp and UNIVERSAL. Should have no effect on existing code.
+ - I went and commented out all the places where I have asserts for
+ non-cyclicity. I once had the idea that DAG_Node could be a base
+ class for graphs that /could/ allow cyclicity, or something like
+ that, so those assertions would apply for methods that work only
+ for acyclic networks. But, in time, I realized that almost
+ everything in DAG_Node would have to have such assertions. Moral
+ of the story: DAG_Node has nearly no code that it could share with
+ a class for anything but DAGs. And since DAG_Node does everything it
+ can to /keep/ you from making cyclicities, there's no point in
+ constantly having assertions of noncyclicity (especially when
+ these assertions are rather expensive to check).
+
+1.02 Sun Mar 05 12:00:00 1998
+ - Minor bugfixes:
+ Fixed a typo in the docs: corrected one "right_sisters" to "right_sister"
+ Initialized a variable to '' to avoid warnings under -w. Thanks to Gilles Lamiral.
+
+1.01 Fri May 14 12:00:00 1998
+ - Major additions:
+ Scads of new methods. Still (as far as I know) backward
+ compatible with all previous versions. Some minor changes in
+ coding, not affecting the interface.
+ - Hopefully more friendly to users that use -w (warnings).
+ - Cautionary tale: I started making big changes to this right around
+ mid-November 1998. But I kept thinking "oh, ONE MORE change and
+ then I'll release it." Famous last words! Other things came up,
+ I forgot what was new and what was different in this module
+ (which is why you don't see a detailed list of differences here),
+ altho apparently somehow I managed to document all the new methods.
+
+0.75 Tue Nov 3 12:00:00 1998
+ - Minor changes:
+ New methods new_daughter, new_daughter_left.
+ $obj->new constructor syntax now documented.
+ Internal accesses to "daughter" and "mother" attribs are now direct, for efficiency's sake.
+ - Minor improvements to the docs.
+
+0.74 Wed Oct 28 12:00:00 1998
+ - Whoops, forgot to bundle the README.
+ - No change in the code.
+
+0.73 Tue Oct 27 12:00:00 1998
+ - First release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/MANIFEST new/Tree-DAG_Node-1.12/MANIFEST
--- old/Tree-DAG_Node-1.11/MANIFEST 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/MANIFEST 2013-07-03 08:43:17.000000000 +0200
@@ -1,6 +1,6 @@
Build.PL
Changelog.ini
-CHANGES
+Changes
lib/Tree/DAG_Node.pm
Makefile.PL
MANIFEST This list of files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/META.json new/Tree-DAG_Node-1.12/META.json
--- old/Tree-DAG_Node-1.11/META.json 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/META.json 2013-07-03 08:43:17.000000000 +0200
@@ -4,7 +4,7 @@
"Sean M. Burke <sburke(a)cpan.org>"
],
"dynamic_config" : 1,
- "generated_by" : "Module::Build version 0.4003, CPAN::Meta::Converter version 2.120921",
+ "generated_by" : "Module::Build version 0.4005, CPAN::Meta::Converter version 2.131560",
"license" : [
"artistic_2"
],
@@ -34,7 +34,7 @@
"provides" : {
"Tree::DAG_Node" : {
"file" : "lib/Tree/DAG_Node.pm",
- "version" : "1.11"
+ "version" : "1.12"
}
},
"release_status" : "stable",
@@ -43,5 +43,5 @@
"http://www.perlfoundation.org/artistic_license_2_0"
]
},
- "version" : "1.11"
+ "version" : "1.12"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/META.yml new/Tree-DAG_Node-1.12/META.yml
--- old/Tree-DAG_Node-1.11/META.yml 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/META.yml 2013-07-03 08:43:17.000000000 +0200
@@ -7,7 +7,7 @@
configure_requires:
Module::Build: 0.38
dynamic_config: 1
-generated_by: 'Module::Build version 0.4003, CPAN::Meta::Converter version 2.120921'
+generated_by: 'Module::Build version 0.4005, CPAN::Meta::Converter version 2.131560'
license: artistic_2
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -16,10 +16,10 @@
provides:
Tree::DAG_Node:
file: lib/Tree/DAG_Node.pm
- version: 1.11
+ version: 1.12
requires:
strict: 0
warnings: 0
resources:
license: http://www.perlfoundation.org/artistic_license_2_0
-version: 1.11
+version: 1.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/README new/Tree-DAG_Node-1.12/README
--- old/Tree-DAG_Node-1.11/README 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/README 2013-07-03 08:43:17.000000000 +0200
@@ -121,5 +121,5 @@
Copyright 1998-2001, 2004, 2007 by Sean M. Burke and David Hand.
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+This program is free software. It is released under the Artistic License 2.0.
+See L<http://opensource.org/licenses/Artistic-2.0>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tree-DAG_Node-1.11/lib/Tree/DAG_Node.pm new/Tree-DAG_Node-1.12/lib/Tree/DAG_Node.pm
--- old/Tree-DAG_Node-1.11/lib/Tree/DAG_Node.pm 2013-02-04 00:00:42.000000000 +0100
+++ new/Tree-DAG_Node-1.12/lib/Tree/DAG_Node.pm 2013-07-03 08:43:17.000000000 +0200
@@ -4,7 +4,7 @@
use warnings;
our $Debug = 0;
-our $VERSION = '1.11';
+our $VERSION = '1.12';
# -----------------------------------------------
@@ -1674,7 +1674,7 @@
"this method returns thus-and-such a value", then you should not rely on
it returning anything meaningful.
-A I<passing> acquintance with at least the broader details of the source
+A I<passing> acquaintance with at least the broader details of the source
code for this class is assumed for anyone using this class as a base
class -- especially if you're overriding existing methods, and
B<definitely> if you're overriding linkage methods.
@@ -1763,7 +1763,7 @@
In other words, I like to have each attribute initialized thru a
method named _init_[attribute], which should expect the object as
-$_[0] and the the options hashref (or {} if none was given) as $_[1].
+$_[0] and the options hashref (or {} if none was given) as $_[1].
If you insist on having your _init recognize options for setting
attributes, you might as well have them dealt with by the appropriate
_init_[attribute] method, like this:
@@ -1825,7 +1825,7 @@
it becomes N2's daughter.
If you try to make a node its own mother, a fatal error results. If
-you try to take one of a a node N1's ancestors and make it also a
+you try to take one of a node N1's ancestors and make it also a
daughter of N1, a fatal error results. A fatal error results if
anything in LIST isn't a node object.
@@ -1870,7 +1870,7 @@
=head2 add_right_sisters(LIST)
-Just like add_left_sisters (which see), except that the the elements
+Just like add_left_sisters (which see), except that the elements
in LIST (in that order) as immediate B<right> sisters of $node;
In other words, given that B's mother's daughter-list is (A,B,C,D),
@@ -1925,7 +1925,7 @@
that tree as currently structured.
(Consider how ($address1 cmp $address2) may be magically meaningful
-to you, if you mant to figure out what nodes are to the right of what
+to you, if you meant to figure out what nodes are to the right of what
other nodes.)
=head2 ancestors()
@@ -1964,7 +1964,7 @@
=head2 clear_daughters()
This unlinks all $mother's daughters.
-Returns the the list of what used to be $mother's daughters.
+Returns the list of what used to be $mother's daughters.
Not to be confused with L</remove_daughters(LIST)>.
@@ -2195,7 +2195,7 @@
=item o tick -- a string to preface each entry with
This string goes between the indenting-spacing and the node's name. You
-may prefer "*" or "-> " or someting.
+may prefer "*" or "-> " or something.
Default: ''.
@@ -2572,7 +2572,7 @@
$node->replace_with($N1, $N2, $N3);
As a side affect of attaching $N1 and $N2 to $node's mother, they're
-unlinked from their parents ($node, and $N1, replectively).
+unlinked from their parents ($node, and $N1, respectively).
But N3's daughter list is unaffected.
In other words, this method does what it has to, as you'd expect it
@@ -2706,7 +2706,7 @@
print $tree->tree_to_lol_notation, "\n";
prints the following (which I've broken over two lines for sake of
-printablitity of documentation):
+printability of documentation):
[[[['Det:The'], [['dog'], 'N'], 'NP'], [["/with rabies\x5c"],
'PP'], 'NP'], [['died'], 'VP'], 'S'],
@@ -2848,7 +2848,7 @@
=over 4
-=item o Starting pount
+=item o Starting point
Start at the $node given.
--
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 perl-Text-CSV_XS for openSUSE:Factory checked in at 2013-07-30 18:44:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Text-CSV_XS (Old)
and /work/SRC/openSUSE:Factory/.perl-Text-CSV_XS.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Text-CSV_XS"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Text-CSV_XS/perl-Text-CSV_XS.changes 2013-06-05 13:07:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Text-CSV_XS.new/perl-Text-CSV_XS.changes 2013-07-30 18:44:02.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Jul 27 11:58:34 UTC 2013 - coolo(a)suse.com
+
+- updated to 1.01
+ * Cache not re-read on getline_all (RT#86155)
+ * Fix automatic UTF-8 in getline/parse for SV's with \0
+ * Documents return value of bind_columns without arguments
+ * Fix automatic UTF-8 in getline/parse
+ * Clarify eol documentation
+ * Move error_input to XS
+
+-------------------------------------------------------------------
Old:
----
Text-CSV_XS-0.97.tgz
New:
----
Text-CSV_XS-1.01.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Text-CSV_XS.spec ++++++
--- /var/tmp/diff_new_pack.sEL7ew/_old 2013-07-30 18:44:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sEL7ew/_new 2013-07-30 18:44:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Text-CSV_XS
-Version: 0.97
+Version: 1.01
Release: 0
%define cpan_name Text-CSV_XS
Summary: comma-separated values manipulation routines
@@ -29,7 +29,7 @@
BuildRequires: perl
BuildRequires: perl-macros
#BuildRequires: perl(Text::CSV_XS)
-Recommends: perl(Encode) >= 2.49
+Recommends: perl(Encode) >= 2.51
%{perl_requires}
%description
++++++ Text-CSV_XS-0.97.tgz -> Text-CSV_XS-1.01.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/CSV_XS.pm new/Text-CSV_XS-1.01/CSV_XS.pm
--- old/Text-CSV_XS-0.97/CSV_XS.pm 2013-03-30 15:58:47.000000000 +0100
+++ new/Text-CSV_XS-1.01/CSV_XS.pm 2013-06-13 20:08:19.000000000 +0200
@@ -27,7 +27,7 @@
use Carp;
use vars qw( $VERSION @ISA );
-$VERSION = "0.97";
+$VERSION = "1.01";
@ISA = qw( DynaLoader );
bootstrap Text::CSV_XS $VERSION;
@@ -368,17 +368,6 @@
return $self->{_EOF};
} # status
-# error_input
-#
-# object method returning the first invalid argument to the most recent
-# combine () or parse (). there are no side-effects.
-
-sub error_input
-{
- my $self = shift;
- return $self->{_ERROR_INPUT};
- } # error_input
-
# erro_diag
#
# If (and only if) an error occurred, this function returns a code that
@@ -659,14 +648,12 @@
use Text::CSV_XS;
my @rows;
- my $csv = Text::CSV_XS->new ({ binary => 1 }) or
- die "Cannot use CSV: ".Text::CSV_XS->error_diag ();
+ my $csv = Text::CSV_XS->new ({ binary => 1, auto_diag => 1 });
open my $fh, "<:encoding(utf8)", "test.csv" or die "test.csv: $!";
while (my $row = $csv->getline ($fh)) {
$row->[2] =~ m/pattern/ or next; # 3rd field should match
push @rows, $row;
}
- $csv->eof or $csv->error_diag ();
close $fh;
$csv->eol ("\r\n");
@@ -685,12 +672,12 @@
=head2 Embedded newlines
-B<Important Note>: The default behavior is to accept only ASCII characters.
-This means that fields can not contain newlines. If your data contains
-newlines embedded in fields, or characters above 0x7e (tilde), or binary
-data, you B<I<must>> set C<< binary => 1 >> in the call to L</new>. To
-cover the widest range of parsing options, you will always want to set
-binary.
+B<Important Note>: The default behavior is to accept only ASCII characters
+in the range from C<0x20> (space) to C<0x7E> (tilde). This means that
+fields can not contain newlines. If your data contains newlines embedded
+in fields, or characters above 0x7e (tilde), or binary data, you
+B<I<must>> set C<< binary => 1 >> in the call to L</new>. To cover the
+widest range of parsing options, you will always want to set binary.
But you still have the problem that you have to pass a correct line to the
L</parse> method, which is more complicated from the usual point of usage:
@@ -702,21 +689,22 @@
will break, as the while might read broken lines, as that does not care
about the quoting. If you need to support embedded newlines, the way to go
-is either
-
- my $csv = Text::CSV_XS->new ({ binary => 1, eol => $/ });
- while (my $row = $csv->getline (*ARGV)) {
- my @fields = @$row;
-
-or, more safely in perl 5.6 and up
+is to B<not> pass C<eol> in the parser (it accepts C<\n>, C<\r>, B<and>
+C<\r\n> by default) and then
- my $csv = Text::CSV_XS->new ({ binary => 1, eol => $/ });
+ my $csv = Text::CSV_XS->new ({ binary => 1 });
open my $io, "<", $file or die "$file: $!";
while (my $row = $csv->getline ($io)) {
my @fields = @$row;
+The old(er) way of using global file handles is still supported
+
+ while (my $row = $csv->getline (*ARGV)) {
+
=head2 Unicode
+Unicode is only tested to work with perl-5.8.2 and up.
+
On parsing (both for L</getline> and L</parse>), if the source is marked
being UTF8, then all fields that are marked binary will also be marked
UTF8.
@@ -856,15 +844,18 @@
=item eol
X<eol>
-An end-of-line string to add to rows. C<undef> is replaced with an empty
-string. The default is C<$\>. Common values for C<eol> are C<"\012"> (Line
-Feed) or C<"\015\012"> (Carriage Return, Line Feed). Cannot exceed 7 (ASCII)
-characters.
+An end-of-line string to add to rows.
+
+When not passed in a B<parser> instance, the default behavior is to accept
+C<\n>, C<\r>, and C<\r\n>, so it is probably safer to not specify C<eol> at
+all. Passing C<undef> or the empty string behave the same.
+
+Common values for C<eol> are C<"\012"> (C<\n> or Line Feed), C<"\015\012">
+(C<\r\n> or Carriage Return, Line Feed), and C<"\015"> (C<\r> or Carriage
+Return). The C<eol> attribute cannot exceed 7 (ASCII) characters.
If both C<$/> and C<eol> equal C<"\015">, parsing lines that end on only a
-Carriage Return without Line Feed, will be L</parse>d correct. Line endings,
-whether in C<$/> or C<eol>, other than C<undef>, C<"\n">, C<"\r\n">, or
-C<"\r"> are not (yet) supported for parsing.
+Carriage Return without Line Feed, will be L</parse>d correct.
=item sep_char
X<sep_char>
@@ -1396,6 +1387,9 @@
$csv->bind_columns (undef);
+If no arguments are passed at all, L</bind_columns> will return the list
+current bindings or C<undef> if no binds are active.
+
=head2 eof
X<eof>
@@ -1546,7 +1540,8 @@
$bad_argument = $csv->error_input ();
This object function returns the erroneous argument (if it exists) of
-L</combine> or L</parse>, whichever was called more recently.
+L</combine> or L</parse>, whichever was called more recently. If the last
+call was successful, C<error_input> will return C<undef>.
=head2 error_diag
X<error_diag>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/CSV_XS.xs new/Text-CSV_XS-1.01/CSV_XS.xs
--- old/Text-CSV_XS-0.97/CSV_XS.xs 2013-03-30 15:58:16.000000000 +0100
+++ new/Text-CSV_XS-1.01/CSV_XS.xs 2013-06-16 20:36:10.000000000 +0200
@@ -7,23 +7,18 @@
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
-#define NEED_PL_parser
#define DPPP_PL_parser_NO_DUMMY
-#define NEED_load_module
#define NEED_my_snprintf
-#define NEED_newRV_noinc
#define NEED_pv_escape
#define NEED_pv_pretty
-#define NEED_sv_2pv_flags
-#define NEED_vload_module
-#include "ppport.h"
-#define is_utf8_sv(s) is_utf8_string ((U8 *)SvPV_nolen (s), 0)
#ifndef PERLIO_F_UTF8
# define PERLIO_F_UTF8 0x00008000
# endif
#ifndef MAXINT
# define MAXINT ((int)(~(unsigned)0 >> 1))
# endif
+#include "ppport.h"
+#define is_utf8_sv(s) is_utf8_string ((U8 *)SvPV_nolen (s), SvCUR (s))
#define MAINT_DEBUG 0
@@ -335,11 +330,11 @@
} /* _pretty_str */
#define _cache_show_byte(trim,idx) \
- c = cp[idx]; warn (" %-20s %02x:%3d\n", trim, c, c)
+ c = cp[idx]; warn (" %-21s %02x:%3d\n", trim, c, c)
#define _cache_show_char(trim,idx) \
- c = cp[idx]; warn (" %-20s %02x:%s\n", trim, c, _pretty_str (&c, 1))
+ c = cp[idx]; warn (" %-21s %02x:%s\n", trim, c, _pretty_str (&c, 1))
#define _cache_show_str(trim,l,str) \
- warn (" %-20s %02d:%s\n", trim, l, _pretty_str (str, l))
+ warn (" %-21s %02d:%s\n", trim, l, _pretty_str (str, l))
#define _cache_show_cstr(trim,l,idx) _cache_show_str (trim, l, cp + idx)
#define xs_cache_diag(hv) cx_xs_cache_diag (aTHX_ hv)
@@ -641,7 +636,7 @@
sv_catpvn (SvRV (dst), csv->buffer, csv->used);
result = TRUE;
}
- if (csv->utf8 && SvROK (dst) && is_utf8_sv (SvRV (dst)))
+ if (csv->utf8 && !csv->useIO && SvROK (dst) && is_utf8_sv (SvRV (dst)))
SvUTF8_on (SvRV (dst));
csv->used = keep;
return result;
@@ -938,23 +933,25 @@
#endif
#define AV_PUSH { \
- *SvEND (sv) = (char)0; \
- SvUTF8_off (sv); \
- if (SvCUR (sv) == 0 && (csv->empty_is_undef || (!(f & CSV_FLAGS_QUO) && csv->blank_is_undef)))\
- sv_setpvn (sv, NULL, 0); \
- else { \
- if (csv->allow_whitespace && ! (f & CSV_FLAGS_QUO)) \
- strip_trail_whitespace (sv); \
- if (f & CSV_FLAGS_BIN && csv->utf8) \
- SvUTF8_on (sv); \
- } \
- SvSETMAGIC (sv); \
- unless (csv->is_bound) av_push (fields, sv); \
- PUSH_RPT; \
- sv = NULL; \
- if (csv->keep_meta_info && fflags) \
- av_push (fflags, newSViv (f)); \
- waitingForField = 1; \
+ *SvEND (sv) = (char)0; \
+ SvUTF8_off (sv); \
+ if (SvCUR (sv) == 0 && ( \
+ csv->empty_is_undef || \
+ (!(f & CSV_FLAGS_QUO) && csv->blank_is_undef))) \
+ sv_setpvn (sv, NULL, 0); \
+ else { \
+ if (csv->allow_whitespace && ! (f & CSV_FLAGS_QUO)) \
+ strip_trail_whitespace (sv); \
+ if (f & CSV_FLAGS_BIN && (csv->utf8 || is_utf8_sv (sv))) \
+ SvUTF8_on (sv); \
+ } \
+ SvSETMAGIC (sv); \
+ unless (csv->is_bound) av_push (fields, sv); \
+ PUSH_RPT; \
+ sv = NULL; \
+ if (csv->keep_meta_info && fflags) \
+ av_push (fflags, newSViv (f)); \
+ waitingForField = 1; \
}
#define strip_trail_whitespace(sv) cx_strip_trail_whitespace (aTHX_ sv)
@@ -1552,6 +1549,9 @@
length = SvIV (len);
while (c_xsParse (csv, hv, row, NULL, io, 1)) {
+
+ SetupCsv (&csv, hv, self);
+
if (skip > 0) {
skip--;
av_empty (row); /* re-use */
@@ -1637,6 +1637,27 @@
/* XS SetDiag */
void
+error_input (self)
+ SV *self
+
+ PPCODE:
+ HV *hv;
+
+ if (self && SvOK (self) && SvROK (self) && SvTYPE (SvRV (self)) == SVt_PVHV) {
+ HV *hv = (HV *)SvRV (self);
+ SV **sv = hv_fetchs (hv, "_ERROR_INPUT", FALSE);
+ if (sv && *sv && SvOK (*sv))
+ ST (0) = *sv;
+ else
+ ST (0) = newSV (0);
+ }
+ else
+ ST (0) = newSV (0);
+
+ XSRETURN (1);
+ /* XS error_input */
+
+void
Combine (self, dst, fields, useIO)
SV *self
SV *dst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/ChangeLog new/Text-CSV_XS-1.01/ChangeLog
--- old/Text-CSV_XS-0.97/ChangeLog 2013-03-30 15:58:16.000000000 +0100
+++ new/Text-CSV_XS-1.01/ChangeLog 2013-06-16 20:40:11.000000000 +0200
@@ -1,3 +1,17 @@
+1.01 - 2013-06-16, H.Merijn Brand
+ - Cache not re-read on getline_all (RT#86155)
+
+1.00 - 2013-06-13, H.Merijn Brand
+ * Fix automatic UTF-8 in getline/parse for SV's with \0
+
+0.99 - 2013-06-05, H.Merijn Brand
+ * Documents return value of bind_columns without arguments
+ * Fix automatic UTF-8 in getline/parse
+
+0.98 - 2013-06-03, H.Merijn Brand
+ * Clarify eol documentation
+ * Move error_input to XS
+
0.97 - 2013-03-30, H.Merijn Brand
* Regain the speed from 0.91 (buffer back to 1k)
* Minor cleanup in XS code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/META.json new/Text-CSV_XS-1.01/META.json
--- old/Text-CSV_XS-0.97/META.json 2013-03-30 16:32:26.000000000 +0100
+++ new/Text-CSV_XS-1.01/META.json 2013-06-17 09:23:10.000000000 +0200
@@ -1,47 +1,45 @@
{
+ "license" : [
+ "perl_5"
+ ],
+ "abstract" : "Comma-Separated Values manipulation routines",
+ "meta-spec" : {
+ "version" : "2",
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec"
+ },
+ "release_status" : "stable",
"resources" : {
+ "license" : [
+ "http://dev.perl.org/licenses/"
+ ],
"repository" : {
- "web" : "http://repo.or.cz/w/Text-CSV_XS.git",
"url" : "http://repo.or.cz/r/Text-CSV_XS.git",
+ "web" : "http://repo.or.cz/w/Text-CSV_XS.git",
"type" : "git"
- },
- "license" : [
- "http://dev.perl.org/licenses/"
- ]
- },
- "meta-spec" : {
- "version" : "2",
- "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec"
+ }
},
- "generated_by" : "Author",
- "version" : "0.97",
"name" : "Text-CSV_XS",
+ "version" : "1.01",
+ "provides" : {
+ "Text::CSV_XS" : {
+ "version" : "1.01",
+ "file" : "CSV_XS.pm"
+ }
+ },
"author" : [
"H.Merijn Brand <h.m.brand(a)xs4all.nl>"
],
"dynamic_config" : 1,
- "license" : [
- "perl_5"
- ],
"prereqs" : {
- "test" : {
- "requires" : {
- "Test::More" : "0",
- "Tie::Scalar" : "0"
- },
- "recommends" : {
- "Encode" : "2.47"
- }
- },
"runtime" : {
"requires" : {
- "perl" : "5.006001",
"IO::Handle" : "0",
+ "perl" : "5.006001",
"DynaLoader" : "0"
},
"recommends" : {
- "perl" : "5.016003",
- "Encode" : "2.49"
+ "Encode" : "2.51",
+ "perl" : "5.016003"
}
},
"configure" : {
@@ -53,14 +51,13 @@
"requires" : {
"Config" : "0"
}
+ },
+ "test" : {
+ "requires" : {
+ "Test::More" : "0",
+ "Tie::Scalar" : "0"
+ }
}
},
- "provides" : {
- "Text::CSV_XS" : {
- "version" : "0.97",
- "file" : "CSV_XS.pm"
- }
- },
- "abstract" : "Comma-Separated Values manipulation routines",
- "release_status" : "stable"
+ "generated_by" : "Author"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/META.yml new/Text-CSV_XS-1.01/META.yml
--- old/Text-CSV_XS-0.97/META.yml 2013-03-30 16:32:26.000000000 +0100
+++ new/Text-CSV_XS-1.01/META.yml 2013-06-17 09:23:10.000000000 +0200
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: Author, CPAN::Meta::Converter version 2.120921
+generated_by: Author, CPAN::Meta::Converter version 2.131560
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -16,21 +16,17 @@
provides:
Text::CSV_XS:
file: CSV_XS.pm
- version: '0.97'
+ version: '1.01'
recommends:
- Encode: '2.49'
+ Encode: '2.51'
perl: '5.016003'
requires:
DynaLoader: 0
IO::Handle: 0
+ Test::More: 0
+ Tie::Scalar: 0
perl: '5.006001'
resources:
license: http://dev.perl.org/licenses/
repository: http://repo.or.cz/r/Text-CSV_XS.git
-runtime:
- recommends:
- Encode: '2.47'
- requires:
- Test::More: 0
- Tie::Scalar: 0
-version: '0.97'
+version: '1.01'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/README new/Text-CSV_XS-1.01/README
--- old/Text-CSV_XS-0.97/README 2013-01-13 18:23:08.000000000 +0100
+++ new/Text-CSV_XS-1.01/README 2013-06-13 13:00:16.000000000 +0200
@@ -29,7 +29,8 @@
perl 5.6.1 or up.
examples/csv-check requires perl with defined-or and PerlIO, and
making that work on other versions is left as an exercise to the
- reader. Other examples are checked against 5.8.4.
+ reader. Other examples are checked against 5.8.4. For Unicode to
+ work more or less reliable, you'd need perl 5.8.2 or newer.
Build/Installation:
Standard build/installation:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/ppport.h new/Text-CSV_XS-1.01/ppport.h
--- old/Text-CSV_XS-0.97/ppport.h 2013-03-18 18:05:02.000000000 +0100
+++ new/Text-CSV_XS-1.01/ppport.h 2013-05-19 17:46:00.000000000 +0200
@@ -6,7 +6,7 @@
ppport.h -- Perl/Pollution/Portability Version 3.20
- Automatically created by Devel::PPPort running under perl 5.016003.
+ Automatically created by Devel::PPPort running under perl 5.018000.
Do NOT edit this file directly! -- Edit PPPort_pm.PL and the
includes in parts/inc/ instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/t/50_utf8.t new/Text-CSV_XS-1.01/t/50_utf8.t
--- old/Text-CSV_XS-0.97/t/50_utf8.t 2012-06-16 20:09:44.000000000 +0200
+++ new/Text-CSV_XS-1.01/t/50_utf8.t 2013-06-13 13:28:18.000000000 +0200
@@ -6,7 +6,7 @@
use Test::More;
BEGIN {
- if ($] < 5.008) {
+ if ($] < 5.008001) {
plan skip_all => "UTF8 tests useless in this ancient perl version";
}
else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/t/51_utf8.t new/Text-CSV_XS-1.01/t/51_utf8.t
--- old/Text-CSV_XS-0.97/t/51_utf8.t 2012-06-07 15:07:59.000000000 +0200
+++ new/Text-CSV_XS-1.01/t/51_utf8.t 2013-06-13 16:39:45.000000000 +0200
@@ -6,7 +6,7 @@
use Test::More;
BEGIN {
- $] < 5.008 and
+ $] < 5.008001 and
plan skip_all => "UTF8 tests useless in this ancient perl version";
}
@@ -43,7 +43,7 @@
[ "bytes up :encoding(UTF-8)", ":encoding(UTF-8)", $bytes_up, "utf8", "no warn", ],
);
- plan tests => 1 + 6 * @tests;
+ plan tests => 11 + 6 * @tests;
}
BEGIN {
@@ -93,3 +93,44 @@
is (warned ($c_warn), warned ($p_warn), "$test against Perl warning");
is (warned ($c_warn), $expect_w, "$test against expected warning");
}
+
+# Test automatic upgrades for valid UTF-8
+{ my $blob = pack "C*", 0..255; $blob =~ tr/",//d;
+ # perl-5.10.x has buggy SvCUR () on blob
+ $] >= 5.010000 && $] <= 5.012001 and $blob =~ tr/\0//d;
+ my @data = (
+ qq[1,aap,3], # No diac
+ qq[1,a\x{e1}p,3], # a_ACUTE in ISO-8859-1
+ qq[1,a\x{c4}\x{83}p,3], # a_BREVE in UTF-8
+ qq[1,"$blob",3], # Binary shit
+ ) x 2;
+ my $data = join "\n" => @data;
+ my @expect = ("aap", "a\341p", "a\x{0103}p", $blob) x 2;
+
+ my $csv = Text::CSV_XS->new ({ binary => 1, auto_diag => 1 });
+
+ foreach my $bc (undef, 3) {
+ my @read;
+
+ # Using getline ()
+ open my $fh, "<", \$data;
+ $bc and $csv->bind_columns (\my ($f1, $f2, $f3));
+ is (scalar $csv->bind_columns, $bc, "Columns_bound?");
+ while (my $row = $csv->getline ($fh)) {
+ push @read, $bc ? $f2 : $row->[1];
+ }
+ close $fh;
+ is_deeply (\@read, \@expect, "Set and reset UTF-8 ".($bc?"no bind":"bind_columns"));
+ is_deeply ([ map { utf8::is_utf8 ($_) } @read ],
+ [ "", "", 1, "", "", "", 1, "" ], "UTF8 flags");
+
+ # Using parse ()
+ @read = map {
+ $csv->parse ($_);
+ $bc ? $f2 : ($csv->fields)[1];
+ } @data;
+ is_deeply (\@read, \@expect, "Set and reset UTF-8 ".($bc?"no bind":"bind_columns"));
+ is_deeply ([ map { utf8::is_utf8 ($_) } @read ],
+ [ "", "", 1, "", "", "", 1, "" ], "UTF8 flags");
+ }
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/t/77_getall.t new/Text-CSV_XS-1.01/t/77_getall.t
--- old/Text-CSV_XS-0.97/t/77_getall.t 2012-11-19 16:03:07.000000000 +0100
+++ new/Text-CSV_XS-1.01/t/77_getall.t 2013-06-16 20:35:09.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
-use Test::More tests => 31;
+use Test::More tests => 61;
BEGIN {
require_ok "Text::CSV_XS";
@@ -13,19 +13,14 @@
$| = 1;
-my @list = (
+my @testlist = (
[ 1, "a", "\x01", "A" ],
[ 2, "b", "\x02", "B" ],
[ 3, "c", "\x03", "C" ],
[ 4, "d", "\x04", "D" ],
);
-{ ok (my $csv = Text::CSV_XS->new ({ binary => 1, eol => "\n" }), "csv out");
- open my $fh, ">", "_77test.csv" or die "_77test.csv: $!";
- ok ($csv->print ($fh, $_), "write $_->[0]") for @list;
- close $fh;
- }
-
+my @list;
sub do_tests
{
my $sub = shift;
@@ -42,34 +37,45 @@
$sub->([@list[1..3]], -3, 3);
} # do_tests
-{ ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
+foreach my $eol ("\n", "\r") {
- do_tests (sub {
- my ($expect, @args) = @_;
- open my $fh, "<", "_77test.csv" or die "_77test.csv: $!";
- my $s_args = join ", " => @args;
- is_deeply ($csv->getline_all ($fh, @args), $expect, "getline_all ($s_args)");
+ @list = @testlist;
+
+ { ok (my $csv = Text::CSV_XS->new ({ binary => 1, eol => $eol }), "csv out EOL "._readable ($eol));
+ open my $fh, ">", "_77test.csv" or die "_77test.csv: $!";
+ ok ($csv->print ($fh, $_), "write $_->[0]") for @list;
close $fh;
- });
- }
+ }
-{ ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
- ok ($csv->column_names (my @cn = qw( foo bar bin baz )), "Set column names");
- @list = map { my %h; @h{@cn} = @$_; \%h } @list;
+ { ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
- do_tests (sub {
- my ($expect, @args) = @_;
+ do_tests (sub {
+ my ($expect, @args) = @_;
+ open my $fh, "<", "_77test.csv" or die "_77test.csv: $!";
+ my $s_args = join ", " => @args;
+ is_deeply ($csv->getline_all ($fh, @args), $expect, "getline_all ($s_args)");
+ close $fh;
+ });
+ }
+
+ { ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
+ ok ($csv->column_names (my @cn = qw( foo bar bin baz )), "Set column names");
+ @list = map { my %h; @h{@cn} = @$_; \%h } @list;
+
+ do_tests (sub {
+ my ($expect, @args) = @_;
+ open my $fh, "<", "_77test.csv" or die "_77test.csv: $!";
+ my $s_args = join ", " => @args;
+ is_deeply ($csv->getline_hr_all ($fh, @args), $expect, "getline_hr_all ($s_args)");
+ close $fh;
+ });
+ }
+
+ { ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
open my $fh, "<", "_77test.csv" or die "_77test.csv: $!";
- my $s_args = join ", " => @args;
- is_deeply ($csv->getline_hr_all ($fh, @args), $expect, "getline_hr_all ($s_args)");
- close $fh;
- });
- }
+ eval { my $row = $csv->getline_hr_all ($fh); };
+ is ($csv->error_diag () + 0, 3002, "Use _hr before colnames ()");
+ }
-{ ok (my $csv = Text::CSV_XS->new ({ binary => 1 }), "csv in");
- open my $fh, "<", "_77test.csv" or die "_77test.csv: $!";
- eval { my $row = $csv->getline_hr_all ($fh); };
- is ($csv->error_diag () + 0, 3002, "Use _hr before colnames ()");
+ unlink "_77test.csv";
}
-
-unlink "_77test.csv";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV_XS-0.97/t/80_diag.t new/Text-CSV_XS-1.01/t/80_diag.t
--- old/Text-CSV_XS-0.97/t/80_diag.t 2013-03-30 15:58:16.000000000 +0100
+++ new/Text-CSV_XS-1.01/t/80_diag.t 2013-06-03 13:22:44.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
- use Test::More tests => 138;
+ use Test::More tests => 141;
#use Test::More "no_plan";
my %err;
@@ -140,6 +140,12 @@
is ($warn[0], "CACHE: invalid\n", "Uninitialized cache");
}
+{ my $csv = Text::CSV_XS->new ();
+ ok ($csv->parse (q{1,"abc"}), "Valid parse");
+ is ($csv->error_input (), undef, "Undefined error_input");
+ is ($csv->{_ERROR_INPUT}, undef, "Undefined error_input");
+ }
+
my $diag_file = "_$$.out";
open EH, ">&STDERR";
open STDERR, ">", $diag_file;
--
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 perl-IO-Socket-SSL for openSUSE:Factory checked in at 2013-07-30 18:43:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-IO-Socket-SSL (Old)
and /work/SRC/openSUSE:Factory/.perl-IO-Socket-SSL.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-IO-Socket-SSL"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-IO-Socket-SSL/perl-IO-Socket-SSL.changes 2013-07-25 14:46:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-IO-Socket-SSL.new/perl-IO-Socket-SSL.changes 2013-07-30 18:43:52.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Jul 27 11:58:48 UTC 2013 - coolo(a)suse.com
+
+- updated to 1.953
+ - fixes to IO::Socket::SSL::Utils, thanks to rurban[AT]x-ray[DOT]at,
+ RT#87052
+ - fix t/acceptSSL-timeout.t on Win32, RT#86862
+
+-------------------------------------------------------------------
Old:
----
IO-Socket-SSL-1.951.tar.gz
New:
----
IO-Socket-SSL-1.953.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-IO-Socket-SSL.spec ++++++
--- /var/tmp/diff_new_pack.xx1deR/_old 2013-07-30 18:43:53.000000000 +0200
+++ /var/tmp/diff_new_pack.xx1deR/_new 2013-07-30 18:43:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-IO-Socket-SSL
-Version: 1.951
+Version: 1.953
Release: 0
%define cpan_name IO-Socket-SSL
Summary: Nearly transparent SSL encapsulation for IO::Socket::INET
++++++ IO-Socket-SSL-1.951.tar.gz -> IO-Socket-SSL-1.953.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/Changes new/IO-Socket-SSL-1.953/Changes
--- old/IO-Socket-SSL-1.951/Changes 2013-07-03 12:02:07.000000000 +0200
+++ new/IO-Socket-SSL-1.953/Changes 2013-07-22 08:31:25.000000000 +0200
@@ -1,3 +1,8 @@
+1.953 2013/7/22
+- fixes to IO::Socket::SSL::Utils, thanks to rurban[AT]x-ray[DOT]at,
+ RT#87052
+1.952 2013/7/11
+- fix t/acceptSSL-timeout.t on Win32, RT#86862
1.951 2013/7/3
- better document builtin defaults for key,cert,CA and how they are depreceated
- use Net::SSLeay::SSL_CTX_set_default_verify_paths to use openssl's builtin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/MANIFEST new/IO-Socket-SSL-1.953/MANIFEST
--- old/IO-Socket-SSL-1.951/MANIFEST 2013-07-03 12:02:11.000000000 +0200
+++ new/IO-Socket-SSL-1.953/MANIFEST 2013-07-22 08:33:07.000000000 +0200
@@ -51,5 +51,4 @@
t/sni.t
t/mitm.t
util/export_certs.pl
-META.yml Module YAML meta-data (added by MakeMaker)
-META.json Module JSON meta-data (added by MakeMaker)
+META.yml Module meta-data (added by MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/META.json new/IO-Socket-SSL-1.953/META.json
--- old/IO-Socket-SSL-1.951/META.json 2013-07-03 12:02:11.000000000 +0200
+++ new/IO-Socket-SSL-1.953/META.json 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-{
- "abstract" : "Nearly transparent SSL encapsulation for IO::Socket::INET.",
- "author" : [
- "Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund"
- ],
- "dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
- "license" : [
- "perl_5"
- ],
- "meta-spec" : {
- "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
- "version" : "2"
- },
- "name" : "IO-Socket-SSL",
- "no_index" : {
- "directory" : [
- "t",
- "inc"
- ]
- },
- "prereqs" : {
- "build" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "0"
- }
- },
- "configure" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "0"
- }
- },
- "runtime" : {
- "requires" : {
- "Net::SSLeay" : "1.46",
- "Scalar::Util" : "0"
- }
- }
- },
- "release_status" : "stable",
- "resources" : {
- "bugtracker" : {
- "web" : "https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL"
- },
- "homepage" : "https://github.com/noxxi/p5-io-socket-ssl",
- "license" : [
- "http://dev.perl.org/licenses/"
- ],
- "repository" : {
- "url" : "https://github.com/noxxi/p5-io-socket-ssl"
- }
- },
- "version" : "1.951"
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/META.yml new/IO-Socket-SSL-1.953/META.yml
--- old/IO-Socket-SSL-1.951/META.yml 2013-07-03 12:02:11.000000000 +0200
+++ new/IO-Socket-SSL-1.953/META.yml 2013-07-22 08:33:07.000000000 +0200
@@ -1,28 +1,28 @@
----
-abstract: 'Nearly transparent SSL encapsulation for IO::Socket::INET.'
+--- #YAML:1.0
+name: IO-Socket-SSL
+version: 1.953
+abstract: Nearly transparent SSL encapsulation for IO::Socket::INET.
author:
- - 'Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund'
-build_requires:
- ExtUtils::MakeMaker: 0
+ - Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund
+license: perl
+distribution_type: module
configure_requires:
- ExtUtils::MakeMaker: 0
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
-license: perl
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
-name: IO-Socket-SSL
-no_index:
- directory:
- - t
- - inc
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Net::SSLeay: 1.46
- Scalar::Util: 0
+ Net::SSLeay: 1.46
+ Scalar::Util: 0
resources:
- bugtracker: https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL
- homepage: https://github.com/noxxi/p5-io-socket-ssl
- license: http://dev.perl.org/licenses/
- repository: https://github.com/noxxi/p5-io-socket-ssl
-version: 1.951
+ bugtracker: https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL
+ homepage: https://github.com/noxxi/p5-io-socket-ssl
+ license: http://dev.perl.org/licenses/
+ repository: https://github.com/noxxi/p5-io-socket-ssl
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.57_05
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/lib/IO/Socket/SSL/Utils.pm new/IO-Socket-SSL-1.953/lib/IO/Socket/SSL/Utils.pm
--- old/IO-Socket-SSL-1.951/lib/IO/Socket/SSL/Utils.pm 2013-06-01 20:20:03.000000000 +0200
+++ new/IO-Socket-SSL-1.953/lib/IO/Socket/SSL/Utils.pm 2013-07-22 08:29:18.000000000 +0200
@@ -48,7 +48,7 @@
sub PEM_cert2string {
my $cert = shift;
return Net::SSLeay::PEM_get_string_X509($cert)
- or croak("cannot get string from cert");
+ || croak("cannot get string from cert");
}
sub PEM_file2key {
@@ -84,7 +84,7 @@
sub PEM_key2string {
my $key = shift;
return Net::SSLeay::PEM_get_string_PrivateKey($key)
- or croak("cannot get string from key");
+ || croak("cannot get string from key");
}
sub CERT_free {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/lib/IO/Socket/SSL.pm new/IO-Socket-SSL-1.953/lib/IO/Socket/SSL.pm
--- old/IO-Socket-SSL-1.951/lib/IO/Socket/SSL.pm 2013-07-03 11:58:31.000000000 +0200
+++ new/IO-Socket-SSL-1.953/lib/IO/Socket/SSL.pm 2013-07-22 08:30:12.000000000 +0200
@@ -20,7 +20,7 @@
use Carp;
use strict;
-our $VERSION = '1.951';
+our $VERSION = '1.953';
use constant SSL_VERIFY_NONE => Net::SSLeay::VERIFY_NONE();
use constant SSL_VERIFY_PEER => Net::SSLeay::VERIFY_PEER();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.951/t/acceptSSL-timeout.t new/IO-Socket-SSL-1.953/t/acceptSSL-timeout.t
--- old/IO-Socket-SSL-1.951/t/acceptSSL-timeout.t 2012-11-30 08:43:08.000000000 +0100
+++ new/IO-Socket-SSL-1.953/t/acceptSSL-timeout.t 2013-07-11 22:11:07.000000000 +0200
@@ -42,7 +42,12 @@
print "Waiting\n";
my $client = $server->accept || die "accept failed: $!";
print "Connect from ".$client->peerhost.':'.$client->peerport."\n";
- if ( IO::Socket::SSL->start_SSL( $client, SSL_server => 1, Timeout => 5 )) {
+ if ( IO::Socket::SSL->start_SSL( $client,
+ SSL_server => 1,
+ Timeout => 5,
+ SSL_cert_file => 'certs/server-cert.pem',
+ SSL_key_file => 'certs/server-key.pem',
+ )) {
print "SSL Handshake OK\n";
print $client "Hi!\n";
} else {
--
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 openssl for openSUSE:Factory checked in at 2013-07-30 18:42:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openssl (Old)
and /work/SRC/openSUSE:Factory/.openssl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2013-07-04 18:04:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openssl.new/openssl.changes 2013-07-30 18:42:59.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Jul 29 08:06:48 UTC 2013 - meissner(a)suse.com
+
+- compression_methods_switch.patch: Disable compression by default to
+ avoid the CRIME attack (CVE-2012-4929 bnc#793420)
+
+ Can be override by setting environment variable
+ OPENSSL_NO_DEFAULT_ZLIB=no
+
+-------------------------------------------------------------------
New:
----
compression_methods_switch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openssl.spec ++++++
--- /var/tmp/diff_new_pack.UNlkbn/_old 2013-07-30 18:43:00.000000000 +0200
+++ /var/tmp/diff_new_pack.UNlkbn/_new 2013-07-30 18:43:00.000000000 +0200
@@ -49,6 +49,7 @@
# PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049
Patch5: openssl-fix-pod-syntax.diff
Patch6: openssl-1.0.1e-truststore.diff
+Patch7: compression_methods_switch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -131,6 +132,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
cp -p %{S:10} .
echo "adding/overwriting some entries in the 'table' hash in Configure"
# $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags
++++++ compression_methods_switch.patch ++++++
Index: openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
===================================================================
--- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod
+++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
@@ -41,6 +41,24 @@ of compression methods supported on a pe
The OpenSSL library has the compression methods B<COMP_rle()> and (when
especially enabled during compilation) B<COMP_zlib()> available.
+And, there is an environment variable to switch the compression
+methods off and on. In default the compression is off to mitigate
+the so called CRIME attack ( CVE-2012-4929). If you want to enable
+compression again set OPENSSL_NO_DEFAULT_ZLIB to "no".
+
+The variable can be switched on and off at runtime; when this variable
+is set "no" compression is enabled, otherwise no, for example:
+
+in shell 'export OPENSSL_NO_DEFAULT_ZLIB=no'
+or in C to call
+int setenv(const char *name, const char *value, int overwrite); and
+int unsetenv(const char *name);
+
+Note: This reverts the behavior of the variable as it was before!
+
+And pay attention that this freaure is temporary, it maybe changed by
+the following updates.
+
=head1 WARNINGS
Once the identities of the compression methods for the TLS protocol have
Index: openssl-1.0.1e/ssl/ssl_ciph.c
===================================================================
--- openssl-1.0.1e.orig/ssl/ssl_ciph.c
+++ openssl-1.0.1e/ssl/ssl_ciph.c
@@ -455,7 +455,11 @@ static void load_builtin_compressions(vo
MemCheck_off();
ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
- if (ssl_comp_methods != NULL)
+
+ if( getenv("OPENSSL_NO_DEFAULT_ZLIB") == NULL)
+ setenv("OPENSSL_NO_DEFAULT_ZLIB", "yes", 1);
+
+ if (ssl_comp_methods != NULL && strncmp( getenv("OPENSSL_NO_DEFAULT_ZLIB"), "no", 2) == 0)
{
comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
if (comp != NULL)
--
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 nfs-utils for openSUSE:Factory checked in at 2013-07-30 18:40:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-05-13 19:57:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-07-30 18:40:44.000000000 +0200
@@ -1,0 +2,19 @@
+Mon Jul 22 06:47:57 UTC 2013 - nfbrown(a)suse.com
+
+- New sysconfig variables
+ NFS4_SERVER_MINOR_VERSION, GSSD_OPTIONS,
+ NFS_GSSD_AVOID_DNS
+ to enable various configurations.
+- bug fixes to init scripts to avoid unmounting everything(!)
+ and to avoid corrupting /run/nfs/bind.mounts
+
+-------------------------------------------------------------------
+Mon Jul 22 06:12:53 UTC 2013 - nfbrown(a)suse.com
+
+- New upstream release 1.2.8 - mostly bugfixes, many to gssd.
+ No important new functionality
+- Changes to ./configure command to remove warnings
+- 8 more patches from upstream 'git' to fix non-trivial bugs
+ including on CVE.
+
+-------------------------------------------------------------------
Old:
----
nfs-utils-1.2.7.tar.bz2
New:
----
0001-mountd-Fix-is_subdirectory-again.patch
0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
0003-Fix-handling-of-preferred-realm-command-line-option.patch
0004-nfsiostat-restore-output-format.patch
0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
0006-gssd-fixed-typo-in-machine-cred-name.patch
nfs-utils-1.2.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfs-utils.spec ++++++
--- /var/tmp/diff_new_pack.XAwHKw/_old 2013-07-30 18:40:46.000000000 +0200
+++ /var/tmp/diff_new_pack.XAwHKw/_new 2013-07-30 18:40:46.000000000 +0200
@@ -35,7 +35,7 @@
Summary: Support Utilities for Kernel nfsd
License: GPL-2.0+
Group: Productivity/Networking/NFS
-Version: 1.2.7
+Version: 1.2.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
@@ -57,6 +57,18 @@
Source12: start-statd
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
+# PATCH-FIX-UPSTREAM 0001-mountd-Fix-is_subdirectory-again.patch upstream-bugfix nfbrown(a)suse.de
+Patch1: 0001-mountd-Fix-is_subdirectory-again.patch
+# PATCH-FIX-UPSTREAM 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch upstream-bugfix nfbrown(a)suse.de
+Patch2: 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
+# PATCH-FIX-UPSTREAM 0003-Fix-handling-of-preferred-realm-command-line-option.patch upstream-bugfix nfbrown(a)suse.de
+Patch3: 0003-Fix-handling-of-preferred-realm-command-line-option.patch
+# PATCH-FIX-UPSTREAM 0004-nfsiostat-restore-output-format.patch upstream-bugfix nfbrown(a)suse.de
+Patch4: 0004-nfsiostat-restore-output-format.patch
+# PATCH-FIX-UPSTREAM 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch upstream-bugfix nfbrown(a)suse.de
+Patch5: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
+# PATCH-FIX-UPSTREAM 0006-gssd-fixed-typo-in-machine-cred-name.patch upstream-bugfix nfbrown(a)suse.de
+Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch
Suggests: python-base
%description
@@ -107,21 +119,25 @@
%prep
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
cp %{S:6} .
%build
rm -f configure; autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \
--mandir=%{_mandir} \
- --disable-rquotad \
--enable-nfsv4 \
--enable-gss \
--enable-ipv6 \
--enable-nfsdcltrack \
--enable-mount \
--enable-libmount-mount \
- --enable-mountconfig \
- --with-krb5=/usr/lib/mit
+ --enable-mountconfig
make
cd nfs
for i in *.html ; do
++++++ 0001-mountd-Fix-is_subdirectory-again.patch ++++++
>From 23d3980b6cfea4e9056d9b7b81e48b4fefc645e0 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb(a)suse.de>
Date: Tue, 7 May 2013 11:46:18 -0400
Subject: [PATCH] mountd: Fix is_subdirectory again
The problem was that is_subdirectory() would also succeed if the two
directories were the same. This is needed for path_matches() which
needs to see if the child is same-or-descendant.
So this patch rearranges path_matches() to do the "are they the same"
test itself and only bother with is_subdirectory() if it they are not
the same.
So now is_subdirectory() can be strict, and so can be usable for
subexport(), which needs a strong 'in subdirectory - not the same' test.
Acked-by: J. Bruce Fields <bfields(a)redhat.com>
Signed-off-by: NeilBrown <neilb(a)suse.de>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
utils/mountd/cache.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 737927c..517aa62 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -347,20 +347,26 @@ static char *next_mnt(void **v, char *p)
static int is_subdirectory(char *child, char *parent)
{
+ /* Check is child is strictly a subdirectory of
+ * parent or a more distant descendant.
+ */
size_t l = strlen(parent);
- if (strcmp(parent, "/") == 0)
+ if (strcmp(parent, "/") == 0 && child[1] != 0)
return 1;
- return strcmp(child, parent) == 0
- || (strncmp(child, parent, l) == 0 && child[l] == '/');
+ return (strncmp(child, parent, l) == 0 && child[l] == '/');
}
static int path_matches(nfs_export *exp, char *path)
{
- if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
- return is_subdirectory(path, exp->m_export.e_path);
- return strcmp(path, exp->m_export.e_path) == 0;
+ /* Does the path match the export? I.e. is it an
+ * exact match, or does the export have CROSSMOUNT, and path
+ * is a descendant?
+ */
+ return strcmp(path, exp->m_export.e_path) == 0
+ || ((exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
+ && is_subdirectory(path, exp->m_export.e_path));
}
static int
@@ -369,15 +375,13 @@ export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
return path_matches(exp, path) && client_matches(exp, dom, ai);
}
-/* True iff e1 is a child of e2 and e2 has crossmnt set: */
+/* True iff e1 is a child of e2 (or descendant) and e2 has crossmnt set: */
static bool subexport(struct exportent *e1, struct exportent *e2)
{
char *p1 = e1->e_path, *p2 = e2->e_path;
- size_t l2 = strlen(p2);
return e2->e_flags & NFSEXP_CROSSMOUNT
- && strncmp(p1, p2, l2) == 0
- && p1[l2] == '/';
+ && is_subdirectory(p1, p2);
}
struct parsed_fsid {
--
1.8.3.1.487.g3e7a5b4
++++++ 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch ++++++
>From c93e8d8eeafec3e3228e24dfebef113e0a79a788 Mon Sep 17 00:00:00 2001
From: "Signed-off-by: NeilBrown" <neilb(a)suse.de>
Date: Tue, 28 May 2013 12:59:22 -0400
Subject: [PATCH] gssd: Fix recent fix to Avoid DNS reverse resolution in gssd.
The final version for this fix that was committed inverted the test
so makes no change in the important cases.
The documentation didn't really help a naive user know when the new -D
flag should be used.
And the code (once fixed) avoided DNS resolution on non-qualified names too,
which probably isn't a good idea.
This patch fixes all three issues.
Signed-off-by: NeilBrown <neilb(a)suse.de>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
utils/gssd/gssd.man | 27 ++++++++++++++++++++++-----
utils/gssd/gssd_proc.c | 18 ++++++++++--------
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/utils/gssd/gssd.man b/utils/gssd/gssd.man
index 1df75c5..ac13fd4 100644
--- a/utils/gssd/gssd.man
+++ b/utils/gssd/gssd.man
@@ -195,11 +195,28 @@ option when starting
.BR rpc.gssd .
.SH OPTIONS
.TP
-.B -D
-DNS Reverse lookups are not used for determining the
-server names pass to GSSAPI. This option will reverses that and forces
-the use of DNS Reverse resolution of the server's IP address to
-retrieve the server name to use in GSAPI authentication.
+.B \-D
+The server name passed to GSSAPI for authentication is normally the
+name exactly as requested. e.g. for NFS
+it is the server name in the "servername:/path" mount request. Only if this
+servername appears to be an IP address (IPv4 or IPv6) or an
+unqualified name (no dots) will a reverse DNS lookup
+will be performed to get the canoncial server name.
+
+If
+.B \-D
+is present, a reverse DNS lookup will
+.I always
+be used, even if the server name looks like a canonical name. So it
+is needed if partially qualified, or non canonical names are regularly
+used.
+
+Using
+.B \-D
+can introduce a security vulnerability, so it is recommended that
+.B \-D
+not be used, and that canonical names always be used when requesting
+services.
.TP
.B -f
Runs
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 6cd4276..b7e2bbb 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -175,7 +175,6 @@ get_servername(const char *name, const struct sockaddr *sa, const char *addr)
char *hostname;
char hbuf[NI_MAXHOST];
unsigned char buf[sizeof(struct in6_addr)];
- int servername = 0;
if (avoid_dns) {
/*
@@ -183,15 +182,18 @@ get_servername(const char *name, const struct sockaddr *sa, const char *addr)
* If it is an IP address, do the DNS lookup otherwise
* skip the DNS lookup.
*/
- servername = 0;
- if (strchr(name, '.') && inet_pton(AF_INET, name, buf) == 1)
- servername = 1; /* IPv4 */
- else if (strchr(name, ':') && inet_pton(AF_INET6, name, buf) == 1)
- servername = 1; /* or IPv6 */
-
- if (servername) {
+ int is_fqdn = 1;
+ if (strchr(name, '.') == NULL)
+ is_fqdn = 0; /* local name */
+ else if (inet_pton(AF_INET, name, buf) == 1)
+ is_fqdn = 0; /* IPv4 address */
+ else if (inet_pton(AF_INET6, name, buf) == 1)
+ is_fqdn = 0; /* IPv6 addrss */
+
+ if (is_fqdn) {
return strdup(name);
}
+ /* Sorry, cannot avoid dns after all */
}
switch (sa->sa_family) {
--
1.8.3.1.487.g3e7a5b4
++++++ 0003-Fix-handling-of-preferred-realm-command-line-option.patch ++++++
>From a402f768db1dc6497cf7f592b33e142936897de2 Mon Sep 17 00:00:00 2001
From: Maximilian Wilhelm <max(a)rfc2324.org>
Date: Mon, 1 Jul 2013 11:58:13 -0400
Subject: [PATCH] Fix handling of preferred realm command line option.
The current implementation ignores any preferred realm specified on the
command line. Fix this behaviour and make sure the preferred realm is
used as first realm when trying to acquire a keytab entry
Signed-off-by: Maximilian Wilhelm <max(a)rfc2324.org>
Signed-off-by: Frederik Moellers <frederik.moellers(a)upb.de>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
utils/gssd/krb5_util.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 9ef80f0..abebdcd 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -852,11 +852,19 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *tgtname,
}
/*
- * Try the "appropriate" realm first, and if nothing found for that
- * realm, try the default realm (if it hasn't already been tried).
+ * Make sure the preferred_realm, which may have been explicitly set
+ * on the command line, is tried first. If nothing is found go on with
+ * the host and local default realm (if that hasn't already been tried).
*/
i = 0;
realm = realmnames[i];
+
+ if (strcmp (realm, preferred_realm) != 0) {
+ realm = preferred_realm;
+ /* resetting the realmnames index */
+ i = -1;
+ }
+
while (1) {
if (realm == NULL) {
tried_all = 1;
--
1.8.3.1.487.g3e7a5b4
++++++ 0004-nfsiostat-restore-output-format.patch ++++++
>From 94642a397d27ea0cfc6d798bc505482023eb5ec1 Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros(a)netapp.com>
Date: Mon, 1 Jul 2013 12:00:51 -0400
Subject: [PATCH] nfsiostat: restore output format
Recent changes to support python 3 changed the output of nfsiostat from:
read: ops/s kB/s kB/op retrans
avg RTT (ms) avg exe (ms)
48.094 2889.133 60.072 0 (0.0%)
177.160 184.833
...
to:
read:
ops/s kB/s kB/op retrans avg RTT (ms) avg exe
(ms)
0.000
0.000
0.000
0 (0.0%)
0.000
0.000
...
Signed-off-by: Weston Andros Adamson <dros(a)netapp.com>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
tools/nfs-iostat/nfs-iostat.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index dfbef87..c035537 100644
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -353,14 +353,14 @@ class DeviceData:
exe_per_op = 0.0
op += ':'
- print('%s' % op.lower().ljust(15))
+ print('%s' % op.lower().ljust(15), end='')
print(' ops/s\t\t kB/s\t\t kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)')
- print('\t\t%7.3f' % (ops / sample_time))
- print('\t%7.3f' % (kilobytes / sample_time))
- print('\t%7.3f' % kb_per_op)
- print(' %7d (%3.1f%%)' % (retrans, retrans_percent))
- print('\t%7.3f' % rtt_per_op)
+ print('\t\t%7.3f' % (ops / sample_time), end='')
+ print('\t%7.3f' % (kilobytes / sample_time), end='')
+ print('\t%7.3f' % kb_per_op, end='')
+ print(' %7d (%3.1f%%)' % (retrans, retrans_percent), end='')
+ print('\t%7.3f' % rtt_per_op, end='')
print('\t%7.3f' % exe_per_op)
def ops(self, sample_time):
@@ -392,7 +392,7 @@ class DeviceData:
print()
print(' op/s\t\trpc bklog')
- print('%7.2f' % (sends / sample_time))
+ print('%7.2f' % (sends / sample_time), end='')
print('\t%7.2f' % backlog)
if which == 0:
--
1.8.3.1.487.g3e7a5b4
++++++ 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch ++++++
>From 05e6d39a988e76d5803f79018a9e40d435f6d2f7 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb(a)suse.de>
Date: Tue, 2 Jul 2013 08:27:41 -0400
Subject: [PATCH] gssd: don't give up on machine credential if hostname not
available.
krb5_util tries various different credential names in order to find
the machine credential, not all of them use the full host name of the
current host.
So if getting the full host name fails, don't give up completely,
still try the other options.
Signed-off-by: NeilBrown <neilb(a)suse.de>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
utils/gssd/krb5_util.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index abebdcd..a6c7eb0 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -825,8 +825,10 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *tgtname,
myhostad[i+1] = 0;
retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
- if (retval)
- goto out;
+ if (retval) {
+ /* Don't use myhostname */
+ myhostname[0] = 0;
+ }
code = krb5_get_default_realm(context, &default_realm);
if (code) {
@@ -891,6 +893,8 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *tgtname,
myhostad,
NULL);
} else {
+ if (!myhostname[0])
+ continue;
snprintf(spn, sizeof(spn), "%s/%s@%s",
svcnames[j], myhostname, realm);
code = krb5_build_principal_ext(context, &princ,
--
1.8.3.1.487.g3e7a5b4
++++++ 0006-gssd-fixed-typo-in-machine-cred-name.patch ++++++
>From da05b199a60e8a8fa91d4d3734cbbe84b23cff69 Mon Sep 17 00:00:00 2001
From: Doug Nazar <nazard.michi(a)gmail.com>
Date: Tue, 2 Jul 2013 08:45:31 -0400
Subject: [PATCH] gssd: fixed typo in machine cred name.
Commit 1c787f14 [gssd: scan for DIR: ccaches, too] changed the default
prefix for the credential cache files. Update the check to ignore the
machine credential file when running with -n (root ignores machine
credentials).
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
utils/gssd/krb5_util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index a6c7eb0..83b9651 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -231,7 +231,7 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname,
continue;
}
if (uid == 0 && !root_uses_machine_creds &&
- strstr(namelist[i]->d_name, "_machine_")) {
+ strstr(namelist[i]->d_name, "machine_")) {
printerr(3, "CC '%s' not available to root\n",
statname);
free(namelist[i]);
--
1.8.3.1.487.g3e7a5b4
++++++ nfs-utils-1.2.7.tar.bz2 -> nfs-utils-1.2.8.tar.bz2 ++++++
++++ 23332 lines of diff (skipped)
++++++ nfs.init ++++++
--- /var/tmp/diff_new_pack.XAwHKw/_old 2013-07-30 18:40:47.000000000 +0200
+++ /var/tmp/diff_new_pack.XAwHKw/_new 2013-07-30 18:40:47.000000000 +0200
@@ -17,7 +17,7 @@
# Required-Stop: $network $portmap
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
-# Short-Description: NFS client services
+# Short-Description: NFS client services
# Description: All necessary services for NFS clients
### END INIT INFO
@@ -94,6 +94,15 @@
if test -n "$flavors" ; then
NEED_GSSD=yes
fi
+if test -n "$GSSD_OPTIONS"; then
+ NEED_GSSD=yes
+fi
+
+case $NFS_GSSD_AVOID_DNS in
+ [Nn]*) ignore_dns=-D ;;
+ [Yy]*) ignore_dns= ;;
+ * ) ignore_dns=-D
+esac
if test "$NFS4_SUPPORT" = yes ; then
NEED_IDMAPD=yes
@@ -153,7 +162,7 @@
/sbin/modprobe rpcsec_gss_$flavor
done
mount_rpc_pipefs
- startproc $GSSD_BIN
+ startproc $GSSD_BIN $ignore_dns $GSSD_OPTIONS
return $?
}
@@ -196,7 +205,7 @@
modprobe nfs
grep -E '^(sunrpc|fs.nfs)' /etc/sysctl.conf | sysctl -q -e -n -p -
- # in case we need /usr and/or /opt via nfs
+ # in case we need /usr and/or /opt via nfs
mount_usr
# sm-notify
@@ -231,10 +240,10 @@
# It's sometime usefull to mount NFS devices in
# background with an ampersand (&) and a sleep time of
# two or more seconds, e.g:
- #
+ #
# sleep 2 && mount -at nfs,nfs4 &
- # sleep 2
- #
+ # sleep 2
+ #
if test -n "$mnt" ; then
# If network devices are not yet discovered, mounts
# might fail, so we might need to 'udevadm settle' to
@@ -268,7 +277,7 @@
# kill process to maximise chance that umount succeeds
mnt=`awk '$3 ~ /^nfs4*$/ {print $2}' /proc/mounts`
runlevel=`runlevel | awk '{print $2}'`
- if test "$runlevel" -eq 0 -o "$runlevel" -eq 6; then
+ if test "$runlevel" -eq 0 -o "$runlevel" -eq 6; then
if test -n "$mnt" ; then
/sbin/mkill -TERM $mnt
fi
@@ -293,7 +302,7 @@
killproc $IDMAPD_BIN
fi
rm -f $IDMAPD_CLIENT_STATE
- fi
+ fi
# stop rpc.statd if not needed by server
if checkproc $STATD_BIN ; then
@@ -334,7 +343,7 @@
echo "gssd not running"
rc_failed 3
fi
- #
+ #
if test "$NEED_IDMAPD" = yes && ! checkproc $IDMAPD_BIN; then
echo "idmapd not running"
rc_failed 3
@@ -354,7 +363,7 @@
if checkproc ${GSSD_BIN##*/}; then
echo -n " gssd"
killproc ${GSSD_BIN##*/}
- startproc $GSSD_BIN
+ startproc $GSSD_BIN $ignore_dns $GSSD_OPTIONS
fi
if checkproc ${IDMAPD_BIN##*/}; then
echo -n " idmapd"
++++++ nfsserver.init ++++++
--- /var/tmp/diff_new_pack.XAwHKw/_old 2013-07-30 18:40:47.000000000 +0200
+++ /var/tmp/diff_new_pack.XAwHKw/_new 2013-07-30 18:40:47.000000000 +0200
@@ -44,7 +44,7 @@
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
-#
+#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signalling is not supported) are
@@ -108,7 +108,7 @@
echo "NFS: Is it no longer needed and may cease to work."
echo "NFS: Please remove these settings."
warned=yes
- fi
+ fi >&2
test -d "$export" || mkdir -p "$export"
mount -o bind "$dir" "$export"
echo "$dir" "$export"
@@ -118,7 +118,7 @@
nfs4_unbind_mounts() {
sort -r -k2 $NFSD_BIND_MOUNTS |
while read src mountpoint crap; do
- umount -l "$mountpoint"
+ [ -n "$mountpoint" ] && umount -l "$mountpoint"
done
> $NFSD_BIND_MOUNTS
}
@@ -188,6 +188,9 @@
if [ "$NFS4_SUPPORT" != "yes" ]; then
VERSION_PARAMS="--no-nfs-version 4"
fi
+ if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then
+ VERSION_PARAMS="$VERSION_PARAMS -nfs-version 4 -nfs-version 4.$NFS4_SERVER_MINOR_VERSION"
+ fi
if [ -n "$NFSV4LEASETIME" -a -f /proc/fs/nfsd/nfsv4leasetime ]; then
echo "$NFSV4LEASETIME" > /proc/fs/nfsd/nfsv4leasetime
fi
@@ -211,7 +214,7 @@
echo $IDMAPD_BIN > $IDMAPD_SERVER_STATE
fi
# exportfs
- /usr/sbin/exportfs -r
+ /usr/sbin/exportfs -r
# rpc.mountd
echo -n " mountd"
if [ -n "$MOUNTD_PORT" ] ; then
@@ -295,7 +298,7 @@
rc_status -v
;;
try-restart)
- ## Stop the service and if this succeeds (i.e. the
+ ## Stop the service and if this succeeds (i.e. the
## service was running before), start it again.
$0 status >/dev/null && $0 restart
@@ -339,7 +342,7 @@
echo -n " idmapd"
checkproc $IDMAPD_BIN
rc_status -v
- fi
+ fi
echo -n " mountd"
checkproc /usr/sbin/rpc.mountd
rc_status -v
++++++ sysconfig.nfs ++++++
--- /var/tmp/diff_new_pack.XAwHKw/_old 2013-07-30 18:40:47.000000000 +0200
+++ /var/tmp/diff_new_pack.XAwHKw/_new 2013-07-30 18:40:47.000000000 +0200
@@ -49,15 +49,28 @@
## Default: yes
## ServiceRestart: nfs nfsserver
#
-# Enable NFSv4 support (yes/no)
+# Enable NFSv4 support (server and/or client) (yes/no)
#
NFS4_SUPPORT="yes"
## Path: Network/File systems/NFS server
+## Description: NFSv4 server minor version
+## Type: integer
+## Default: 0
+## ServiceRestart: nfsserver
+#
+# Select NFSv4 minor version for server to support (0, 1).
+# If '1' is selected, NFSv4.0 will also be supported.
+NFS4_SERVER_MINOR_VERSION="0"
+
+## Path: Network/File systems/NFS server
## Description: Network Status Monitor options
## Type: string
## Default: ""
#
+# If a fixed port should be used to send reboot notification
+# messages to other systems, that port should be given
+# here as "-p portnumber".
#
SM_NOTIFY_OPTIONS=""
@@ -134,6 +147,16 @@
NFSD_OPTIONS=""
## Path: Network/File systems/NFS server
+## Description: Extra options for gssd
+## Type: string
+## Default: ""
+#
+# Normally gssd does not require any options. In some circumstances,
+# -n, -l or other options might be useful. See "man 8 rpc.gssd" for
+# details. Those options can be set here.
+GSSD_OPTIONS=""
+
+## Path: Network/File systems/NFS server
## Description: Extra options for mountd
## Type: string
## Default: ""
@@ -142,3 +165,16 @@
# such as --manage-gids.
MOUNTD_OPTIONS=""
+## Path: Network/File systems/NFS server
+## Description: Avoid DNS lookups for kerberos principal
+## Type: yesno
+## Default: no
+## ServiceRestart: gssd
+#
+# Avoid DNS lookups when determining kerberos identity
+# of NFS server (yes/no)
+# "yes" is safest, but "no" might be needed to preserve
+# correct behaviour at sites that don't use
+# Fully Qualified Domain Names when mounting NFS Shares.
+#
+NFS_GSSD_AVOID_DNS="no"
--
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 mpfr for openSUSE:Factory checked in at 2013-07-30 18:40:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mpfr (Old)
and /work/SRC/openSUSE:Factory/.mpfr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpfr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mpfr/mpfr.changes 2013-03-15 10:42:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mpfr.new/mpfr.changes 2013-07-30 18:40:36.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 16 10:24:10 UTC 2013 - idonmez(a)suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mpfr.spec ++++++
--- /var/tmp/diff_new_pack.LcL7Aj/_old 2013-07-30 18:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.LcL7Aj/_new 2013-07-30 18:40:36.000000000 +0200
@@ -24,7 +24,7 @@
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Url: http://www.mpfr.org/
-Source: mpfr-%{version}.tar.bz2
+Source: http://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.bz2
Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
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 mpc for openSUSE:Factory checked in at 2013-07-30 18:39:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mpc (Old)
and /work/SRC/openSUSE:Factory/.mpc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mpc/mpc.changes 2012-07-30 20:35:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mpc.new/mpc.changes 2013-07-30 18:39:59.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 16 10:25:13 UTC 2013 - idonmez(a)suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
Old:
----
mpc-1.0.tar.bz2
New:
----
mpc-1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mpc.spec ++++++
--- /var/tmp/diff_new_pack.mpPSTz/_old 2013-07-30 18:40:00.000000000 +0200
+++ /var/tmp/diff_new_pack.mpPSTz/_new 2013-07-30 18:40:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mpc
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -25,7 +25,7 @@
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Url: http://www.multiprecision.org/mpc/
-Source: mpc-%{version}.tar.bz2
+Source: http://www.multiprecision.org/mpc/download/mpc-%{version}.tar.gz
Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
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 libserf for openSUSE:Factory checked in at 2013-07-30 18:39:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libserf (Old)
and /work/SRC/openSUSE:Factory/.libserf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libserf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libserf/libserf.changes 2013-07-25 14:29:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2013-07-30 18:39:43.000000000 +0200
@@ -1,0 +2,17 @@
+Sun Jul 28 14:54:40 UTC 2013 - andreas.stieger(a)gmx.de
+
+- update libserf-1.3.x-soname.patch to add SHLIBVERSION to make
+ scons add a SONAME instead of a global linker flag. This is only
+ effective with scons >= 2.3
+- fix running of regression/unit test suite:
+ * add libserf-1.3.x-scons-check-exit.patch to return a non-zero
+ exist status upon check failures
+ * call scons check with CFLAGS
+
+-------------------------------------------------------------------
+Fri Jul 26 22:10:36 UTC 2013 - andreas.stieger(a)gmx.de
+
+- update libserf-1.3.x-gssapi-libs.patch with upstream commit,
+ mark as committed upstream
+
+-------------------------------------------------------------------
New:
----
libserf-1.3.x-scons-check-exit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libserf.spec ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -21,8 +21,8 @@
%define minimum_apr_version 1.3.0
Name: libserf
-%define soname 0
%define major 1
+%define sosuffix 0.%{major}.0
Version: 1.3.0
Release: 0
Summary: High-Performance Asynchronous HTTP Client Library
@@ -34,6 +34,7 @@
Patch0: libserf-1.3.x-libdir.patch
Patch1: libserf-1.3.x-soname.patch
Patch2: libserf-1.3.x-gssapi-libs.patch
+Patch3: libserf-1.3.x-scons-check-exit.patch
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: libapr-util1-devel >= %{minimum_apr_version}
@@ -44,7 +45,8 @@
BuildRequires: make
BuildRequires: openldap2-devel
BuildRequires: pkgconfig
-BuildRequires: scons >= 2.0
+# SHLIBVERERSION introduced in 2.3 (libserf-1.3.x-soname.patch)
+BuildRequires: scons >= 2.3
BuildRequires: zlib-devel
%if %{with gssapi}
BuildRequires: krb5-devel
@@ -118,6 +120,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
# scons expects coma separated flags
@@ -139,29 +142,33 @@
%install
scons install --install-sandbox=%{buildroot}
pushd %{buildroot}%{_libdir}/
-%__mv libserf-%{major}.so libserf-%{major}.so.%{soname}.0.0
-ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so.%{soname}
-ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so
+ln -s libserf-%{major}.so.%{sosuffix} libserf-%{major}.so.0
+ln -s libserf-%{major}.so.%{sosuffix} libserf-%{major}.so
popd
%__rm -f "%{buildroot}%{_libdir}"/lib*.a
%check
-scons CFLAGS="" check
+# scons expects coma separated flags
+SCONS_OPTFLAGS=`echo %{optflags} | sed "s/ /,/g"`
+scons \
+ CFLAGS=$SCONS_OPTFLAGS \
+ check \
+ %{?_smp_mflags}
-%post -n libserf-1-0 -p /sbin/ldconfig
+%post -n libserf-%{major}-0 -p /sbin/ldconfig
-%postun -n libserf-1-0 -p /sbin/ldconfig
+%postun -n libserf-%{major}-0 -p /sbin/ldconfig
-%files -n libserf-1-0
+%files -n libserf-%{major}-0
%defattr(-,root,root)
%doc CHANGES LICENSE NOTICE README
%doc design-guide.txt
-%{_libdir}/libserf-%{major}.so.%{soname}
-%{_libdir}/libserf-%{major}.so.%{soname}.*.*
+%{_libdir}/libserf-%{major}.so.0
+%{_libdir}/libserf-%{major}.so.%{sosuffix}
%files -n libserf-devel
%defattr(-,root,root)
-%_includedir/serf-%major
+%_includedir/serf-%{major}
%{_libdir}/libserf-%{major}.so
%{_libdir}/pkgconfig/serf-%{major}.pc
++++++ libserf-1.3.x-gssapi-libs.patch ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -1,28 +1,28 @@
From: Andreas Stieger <andreas.stieger(a)gmx.de>
Date: 2013-07-24 23:58:00 +0100
Subject: [PATCH] add gssapi libs to pkgconfig file, resolve TODO
-References: https://code.google.com/p/serf/issues/detail?id=113
-Upstream: submitted
+References: https://code.google.com/p/serf/issues/detail?id=113 http://code.google.com/p/serf/source/diff?spec=svn2079&old=2070&r=2079&form…
+Upstream: committed
Makes pkgconfig file contain libraries for gssapi
----
- SConstruct | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: serf-1.3.0/SConstruct
+Index: trunk/SConstruct
===================================================================
---- serf-1.3.0.orig/SConstruct 2013-07-24 23:40:43.000000000 +0100
-+++ serf-1.3.0/SConstruct 2013-07-24 23:48:19.000000000 +0100
-@@ -345,6 +345,7 @@ else:
+--- trunk/SConstruct (revision 2078)
++++ trunk/SConstruct (revision 2079)
+@@ -334,7 +334,10 @@
+
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
if gssapi and CALLOUT_OKAY:
- env.ParseConfig('$GSSAPI --libs gssapi')
+- env.ParseConfig('$GSSAPI --libs gssapi')
++ def parse_libs(env, cmd, unique=1):
++ env['GSSAPI_LIBS'] = cmd.strip()
++ return env.MergeFlags(cmd, unique)
++ env.ParseConfig('$GSSAPI --libs gssapi', parse_libs)
env.Append(CPPDEFINES='SERF_HAVE_GSSAPI')
-+ gssapi_libs = os.popen(env.subst('$GSSAPI --libs gssapi')).read().strip()
if sys.platform == 'win32':
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
-
-@@ -356,7 +357,6 @@ if sys.platform == 'sunos5':
+@@ -347,7 +350,6 @@
env.Append(RPATH=d)
# Set up the construction of serf-*.pc
@@ -30,12 +30,13 @@
pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
env.File('build/serf.pc.in'),
SUBST_DICT = {
-@@ -364,7 +364,7 @@ pkgconfig = env.Textfile('serf-%d.pc' %
+@@ -355,7 +357,8 @@
'@PREFIX@': '$PREFIX',
'@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
'@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
- '@LIBS@': '%s %s -lz' % (apu_libs, apr_libs),
-+ '@LIBS@': '%s %s %s -lz' % (gssapi_libs, apu_libs, apr_libs),
++ '@LIBS@': '%s %s %s -lz' % (apu_libs, apr_libs,
++ env.get('GSSAPI_LIBS')),
})
env.Default(lib_static, lib_shared, pkgconfig)
++++++ libserf-1.3.x-scons-check-exit.patch ++++++
From: Andreas Stieger <andreas.stieger(a)gmx.de>
Date: Sun, 28 Jul 2013 14:16:28 +0100
Subject: [PATCH] scons check should return non-zero exit status
References: https://code.google.com/p/serf/issues/detail?id=116 http://code.google.com/p/serf/source/detail?r=2081
Upstream: committed
make "scons check" return a non-zero exis status for %check to make sense
Index: trunk/build/check.py
===================================================================
--- trunk/build/check.py (revision 2080)
+++ trunk/build/check.py (revision 2081)
@@ -48,6 +48,7 @@ if __name__ == '__main__':
subprocess.check_call([SERF_RESPONSE_EXE, case])
except subprocess.CalledProcessError:
print "ERROR: test case %s failed" % (case)
+ sys.exit(1)
print "== Running the unit tests =="
try:
@@ -54,3 +55,4 @@ if __name__ == '__main__':
subprocess.check_call(TEST_ALL_EXE)
except subprocess.CalledProcessError:
print "ERROR: test(s) failed in test_all"
+ sys.exit(1)
++++++ libserf-1.3.x-soname.patch ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -4,31 +4,23 @@
References: https://code.google.com/p/serf/issues/detail?id=112
Upstream: submitted
-add an soname to the linker options
+add an soname, works with scons >= 2.3.0
fixes warning: libserf-1-0.i586: W: no-soname /usr/lib/libserf-1.so.0.0.0
---
- SConstruct | 3 +++
- 1 file changed, 3 insertions(+)
+ SConstruct | 2 ++
+ 1 file changed, 2 insertions(+)
Index: serf-1.3.0/SConstruct
===================================================================
---- serf-1.3.0.orig/SConstruct 2013-07-24 22:43:28.000000000 +0100
-+++ serf-1.3.0/SConstruct 2013-07-24 22:59:36.000000000 +0100
-@@ -191,6 +191,7 @@ libdir = '$LIBDIR'
+--- serf-1.3.0.orig/SConstruct 2013-07-28 13:23:02.000000000 +0100
++++ serf-1.3.0/SConstruct 2013-07-28 13:23:03.000000000 +0100
+@@ -190,6 +190,8 @@ thisdir = os.getcwd()
+ libdir = '$LIBDIR'
incdir = '$PREFIX/include/serf-$MAJOR'
++env['SHLIBVERSION']='0.${MAJOR}.0'
++
LIBNAME = 'libserf-${MAJOR}'
-+SONAME='libserf-${MAJOR}.so.0'
if sys.platform != 'win32':
LIBNAMESTATIC = LIBNAME
- else:
-@@ -199,6 +200,8 @@ else:
- env.Append(RPATH=libdir,
- PDB='${TARGET.filebase}.pdb')
-
-+env.Append(LINKFLAGS='-Wl,-soname,%s' % SONAME )
-+
- if sys.platform == 'darwin':
- # linkflags.append('-Wl,-install_name,(a)executable_path/%s.dylib' % (LIBNAME,))
- env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0