openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2014
- 1 participants
- 1539 discussions
Hello community,
here is the log from the commit of package perl-Software-License for openSUSE:Factory checked in at 2014-05-31 08:09:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Software-License (Old)
and /work/SRC/openSUSE:Factory/.perl-Software-License.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Software-License"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Software-License/perl-Software-License.changes 2014-03-11 08:03:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Software-License.new/perl-Software-License.changes 2014-05-31 08:09:26.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 27 07:41:41 UTC 2014 - ncutler(a)suse.com
+
+- updated to 0.103010
+ - fix guess_license_from_pod's return on GPL licenses
+ (thanks, Syohei YOSHIDA!)
+
+-------------------------------------------------------------------
Old:
----
Software-License-0.103009.tar.gz
New:
----
Software-License-0.103010.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Software-License.spec ++++++
--- /var/tmp/diff_new_pack.dgAZ84/_old 2014-05-31 08:09:27.000000000 +0200
+++ /var/tmp/diff_new_pack.dgAZ84/_new 2014-05-31 08:09:27.000000000 +0200
@@ -17,10 +17,10 @@
Name: perl-Software-License
-Version: 0.103009
+Version: 0.103010
Release: 0
%define cpan_name Software-License
-Summary: packages that provide templated software licenses
+Summary: Packages that provide templated software licenses
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Software-License/
@@ -44,7 +44,8 @@
%{perl_requires}
%description
-packages that provide templated software licenses
+This package provides templated software licenses in the form of modules,
+as well as some license-related utilities, such as a 'fulltext' method.
%prep
%setup -q -n %{cpan_name}-%{version}
++++++ Software-License-0.103009.tar.gz -> Software-License-0.103010.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/Changes new/Software-License-0.103010/Changes
--- old/Software-License-0.103009/Changes 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/Changes 2014-03-30 04:13:26.000000000 +0200
@@ -1,5 +1,9 @@
Revision history for Software-License
+0.103010 2014-03-29 22:13:19-04:00 America/New_York
+ - fix guess_license_from_pod's return on GPL licenses
+ (thanks, Syohei YOSHIDA!)
+
0.103009 2014-02-20 22:19:45-05:00 America/New_York
- Updated FSF mailing address in license text for GFDL versions 1.2,
GPL versions 1 & 2, and LGPL 2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/LICENSE new/Software-License-0.103010/LICENSE
--- old/Software-License-0.103009/LICENSE 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/LICENSE 2014-03-30 04:13:26.000000000 +0200
@@ -22,7 +22,7 @@
Version 1, February 1989
Copyright (C) 1989 Free Software Foundation, Inc.
- 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/META.json new/Software-License-0.103010/META.json
--- old/Software-License-0.103009/META.json 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/META.json 2014-03-30 04:13:26.000000000 +0200
@@ -4,7 +4,7 @@
"Ricardo Signes <rjbs(a)cpan.org>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.133380",
+ "generated_by" : "Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.140640",
"license" : [
"perl_5"
],
@@ -59,10 +59,10 @@
"web" : "https://github.com/rjbs/Software-License"
}
},
- "version" : "0.103009",
+ "version" : "0.103010",
"x_Dist_Zilla" : {
"perl" : {
- "version" : "5.019009"
+ "version" : "5.019010"
},
"plugins" : [
{
@@ -73,12 +73,12 @@
{
"class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed",
"name" : "@RJBS/CheckPrereqsIndexed",
- "version" : "0.010"
+ "version" : "0.011"
},
{
"class" : "Dist::Zilla::Plugin::CheckExtraTests",
"name" : "@RJBS/CheckExtraTests",
- "version" : "0.018"
+ "version" : "0.021"
},
{
"class" : "Dist::Zilla::Plugin::PromptIfStale",
@@ -94,7 +94,7 @@
}
},
"name" : "@RJBS/RJBS-Outdated",
- "version" : "0.017"
+ "version" : "0.021"
},
{
"class" : "Dist::Zilla::Plugin::PromptIfStale",
@@ -108,7 +108,7 @@
}
},
"name" : "@RJBS/CPAN-Outdated",
- "version" : "0.017"
+ "version" : "0.021"
},
{
"class" : "Dist::Zilla::Plugin::PruneCruft",
@@ -146,11 +146,6 @@
"version" : "5.014"
},
{
- "class" : "Dist::Zilla::Plugin::MakeMaker",
- "name" : "@RJBS/@Filter/MakeMaker",
- "version" : "5.014"
- },
- {
"class" : "Dist::Zilla::Plugin::Manifest",
"name" : "@RJBS/@Filter/Manifest",
"version" : "5.014"
@@ -171,6 +166,16 @@
"version" : "5.014"
},
{
+ "class" : "Dist::Zilla::Plugin::MakeMaker",
+ "config" : {
+ "Dist::Zilla::Role::TestRunner" : {
+ "default_jobs" : 9
+ }
+ },
+ "name" : "@RJBS/MakeMaker",
+ "version" : "5.014"
+ },
+ {
"class" : "Dist::Zilla::Plugin::AutoPrereqs",
"name" : "@RJBS/AutoPrereqs",
"version" : "5.014"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/META.yml new/Software-License-0.103010/META.yml
--- old/Software-License-0.103009/META.yml 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/META.yml 2014-03-30 04:13:26.000000000 +0200
@@ -8,7 +8,7 @@
configure_requires:
ExtUtils::MakeMaker: '6.30'
dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.133380'
+generated_by: 'Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.140640'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -30,10 +30,10 @@
bugtracker: https://github.com/rjbs/Software-License/issues
homepage: https://github.com/rjbs/Software-License
repository: https://github.com/rjbs/Software-License.git
-version: '0.103009'
+version: '0.103010'
x_Dist_Zilla:
perl:
- version: '5.019009'
+ version: '5.019010'
plugins:
-
class: Dist::Zilla::Plugin::Git::GatherDir
@@ -42,11 +42,11 @@
-
class: Dist::Zilla::Plugin::CheckPrereqsIndexed
name: '@RJBS/CheckPrereqsIndexed'
- version: '0.010'
+ version: '0.011'
-
class: Dist::Zilla::Plugin::CheckExtraTests
name: '@RJBS/CheckExtraTests'
- version: '0.018'
+ version: '0.021'
-
class: Dist::Zilla::Plugin::PromptIfStale
config:
@@ -58,7 +58,7 @@
phase: build
skip: []
name: '@RJBS/RJBS-Outdated'
- version: '0.017'
+ version: '0.021'
-
class: Dist::Zilla::Plugin::PromptIfStale
config:
@@ -69,7 +69,7 @@
phase: release
skip: []
name: '@RJBS/CPAN-Outdated'
- version: '0.017'
+ version: '0.021'
-
class: Dist::Zilla::Plugin::PruneCruft
name: '@RJBS/@Filter/PruneCruft'
@@ -99,10 +99,6 @@
name: '@RJBS/@Filter/ShareDir'
version: '5.014'
-
- class: Dist::Zilla::Plugin::MakeMaker
- name: '@RJBS/@Filter/MakeMaker'
- version: '5.014'
- -
class: Dist::Zilla::Plugin::Manifest
name: '@RJBS/@Filter/Manifest'
version: '5.014'
@@ -119,6 +115,13 @@
name: '@RJBS/@Filter/UploadToCPAN'
version: '5.014'
-
+ class: Dist::Zilla::Plugin::MakeMaker
+ config:
+ Dist::Zilla::Role::TestRunner:
+ default_jobs: 9
+ name: '@RJBS/MakeMaker'
+ version: '5.014'
+ -
class: Dist::Zilla::Plugin::AutoPrereqs
name: '@RJBS/AutoPrereqs'
version: '5.014'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/Makefile.PL new/Software-License-0.103010/Makefile.PL
--- old/Software-License-0.103009/Makefile.PL 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/Makefile.PL 2014-03-30 04:13:26.000000000 +0200
@@ -36,7 +36,7 @@
"Test::More" => "0.96",
"Try::Tiny" => 0
},
- "VERSION" => "0.103009",
+ "VERSION" => "0.103010",
"test" => {
"TESTS" => "t/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/README new/Software-License-0.103010/README
--- old/Software-License-0.103009/README 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/README 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
This archive contains the distribution Software-License,
-version 0.103009:
+version 0.103010:
packages that provide templated software licenses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/AGPL_3.pm new/Software-License-0.103010/lib/Software/License/AGPL_3.pm
--- old/Software-License-0.103009/lib/Software/License/AGPL_3.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/AGPL_3.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::AGPL_3;
-$Software::License::AGPL_3::VERSION = '0.103009';
+$Software::License::AGPL_3::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU Affero General Public License, Version 3
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Apache_1_1.pm new/Software-License-0.103010/lib/Software/License/Apache_1_1.pm
--- old/Software-License-0.103009/lib/Software/License/Apache_1_1.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Apache_1_1.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Apache_1_1;
-$Software::License::Apache_1_1::VERSION = '0.103009';
+$Software::License::Apache_1_1::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Apache Software License, Version 1.1
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Apache_2_0.pm new/Software-License-0.103010/lib/Software/License/Apache_2_0.pm
--- old/Software-License-0.103009/lib/Software/License/Apache_2_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Apache_2_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Apache_2_0;
-$Software::License::Apache_2_0::VERSION = '0.103009';
+$Software::License::Apache_2_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Apache License, Version 2.0
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Artistic_1_0.pm new/Software-License-0.103010/lib/Software/License/Artistic_1_0.pm
--- old/Software-License-0.103009/lib/Software/License/Artistic_1_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Artistic_1_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,32 +1,32 @@
use strict;
use warnings;
package Software::License::Artistic_1_0;
-$Software::License::Artistic_1_0::VERSION = '0.103009';
+$Software::License::Artistic_1_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Artistic License
-# =head1 OPTIONS
-#
-# The Artistic License 1.0 has a sometimes-omitted "aggregation clause" which
-# reads:
-#
-# 8. The name of the Copyright Holder may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# By default, this clause will be included. To disable it, include the following
-# pair when instantiating the license:
-#
-# aggregation_clause => 0
-#
-# =head1 METHODS
-#
-# =head2 aggregation_clause
-#
-# This method returns whether the aggregation clause is allowed on this instance.
-# By default this method returns true on instances and dies on the class.
-#
-# =cut
+#pod =head1 OPTIONS
+#pod
+#pod The Artistic License 1.0 has a sometimes-omitted "aggregation clause" which
+#pod reads:
+#pod
+#pod 8. The name of the Copyright Holder may not be used to endorse or promote
+#pod products derived from this software without specific prior written
+#pod permission.
+#pod
+#pod By default, this clause will be included. To disable it, include the following
+#pod pair when instantiating the license:
+#pod
+#pod aggregation_clause => 0
+#pod
+#pod =head1 METHODS
+#pod
+#pod =head2 aggregation_clause
+#pod
+#pod This method returns whether the aggregation clause is allowed on this instance.
+#pod By default this method returns true on instances and dies on the class.
+#pod
+#pod =cut
sub aggregation_clause {
exists $_[0]->{aggregation_clause} ? $_[0]->{aggregation_clause} : 1
@@ -60,7 +60,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 OPTIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Artistic_2_0.pm new/Software-License-0.103010/lib/Software/License/Artistic_2_0.pm
--- old/Software-License-0.103009/lib/Software/License/Artistic_2_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Artistic_2_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Artistic_2_0;
-$Software::License::Artistic_2_0::VERSION = '0.103009';
+$Software::License::Artistic_2_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Artistic License 2.0
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/BSD.pm new/Software-License-0.103010/lib/Software/License/BSD.pm
--- old/Software-License-0.103009/lib/Software/License/BSD.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/BSD.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::BSD;
-$Software::License::BSD::VERSION = '0.103009';
+$Software::License::BSD::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The (three-clause) BSD License
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/CC0_1_0.pm new/Software-License-0.103010/lib/Software/License/CC0_1_0.pm
--- old/Software-License-0.103009/lib/Software/License/CC0_1_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/CC0_1_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,22 +1,22 @@
use strict;
use warnings;
package Software::License::CC0_1_0;
-$Software::License::CC0_1_0::VERSION = '0.103009';
+$Software::License::CC0_1_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: the "public domain"-like CC0 license, version 1.0
-# =head1 WARNING
-#
-# B<You should really think hard before using this license.>
-#
-# This license is provided for those who want to place their software into the
-# public domain. Doing this means you have waived any copyright protection as
-# much as allowed by law, and that you grant anybody the right to do anything
-# with your software. You cannot reverse your decision to dedicate software as
-# public property, so use this only if you're quite sure that you mean to do
-# it.
-#
-# =cut
+#pod =head1 WARNING
+#pod
+#pod B<You should really think hard before using this license.>
+#pod
+#pod This license is provided for those who want to place their software into the
+#pod public domain. Doing this means you have waived any copyright protection as
+#pod much as allowed by law, and that you grant anybody the right to do anything
+#pod with your software. You cannot reverse your decision to dedicate software as
+#pod public property, so use this only if you're quite sure that you mean to do
+#pod it.
+#pod
+#pod =cut
sub name { q(CC0 License) }
sub url { q{http://creativecommons.org/publicdomain/zero/1.0/} }
@@ -36,7 +36,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 WARNING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Custom.pm new/Software-License-0.103010/lib/Software/License/Custom.pm
--- old/Software-License-0.103009/lib/Software/License/Custom.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Custom.pm 2014-03-30 04:13:26.000000000 +0200
@@ -2,79 +2,79 @@
use warnings;
package Software::License::Custom;
# ABSTRACT: custom license handler
-$Software::License::Custom::VERSION = '0.103009';
+$Software::License::Custom::VERSION = '0.103010';
use parent 'Software::License';
use Carp;
use Text::Template;
-# =head1 DESCRIPTION
-#
-# This module extends L<Software::License> to give the possibility of specifying
-# all aspects related to a software license in a custom file. This allows for
-# setting custom dates, notices, etc. while still preserving compatibility with
-# all places where L<Software::License> is used, e.g. L<Dist::Zilla>.
-#
-# In this way, you should be able to customise some aspects of the licensing
-# messages that would otherwise be difficult to tinker, e.g. adding a note
-# in the notice, setting multiple years for the copyright notice or set multiple
-# authors and/or copyright holders.
-#
-# The license details should be put inside a file that contains different
-# sections. Each section has the following format:
-#
-# =begin :list
-#
-# = header line
-#
-# This is a line that begins and ends with two underscores C<__>. The string
-# between the begin and the end of the line is first depured of any non-word
-# character, then used as the name of the section;
-#
-# = body
-#
-# a L<Text::Template> (possibly a plain text file) where items to be
-# expanded are enclosed between double braces
-#
-# =end :list
-#
-# Each section is terminated by the header of the following section or by
-# the end of the file. Example:
-#
-# __[ NAME ]__
-# The Foo-Bar License
-# __URL__
-# http://www.example.com/foo-bar.txt
-# __[ META_NAME ]__
-# foo_bar_meta
-# __{ META2_NAME }__
-# foo_bar_meta2
-# __[ NOTICE ]__
-# Copyright (C) 2000-2002 by P.R. Evious
-# Copyright (C) {{$self->year}} by {{$self->holder}}.
-#
-# This is free software, licensed under {{$self->name}}.
-#
-# __[ LICENSE ]__
-# The Foo-Bar License
-#
-# Well... this is only some sample text. Verily... only sample text!!!
-#
-# Yes, spanning more lines and more paragraphs.
-#
-# The different formats for specifying the section name in the example
-# above are only examples, you're invited to use a consistent approach.
-#
-# =method new
-#
-# my $slc = Software::License::Custom->new({filename => 'LEGAL'});
-#
-# Create a new object. Arguments are passed through an anonymous hash, the
-# following keys are allowed:
-#
-# filename - the file where the custom software license details are stored
-#
-# =cut
+#pod =head1 DESCRIPTION
+#pod
+#pod This module extends L<Software::License> to give the possibility of specifying
+#pod all aspects related to a software license in a custom file. This allows for
+#pod setting custom dates, notices, etc. while still preserving compatibility with
+#pod all places where L<Software::License> is used, e.g. L<Dist::Zilla>.
+#pod
+#pod In this way, you should be able to customise some aspects of the licensing
+#pod messages that would otherwise be difficult to tinker, e.g. adding a note
+#pod in the notice, setting multiple years for the copyright notice or set multiple
+#pod authors and/or copyright holders.
+#pod
+#pod The license details should be put inside a file that contains different
+#pod sections. Each section has the following format:
+#pod
+#pod =begin :list
+#pod
+#pod = header line
+#pod
+#pod This is a line that begins and ends with two underscores C<__>. The string
+#pod between the begin and the end of the line is first depured of any non-word
+#pod character, then used as the name of the section;
+#pod
+#pod = body
+#pod
+#pod a L<Text::Template> (possibly a plain text file) where items to be
+#pod expanded are enclosed between double braces
+#pod
+#pod =end :list
+#pod
+#pod Each section is terminated by the header of the following section or by
+#pod the end of the file. Example:
+#pod
+#pod __[ NAME ]__
+#pod The Foo-Bar License
+#pod __URL__
+#pod http://www.example.com/foo-bar.txt
+#pod __[ META_NAME ]__
+#pod foo_bar_meta
+#pod __{ META2_NAME }__
+#pod foo_bar_meta2
+#pod __[ NOTICE ]__
+#pod Copyright (C) 2000-2002 by P.R. Evious
+#pod Copyright (C) {{$self->year}} by {{$self->holder}}.
+#pod
+#pod This is free software, licensed under {{$self->name}}.
+#pod
+#pod __[ LICENSE ]__
+#pod The Foo-Bar License
+#pod
+#pod Well... this is only some sample text. Verily... only sample text!!!
+#pod
+#pod Yes, spanning more lines and more paragraphs.
+#pod
+#pod The different formats for specifying the section name in the example
+#pod above are only examples, you're invited to use a consistent approach.
+#pod
+#pod =method new
+#pod
+#pod my $slc = Software::License::Custom->new({filename => 'LEGAL'});
+#pod
+#pod Create a new object. Arguments are passed through an anonymous hash, the
+#pod following keys are allowed:
+#pod
+#pod filename - the file where the custom software license details are stored
+#pod
+#pod =cut
sub new {
my ($class, $arg) = @_;
@@ -88,15 +88,15 @@
return $self;
}
-# =method load_sections_from
-#
-# $slc->load_sections_from('MY-LEGAL-ASPECTS');
-#
-# Loads the different sections of the license from the provided filename.
-#
-# Returns the input object.
-#
-# =cut
+#pod =method load_sections_from
+#pod
+#pod $slc->load_sections_from('MY-LEGAL-ASPECTS');
+#pod
+#pod Loads the different sections of the license from the provided filename.
+#pod
+#pod Returns the input object.
+#pod
+#pod =cut
sub load_sections_from {
my ($self, $filename) = @_;
@@ -123,15 +123,15 @@
return $self;
}
-# =method section_data
-#
-# my $notice_template_reference = $slc->section_data('NOTICE');
-#
-# Returns a reference to a textual template that can be fed to
-# L<Text::Template> (it could be simple text), according to what is
-# currently loaded in the object.
-#
-# =cut
+#pod =method section_data
+#pod
+#pod my $notice_template_reference = $slc->section_data('NOTICE');
+#pod
+#pod Returns a reference to a textual template that can be fed to
+#pod L<Text::Template> (it could be simple text), according to what is
+#pod currently loaded in the object.
+#pod
+#pod =cut
sub section_data {
my ($self, $name) = @_;
@@ -141,26 +141,26 @@
return \$section_for->{$name};
}
-# =head1 MORE METHODS
-#
-# The following methods, found in all software license classes, look up and
-# render the template with the capitalized form of their name. In other words,
-# the C<license> method looks in the C<LICENSE> template.
-#
-# For now, the C<meta_name> and C<meta2_name> methods return C<custom> if called
-# on the class. This may become fatal in the future.
-#
-# =for :list
-# * name
-# * url
-# * meta_name
-# * meta2_name
-# * license
-# * notice
-# * fulltext
-# * version
-#
-# =cut
+#pod =head1 MORE METHODS
+#pod
+#pod The following methods, found in all software license classes, look up and
+#pod render the template with the capitalized form of their name. In other words,
+#pod the C<license> method looks in the C<LICENSE> template.
+#pod
+#pod For now, the C<meta_name> and C<meta2_name> methods return C<custom> if called
+#pod on the class. This may become fatal in the future.
+#pod
+#pod =for :list
+#pod * name
+#pod * url
+#pod * meta_name
+#pod * meta2_name
+#pod * license
+#pod * notice
+#pod * fulltext
+#pod * version
+#pod
+#pod =cut
sub name { shift->_fill_in('NAME') }
sub url { shift->_fill_in('URL') }
@@ -205,7 +205,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/FreeBSD.pm new/Software-License-0.103010/lib/Software/License/FreeBSD.pm
--- old/Software-License-0.103009/lib/Software/License/FreeBSD.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/FreeBSD.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::FreeBSD;
-$Software::License::FreeBSD::VERSION = '0.103009';
+$Software::License::FreeBSD::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The FreeBSD License (aka two-clause BSD)
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/GFDL_1_2.pm new/Software-License-0.103010/lib/Software/License/GFDL_1_2.pm
--- old/Software-License-0.103009/lib/Software/License/GFDL_1_2.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/GFDL_1_2.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::GFDL_1_2;
-$Software::License::GFDL_1_2::VERSION = '0.103009';
+$Software::License::GFDL_1_2::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The GNU Free Documentation License v1.2
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/GFDL_1_3.pm new/Software-License-0.103010/lib/Software/License/GFDL_1_3.pm
--- old/Software-License-0.103009/lib/Software/License/GFDL_1_3.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/GFDL_1_3.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::GFDL_1_3;
-$Software::License::GFDL_1_3::VERSION = '0.103009';
+$Software::License::GFDL_1_3::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The GNU Free Documentation License v1.3
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/GPL_1.pm new/Software-License-0.103010/lib/Software/License/GPL_1.pm
--- old/Software-License-0.103009/lib/Software/License/GPL_1.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/GPL_1.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::GPL_1;
-$Software::License::GPL_1::VERSION = '0.103009';
+$Software::License::GPL_1::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU General Public License, Version 1
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/GPL_2.pm new/Software-License-0.103010/lib/Software/License/GPL_2.pm
--- old/Software-License-0.103009/lib/Software/License/GPL_2.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/GPL_2.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::GPL_2;
-$Software::License::GPL_2::VERSION = '0.103009';
+$Software::License::GPL_2::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU General Public License, Version 2
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/GPL_3.pm new/Software-License-0.103010/lib/Software/License/GPL_3.pm
--- old/Software-License-0.103009/lib/Software/License/GPL_3.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/GPL_3.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::GPL_3;
-$Software::License::GPL_3::VERSION = '0.103009';
+$Software::License::GPL_3::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU General Public License, Version 3
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/LGPL_2_1.pm new/Software-License-0.103010/lib/Software/License/LGPL_2_1.pm
--- old/Software-License-0.103009/lib/Software/License/LGPL_2_1.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/LGPL_2_1.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::LGPL_2_1;
-$Software::License::LGPL_2_1::VERSION = '0.103009';
+$Software::License::LGPL_2_1::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU Lesser General Public License, Version 2.1
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/LGPL_3_0.pm new/Software-License-0.103010/lib/Software/License/LGPL_3_0.pm
--- old/Software-License-0.103009/lib/Software/License/LGPL_3_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/LGPL_3_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::LGPL_3_0;
-$Software::License::LGPL_3_0::VERSION = '0.103009';
+$Software::License::LGPL_3_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: GNU Lesser General Public License, Version 3
@@ -37,7 +37,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/MIT.pm new/Software-License-0.103010/lib/Software/License/MIT.pm
--- old/Software-License-0.103009/lib/Software/License/MIT.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/MIT.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::MIT;
-$Software::License::MIT::VERSION = '0.103009';
+$Software::License::MIT::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The MIT (aka X11) License
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Mozilla_1_0.pm new/Software-License-0.103010/lib/Software/License/Mozilla_1_0.pm
--- old/Software-License-0.103009/lib/Software/License/Mozilla_1_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Mozilla_1_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Mozilla_1_0;
-$Software::License::Mozilla_1_0::VERSION = '0.103009';
+$Software::License::Mozilla_1_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: Mozilla Public License 1.0
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Mozilla_1_1.pm new/Software-License-0.103010/lib/Software/License/Mozilla_1_1.pm
--- old/Software-License-0.103009/lib/Software/License/Mozilla_1_1.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Mozilla_1_1.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Mozilla_1_1;
-$Software::License::Mozilla_1_1::VERSION = '0.103009';
+$Software::License::Mozilla_1_1::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Mozilla Public License 1.1
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Mozilla_2_0.pm new/Software-License-0.103010/lib/Software/License/Mozilla_2_0.pm
--- old/Software-License-0.103009/lib/Software/License/Mozilla_2_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Mozilla_2_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Mozilla_2_0;
-$Software::License::Mozilla_2_0::VERSION = '0.103009';
+$Software::License::Mozilla_2_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: Mozilla Public License Version 2.0
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/None.pm new/Software-License-0.103010/lib/Software/License/None.pm
--- old/Software-License-0.103009/lib/Software/License/None.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/None.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::None;
-$Software::License::None::VERSION = '0.103009';
+$Software::License::None::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: describes a "license" that gives no license for re-use
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/OpenSSL.pm new/Software-License-0.103010/lib/Software/License/OpenSSL.pm
--- old/Software-License-0.103009/lib/Software/License/OpenSSL.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/OpenSSL.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::OpenSSL;
-$Software::License::OpenSSL::VERSION = '0.103009';
+$Software::License::OpenSSL::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The OpenSSL License
@@ -32,7 +32,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Perl_5.pm new/Software-License-0.103010/lib/Software/License/Perl_5.pm
--- old/Software-License-0.103009/lib/Software/License/Perl_5.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Perl_5.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Perl_5;
-$Software::License::Perl_5::VERSION = '0.103009';
+$Software::License::Perl_5::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Perl 5 License (Artistic 1 & GPL 1)
@@ -41,7 +41,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/PostgreSQL.pm new/Software-License-0.103010/lib/Software/License/PostgreSQL.pm
--- old/Software-License-0.103009/lib/Software/License/PostgreSQL.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/PostgreSQL.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::PostgreSQL;
-$Software::License::PostgreSQL::VERSION = '0.103009';
+$Software::License::PostgreSQL::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The PostgreSQL License
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/QPL_1_0.pm new/Software-License-0.103010/lib/Software/License/QPL_1_0.pm
--- old/Software-License-0.103009/lib/Software/License/QPL_1_0.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/QPL_1_0.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::QPL_1_0;
-$Software::License::QPL_1_0::VERSION = '0.103009';
+$Software::License::QPL_1_0::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Q Public License, Version 1.0
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/SSLeay.pm new/Software-License-0.103010/lib/Software/License/SSLeay.pm
--- old/Software-License-0.103009/lib/Software/License/SSLeay.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/SSLeay.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::SSLeay;
-$Software::License::SSLeay::VERSION = '0.103009';
+$Software::License::SSLeay::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The Original SSLeay License
@@ -22,7 +22,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Sun.pm new/Software-License-0.103010/lib/Software/License/Sun.pm
--- old/Software-License-0.103009/lib/Software/License/Sun.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Sun.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Sun;
-$Software::License::Sun::VERSION = '0.103009';
+$Software::License::Sun::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: Sun Internet Standards Source License (SISSL)
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License/Zlib.pm new/Software-License-0.103010/lib/Software/License/Zlib.pm
--- old/Software-License-0.103009/lib/Software/License/Zlib.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License/Zlib.pm 2014-03-30 04:13:26.000000000 +0200
@@ -1,7 +1,7 @@
use strict;
use warnings;
package Software::License::Zlib;
-$Software::License::Zlib::VERSION = '0.103009';
+$Software::License::Zlib::VERSION = '0.103010';
use parent 'Software::License';
# ABSTRACT: The zlib License
@@ -23,7 +23,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 AUTHOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/License.pm new/Software-License-0.103010/lib/Software/License.pm
--- old/Software-License-0.103009/lib/Software/License.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/License.pm 2014-03-30 04:13:26.000000000 +0200
@@ -3,30 +3,30 @@
use 5.006; # warnings
package Software::License;
# ABSTRACT: packages that provide templated software licenses
-$Software::License::VERSION = '0.103009';
+$Software::License::VERSION = '0.103010';
use Data::Section -setup => { header_re => qr/\A__([^_]+)__\Z/ };
use Sub::Install ();
use Text::Template ();
-# =head1 SYNOPSIS
-#
-# my $license = Software::License::Discordian->new({
-# holder => 'Ricardo Signes',
-# });
-#
-# print $output_fh $license->fulltext;
-#
-# =method new
-#
-# my $license = $subclass->new(\%arg);
-#
-# This method returns a new license object for the given license class. Valid
-# arguments are:
-#
-# holder - the holder of the copyright; required
-# year - the year of copyright; defaults to current year
-#
-# =cut
+#pod =head1 SYNOPSIS
+#pod
+#pod my $license = Software::License::Discordian->new({
+#pod holder => 'Ricardo Signes',
+#pod });
+#pod
+#pod print $output_fh $license->fulltext;
+#pod
+#pod =method new
+#pod
+#pod my $license = $subclass->new(\%arg);
+#pod
+#pod This method returns a new license object for the given license class. Valid
+#pod arguments are:
+#pod
+#pod holder - the holder of the copyright; required
+#pod year - the year of copyright; defaults to current year
+#pod
+#pod =cut
sub new {
my ($class, $arg) = @_;
@@ -36,64 +36,64 @@
bless $arg => $class;
}
-# =method year
-#
-# =method holder
-#
-# These methods are attribute readers.
-#
-# =cut
+#pod =method year
+#pod
+#pod =method holder
+#pod
+#pod These methods are attribute readers.
+#pod
+#pod =cut
sub year { defined $_[0]->{year} ? $_[0]->{year} : (localtime)[5]+1900 }
sub holder { $_[0]->{holder} }
-# =method name
-#
-# This method returns the name of the license, suitable for shoving in the middle
-# of a sentence, generally with a leading capitalized "The."
-#
-# =method url
-#
-# This method returns the URL at which a canonical text of the license can be
-# found, if one is available. If possible, this will point at plain text, but it
-# may point to an HTML resource.
-#
-# =method notice
-#
-# This method returns a snippet of text, usually a few lines, indicating the
-# copyright holder and year of copyright, as well as an indication of the license
-# under which the software is distributed.
-#
-# =cut
+#pod =method name
+#pod
+#pod This method returns the name of the license, suitable for shoving in the middle
+#pod of a sentence, generally with a leading capitalized "The."
+#pod
+#pod =method url
+#pod
+#pod This method returns the URL at which a canonical text of the license can be
+#pod found, if one is available. If possible, this will point at plain text, but it
+#pod may point to an HTML resource.
+#pod
+#pod =method notice
+#pod
+#pod This method returns a snippet of text, usually a few lines, indicating the
+#pod copyright holder and year of copyright, as well as an indication of the license
+#pod under which the software is distributed.
+#pod
+#pod =cut
sub notice { shift->_fill_in('NOTICE') }
-# =method license
-#
-# This method returns the full text of the license.
-#
-# =cut
+#pod =method license
+#pod
+#pod This method returns the full text of the license.
+#pod
+#pod =cut
sub license { shift->_fill_in('LICENSE') }
-# =method fulltext
-#
-# This method returns the complete text of the license, preceded by the copyright
-# notice.
-#
-# =cut
+#pod =method fulltext
+#pod
+#pod This method returns the complete text of the license, preceded by the copyright
+#pod notice.
+#pod
+#pod =cut
sub fulltext {
my ($self) = @_;
return join "\n", $self->notice, $self->license;
}
-# =method version
-#
-# This method returns the version of the license. If the license is not
-# versioned, this method will return false.
-#
-# =cut
+#pod =method version
+#pod
+#pod This method returns the version of the license. If the license is not
+#pod versioned, this method will return false.
+#pod
+#pod =cut
sub version {
my ($self) = @_;
@@ -105,23 +105,23 @@
return join '.', @vparts;
}
-# =method meta_name
-#
-# This method returns the string that should be used for this license in the CPAN
-# META.yml file, according to the CPAN Meta spec v1, or undef if there is no
-# known string to use.
-#
-# This method may also be invoked as C<meta_yml_name> for legacy reasons.
-#
-# =method meta2_name
-#
-# This method returns the string that should be used for this license in the CPAN
-# META.json or META.yml file, according to the CPAN Meta spec v2, or undef if
-# there is no known string to use. If this method does not exist, and
-# C<meta_name> returns open_source, restricted, unrestricted, or unknown, that
-# value will be used.
-#
-# =cut
+#pod =method meta_name
+#pod
+#pod This method returns the string that should be used for this license in the CPAN
+#pod META.yml file, according to the CPAN Meta spec v1, or undef if there is no
+#pod known string to use.
+#pod
+#pod This method may also be invoked as C<meta_yml_name> for legacy reasons.
+#pod
+#pod =method meta2_name
+#pod
+#pod This method returns the string that should be used for this license in the CPAN
+#pod META.json or META.yml file, according to the CPAN Meta spec v2, or undef if
+#pod there is no known string to use. If this method does not exist, and
+#pod C<meta_name> returns open_source, restricted, unrestricted, or unknown, that
+#pod value will be used.
+#pod
+#pod =cut
# sub meta1_name { return undef; } # sort this out later, should be easy
sub meta_name { return undef; }
@@ -152,49 +152,49 @@
);
}
-# =head1 LOOKING UP LICENSE CLASSES
-#
-# If you have an entry in a F<META.yml> or F<META.json> file, or similar
-# metadata, and want to look up the Software::License class to use, there are
-# useful tools in L<Software::LicenseUtils>.
-#
-# =head1 TODO
-#
-# =for :list
-# * register licenses with aliases to allow $registry->get('gpl', 2);
-#
-# =head1 SEE ALSO
-#
-# The specific license:
-#
-# =for :list
-# * L<Software::License::AGPL_3>
-# * L<Software::License::Apache_1_1>
-# * L<Software::License::Apache_2_0>
-# * L<Software::License::Artistic_1_0>
-# * L<Software::License::Artistic_2_0>
-# * L<Software::License::BSD>
-# * L<Software::License::CC0>
-# * L<Software::License::FreeBSD>
-# * L<Software::License::GFDL_1_2>
-# * L<Software::License::GPL_1>
-# * L<Software::License::GPL_2>
-# * L<Software::License::GPL_3>
-# * L<Software::License::LGPL_2_1>
-# * L<Software::License::LGPL_3_0>
-# * L<Software::License::MIT>
-# * L<Software::License::Mozilla_1_0>
-# * L<Software::License::Mozilla_1_1>
-# * L<Software::License::Mozilla_2_0>
-# * L<Software::License::None>
-# * L<Software::License::OpenSSL>
-# * L<Software::License::Perl_5>
-# * L<Software::License::QPL_1_0>
-# * L<Software::License::SSLeay>
-# * L<Software::License::Sun>
-# * L<Software::License::Zlib>
-#
-# =cut
+#pod =head1 LOOKING UP LICENSE CLASSES
+#pod
+#pod If you have an entry in a F<META.yml> or F<META.json> file, or similar
+#pod metadata, and want to look up the Software::License class to use, there are
+#pod useful tools in L<Software::LicenseUtils>.
+#pod
+#pod =head1 TODO
+#pod
+#pod =for :list
+#pod * register licenses with aliases to allow $registry->get('gpl', 2);
+#pod
+#pod =head1 SEE ALSO
+#pod
+#pod The specific license:
+#pod
+#pod =for :list
+#pod * L<Software::License::AGPL_3>
+#pod * L<Software::License::Apache_1_1>
+#pod * L<Software::License::Apache_2_0>
+#pod * L<Software::License::Artistic_1_0>
+#pod * L<Software::License::Artistic_2_0>
+#pod * L<Software::License::BSD>
+#pod * L<Software::License::CC0>
+#pod * L<Software::License::FreeBSD>
+#pod * L<Software::License::GFDL_1_2>
+#pod * L<Software::License::GPL_1>
+#pod * L<Software::License::GPL_2>
+#pod * L<Software::License::GPL_3>
+#pod * L<Software::License::LGPL_2_1>
+#pod * L<Software::License::LGPL_3_0>
+#pod * L<Software::License::MIT>
+#pod * L<Software::License::Mozilla_1_0>
+#pod * L<Software::License::Mozilla_1_1>
+#pod * L<Software::License::Mozilla_2_0>
+#pod * L<Software::License::None>
+#pod * L<Software::License::OpenSSL>
+#pod * L<Software::License::Perl_5>
+#pod * L<Software::License::QPL_1_0>
+#pod * L<Software::License::SSLeay>
+#pod * L<Software::License::Sun>
+#pod * L<Software::License::Zlib>
+#pod
+#pod =cut
1;
@@ -208,7 +208,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/lib/Software/LicenseUtils.pm new/Software-License-0.103010/lib/Software/LicenseUtils.pm
--- old/Software-License-0.103009/lib/Software/LicenseUtils.pm 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/lib/Software/LicenseUtils.pm 2014-03-30 04:13:26.000000000 +0200
@@ -4,22 +4,22 @@
package Software::LicenseUtils;
# ABSTRACT: little useful bits of code for licensey things
-$Software::LicenseUtils::VERSION = '0.103009';
+$Software::LicenseUtils::VERSION = '0.103010';
use File::Spec;
use IO::Dir;
use Module::Load;
-# =method guess_license_from_pod
-#
-# my @guesses = Software::LicenseUtils->guess_license_from_pod($pm_text);
-#
-# Given text containing POD, like a .pm file, this method will attempt to guess
-# at the license under which the code is available. This method will either
-# a list of Software::License classes (or instances) or false.
-#
-# Calling this method in scalar context is a fatal error.
-#
-# =cut
+#pod =method guess_license_from_pod
+#pod
+#pod my @guesses = Software::LicenseUtils->guess_license_from_pod($pm_text);
+#pod
+#pod Given text containing POD, like a .pm file, this method will attempt to guess
+#pod at the license under which the code is available. This method will either
+#pod a list of Software::License classes (or instances) or false.
+#pod
+#pod Calling this method in scalar context is a fatal error.
+#pod
+#pod =cut
my $_v = qr/(?:v(?:er(?:sion|\.))(?: |\.)?)/i;
my @phrases = (
@@ -39,8 +39,8 @@
$_[0] == 2 ? 'LGPL_2_1' : $_[0] == 3 ? 'LGPL_3_0' : ()
},
'LGPL' => [ qw(LGPL_2_1 LGPL_3_0) ],
- "GPL,? $_v?(\\d)" => sub { "GPL_$_[0]_0" },
- 'GPL' => [ map { "GPL_$_\_0" } (1..3) ],
+ "GPL,? $_v?(\\d)" => sub { "GPL_$_[0]" },
+ 'GPL' => [ map { "GPL_$_" } (1..3) ],
'BSD' => 'BSD',
'Artistic' => [ map { "Artistic_$_\_0" } (1..2) ],
'MIT' => 'MIT',
@@ -124,15 +124,15 @@
return;
}
-# =method guess_license_from_meta
-#
-# my @guesses = Software::LicenseUtils->guess_license_from_meta($meta_str);
-#
-# Given the content of the META.(yml|json) file found in a CPAN distribution, this
-# method makes a guess as to which licenses may apply to the distribution. It
-# will return a list of zero or more Software::License instances or classes.
-#
-# =cut
+#pod =method guess_license_from_meta
+#pod
+#pod my @guesses = Software::LicenseUtils->guess_license_from_meta($meta_str);
+#pod
+#pod Given the content of the META.(yml|json) file found in a CPAN distribution, this
+#pod method makes a guess as to which licenses may apply to the distribution. It
+#pod will return a list of zero or more Software::License instances or classes.
+#pod
+#pod =cut
sub guess_license_from_meta {
my ($class, $meta_text) = @_;
@@ -150,15 +150,15 @@
*guess_license_from_meta_yml = \&guess_license_from_meta;
}
-# =method guess_license_from_meta_key
-#
-# my @guesses = Software::LicenseUtils->guess_license_from_meta_key($key, $v);
-#
-# This method returns zero or more Software::License classes known to use C<$key>
-# as their META key. If C<$v> is supplied, it specifies whether to treat C<$key>
-# as a v1 or v2 meta entry. Any value other than 1 or 2 will raise an exception.
-#
-# =cut
+#pod =method guess_license_from_meta_key
+#pod
+#pod my @guesses = Software::LicenseUtils->guess_license_from_meta_key($key, $v);
+#pod
+#pod This method returns zero or more Software::License classes known to use C<$key>
+#pod as their META key. If C<$v> is supplied, it specifies whether to treat C<$key>
+#pod as a v1 or v2 meta entry. Any value other than 1 or 2 will raise an exception.
+#pod
+#pod =cut
sub guess_license_from_meta_key {
my ($self, $key, $v) = @_;
@@ -185,18 +185,18 @@
'Artistic-2' => 'Software::License::Artistic_2_0',
);
-# =method new_from_short_name
-#
-# my $license_object = Software::LicenseUtils->new_from_short_name( {
-# short_name => 'GPL-1',
-# holder => 'X. Ample'
-# }) ;
-#
-# Create a new L<Software::License> object from the license specified
-# with C<short_name>. Known short license names are C<GPL-*>, C<LGPL-*> ,
-# C<Artistic> and C<Artistic-*>
-#
-# =cut
+#pod =method new_from_short_name
+#pod
+#pod my $license_object = Software::LicenseUtils->new_from_short_name( {
+#pod short_name => 'GPL-1',
+#pod holder => 'X. Ample'
+#pod }) ;
+#pod
+#pod Create a new L<Software::License> object from the license specified
+#pod with C<short_name>. Known short license names are C<GPL-*>, C<LGPL-*> ,
+#pod C<Artistic> and C<Artistic-*>
+#pod
+#pod =cut
sub new_from_short_name {
my ( $class, $arg ) = @_;
@@ -227,7 +227,7 @@
=head1 VERSION
-version 0.103009
+version 0.103010
=head1 METHODS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Software-License-0.103009/xt/release/changes_has_content.t new/Software-License-0.103010/xt/release/changes_has_content.t
--- old/Software-License-0.103009/xt/release/changes_has_content.t 2014-02-21 04:19:51.000000000 +0100
+++ new/Software-License-0.103010/xt/release/changes_has_content.t 2014-03-30 04:13:26.000000000 +0200
@@ -4,7 +4,7 @@
note 'Checking Changes';
my $changes_file = 'Changes';
-my $newver = '0.103009';
+my $newver = '0.103010';
my $trial_token = '-TRIAL';
SKIP: {
--
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 htop for openSUSE:Factory checked in at 2014-05-31 08:09:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/htop (Old)
and /work/SRC/openSUSE:Factory/.htop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/htop/htop.changes 2014-01-07 14:42:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.htop.new/htop.changes 2014-05-31 08:09:21.000000000 +0200
@@ -1,0 +2,16 @@
+Mon May 19 18:57:58 UTC 2014 - dmitry_r(a)opensuse.org
+
+- Update to version 1.0.3
+ * Tag all children ('c' key)
+ * Fixes in accounting of guest time when using virtualization
+ * Performance improvements
+ * Further performance improvements due to conditional parsing
+ of IO data depending on selected fields.
+ * Better consistency in coloring.
+ * Increase limit of buffer when tracing a deep nested process tree.
+ * Display pagefault stats.
+ * BUGFIX: Fix crash when adding meters and toggling detailed CPU time.
+ * Add column to track the OOM-killer score of processes
+ * Rebase htop-stdgnu.patch
+
+-------------------------------------------------------------------
Old:
----
htop-1.0.2.tar.gz
New:
----
htop-1.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ htop.spec ++++++
--- /var/tmp/diff_new_pack.8OsRgB/_old 2014-05-31 08:09:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8OsRgB/_new 2014-05-31 08:09:22.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package htop
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
Name: htop
-Version: 1.0.2
+Version: 1.0.3
Release: 0
Summary: An Interactive text-mode Process Viewer for Linux
License: GPL-2.0+
Group: System/Monitoring
-Url: http://htop.sourceforge.net
-
-Source0: %{name}-%{version}.tar.gz
+Url: http://hisham.hm/htop
+Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
Patch0: htop-desktop-file-fix-thoenig-01.patch
Patch1: htop-stdgnu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ htop-1.0.2.tar.gz -> htop-1.0.3.tar.gz ++++++
++++ 12115 lines of diff (skipped)
++++++ htop-stdgnu.patch ++++++
--- /var/tmp/diff_new_pack.8OsRgB/_old 2014-05-31 08:09:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8OsRgB/_new 2014-05-31 08:09:22.000000000 +0200
@@ -1,12 +1,29 @@
---- htop-1.0.2.orig/configure.ac
-+++ htop-1.0.2/configure.ac
+Index: htop-1.0.3/Makefile.am
+===================================================================
+--- htop-1.0.3.orig/Makefile.am
++++ htop-1.0.3/Makefile.am
+@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = htop.png
+
+-htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
+-AM_CPPFLAGS = -DNDEBUG
++htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CPPFLAGS = -include config.h -DNDEBUG
+
+ myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
+ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
+Index: htop-1.0.3/configure.ac
+===================================================================
+--- htop-1.0.3.orig/configure.ac
++++ htop-1.0.3/configure.ac
@@ -1,11 +1,12 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.65)
-+AC_PREREQ([2.60])
- AC_INIT([htop],[1.0.2],[loderunner(a)users.sourceforge.net])
++AC_PREREQ([2.65])
+ AC_INIT([htop],[1.0.3],[hisham(a)gobolinux.org])
# The following two lines are required by hwloc scripts
AC_USE_SYSTEM_EXTENSIONS
@@ -14,7 +31,7 @@
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.11])
-@@ -14,15 +15,15 @@ AC_CONFIG_HEADER([config.h])
+@@ -14,15 +15,14 @@ AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Checks for programs.
@@ -27,17 +44,16 @@
-AC_PROG_LIBTOOL
+#AC_DISABLE_SHARED
+#AC_ENABLE_STATIC
-+#LT_INIT
++#AC_PROG_LIBTOOL
-# Checks for libraries.
-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
-+
+AC_SEARCH_LIBS([ceil], [m])
# Checks for header files.
AC_HEADER_DIRENT
-@@ -30,7 +31,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
+@@ -30,7 +30,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
-AC_CHECK_HEADERS([execinfo.h],[:],[:])
@@ -45,14 +61,14 @@
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
-@@ -40,17 +41,9 @@ AC_TYPE_UID_T
+@@ -40,17 +40,8 @@ AC_TYPE_UID_T
# Checks for library functions.
AC_FUNC_CLOSEDIR_VOID
-AC_TYPE_SIGNAL
--AC_FUNC_STAT
+ AC_FUNC_STAT
-AC_CHECK_FUNCS([memmove strncasecmp strstr strdup])
-
+-
-save_cflags="${CFLAGS}"
-CFLAGS="${CFLAGS} -std=c99"
-AC_MSG_CHECKING([whether gcc -std=c99 option works])
@@ -60,12 +76,11 @@
- AC_MSG_RESULT([yes]),
- AC_MSG_ERROR([htop is written in C99. A newer version of gcc is required.]))
-CFLAGS="$save_cflags"
-+AC_FUNC_STAT
+AC_CHECK_FUNCS_ONCE([memmove strncasecmp strstr strdup])
PROCDIR=/proc
AC_ARG_WITH(proc, [ --with-proc=DIR Location of a Linux-compatible proc filesystem (default=/proc).],
-@@ -61,33 +54,33 @@ AC_ARG_WITH(proc, [ --with-proc=DIR
+@@ -61,33 +52,33 @@ AC_ARG_WITH(proc, [ --with-proc=DIR
fi,
AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
@@ -105,7 +120,7 @@
if test "x$enable_unicode" = xyes; then
AC_CHECK_LIB([ncursesw], [refresh], [], [
missing_libraries="$missing_libraries libncursesw"
-@@ -113,7 +106,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
+@@ -117,7 +108,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
fi
@@ -114,7 +129,7 @@
if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then
AC_MSG_CHECKING([for usable sched_setaffinity])
AC_RUN_IFELSE([
-@@ -134,7 +127,7 @@ if test "x$enable_native_affinity" = xye
+@@ -138,14 +129,14 @@ if test "x$enable_native_affinity" = xye
AC_DEFINE(HAVE_NATIVE_AFFINITY, 1, [Define if native sched_setaffinity and sched_getaffinity are to be used.])
fi
@@ -123,16 +138,11 @@
if test "x$enable_hwloc" = xyes
then
AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [], [missing_libraries="$missing_libraries libhwloc"])
---- htop-1.0.2.orig/Makefile.am
-+++ htop-1.0.2/Makefile.am
-@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
- pixmapdir = $(datadir)/pixmaps
- pixmap_DATA = htop.png
-
--htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
--AM_CPPFLAGS = -DNDEBUG
-+htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
-+AM_CPPFLAGS = -include config.h -DNDEBUG
+ AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers $ac_header"])
+ fi
- myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
- ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
+-AC_ARG_ENABLE(oom, [AC_HELP_STRING([--enable-oom], [enable OOM score reporting])], ,enable_oom="no")
++AC_ARG_ENABLE(oom, [AS_HELP_STRING([--enable-oom],[enable OOM score reporting])], ,enable_oom="no")
+ if test "x$enable_oom" = xyes; then
+ AC_DEFINE(HAVE_OOM, 1, [Define if OOM score support enabled.])
+ fi
--
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 cpanspec for openSUSE:Factory checked in at 2014-05-31 08:09:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cpanspec (Old)
and /work/SRC/openSUSE:Factory/.cpanspec.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpanspec"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cpanspec/cpanspec.changes 2013-08-04 07:28:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cpanspec.new/cpanspec.changes 2014-05-31 08:09:17.000000000 +0200
@@ -1,0 +2,19 @@
+Tue May 27 12:54:02 UTC 2014 - coolo(a)suse.com
+
+- remove cpanspec-1.78.06-spdx.patch - upstreamed
+
+-------------------------------------------------------------------
+Tue May 27 12:53:43 UTC 2014 - coolo(a)suse.com
+
+- Stephan Kulow (2):
+ apply spdx.patch applied for a year in OBS
+ bump version
+
+-------------------------------------------------------------------
+Tue May 27 12:51:46 UTC 2014 - coolo(a)suse.com
+
+- Stephan Kulow (2):
+ no longer print possible build requires
+ avoid useless newlines
+
+-------------------------------------------------------------------
Old:
----
cpanspec-1.78.06-spdx.patch
cpanspec-1.78.07.tar.gz
New:
----
cpanspec-1.78.08.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpanspec.spec ++++++
--- /var/tmp/diff_new_pack.3268r9/_old 2014-05-31 08:09:18.000000000 +0200
+++ /var/tmp/diff_new_pack.3268r9/_new 2014-05-31 08:09:18.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cpanspec
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cpanspec
-Version: 1.78.07
+Version: 1.78.08
Release: 0
%define cpan_name cpanspec
Summary: Generate a SUSE spec file for a CPAN module
@@ -26,8 +26,6 @@
Url: http://sourceforge.net/projects/cpanspec/
Source0: cpanspec-%{version}.tar.gz
Source99: updaterpm.sh
-# PATCH-FIX-OPENSUSE suggest licence in SPDX format
-Patch0: cpanspec-1.78.06-spdx.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
@@ -60,7 +58,6 @@
%prep
%setup -q -n %{cpan_name}-%{version}
-%patch0 -p1
find . -type f -print0 | xargs -0 chmod 644
%build
++++++ cpanspec-1.78.07.tar.gz -> cpanspec-1.78.08.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.07/META.json new/cpanspec-1.78.08/META.json
--- old/cpanspec-1.78.07/META.json 2013-08-01 07:48:45.000000000 +0200
+++ new/cpanspec-1.78.08/META.json 2014-05-27 14:53:44.000000000 +0200
@@ -4,7 +4,7 @@
"unknown"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
+ "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
"license" : [
"unknown"
],
@@ -50,5 +50,5 @@
}
},
"release_status" : "stable",
- "version" : "v1.78.07"
+ "version" : "v1.78.08"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.07/META.yml new/cpanspec-1.78.08/META.yml
--- old/cpanspec-1.78.07/META.yml 2013-08-01 07:48:45.000000000 +0200
+++ new/cpanspec-1.78.08/META.yml 2014-05-27 14:53:44.000000000 +0200
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -32,4 +32,4 @@
Text::Autoformat: 0
YAML: 0
locale: 0
-version: v1.78.07
+version: v1.78.08
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.07/cpanspec new/cpanspec-1.78.08/cpanspec
--- old/cpanspec-1.78.07/cpanspec 2013-08-01 07:48:43.000000000 +0200
+++ new/cpanspec-1.78.08/cpanspec 2014-05-27 14:53:43.000000000 +0200
@@ -190,7 +190,7 @@
use warnings;
our $NAME="cpanspec";
-our $VERSION='1.78.07';
+our $VERSION='1.78.08';
use Cwd;
BEGIN {
@@ -1014,7 +1014,7 @@
get_license($content);
if ($license && ($license =~ /under the same terms as Perl itself/ ||
$license =~ /under the terms of the Perl artistic license/)) {
- $license = "GPL+ or Artistic";
+ $license = "GPL-1.0+ or Artistic-1.0";
}
}
@@ -1022,7 +1022,7 @@
$summary="$module Perl module";
}
- $license="CHECK(GPL+ or Artistic)" if (!$license);
+ $license="CHECK(GPL-1.0+ or Artistic-1.0)" if (!$license);
$description=$summary if (!defined($description));
@@ -1169,12 +1169,12 @@
printf $spec "%-16s%s", "BuildRequires:", "perl($dep)";
print $spec (" >= " . $build_requires{$dep})
if ($build_requires{$dep});
+ print $spec "\n";
} else {
- printf $spec "#%-15s%s", "BuildRequires:", "perl($dep)";
- print $spec (" >= " . $possible_build_requires{$dep})
- if ($possible_build_requires{$dep});
+ #printf $spec "#%-15s%s", "BuildRequires:", "perl($dep)";
+ #print $spec (" >= " . $possible_build_requires{$dep})
+ # if ($possible_build_requires{$dep});
}
- print $spec "\n";
}
for my $dep (sort @add_buildrequires) {
++++++ updaterpm.sh ++++++
--- /var/tmp/diff_new_pack.3268r9/_old 2014-05-31 08:09:18.000000000 +0200
+++ /var/tmp/diff_new_pack.3268r9/_new 2014-05-31 08:09:18.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
-rev=d390a77f700fdf7bf1938aa2a70c4a1557225b52
-git clone --depth 0 http://git.gitorious.org/opensuse/cpanspec.git
+rev=0ad24195a30c0f0c9521f4ed2680545471230f76
+git clone --depth 0 https://github.com/openSUSE/cpanspec.git
cd cpanspec
nrev=`git show HEAD| grep commit | head -n 1 | cut '-d ' -f2`
osc vc -m "`git log --no-merges ^$rev HEAD cpanspec | git shortlog`" ..
--
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 patchinfo.2838 for openSUSE:13.1:Update checked in at 2014-05-30 16:51:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.2838 (Old)
and /work/SRC/openSUSE:13.1:Update/.patchinfo.2838.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patchinfo.2838"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_patchinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _patchinfo ++++++
<patchinfo>
<issue id="877258" tracker="bnc">VUL-0: CVE-2014-3146: python-lxml: clean_html input sanitization flaw</issue>
<issue id="657698" tracker="bnc">python-lxml must not require pyxml</issue>
<issue id="CVE-2014-3146" tracker="cve" />
<category>security</category>
<rating>moderate</rating>
<packager>thomas-schraitle</packager>
<description>python-lxml was fixed to ensure proper input sanitization in clean_html (CVE-2014-3146).
</description>
<summary>python-lxml: Fixed input sanitization</summary>
</patchinfo>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python3-lxml for openSUSE:12.3:Update checked in at 2014-05-30 16:50:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/python3-lxml (Old)
and /work/SRC/openSUSE:12.3:Update/.python3-lxml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-lxml"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.C7dItr/_old 2014-05-30 16:51:00.000000000 +0200
+++ /var/tmp/diff_new_pack.C7dItr/_new 2014-05-30 16:51:00.000000000 +0200
@@ -1 +1 @@
-<link package='python3-lxml.1492' cicount='copy' />
+<link package='python3-lxml.2838' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-lxml.2838 for openSUSE:13.1:Update checked in at 2014-05-30 16:50:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/python-lxml.2838 (Old)
and /work/SRC/openSUSE:13.1:Update/.python-lxml.2838.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-lxml.2838"
Changes:
--------
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:13.1:Update/.python-lxml.2838.new/python-lxml.changes 2014-05-30 16:50:56.000000000 +0200
@@ -0,0 +1,767 @@
+-------------------------------------------------------------------
+Thu May 22 13:53:20 UTC 2014 - toms(a)opensuse.org
+
+- Fixed bnc#877258:
+ CVE-2014-3146: python-lxml: clean_html input sanitization flaw
+ (patch file python-lxml-html.clean.diff)
+
+-------------------------------------------------------------------
+Wed Oct 23 08:54:33 UTC 2013 - toddrme2178(a)gmail.com
+
+- Remove old source file
+
+-------------------------------------------------------------------
+Tue Aug 13 09:58:19 UTC 2013 - dmueller(a)suse.com
+
+- update to 3.2.3:
+* LP#1185701: spurious XMLSyntaxError after finishing iterparse().
+* Crash in lxml.objectify during xsi annotation.
+
+-------------------------------------------------------------------
+Mon May 13 08:34:19 UTC 2013 - dmueller(a)suse.com
+
+- update to 3.2.1:
+* The methods ``apply_templates()`` and ``process_children()`` of XSLT
+ extension elements have gained two new boolean options ``elements_only``
+ and ``remove_blank_text`` that discard either all strings or whitespace-only
+ strings from the result list.
+* When moving Elements to another tree, the namespace cleanup mechanism
+ no longer drops namespace prefixes from attributes for which it finds
+ a default namespace declaration, to prevent them from appearing as
+ unnamespaced attributes after serialisation.
+* Returning non-type objects from a custom class lookup method could lead
+ to a crash.
+* Instantiating and using subtypes of Comments and ProcessingInstructions
+ crashed.
+
+-------------------------------------------------------------------
+Mon Apr 29 12:25:39 UTC 2013 - dmueller(a)suse.com
+
+- update to 3.2.0:
+ * Leading whitespace could change the behaviour of the string
+ parsing functions in ``lxml.html``.
+ * LP#599318: The string parsing functions in ``lxml.html`` are more robust
+ in the face of uncommon HTML content like framesets or missing body tags.
+ Patch by Stefan Seelmann.
+ * LP#712941: I/O errors while trying to access files with paths that contain
+ non-ASCII characters could raise ``UnicodeDecodeError`` instead of properly
+ reporting the ``IOError``.
+ * LP#673205: Parsing from in-memory strings disabled network access in the
+ default parser and made subsequent attempts to parse from a URL fail.
+ * LP#971754: lxml.html.clean appends 'nofollow' to 'rel' attributes instead
+ of overwriting the current value.
+ * LP#715687: lxml.html.clean no longer discards scripts that are explicitly
+ allowed by the user provided whitelist. Patch by Christine Koppelt.
+
+-------------------------------------------------------------------
+Sat Mar 30 17:29:03 UTC 2013 - arun(a)gmx.de
+
+- update to 3.1.1:
+ (changes taken from http://lxml.de/3.1/changes-3.1.1.html)
+
+ * 3.1.1 (2013-03-29)
+ ** Bugs fixed
+ - LP#1160386: Write access to lxml.html.FormElement.fields raised an AttributeError in Py3.
+ - Illegal memory access during cleanup in incremental xmlfile writer.
+ ** Other changes
+ - The externally useless class lxml.etree._BaseParser was removed from the module dict.
+
+ * 3.1.0 (2013-02-10)
+ ** Features added
+ - GH#89: lxml.html.clean allows overriding the set of attributes that it considers 'safe'.
+ Patch by Francis Devereux.
+ ** Bugs fixed
+ - LP#1104370: copy.copy(el.attrib) raised an exception. It now returns a copy of the
+ attributes as a plain Python dict.
+ - GH#95: When used with namespace prefixes, the el.find*() methods always used the first
+ namespace mapping that was provided for each path expression instead of using the one that
+ was actually passed in for the current run.
+ - LP#1092521, GH#91: Fix undefined C symbol in Python runtimes compiled without threading
+ support. Patch by Ulrich Seidl.
+
+ * 3.1beta1 (2012-12-21)
+ ** Features added
+ - New build-time option --with-unicode-strings for Python 2 that makes the API always
+ return Unicode strings for names and text instead of byte strings for plain ASCII content.
+ - New incremental XML file writing API etree.xmlfile().
+ - E factory in lxml.objectify is callable to simplify the creation of tags with
+ non-identifier names without having to resort to getattr().
+ ** Bugs fixed
+ - When starting from a non-namespaced element in lxml.objectify, searching for a
+ child without explicitly specifying a namespace incorrectly found namespaced
+ elements with the requested local name, instead of restricting the search to
+ non-namespaced children.
+ - GH#85: Deprecation warnings were fixed for Python 3.x.
+ - GH#33: lxml.html.fromstring() failed to accept bytes input in Py3.
+ - LP#1080792: Static build of libxml2 2.9.0 failed due to missing file.
+ ** Other changes
+ - The externally useless class _ObjectifyElementMakerCaller was removed from the
+ module API of lxml.objectify.
+ - LP#1075622: lxml.builder is faster for adding text to elements with many children.
+ Patch by Anders Hammarquist.
+
+ * 3.0.2 (2012-12-14)
+ ** Bugs fixed
+ - Fix crash during interpreter shutdown by switching to Cython 0.17.3 for building.
+
+ * 3.0.1 (2012-10-14)
+ ** Bugs fixed
+ - LP#1065924: Element proxies could disappear during garbage collection in PyPy
+ without proper cleanup.
+ - GH#71: Failure to work with libxml2 2.6.x.
+ - LP#1065139: static MacOS-X build failed in Py3.
+
+ * 3.0 (2012-10-08)
+ ** Bugs fixed
+ - End-of-file handling was incorrect in iterparse() when reading from a low-level
+ C file stream and failed in libxml2 2.9.0 due to its improved consistency checks.
+ ** Other changes
+ - The build no longer uses Cython by default unless the generated C files are
+ missing. To use Cython, pass the option "--with-cython". To ignore the fatal build
+ error when Cython is required but not available (e.g. to run special setup.py
+ commands that do not actually run a build), pass "--without-cython".
+
+ * 3.0beta1 (2012-09-26)
+ ** Features added
+ - Python level access to (optional) libxml2 memory debugging features to simplify
+ debugging of memory leaks etc.
+ ** Bugs fixed
+ - Fix a memory leak in XPath by switching to Cython 0.17.1.
+ - Some tests were adapted to work with PyPy.
+ ** Other changes
+ - The code was adapted to work with the upcoming libxml2 2.9.0 release.
+
+ * 3.0alpha2 (2012-08-23)
+ ** Features added
+ - The .iter() method of elements now accepts tag arguments like "{*}name" to search
+ for elements with a given local name in any namespace. With this addition, all
+ combinations of wildcards now work as expected: "{ns}name", "{}name", "{*}name",
+ "{ns}*", "{}*" and "{*}*". Note that "name" is equivalent to "{}name", but "*" is
+ "{*}*". The same change applies to the .getiterator(), .itersiblings(), .iterancestors(),
+ .iterdescendants(), .iterchildren() and .itertext() methods;the strip_attributes(),
+ strip_elements() and strip_tags() functions as well as the iterparse() class.
+ Patch by Simon Sapin.
+ - C14N allows specifying the inclusive prefixes to be promoted to top-level during
+ exclusive serialisation.
+ ** Bugs fixed
+ - Passing long Unicode strings into the feed() parser interface failed to read the entire string.
+
+ * 3.0alpha1 (2012-07-31)
+ ** Features added
+ - Initial support for building in PyPy (through cpyext).
+ - DTD objects gained an API that allows read access to their declarations.
+ - xpathgrep.py gained support for parsing line-by-line (e.g. from grep output) and
+ for surrounding the output with a new root tag.
+ - E-factory in lxml.builder accepts subtypes of known data types (such as string
+ subtypes) when building elements around them.
+ - Tree iteration and iterparse() with a selective tag argument supports passing a
+ set of tags. Tree nodes will be returned by the iterators if they match any of the tags.
+ ** Bugs fixed
+ - The .find*() methods in lxml.objectify no longer use XPath internally, which makes
+ them faster in many cases (especially when short circuiting after a single or
+ couple of elements) and fixes some behavioural differences compared to lxml.etree.
+ Note that this means that they no longer support arbitrary XPath expressions but
+ only the subset that the ElementPath language supports. The previous implementation
+ was also redundant with the normal XPath support, which can be used as a replacement.
+ - el.find('*') could accidentally return a comment or processing instruction that
+ happened to be in the wrong spot. (Same for the other .find*() methods.)
+ - The error logging is less intrusive and avoids a global setup where possible.
+ - Fixed undefined names in html5lib parser.
+ - xpathgrep.py did not work in Python 3.
+ - Element.attrib.update() did not accept an attrib of another Element as parameter.
+ - For subtypes of ElementBase that make the .text or .tail properties immutable (as in
+ objectify, for example), inserting text when creating Elements through the E-Factory
+ feature of the class constructor would fail with an exception, stating that the text
+ cannot be modified.
+ ** Other changes
+ - The code base was overhauled to properly use 'const' where the API of libxml2 anders
+ libxslt requests it. This also has an impact on the public C-API of lxml itself, as
+ defined in etreepublic.pxd, as well as the provided declarations in the lxml/includes/
+ directory. Code that uses these declarations may have to be adapted. On the plus side,
+ this fixes several C compiler warnings, also for user code, thus making it easier to
+ spot real problems again.
+ - The functionality of "lxml.cssselect" was moved into a separate PyPI package called
+ "cssselect". To continue using it, you must install that package separately. The
+ "lxml.cssselect" module is still available and provides the same interface, provided
+ the "cssselect" package can be imported at runtime.
+ - Element attributes passed in as an attrib dict or as keyword arguments are now sorted
+ by (namespaced) name before being created to make their order predictable for
+ serialisation and iteration. Note that adding or deleting attributes afterwards does
+ not take that order into account, i.e. setting a new attribute appends it after the
+ existing ones.
+ - Several classes that are for internal use only were removed from the lxml.etree module
+ dict: _InputDocument, _ResolverRegistry, _ResolverContext, _BaseContext, _ExsltRegExp,
+ _IterparseContext, _TempStore, _ExceptionContext, __ContentOnlyElement, _AttribIterator,
+ _NamespaceRegistry, _ClassNamespaceRegistry, _FunctionNamespaceRegistry,
+ _XPathFunctionNamespaceRegistry, _ParserDictionaryContext, _FileReaderContext,
+ _ParserContext, _PythonSaxParserTarget, _TargetParserContext, _ReadOnlyProxy,
++++ 570 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.1:Update/.python-lxml.2838.new/python-lxml.changes
New:
----
lxml-3.2.3.tar.gz
lxmldoc-3.2.3.pdf
python-lxml-html.clean.diff
python-lxml.changes
python-lxml.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-lxml.spec ++++++
#
# spec file for package python-lxml
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: python-lxml
Version: 3.2.3
Release: 0
Summary: Powerful and Pythonic XML processing library
License: BSD-3-Clause and GPL-2.0+
Group: Development/Languages/Python
Url: http://lxml.de/
Source: http://pypi.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz
Source1: http://lxml.de/lxmldoc-%{version}.pdf
# PATCH-FIX-UPSTREAM python-lxml-html.clean.diff bnc#877258 Fixed CVE-2014-3146
Patch0: %{name}-html.clean.diff
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: python-Cython
BuildRequires: python-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif
%description
lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It
provides safe and convenient access to these libraries using the ElementTree
API. It extends the ElementTree API significantly to offer support for XPath,
RelaxNG, XML Schema, XSLT, C14N and much more.
%package doc
Summary: Powerful and Pythonic XML processing library - Documentation
Group: Development/Libraries/Python
%if 0%{?suse_version} && 0%{?suse_version} > 1110
BuildArch: noarch
%endif
%description doc
lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It
provides safe and convenient access to these libraries using the ElementTree
API. It extends the ElementTree API significantly to offer support for XPath,
RelaxNG, XML Schema, XSLT, C14N and much more.
This package contains documentation for lxml (HTML and PDF).
%prep
%setup -q -n lxml-%{version}
cp %{SOURCE1} .
%patch0
%build
CFLAGS="%{optflags}" python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%files
%defattr(-,root,root)
%doc CHANGES.txt CREDITS.txt LICENSES.txt README.rst
%{python_sitearch}/lxml/
%{python_sitearch}/lxml-%{version}-py%{py_ver}.egg-info
%exclude %{python_sitearch}/lxml/*.h
%exclude %{python_sitearch}/lxml/includes/*.h
%files doc
%defattr(-,root,root)
%doc doc/html lxmldoc-%{version}.pdf
%changelog
++++++ python-lxml-html.clean.diff ++++++
--- src/lxml/html/clean.py.orig 2014-05-22 09:08:35.227652504 +0200
+++ src/lxml/html/clean.py 2014-05-22 09:11:36.334317035 +0200
@@ -70,9 +70,10 @@
# All kinds of schemes besides just javascript: that can cause
# execution:
-_javascript_scheme_re = re.compile(
- r'\s*(?:javascript|jscript|livescript|vbscript|data|about|mocha):', re.I)
-_substitute_whitespace = re.compile(r'\s+').sub
+_is_javascript_scheme = re.compile(
+ r'(?:javascript|jscript|livescript|vbscript|data|about|mocha):',
+ re.I).search
+_substitute_whitespace = re.compile(r'[\s\x00-\x08\x0B\x0C\x0E-\x19]+').sub
# FIXME: should data: be blocked?
# FIXME: check against: http://msdn2.microsoft.com/en-us/library/ms537512.aspx
@@ -467,7 +468,7 @@
def _remove_javascript_link(self, link):
# links like "j a v a s c r i p t:" might be interpreted in IE
new = _substitute_whitespace('', link)
- if _javascript_scheme_re.search(new):
+ if _is_javascript_scheme(new):
# FIXME: should this be None to delete?
return ''
return link
--
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 libcap-ng.2831 for openSUSE:13.1:Update checked in at 2014-05-30 16:50:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/libcap-ng.2831 (Old)
and /work/SRC/openSUSE:13.1:Update/.libcap-ng.2831.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcap-ng.2831"
Changes:
--------
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:13.1:Update/.libcap-ng.2831.new/libcap-ng-python.changes 2014-05-30 16:50:37.000000000 +0200
@@ -0,0 +1,85 @@
+-------------------------------------------------------------------
+Thu Mar 14 09:30:13 UTC 2013 - meissner(a)suse.com
+
+- use source url
+
+-------------------------------------------------------------------
+Wed Mar 13 22:44:29 UTC 2013 - crrodriguez(a)opensuse.org
+
+- version 0.7.3
+- Make file opens use the cloexec flag (Cristian Rodríguez)
+- Add CAP_BLOCK_SUSPEND
+- Fix possible segfaults when CAP_LAST_CAP is larger than the lookup table
+- In pscap, don't drop capabilities when running with capabilities
+- Add CAP_COMPROMISE_KERNEL
+- Define FTW_CONTINUE in case its not defined in libc
+- Use glibc for xattr.h if available
+- Make sure stderr is used consistently in utils
+- Fix logic causing file based capabilities to not be supported when it should
+
+-------------------------------------------------------------------
+Sun Feb 12 17:24:55 UTC 2012 - crrodriguez(a)opensuse.org
+
+- Move libraries back to %{_libdir}, /usr merge project
+
+-------------------------------------------------------------------
+Wed Oct 5 15:06:00 UTC 2011 - uli(a)suse.com
+
+- cross-build workaround: make sure no attempt is made to build
+ python stuff even if it's installed on the host system
+
+-------------------------------------------------------------------
+Wed Aug 31 01:49:59 UTC 2011 - crrodriguez(a)opensuse.org
+
+- Update to version 0.6.6
+- Add CAP_SYSLOG and CAP_WAKE_ALARM (needed for newish kernels)
+
+-------------------------------------------------------------------
+Mon Nov 8 14:06:01 UTC 2010 - coolo(a)novell.com
+
+- fix requires
+
+-------------------------------------------------------------------
+Wed Nov 3 21:56:17 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.5:
+ * works around a problem in the Linux 2.6.36 kernel headers
+ * fixes a segfault when using filecap on a specific file
+
+-------------------------------------------------------------------
+Thu Oct 14 11:18:28 UTC 2010 - coolo(a)novell.com
+
+- split out python packages now that libcap-ng is used in many
+ low level tools it creates cycles
+
+-------------------------------------------------------------------
+Thu May 6 17:55:55 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.4:
+ * the library now uses kernel thread ID for capget/set calls
+ * a display problem of filesystem based capabilities was fixed
+ * netcap now prints device name for packet socket apps
+
+- add baselibs.conf to build libcap-ng0-32bit
+
+-------------------------------------------------------------------
+Fri Mar 12 10:01:51 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.3:
+ * in netcap and pscap use the effective uid
+ * in capng_change_id, only retain setpcap if clearing the bounding set
+
+- add rpmlintrc to disable false positive warnings
+
+- symlink license files on openSUSE
+
+-------------------------------------------------------------------
+Wed Mar 10 16:02:51 UTC 2010 - prusnak(a)suse.cz
+
+- fixed Requires of python subpackage
+
+-------------------------------------------------------------------
+Fri Feb 26 12:14:04 UTC 2010 - prusnak(a)suse.cz
+
+- imported package from Fedora (version 0.6.2)
+
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:13.1:Update/.libcap-ng.2831.new/libcap-ng.changes 2014-05-30 16:50:37.000000000 +0200
@@ -0,0 +1,92 @@
+-------------------------------------------------------------------
+Tue May 20 15:11:50 UTC 2014 - vcizek(a)suse.com
+
+- fix for CVE-2014-3215 (bnc#876832)
+ * use PR_SET_NO_NEW_PRIVS to prevent gain of new privileges
+ * added libcap-ng-CVE-2014-3215.patch
+
+-------------------------------------------------------------------
+Thu Mar 14 09:30:04 UTC 2013 - meissner(a)suse.com
+
+- use source url
+
+-------------------------------------------------------------------
+Wed Mar 13 22:44:29 UTC 2013 - crrodriguez(a)opensuse.org
+
+- version 0.7.3
+- Make file opens use the cloexec flag (Cristian Rodríguez)
+- Add CAP_BLOCK_SUSPEND
+- Fix possible segfaults when CAP_LAST_CAP is larger than the lookup table
+- In pscap, don't drop capabilities when running with capabilities
+- Add CAP_COMPROMISE_KERNEL
+- Define FTW_CONTINUE in case its not defined in libc
+- Use glibc for xattr.h if available
+- Make sure stderr is used consistently in utils
+- Fix logic causing file based capabilities to not be supported when it should
+
+-------------------------------------------------------------------
+Sun Feb 12 17:24:55 UTC 2012 - crrodriguez(a)opensuse.org
+
+- Move libraries back to %{_libdir}, /usr merge project
+
+-------------------------------------------------------------------
+Wed Oct 5 15:06:00 UTC 2011 - uli(a)suse.com
+
+- cross-build workaround: make sure no attempt is made to build
+ python stuff even if it's installed on the host system
+
+-------------------------------------------------------------------
+Wed Aug 31 01:49:59 UTC 2011 - crrodriguez(a)opensuse.org
+
+- Update to version 0.6.6
+- Add CAP_SYSLOG and CAP_WAKE_ALARM (needed for newish kernels)
+
+-------------------------------------------------------------------
+Mon Nov 8 14:06:01 UTC 2010 - coolo(a)novell.com
+
+- fix requires
+
+-------------------------------------------------------------------
+Wed Nov 3 21:56:17 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.5:
+ * works around a problem in the Linux 2.6.36 kernel headers
+ * fixes a segfault when using filecap on a specific file
+
+-------------------------------------------------------------------
+Thu Oct 14 11:18:28 UTC 2010 - coolo(a)novell.com
+
+- split out python packages now that libcap-ng is used in many
+ low level tools it creates cycles
+
+-------------------------------------------------------------------
+Thu May 6 17:55:55 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.4:
+ * the library now uses kernel thread ID for capget/set calls
+ * a display problem of filesystem based capabilities was fixed
+ * netcap now prints device name for packet socket apps
+
+- add baselibs.conf to build libcap-ng0-32bit
+
+-------------------------------------------------------------------
+Fri Mar 12 10:01:51 UTC 2010 - pascal.bleser(a)opensuse.org
+
+- update to 0.6.3:
+ * in netcap and pscap use the effective uid
+ * in capng_change_id, only retain setpcap if clearing the bounding set
+
+- add rpmlintrc to disable false positive warnings
+
+- symlink license files on openSUSE
+
+-------------------------------------------------------------------
+Wed Mar 10 16:02:51 UTC 2010 - prusnak(a)suse.cz
+
+- fixed Requires of python subpackage
+
+-------------------------------------------------------------------
+Fri Feb 26 12:14:04 UTC 2010 - prusnak(a)suse.cz
+
+- imported package from Fedora (version 0.6.2)
+
New:
----
baselibs.conf
libcap-ng-0.7.3.tar.gz
libcap-ng-CVE-2014-3215.patch
libcap-ng-python.changes
libcap-ng-python.spec
libcap-ng.changes
libcap-ng.rpmlintrc
libcap-ng.spec
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcap-ng-python.spec ++++++
#
# spec file for package libcap-ng-python
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Summary: An alternate POSIX capabilities library
License: LGPL-2.1+
Group: System/Libraries
Name: libcap-ng-python
Version: 0.7.3
Release: 0
%define soname 0
%define rname libcap-ng
Url: http://people.redhat.com/sgrubb/libcap-ng
Source0: http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
Source1: pre_checkin.sh
Source2: baselibs.conf
Source99: libcap-ng.rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: kernel-headers >= 2.6.11
BuildRequires: libattr-devel
BuildRequires: pkg-config
BuildRequires: python-base
%description
Libcap-ng is a library that makes using posix capabilities easier
%if "%{name}" == "%{rname}"
%package -n %{name}%{soname}
Summary: An alternate POSIX capabilities library
License: LGPL-2.1+
Group: System/Libraries
%description -n %{name}%{soname}
Libcap-ng is a library that makes using posix capabilities easier
%package devel
Summary: Header files for libcap-ng library
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name}%{soname} = %{version}
Requires: kernel-headers >= 2.6.11
Requires: pkgconfig
%description devel
The libcap-ng-devel package contains the files needed for developing
applications that need to use the libcap-ng library.
%package utils
Summary: Utilities for analysing and setting file capabilities
License: GPL-2.0+
Group: System/Base
%description utils
The libcap-ng-utils package contains applications to analyse the
posix capabilities of all the program running on a system. It also
lets you set the file system based capabilities.
%else
%package -n python-capng
Summary: Python bindings for libcap-ng library
License: LGPL-2.1+
Group: Development/Libraries/Python
BuildRequires: python-devel
BuildRequires: swig
Requires: %{rname}%{soname} = %{version}
%py_requires
%description -n python-capng
The libcap-ng-python package contains the bindings so that libcap-ng
and can be used by python applications.
%endif
%prep
%setup -q -n %{rname}-%{version}
%build
%configure --disable-static --with-pic --with-python=yes
%__make %{?_smp_mflags}
%install
%__make DESTDIR="%{buildroot}" install
# Remove a couple things so they don't get picked up
find %{buildroot} -type f -name "*.la" -print -delete
%if "%{name}" == "%{rname}-python"
%__rm -f %{buildroot}%{_libdir}/lib*.so*
%__rm -f %{buildroot}%{_libdir}/lib*.so*
%__rm -rf %{buildroot}%{_libdir}/pkgconfig
%__rm -rf %{buildroot}%{_bindir}
%__rm -rf %{buildroot}%{_mandir}
%__rm -rf %{buildroot}%{_includedir}
%__rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%if "%{name}" == "%{rname}"
%post -n %{name}%{soname} -p /sbin/ldconfig
%postun -n %{name}%{soname} -p /sbin/ldconfig
%files -n %{name}%{soname}
%defattr(-,root,root,-)
%doc COPYING.LIB
%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}
%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.*
%files devel
%defattr(-,root,root,-)
%attr(0644,root,root) %{_mandir}/man3/*.3%{ext_man}
%attr(0644,root,root) %{_includedir}/cap-ng.h
%attr(0755,root,root) %{_libdir}/%{rname}.so
%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4
%{_libdir}/pkgconfig/%{rname}.pc
%files utils
%defattr(-,root,root,-)
%doc COPYING
%attr(0755,root,root) %{_bindir}/captest
%attr(0755,root,root) %{_bindir}/filecap
%attr(0755,root,root) %{_bindir}/netcap
%attr(0755,root,root) %{_bindir}/pscap
%attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man}
%else
%files -n python-capng
%defattr(-,root,root,-)
%attr(755,root,root) %{python_sitearch}/_capng.so
%{python_sitearch}/capng.py*
%endif
%changelog
++++++ libcap-ng.spec ++++++
#
# spec file for package libcap-ng
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Summary: An alternate POSIX capabilities library
License: LGPL-2.1+
Group: System/Libraries
Name: libcap-ng
Version: 0.7.3
Release: 0
%define soname 0
%define rname libcap-ng
Url: http://people.redhat.com/sgrubb/libcap-ng
Source0: http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
Source1: pre_checkin.sh
Source2: baselibs.conf
Source99: libcap-ng.rpmlintrc
Patch: libcap-ng-CVE-2014-3215.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: kernel-headers >= 2.6.11
BuildRequires: libattr-devel
BuildRequires: pkg-config
BuildRequires: python-base
%description
Libcap-ng is a library that makes using posix capabilities easier
%if "%{name}" == "%{rname}"
%package -n %{name}%{soname}
Summary: An alternate POSIX capabilities library
License: LGPL-2.1+
Group: System/Libraries
%description -n %{name}%{soname}
Libcap-ng is a library that makes using posix capabilities easier
%package devel
Summary: Header files for libcap-ng library
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name}%{soname} = %{version}
Requires: kernel-headers >= 2.6.11
Requires: pkgconfig
%description devel
The libcap-ng-devel package contains the files needed for developing
applications that need to use the libcap-ng library.
%package utils
Summary: Utilities for analysing and setting file capabilities
License: GPL-2.0+
Group: System/Base
%description utils
The libcap-ng-utils package contains applications to analyse the
posix capabilities of all the program running on a system. It also
lets you set the file system based capabilities.
%else
%package -n python-capng
Summary: Python bindings for libcap-ng library
License: LGPL-2.1+
Group: Development/Libraries/Python
BuildRequires: python-devel
BuildRequires: swig
Requires: %{rname}%{soname} = %{version}
%py_requires
%description -n python-capng
The libcap-ng-python package contains the bindings so that libcap-ng
and can be used by python applications.
%endif
%prep
%setup -q -n %{rname}-%{version}
%patch
%build
%configure --disable-static --with-pic --with-python=no
%__make %{?_smp_mflags}
%install
%__make DESTDIR="%{buildroot}" install
# Remove a couple things so they don't get picked up
find %{buildroot} -type f -name "*.la" -print -delete
%if "%{name}" == "%{rname}-python"
%__rm -f %{buildroot}%{_libdir}/lib*.so*
%__rm -f %{buildroot}%{_libdir}/lib*.so*
%__rm -rf %{buildroot}%{_libdir}/pkgconfig
%__rm -rf %{buildroot}%{_bindir}
%__rm -rf %{buildroot}%{_mandir}
%__rm -rf %{buildroot}%{_includedir}
%__rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%if "%{name}" == "%{rname}"
%post -n %{name}%{soname} -p /sbin/ldconfig
%postun -n %{name}%{soname} -p /sbin/ldconfig
%files -n %{name}%{soname}
%defattr(-,root,root,-)
%doc COPYING.LIB
%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}
%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.*
%files devel
%defattr(-,root,root,-)
%attr(0644,root,root) %{_mandir}/man3/*.3%{ext_man}
%attr(0644,root,root) %{_includedir}/cap-ng.h
%attr(0755,root,root) %{_libdir}/%{rname}.so
%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4
%{_libdir}/pkgconfig/%{rname}.pc
%files utils
%defattr(-,root,root,-)
%doc COPYING
%attr(0755,root,root) %{_bindir}/captest
%attr(0755,root,root) %{_bindir}/filecap
%attr(0755,root,root) %{_bindir}/netcap
%attr(0755,root,root) %{_bindir}/pscap
%attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man}
%else
%files -n python-capng
%defattr(-,root,root,-)
%attr(755,root,root) %{python_sitearch}/_capng.so
%{python_sitearch}/capng.py*
%endif
%changelog
++++++ baselibs.conf ++++++
libcap-ng0
++++++ libcap-ng-CVE-2014-3215.patch ++++++
Index: docs/capng_lock.3
===================================================================
--- docs/capng_lock.3 (revision 55)
+++ docs/capng_lock.3 (working copy)
@@ -8,12 +8,13 @@
.SH "DESCRIPTION"
-capng_lock will take steps to prevent children of the current process to regain full privileges if the uid is 0. This should be called while possessing the CAP_SETPCAP capability in the kernel. This function will do the following if permitted by the kernel: Set the NOROOT option on for PR_SET_SECUREBITS, set the NOROOT_LOCKED option to on for PR_SET_SECUREBITS, set the PR_NO_SETUID_FIXUP option on for PR_SET_SECUREBITS, and set the PR_NO_SETUID_FIXUP_LOCKED option on for PR_SET_SECUREBITS.
+capng_lock will take steps to prevent children of the current process from gaining privileges by executing setuid programs. This should be called while possessing the CAP_SETPCAP capability in the kernel.
+This function will do the following if permitted by the kernel: If the kernel supports PR_SET_NO_NEW_PRIVS, it will use it. Otherwise it will set the NOROOT option on for PR_SET_SECUREBITS, set the NOROOT_LOCKED option to on for PR_SET_SECUREBITS, set the PR_NO_SETUID_FIXUP option on for PR_SET_SECUREBITS, and set the PR_NO_SETUID_FIXUP_LOCKED option on for PR_SET_SECUREBITS. If both fail, it will return an error.
.SH "RETURN VALUE"
-This returns 0 on success and a negative number on failure. -1 means a failure setting any of the PR_SET_SECUREBITS options.
+This returns 0 on success and a negative number on failure. -1 means a failure to use PR_SET_NO_NEW_PRIVS and a failure setting any of the PR_SET_SECUREBITS options.
.SH "SEE ALSO"
Index: src/cap-ng.c
===================================================================
--- src/cap-ng.c (revision 55)
+++ src/cap-ng.c (working copy)
@@ -49,6 +49,7 @@
* 2.6.24 kernel XATTR_NAME_CAPS
* 2.6.25 kernel PR_CAPBSET_DROP, CAPABILITY_VERSION_2
* 2.6.26 kernel PR_SET_SECUREBITS, SECURE_*_LOCKED, VERSION_3
+ * 3.5 kernel PR_SET_NO_NEW_PRIVS
*/
/* External syscall prototypes */
@@ -126,6 +127,14 @@
#define SECURE_NO_SETUID_FIXUP_LOCKED 3 /* make bit-2 immutable */
#endif
+/* prctl values that we use */
+#ifndef PR_SET_SECUREBITS
+#define PR_SET_SECUREBITS 28
+#endif
+#ifndef PR_SET_NO_NEW_PRIVS
+#define PR_SET_NO_NEW_PRIVS 38
+#endif
+
// States: new, allocated, initted, updated, applied
typedef enum { CAPNG_NEW, CAPNG_ERROR, CAPNG_ALLOCATED, CAPNG_INIT,
CAPNG_UPDATED, CAPNG_APPLIED } capng_states_t;
@@ -703,15 +712,22 @@
int capng_lock(void)
{
-#ifdef PR_SET_SECUREBITS
- int rc = prctl(PR_SET_SECUREBITS,
- 1 << SECURE_NOROOT |
- 1 << SECURE_NOROOT_LOCKED |
- 1 << SECURE_NO_SETUID_FIXUP |
- 1 << SECURE_NO_SETUID_FIXUP_LOCKED, 0, 0, 0);
+ int rc;
+
+ // On Linux 3.5 and up, we can directly prevent ourselves and
+ // our descendents from gaining privileges.
+ if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) == 0)
+ return 0;
+
+ // This kernel is too old or otherwise doesn't support
+ // PR_SET_NO_NEW_PRIVS. Fall back to using securebits.
+ rc = prctl(PR_SET_SECUREBITS,
+ 1 << SECURE_NOROOT |
+ 1 << SECURE_NOROOT_LOCKED |
+ 1 << SECURE_NO_SETUID_FIXUP |
+ 1 << SECURE_NO_SETUID_FIXUP_LOCKED, 0, 0, 0);
if (rc)
return -1;
-#endif
return 0;
}
++++++ libcap-ng.rpmlintrc ++++++
addFilter("libcap-ng-utils.*: W: shlib-policy-missing-lib")
addFilter("libcap-ng-utils.*: W: shlib-policy-nonversioned-dir .*")
addFilter("python-capng..*: W: files-duplicate /usr/lib.*/python.*/site-packages/.*")
addFilter("libcap-ng-devel..*: W: no-dependency-on libcap-ng/libcap-ng-libs/liblibcap-ng")
++++++ pre_checkin.sh ++++++
#!/bin/bash
echo -n "Generating python spec "
cp libcap-ng.spec libcap-ng-python.spec
cp libcap-ng.changes libcap-ng-python.changes
perl -pi -e "s/^Name:.*libcap-ng$/Name: libcap-ng-python/" libcap-ng-python.spec
echo "Done."
--
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 WALinuxAgent for openSUSE:Factory checked in at 2014-05-29 08:44:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/WALinuxAgent (Old)
and /work/SRC/openSUSE:Factory/.WALinuxAgent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WALinuxAgent"
Changes:
--------
--- /work/SRC/openSUSE:Factory/WALinuxAgent/WALinuxAgent.changes 2014-02-22 18:18:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.WALinuxAgent.new/WALinuxAgent.changes 2014-05-29 08:44:54.000000000 +0200
@@ -1,0 +2,25 @@
+Wed May 28 16:56:32 UTC 2014 - rschweikert(a)suse.com
+
+- update to version 2.0.5
+ + Multiple fixes for FreeBSD provisioning
+ + Add support for SLES 12
+ + Multiple fixes for extension handler framework
+ - New logging support
+ - Add state handling for each extension
+ - Properly handle non-JSON extensions
+ - Several other bugfixes
+ + Replace platform.* calls with DistInfo() function
+ + Inherit from redhatDistro in centosDistro class
+ + Fix hostname configuration for RHEL7-based systems
+ + EnvMonitor - Set SCSI I/O timeout for all attached disks
+
+-------------------------------------------------------------------
+Mon Apr 14 19:25:12 UTC 2014 - rschweikert(a)suse.com
+
+- update to version 2.0.4
+ + Fix encoding issue in LogToFile() & LogToCon()
+ + Add support for parsing ExtensionsConfiguration from GoalState document
+ + Add support for the Fedora distribution
+ + Several fixes to FreeBSDDistro class
+
+-------------------------------------------------------------------
Old:
----
WALinuxAgent-2.0.3.tar.bz2
New:
----
WALinuxAgent-2.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ WALinuxAgent.spec ++++++
--- /var/tmp/diff_new_pack.tVVkny/_old 2014-05-29 08:44:55.000000000 +0200
+++ /var/tmp/diff_new_pack.tVVkny/_new 2014-05-29 08:44:55.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package WALinuxAgent
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: WALinuxAgent
Summary: The Windows Azure Linux Agent
-Version: 2.0.3
-Release: 0
License: Apache-2.0
Group: System/Daemons
+Version: 2.0.5
+Release: 0
Url: https://github.com/WindowsAzure/WALinuxAgent
Source0: WALinuxAgent-%{version}.tar.bz2
Source1: 99-azure-timeout.rules
@@ -45,15 +46,15 @@
BuildRequires: udev
-Requires: python-pyasn1
+Requires: grep
Requires: iptables
-Requires: pwdutils
+Requires: logrotate
Requires: openssh
Requires: openssl
-Requires: util-linux
-Requires: grep
-Requires: logrotate
+Requires: pwdutils
+Requires: python-pyasn1
Requires: sudo
+Requires: util-linux
Conflicts: NetworkManager
@@ -152,5 +153,4 @@
%config /usr/lib/udev/rules.d/99-azure-timeout.rules
%endif
-
%changelog
++++++ WALinuxAgent-2.0.3.tar.bz2 -> WALinuxAgent-2.0.5.tar.bz2 ++++++
++++ 1886 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 id3lib for openSUSE:Factory checked in at 2014-05-29 08:44:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/id3lib (Old)
and /work/SRC/openSUSE:Factory/.id3lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "id3lib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/id3lib/id3lib.changes 2014-01-23 15:45:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.id3lib.new/id3lib.changes 2014-05-29 08:44:43.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 28 05:46:14 UTC 2014 - crrodriguez(a)opensuse.org
+
+- id3lib-3.8.3-doxygen.patch , extend to stop timestamp generation.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ id3lib-3.8.3-doxygen.patch ++++++
--- /var/tmp/diff_new_pack.NAigUb/_old 2014-05-29 08:44:45.000000000 +0200
+++ /var/tmp/diff_new_pack.NAigUb/_new 2014-05-29 08:44:45.000000000 +0200
@@ -1,6 +1,6 @@
---- doc/Doxyfile.in
+--- doc/Doxyfile.in.orig
+++ doc/Doxyfile.in
-@@ -263,18 +263,17 @@
+@@ -263,18 +263,17 @@ WARN_FORMAT = "$file:$line: $
INPUT = ../src \
../include/id3/field.h \
@@ -21,7 +21,7 @@
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
-@@ -432,7 +431,7 @@
+@@ -432,7 +431,7 @@ COMPACT_LATEX = NO
# by the printer. Possible values are: a4, a4wide, letter, legal and
# executive. If left blank a4wide will be used.
@@ -30,7 +30,7 @@
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-@@ -451,20 +450,20 @@
+@@ -451,20 +450,20 @@ LATEX_HEADER =
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
@@ -54,9 +54,17 @@
#---------------------------------------------------------------------------
# configuration options related to the RTF output
---- doc/Makefile.am
+@@ -720,4 +719,6 @@ BIN_ABSPATH = /usr/local/bin/
+ # documentation generated for other projects. This allows doxysearch to search
+ # the documentation for these projects as well.
+
+-EXT_DOC_PATHS =
++EXT_DOC_PATHS =
++
++HTML_TIMESTAMP = NO
+--- doc/Makefile.am.orig
+++ doc/Makefile.am
-@@ -42,8 +42,7 @@
+@@ -42,8 +42,7 @@ dox: Doxyfile
docs: dox index.html id3lib.css
-rm -rf $(docsdistdir).*
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
29 May '14
Hello community,
here is the log from the commit of package adobe-sourceserifpro-fonts for openSUSE:Factory checked in at 2014-05-29 08:44:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/adobe-sourceserifpro-fonts (Old)
and /work/SRC/openSUSE:Factory/.adobe-sourceserifpro-fonts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adobe-sourceserifpro-fonts"
Changes:
--------
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:Factory/.adobe-sourceserifpro-fonts.new/adobe-sourceserifpro-fonts.changes 2014-05-29 08:44:37.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Tue May 27 11:17:44 UTC 2014 - robert.munteanu(a)gmail.com
+
+- Initial version
+
New:
----
SourceSerifPro_FontsOnly-1.014.zip
adobe-sourceserifpro-fonts.changes
adobe-sourceserifpro-fonts.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ adobe-sourceserifpro-fonts.spec ++++++
#
# spec file for package adobe-sourceserifpro-fonts
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: adobe-sourceserifpro-fonts
%define _name SourceSerifPro
# Thre is no real version number, so we use the zip files release date.
Version: 1.014
Release: 0
Summary: A set of OpenType fonts designed for user interfaces
License: OFL-1.1
Group: System/X11/Fonts
Url: http://sourceforge.net/projects/sourceserifpro.adobe/
Source: http://downloads.sourceforge.net/sourceserifpro.adobe/%{_name}_FontsOnly-%{…
BuildRequires: fontpackages-devel
BuildRequires: unzip
%reconfigure_fonts_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
A set of serif OpenType fonts designed to complement Source Sans Pro
%prep
%setup -q -n source-serif-pro-%{version}R
# Fix line endings
sed -i 's/\r$//g' LICENSE.txt
# fix spurious-executable-perm
chmod -x *.html LICENSE.txt
%build
%install
install -d %{buildroot}%{_ttfontsdir}
# by default install command uses 755 umask
install -m 644 OTF/*.otf TTF/*.ttf %{buildroot}%{_ttfontsdir}
%reconfigure_fonts_scriptlets
%files
%defattr(-,root,root)
%doc LICENSE.txt *.html
%dir %{_ttfontsdir}
%{_ttfontsdir}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0