commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2018-12-19 13:24:47 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new.28833 (New) Package is "inst-source-utils" Wed Dec 19 13:24:47 2018 rev:64 rq:656866 version:2018.12.10 Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2018-12-10 12:27:35.966571271 +0100 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new.28833/inst-source-utils.changes 2018-12-19 13:24:50.469277725 +0100 @@ -1,0 +2,5 @@ +Mon Dec 10 16:33:02 CET 2018 - r...@suse.de + +- add pattern-category also to susedata, not just susedata_i18n + +--- Old: inst-source-utils-2018.12.05.obscpio New: inst-source-utils-2018.12.10.obscpio Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.RZ8wQU/_old 2018-12-19 13:24:52.061275787 +0100 +++ /var/tmp/diff_new_pack.RZ8wQU/_new 2018-12-19 13:24:52.097275743 +0100 @@ -20,7 +20,7 @@ Summary:Utilities for creating customized installation sources License:GPL-2.0-or-later Group: System/YaST -Version:2018.12.05 +Version:2018.12.10 Release:0 Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++ _service ++ --- /var/tmp/diff_new_pack.RZ8wQU/_old 2018-12-19 13:24:52.465275295 +0100 +++ /var/tmp/diff_new_pack.RZ8wQU/_new 2018-12-19 13:24:52.477275280 +0100 @@ -2,8 +2,8 @@ https://github.com/openSUSE/inst-source-utils.git git -2018.12.05 -2018.12.05 +2018.12.10 +2018.12.10 inst-source-utils.changes inst-source-utils.spec ++ inst-source-utils-2018.12.05.obscpio -> inst-source-utils-2018.12.10.obscpio ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils-2018.12.05/inst-source-utils.changes new/inst-source-utils-2018.12.10/inst-source-utils.changes --- old/inst-source-utils-2018.12.05/inst-source-utils.changes 2018-12-05 15:56:23.0 +0100 +++ new/inst-source-utils-2018.12.10/inst-source-utils.changes 2018-12-10 16:27:50.0 +0100 @@ -1,9 +1,4 @@ --- -Wed Dec 5 14:55:50 UTC 2018 - Adrian Schröter - -- Add pattern-category (fate#323785) - Fri Apr 6 10:02:20 UTC 2018 - adr...@suse.de - add support for transalted EULA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils-2018.12.05/usr/share/inst-source-utils/modules/ABXML.pm new/inst-source-utils-2018.12.10/usr/share/inst-source-utils/modules/ABXML.pm --- old/inst-source-utils-2018.12.05/usr/share/inst-source-utils/modules/ABXML.pm 2018-12-05 15:56:23.0 +0100 +++ new/inst-source-utils-2018.12.10/usr/share/inst-source-utils/modules/ABXML.pm 2018-12-10 16:27:50.0 +0100 @@ -286,6 +286,7 @@ 'rel', ], 'eula', + 'pattern-category', [[ 'keyword' => '_content', ]], ++ inst-source-utils.obsinfo ++ --- /var/tmp/diff_new_pack.RZ8wQU/_old 2018-12-19 13:24:53.053274578 +0100 +++ /var/tmp/diff_new_pack.RZ8wQU/_new 2018-12-19 13:24:53.057274573 +0100 @@ -1,5 +1,5 @@ name: inst-source-utils -version: 2018.12.05 -mtime: 1544021783 -commit: ed5421da4d72d5f40bb71ba7151b83d8595fb990 +version: 2018.12.10 +mtime: 1544455670 +commit: 8cdf7e68654522e16a4ac8d9f30a180aef4e2405
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2018-12-10 12:27:33
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new.19453 (New)
Package is "inst-source-utils"
Mon Dec 10 12:27:33 2018 rev:63 rq:655352 version:2018.12.05
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2018-04-07 20:53:58.901069183 +0200
+++
/work/SRC/openSUSE:Factory/.inst-source-utils.new.19453/inst-source-utils.changes
2018-12-10 12:27:35.966571271 +0100
@@ -1,0 +2,5 @@
+Wed Dec 5 14:55:50 UTC 2018 - Adrian Schröter
+
+- Add pattern-category (fate#323785)
+
+---
Old:
inst-source-utils-2018.04.06.obscpio
New:
inst-source-utils-2018.12.05.obscpio
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.2AG4v6/_old 2018-12-10 12:27:37.722569516 +0100
+++ /var/tmp/diff_new_pack.2AG4v6/_new 2018-12-10 12:27:37.726569512 +0100
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0-or-later
Group: System/YaST
-Version:2018.04.06
+Version:2018.12.05
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ _service ++
--- /var/tmp/diff_new_pack.2AG4v6/_old 2018-12-10 12:27:37.750569489 +0100
+++ /var/tmp/diff_new_pack.2AG4v6/_new 2018-12-10 12:27:37.754569484 +0100
@@ -2,8 +2,8 @@
https://github.com/openSUSE/inst-source-utils.git
git
-2018.04.06
-2018.04.06
+2018.12.05
+2018.12.05
inst-source-utils.changes
inst-source-utils.spec
++ inst-source-utils-2018.04.06.obscpio ->
inst-source-utils-2018.12.05.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/inst-source-utils-2018.04.06/inst-source-utils.changes
new/inst-source-utils-2018.12.05/inst-source-utils.changes
--- old/inst-source-utils-2018.04.06/inst-source-utils.changes 2018-04-06
11:58:57.0 +0200
+++ new/inst-source-utils-2018.12.05/inst-source-utils.changes 2018-12-05
15:56:23.0 +0100
@@ -1,4 +1,14 @@
---
+Wed Dec 5 14:55:50 UTC 2018 - Adrian Schröter
+
+- Add pattern-category (fate#323785)
+
+---
+Fri Apr 6 10:02:20 UTC 2018 - adr...@suse.de
+
+- add support for transalted EULA
+
+---
Tue Mar 13 12:27:40 UTC 2018 - adr...@suse.de
- new susedata i18n structure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils-2018.04.06/inst-source-utils.spec
new/inst-source-utils-2018.12.05/inst-source-utils.spec
--- old/inst-source-utils-2018.04.06/inst-source-utils.spec 2018-04-06
11:58:57.0 +0200
+++ new/inst-source-utils-2018.12.05/inst-source-utils.spec 2018-12-05
15:56:23.0 +0100
@@ -18,9 +18,9 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/YaST
-Version:2018.2.16
+Version:2018.04.06
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
@@ -49,9 +49,11 @@
%install
install -d -m 755 %{buildroot}/%{_prefix}
-cp -a * %{buildroot}
+
+cp -a usr %{buildroot}/
%files
+%doc COPYING
%defattr(755,root,root,755)
%_bindir/*
%defattr(644,root,root,755)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/inst-source-utils-2018.04.06/usr/share/inst-source-utils/modules/ABXML.pm
new/inst-source-utils-2018.12.05/usr/share/inst-source-utils/modules/ABXML.pm
---
old/inst-source-utils-2018.04.06/usr/share/inst-source-utils/modules/ABXML.pm
2018-04-06 11:58:57.0 +0200
+++
new/inst-source-utils-2018.12.05/usr/share/inst-source-utils/modules/ABXML.pm
2018-12-05 15:56:23.0 +0100
@@ -324,6 +324,11 @@
[],
'_content',
],
+ [ 'pattern-category' =>
+ 'lang',
+ [],
+ '_content',
+
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2018-04-07 20:53:56
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Sat Apr 7 20:53:56 2018 rev:62 rq:593950 version:2018.04.06
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2018-03-20 21:51:33.140710326 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2018-04-07 20:53:58.901069183 +0200
@@ -1,0 +2,5 @@
+Fri Apr 6 10:02:20 UTC 2018 - adr...@suse.de
+
+- add support for transalted EULA
+
+---
Old:
inst-source-utils-2018.03.13.obscpio
New:
inst-source-utils-2018.04.06.obscpio
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.XtiCL9/_old 2018-04-07 20:53:59.845035017 +0200
+++ /var/tmp/diff_new_pack.XtiCL9/_new 2018-04-07 20:53:59.849034872 +0200
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0-or-later
Group: System/YaST
-Version:2018.03.13
+Version:2018.04.06
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
@@ -49,6 +49,7 @@
%install
install -d -m 755 %{buildroot}/%{_prefix}
+
cp -a usr %{buildroot}/
%files
++ _service ++
--- /var/tmp/diff_new_pack.XtiCL9/_old 2018-04-07 20:53:59.877033858 +0200
+++ /var/tmp/diff_new_pack.XtiCL9/_new 2018-04-07 20:53:59.885033569 +0200
@@ -2,8 +2,8 @@
https://github.com/openSUSE/inst-source-utils.git
git
-2018.03.13
-2018.03.13
+2018.04.06
+2018.04.06
inst-source-utils.changes
inst-source-utils.spec
++ inst-source-utils-2018.03.13.obscpio ->
inst-source-utils-2018.04.06.obscpio ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils-2018.03.13/inst-source-utils.spec
new/inst-source-utils-2018.04.06/inst-source-utils.spec
--- old/inst-source-utils-2018.03.13/inst-source-utils.spec 2018-03-13
13:36:51.0 +0100
+++ new/inst-source-utils-2018.04.06/inst-source-utils.spec 2018-04-06
11:58:57.0 +0200
@@ -29,7 +29,7 @@
Provides: autoyast2-utils = 2.14.10
Recommends: create-repo-utils
Requires: perl-XML-Parser
-Source: inst-source-utils.tar.bz2
+Source: %name-%version.tar.xz
Source1:split.pl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,7 @@
%prep
-%setup -n %{name} -q
+%setup -q
%build
@@ -51,9 +51,6 @@
install -d -m 755 %{buildroot}/%{_prefix}
cp -a * %{buildroot}
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(755,root,root,755)
%_bindir/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/inst-source-utils-2018.03.13/usr/share/inst-source-utils/modules/ABXML.pm
new/inst-source-utils-2018.04.06/usr/share/inst-source-utils/modules/ABXML.pm
---
old/inst-source-utils-2018.03.13/usr/share/inst-source-utils/modules/ABXML.pm
2018-03-13 13:36:51.0 +0100
+++
new/inst-source-utils-2018.04.06/usr/share/inst-source-utils/modules/ABXML.pm
2018-04-06 11:58:57.0 +0200
@@ -324,6 +324,7 @@
[],
'_content',
],
+ 'eula',
]],
];
++ inst-source-utils.obsinfo ++
--- /var/tmp/diff_new_pack.XtiCL9/_old 2018-04-07 20:54:00.037028068 +0200
+++ /var/tmp/diff_new_pack.XtiCL9/_new 2018-04-07 20:54:00.037028068 +0200
@@ -1,5 +1,5 @@
name: inst-source-utils
-version: 2018.03.13
-mtime: 1520944611
-commit: b167a26588b85b9392026498d8a87a0262970d06
+version: 2018.04.06
+mtime: 1523008737
+commit: bfed98b447f81e7df51bd7e66ec22f9684bca2de
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2018-03-20 21:51:30
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Tue Mar 20 21:51:30 2018 rev:61 rq:586411 version:2018.03.13
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2018-03-04 11:51:30.752500010 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2018-03-20 21:51:33.140710326 +0100
@@ -1,0 +2,6 @@
+Tue Mar 13 12:27:40 UTC 2018 - adr...@suse.de
+
+- new susedata i18n structure
+- move source to git
+
+---
Old:
inst-source-utils.tar.bz2
New:
_service
inst-source-utils-2018.03.13.obscpio
inst-source-utils.obsinfo
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.v5sK7S/_old 2018-03-20 21:51:34.204672013 +0100
+++ /var/tmp/diff_new_pack.v5sK7S/_new 2018-03-20 21:51:34.208671870 +0100
@@ -18,9 +18,9 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/YaST
-Version:2018.2.16
+Version:2018.03.13
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
@@ -29,7 +29,7 @@
Provides: autoyast2-utils = 2.14.10
Recommends: create-repo-utils
Requires: perl-XML-Parser
-Source: inst-source-utils.tar.bz2
+Source: %name-%version.tar.xz
Source1:split.pl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,18 +43,16 @@
%prep
-%setup -n %{name} -q
+%setup -q
%build
%install
install -d -m 755 %{buildroot}/%{_prefix}
-cp -a * %{buildroot}
-
-%clean
-rm -rf %{buildroot}
+cp -a usr %{buildroot}/
%files
+%doc COPYING
%defattr(755,root,root,755)
%_bindir/*
%defattr(644,root,root,755)
++ _service ++
https://github.com/openSUSE/inst-source-utils.git
git
2018.03.13
2018.03.13
inst-source-utils.changes
inst-source-utils.spec
*.tar
xz
++ inst-source-utils.obsinfo ++
name: inst-source-utils
version: 2018.03.13
mtime: 1520944611
commit: b167a26588b85b9392026498d8a87a0262970d06
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2018-03-04 11:51:26 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils" Sun Mar 4 11:51:26 2018 rev:60 rq:580882 version:2018.2.16 Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2017-08-06 11:30:58.275784146 +0200 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2018-03-04 11:51:30.752500010 +0100 @@ -1,0 +2,6 @@ +Tue Feb 27 15:17:48 CET 2018 - r...@suse.de + +- mk_changelog: do not use localtime call for min_date + (bnc#1081766) + +--- Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.9IpnGP/_old 2018-03-04 11:51:33.016418528 +0100 +++ /var/tmp/diff_new_pack.9IpnGP/_new 2018-03-04 11:51:33.024418240 +0100 @@ -1,7 +1,7 @@ # # spec file for package inst-source-utils # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary:Utilities for creating customized installation sources License:GPL-2.0+ Group: System/YaST -Version:2016.7.26 +Version:2018.2.16 Release:0 Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++ inst-source-utils.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/mk_changelog new/inst-source-utils/usr/bin/mk_changelog --- old/inst-source-utils/usr/bin/mk_changelog 2016-07-26 12:03:01.0 +0200 +++ new/inst-source-utils/usr/bin/mk_changelog 2018-02-27 15:23:02.42923 +0100 @@ -35,8 +35,7 @@ use RPMQ; # current date minus two years -#my $min_date = timelocal(0,0,0,localtime->mday,localtime->mon , localtime->year+1898 ); -my $min_date = localtime(time - 2*365*24*3600); +my $min_date = time - 2*365*24*3600; my %month_to_num = (Jan=>0,Feb=>1,Mar=>2,Apr=>3,May=>4,Jun=>5,Jul=>6,Aug=>7,Sep=>8,Oct=>9,Nov=>10,Dec=>11); my $delimiter = "--"; my $actual = 0;
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2017-08-06 11:30:57 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils" Sun Aug 6 11:30:57 2017 rev:59 rq:512907 version:2016.7.26 Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2016-08-03 11:40:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2017-08-06 11:30:58.275784146 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 13:26:40 CEST 2017 - r...@suse.de + +- drop requires for recode + +--- Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.L9eZHK/_old 2017-08-06 11:30:59.819566650 +0200 +++ /var/tmp/diff_new_pack.L9eZHK/_new 2017-08-06 11:30:59.847562706 +0200 @@ -1,7 +1,7 @@ # # spec file for package inst-source-utils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,6 @@ Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch Requires: gpg2 -Requires: recode Obsoletes: autoyast2-utils <= 2.14.10 Provides: autoyast2-utils = 2.14.10 Recommends: create-repo-utils
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2016-08-03 11:40:29 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils" Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2016-06-05 14:20:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2016-08-03 11:40:30.0 +0200 @@ -1,0 +2,6 @@ +Tue Jul 26 12:07:52 CEST 2016 - r...@suse.de + +- ABXML: add diskusage data to susedata xml structure + (fate#320517) + +--- Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.IA1IdY/_old 2016-08-03 11:40:31.0 +0200 +++ /var/tmp/diff_new_pack.IA1IdY/_new 2016-08-03 11:40:31.0 +0200 @@ -20,7 +20,7 @@ Summary:Utilities for creating customized installation sources License:GPL-2.0+ Group: System/YaST -Version:2016.5.2 +Version:2016.7.26 Release:0 Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++ inst-source-utils.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm new/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm --- old/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm 2016-05-02 17:44:32.0 +0200 +++ new/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm 2016-07-26 12:03:01.0 +0200 @@ -289,6 +289,15 @@ [[ 'keyword' => '_content', ]], + [ 'diskusage' => + [ 'dirs' => + [[ 'dir' => + 'name', + 'size', + 'count', + ]], + ], + ], ]], ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm new/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm --- old/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm 2016-05-03 11:56:58.0 +0200 +++ new/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm 2016-07-26 12:03:01.0 +0200 @@ -30,6 +30,7 @@ # @val = RPMQ::rpmq($filename, $tag); # 2004-11-25, mls add support for signature header queries +require Data::Dumper; package RPMQ; my %STAG = (
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2016-06-05 14:20:26
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2015-12-13 09:39:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2016-06-05 14:20:28.0 +0200
@@ -1,0 +2,7 @@
+Mon May 2 17:46:57 CEST 2016 - r...@suse.de
+
+- RPMQ: add infrastructure for HEADERSTART and EXTRA
+- create_package_descr: use infrastucture to allow running with
+ only rpm headers instead of full rpms (bnc#978085)
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.CBVocO/_old 2016-06-05 14:20:29.0 +0200
+++ /var/tmp/diff_new_pack.CBVocO/_new 2016-06-05 14:20:29.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0+
Group: System/YaST
-Version:2015.12.9
+Version:2016.5.2
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2015-12-09
15:58:20.0 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2016-05-02
17:44:32.0 +0200
@@ -73,6 +73,7 @@
my $extra_provides = "";
my $extra_tags = "";
my $with_links = "";
+my $use_headers = "0";
my %xprovlist;
my %xreqlist;
@@ -103,7 +104,8 @@
print " [-K ] (do_keywords)\n";
print " [-F ] (do_file_list)\n";
print " [-B ] (add requires for src
packages)\n\n";
-print " [-Q ] (never use Shr tags)\n\n";
+print " [-Q ] (never use Shr tags)\n";
+print " [-H ] (Use headers)\n\n";
print " Note: the -T option allows to add additional tags to
the\n";
print " resulting packages file.\n";
print " The file should contain the package name, a colon
and\n";
@@ -146,6 +148,7 @@
elsif ( $arg eq "-C" ) { $do_checksums = "1"; }
elsif ( $arg eq "-D" ) { $do_checksums = "1"; $do_sha256 = "1";
$checksum_binary = "sha256sum"; }
elsif ( $arg eq "-F" ) { $do_file_list = 1; }
+ elsif ( $arg eq "-H" ) { $use_headers = 1; }
elsif ( $arg eq "-I" ) { $ignore_file = shift @ARGV ; }
elsif ( $arg eq "-K" ) { $do_keywords = "1"; }
elsif ( $arg eq "-L" ) { $ignore_symlinks = "1"; }
@@ -288,7 +291,7 @@
chomp ( $filespec );
$filespec =~ /\/([^\/]*)$/;
my $filename = $1;
- my $filesize = stat($filespec)->size;
+ my $filesize;
# name, version, release, arch, obsolete, requires, provides,
# conflicts, copyright, group, buildtime, size, sourcerpm
my %res = RPMQ::rpmq_many("$package", 1000, 1001, 1002, 1022,
@@ -301,12 +304,15 @@
1027, 1116, 1117, 1118, 1030, 1028,
1095, 1096,
1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124,
5046, 5047, 5048, 5049, 5050, 5051,
- 5052, 5053, 5054, 5055, 5056, 5057,
+ 5052, 5053, 5054, 5055, 5056, 5057,
"HEADERSTART", "SIGTAG_SIZE", "EXTRA"
);
# skip delta rpms (if PAYLOADFORMAT eq drpm)
next if ($res{1124}[0] && $res{1124}[0] eq "drpm");
#
+ my $data = $res{"SIGTAG_SIZE"}[0];
+ my $header = $res{"HEADERSTART"}[0];
+
my @depexcl = $res{1054};
my @prereq = rpmq_add_req_flagsvers(\%res, 1049, 1048, 1050); # requires
RPMQ::rpmq_add_flagsvers(\%res, 1047, 1112, 1113); # provides
@@ -339,9 +345,14 @@
my $file_arch;
my %pacdata;
+ if ( $use_headers eq "1" ){
+ $filesize = $res{'EXTRA'}[0]{size};
+ } else {
+ $file
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2015-12-13 09:39:33
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2015-11-04 15:31:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2015-12-13 09:39:34.0 +0100
@@ -1,0 +2,12 @@
+Wed Dec 9 16:01:55 CET 2015 - r...@suse.de
+
+- update rezip_repo_rsyncable again: fix up filenames if they
+ are checksum prefixed, do not change timestamps of the
+ files recompressed (bnc#958511)
+
+---
+Tue Dec 8 12:10:41 CET 2015 - r...@suse.de
+
+- rezip_repo_rsyncable: add "-n" option for gzip
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.BN93LN/_old 2015-12-13 09:39:35.0 +0100
+++ /var/tmp/diff_new_pack.BN93LN/_new 2015-12-13 09:39:35.0 +0100
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0+
Group: System/YaST
-Version:2015.10.27
+Version:2015.12.9
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2015-10-27
15:16:22.0 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums 2015-12-09
15:58:20.0 +0100
@@ -51,8 +51,13 @@
function signit(){
if [ "$(type -p sign 2>/dev/null)" != "" ]; then
- sign $SIGN_OPTS -d $1
- sign $SIGN_OPTS -p > $1.key
+# if sign -t ; then
+sign $SIGN_OPTS -d $1
+sign $SIGN_OPTS -p > $1.key
+# else
+#: > $1.asc
+#cp //keys/default $1.key
+# fi
else
gpg -a -b $1
KEY_ID=`gpg -b < /dev/null | gpg --list-packets | sed -n -e
"/^:signature/s@.*keyid @@p"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/rezip_repo_rsyncable
new/inst-source-utils/usr/bin/rezip_repo_rsyncable
--- old/inst-source-utils/usr/bin/rezip_repo_rsyncable 2015-10-27
15:10:01.0 +0100
+++ new/inst-source-utils/usr/bin/rezip_repo_rsyncable 2015-12-09
15:58:20.0 +0100
@@ -28,11 +28,17 @@
my $checksumtype = uc($checksumstring);
$checksumtype =~ s/([0-9]+)/-$1/;
$checksumtype .= "-1" unless $checksumtype =~ /[0-9]/;
- open(REC, "<", "$repobase/$filename");
+ next unless open(REC, "<", "$repobase/$filename");
my $ctx = Digest->new($checksumtype);
$ctx->addfile(*REC);
my $newfilechksum = $ctx->hexdigest();
close (REC);
+ if ($filename =~ /^([^\/]*\/)?[0-9a-f][0-9a-f]*-(.*\.gz)$/) {
+ my $new_filename = "$1$newfilechksum-$2";
+ rename ("$repobase/$filename","$repobase/$new_filename");
+ $filename = $new_filename;
+ $record->{'location'}->{'href'} = $filename;
+ }
my $nstat = stat("$repobase/$filename");
my $newfiletime = $nstat->mtime;
my $newfilesize = $nstat->size;
@@ -75,9 +81,12 @@
if ( $rsyncable ) {
my @GZIPPED = glob("$arg/*.gz");
for (@GZIPPED) {
+system ("touch", "--reference", "$_", "$_.timestamp");
system ("gunzip", "-f", $_);
$_ =~ s/.gz$//;
-system ("gzip", "-9", $rsyncable, $_);
+system ("gzip", "-9", "-n", $rsyncable, $_);
+system ("touch", "--reference", "$_.gz.timestamp", "$_.gz");
+unlink ("$_.gz.timestamp");
}
my $has_sign = "";
$has_sign = "1" if ( -f "$arg/repomd.xml.asc" );
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2015-11-04 15:31:07
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2014-03-20 06:53:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2015-11-04 15:31:09.0 +0100
@@ -1,0 +2,6 @@
+Tue Oct 27 15:10:49 CET 2015 - r...@suse.de
+
+- mk_listings: set LC_CTYPE (bnc#910388)
+- ABXML.pm: add endoflife in product structure
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.fdvnEy/_old 2015-11-04 15:31:10.0 +0100
+++ /var/tmp/diff_new_pack.fdvnEy/_new 2015-11-04 15:31:10.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0+
Group: System/YaST
-Version:2014.3.18
+Version:2015.10.27
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2014-03-18
16:40:31.0 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums 2015-10-27
15:16:22.0 +0100
@@ -51,8 +51,8 @@
function signit(){
if [ "$(type -p sign 2>/dev/null)" != "" ]; then
- sign $SIGN_OPTS -d $1
- sign $SIGN_OPTS -p > $1.key
+ sign $SIGN_OPTS -d $1
+ sign $SIGN_OPTS -p > $1.key
else
gpg -a -b $1
KEY_ID=`gpg -b < /dev/null | gpg --list-packets | sed -n -e
"/^:signature/s@.*keyid @@p"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/mk_listings
new/inst-source-utils/usr/bin/mk_listings
--- old/inst-source-utils/usr/bin/mk_listings 2014-03-18 16:40:31.0
+0100
+++ new/inst-source-utils/usr/bin/mk_listings 2015-10-27 15:10:01.0
+0100
@@ -76,6 +76,8 @@
usage(0);
}
+$ENV{'LC_CTYPE'}="en_US.UTF-8";
+
my $rsyncable = "";
my $arg = shift @ARGV;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm
new/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm
--- old/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm
2014-03-18 16:40:31.0 +0100
+++ new/inst-source-utils/usr/share/inst-source-utils/modules/ABXML.pm
2015-10-27 15:10:01.0 +0100
@@ -596,6 +596,7 @@
'migrationtarget',
'release',
'arch',
+ 'endoflife',
'productline',
[ 'register' =>
[],
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2014-03-20 06:53:33
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2014-03-18 16:21:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2014-03-20 06:53:36.0 +0100
@@ -1,0 +2,5 @@
+Tue Mar 18 16:40:34 CET 2014 - r...@suse.de
+
+- update create_package_descr: fix utf8 handling thanks to mls
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.Z28UAy/_old 2014-03-20 06:53:36.0 +0100
+++ /var/tmp/diff_new_pack.Z28UAy/_new 2014-03-20 06:53:36.0 +0100
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0+
Group: System/YaST
-Version:2014.3.14
+Version:2014.3.18
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2014-03-14
02:38:18.0 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2014-03-18
16:40:31.0 +0100
@@ -35,6 +35,7 @@
use strict;
use RPMQ;
use Digest::MD5 ();
+use Encode;
my
(@DATADIRS,@IGNOREDIRS,@LANGUAGES,%SEEN_PACKAGE,%IGNORE_PACKAGE,@SHA_CACHEDIR);
my %lang_alias = ( "czech"=>"cs",
@@ -494,22 +495,6 @@
close ( $pkg_du );
close ( $pkg_fl ) if $do_file_list;
-print "INFO:now recoding to UTF-8: ";
-foreach my $file ("packages","packages.DU") {
-print "$file ";
-system ( "recode", "ISO-8859-1...UTF-8", "$output_dir/$file" );
-}
-foreach my $lang (@LANGUAGES) {
-my $file = "packages.$lang_alias{$lang}";
-print "$file ";
-if ( $lang eq "czech" || $lang eq "hungarian" ) {
- system ( "recode", "ISO-8859-2...UTF-8", "$output_dir/$file" );
-} else {
- system ( "recode", "ISO-8859-1...UTF-8", "$output_dir/$file" );
-}
-}
-print "\n";
-
#
#
@@ -567,22 +552,40 @@
print $FH "## ".join(" ",@XX)."\n";
}
+sub utf8ify {
+ my ($value) = @_;
+ eval {
+Encode::_utf8_on($value);
+$value = encode('UTF-8', $value, Encode::FB_CROAK);
+ };
+ if ($@) {
+Encode::_utf8_off($value);
+$value = encode('UTF-8', $value, Encode::FB_DEFAULT);
+ }
+ Encode::_utf8_off($value);
+ return $value;
+}
+
sub WriteAnyEntry {
my ($FH,$value) = @_;
+ $value = utf8ify($value) if $value =~ /[\200-\377]/s;
print $FH "$value\n";
}
sub WriteSEntry {
my ($FH,$tag,$value) = @_;
- if ( $value ) { print $FH "=$tag: $value\n"; }
+ if ( $value ) {
+$value = utf8ify($value) if $value =~ /[\200-\377]/s;
+print $FH "=$tag: $value\n";
+ }
}
sub WriteMEntry {
my ($FH,$tag,@value) = @_;
if ( @value && $value[0] ) {
-print $FH "+$tag:\n";
-print $FH join("\n", @value)."\n";
-print $FH "-$tag:\n";
+my $value = join("\n", @value);
+$value = utf8ify($value) if $value =~ /[\200-\377]/s;
+print $FH "+$tag:\n$value\n-$tag:\n";
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2014-03-18 16:21:14
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2014-03-06 19:18:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2014-03-18 16:21:17.0 +0100
@@ -1,0 +2,11 @@
+Fri Mar 14 02:38:32 CET 2014 - r...@suse.de
+
+- create_sha1sums: skip content file actions if content file
+ does not exist
+
+---
+Wed Mar 12 17:56:59 CET 2014 - r...@suse.de
+
+- fix bogus code in rezip-repo-rsyncable
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.uvfVaB/_old 2014-03-18 16:21:18.0 +0100
+++ /var/tmp/diff_new_pack.uvfVaB/_new 2014-03-18 16:21:18.0 +0100
@@ -20,7 +20,7 @@
Summary:Utilities for creating customized installation sources
License:GPL-2.0+
Group: System/YaST
-Version:2014.3.5
+Version:2014.3.14
Release:0
Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2014-03-05
14:34:15.0 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums 2014-03-14
02:38:18.0 +0100
@@ -91,59 +91,61 @@
CDS_PRIM=$(pwd)
fi
-# prepare content file
-CONTTMP=$(mktemp $CDS_PRIM/content-XX)
-grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA" >
$CONTTMP
-mv $CONTTMP $CDS_PRIM/content
-
-# add pattern and packages files to content file
-DESCRDIR=`grep DESCRDIR $CDS_PRIM/content | awk '" " { print $2 }'`
-if [ -z "$DESCRDIR" ]; then
- DESCRDIR="suse/setup/descr"
-fi
-if test -d $CDS_PRIM/$DESCRDIR ; then
- pushd $CDS_PRIM/$DESCRDIR >/dev/null
- rm -f *.asc
- $CHECKSUM * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed
-e "s@^@META $CHECKSUM_T @" >> $CDS_PRIM/content
+if [ -f $CDS_PRIM/content ] ; then
+ # prepare content file
+ CONTTMP=$(mktemp $CDS_PRIM/content-XX)
+ grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA" >
$CONTTMP
+ mv $CONTTMP $CDS_PRIM/content
+
+ # add pattern and packages files to content file
+ DESCRDIR=`grep DESCRDIR $CDS_PRIM/content | awk '" " { print $2 }'`
+ if [ -z "$DESCRDIR" ]; then
+ DESCRDIR="suse/setup/descr"
+ fi
+ if test -d $CDS_PRIM/$DESCRDIR ; then
+pushd $CDS_PRIM/$DESCRDIR >/dev/null
+rm -f *.asc
+$CHECKSUM * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" |
sed -e "s@^@META $CHECKSUM_T @" >> $CDS_PRIM/content
+popd >/dev/null
+ fi
+ pushd $CDS_PRIM >/dev/null
+ if [ "$EXTRA" = "yes" ] ; then
+ for i in license.tar.gz control.xml installation.xml media.1/info.txt
media.1/license.zip y2update.tgz driverupdate; do
+ test -f $i || continue
+ $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >>
$CDS_PRIM/content
+ done
+ for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd
boot/*/loader/*.spl docu/* images/* ; do
+ test -f $i || continue
+ $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >>
$CDS_PRIM/content
+ done
+ # check if we need to include additional files for > 11.0
+ if grep -q CONTENTSTYLE $CDS_PRIM/content; then
+ DATADIR=$(grep DATADIR content | awk '" " { print $2 }')
+ if [ -d "$CDS_PRIM/$DATADIR/setup/slide" ]; then
+ SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide"
+ fi
+ if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then
+ /usr/bin/create_sha1sum $CHECKSUM_O --quiet
"$SLIDESHOWDIR"
+ fi
+ if [ $SIGN = "yes" ]; then
+ for sha1sumfile in $(find $SLIDESHOWDIR -name
$CHECKSUM_F); do
+ signit "$sha1sumfile"
+ done
+ fi
+ fi
+
+ fi
+ if [ "$INCLUDE_SHA1SUMS" = "yes" ]; then
+ for i in $(find $CDS_PRIM/ -name $CHECKSUM_F | sed -e "s|./||"); do
+ test -f $i || continue
+ $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >>
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2014-03-06 19:18:14 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils" Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2014-03-05 15:36:44.0 +0100 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2014-03-06 19:18:17.0 +0100 @@ -1,0 +2,5 @@ +Wed Mar 5 14:34:28 CET 2014 - r...@suse.de + +- bump version number and add automatic to pre_checkin.sh + +--- Old: get_version_number.sh Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.queRQc/_old 2014-03-06 19:18:17.0 +0100 +++ /var/tmp/diff_new_pack.queRQc/_new 2014-03-06 19:18:17.0 +0100 @@ -20,7 +20,7 @@ Summary:Utilities for creating customized installation sources License:GPL-2.0+ Group: System/YaST -Version:2011.10.16 +Version:2014.3.5 Release:0 Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++ inst-source-utils.tar.bz2 ++ ++ pre_checkin.sh ++ --- /var/tmp/diff_new_pack.queRQc/_old 2014-03-06 19:18:17.0 +0100 +++ /var/tmp/diff_new_pack.queRQc/_new 2014-03-06 19:18:17.0 +0100 @@ -62,3 +62,7 @@ popd >/dev/null cp -v $TMPDIR/../inst-source-utils.tar.bz2 . test "$TMPDIR" != "/" -a -d "$TMPDIR" && rm -rf $TMPDIR + +LASTFILE=`find_newest_file *.tar.bz2` +VERSION=`get_date_version_string $LASTFILE` +sed -i -e "s@^Version:.*@Version:$VERSION@" inst-source-utils.spec -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2014-03-05 15:36:41
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2014-02-28 16:22:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2014-03-05 15:36:44.0 +0100
@@ -1,0 +2,7 @@
+Tue Mar 4 16:47:58 CET 2014 - r...@suse.de
+
+- add ABXML.pm and ABStructured.pm
+- rewrite rezip_repo_rsyncable to keep checksum type
+- add requires for perl-XML-Parser
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.g0hHI0/_old 2014-03-05 15:36:45.0 +0100
+++ /var/tmp/diff_new_pack.g0hHI0/_new 2014-03-05 15:36:45.0 +0100
@@ -29,6 +29,7 @@
Obsoletes: autoyast2-utils <= 2.14.10
Provides: autoyast2-utils = 2.14.10
Recommends: create-repo-utils
+Requires: perl-XML-Parser
Source: inst-source-utils.tar.bz2
Source1:split.pl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/rezip_repo_rsyncable
new/inst-source-utils/usr/bin/rezip_repo_rsyncable
--- old/inst-source-utils/usr/bin/rezip_repo_rsyncable 2014-02-25
15:36:17.0 +0100
+++ new/inst-source-utils/usr/bin/rezip_repo_rsyncable 2014-03-04
13:37:49.0 +0100
@@ -1,45 +1,56 @@
#!/usr/bin/perl
+BEGIN {
+ $abuild_base_dir = "/usr/share/inst-source-utils";
+ unshift @INC, "$abuild_base_dir/modules";
+}
+
+
use strict;
use File::stat;
+use ABStructured ':bytes';
+use ABXML;
+use Digest;
+
sub GenerateRepomdXml {
-my ($patches_directory) = @_;
-opendir(PDIR,"$patches_directory");
-my @all_patches = grep {/\.xml(\.gz)?$/} readdir(PDIR);
-closedir(PDIR);
-open (NEWDIR,">$patches_directory/repomd.xml");
-print NEWDIR "\n";
-print NEWDIR "http://linux.duke.edu/metadata/repo\";>\n";
-my $pdirname = $patches_directory;
-$pdirname =~ s/^.*\///;
-for (@all_patches) {
-next if (/^patch-/);
-next if (/^repomd/);
-my ($checksum,$dummy) = split('\s+',`sha1sum "$patches_directory/$_"`);
-my $o_checksum = $checksum;
-if ( /\.gz/ ) {
-($o_checksum,my $dummy) = split('\s+',`gzip -dc
"$patches_directory/$_" | sha1sum`);
-}
-my $timestamp = stat("$patches_directory/$_")->mtime;
-my $filename = $_;
-$_ =~ s/.xml(\.gz)?$//;
-print NEWDIR " \n";
-print NEWDIR "\n";
-print NEWDIR "$checksum\n";
-print NEWDIR "$timestamp\n";
-print NEWDIR "$o_checksum\n";
-print NEWDIR " \n";
+my ($repodir) = @_;
+my $repobase = $repodir;
+$repobase =~ s/\/repodata//;
+open (REPOMD, "<", "$repodir/repomd.xml");
+my $repomd_raw = join("",);
+close (REPOMD);
+my $repomd = XMLin($ABXML::repomd, $repomd_raw);
+for my $record (@{$repomd->{'data'}}) {
+ my $filename = $record->{'location'}->{'href'};
+ my $checksumstring = $record->{'checksum'}->{'type'};
+ my $checksumtype = uc($checksumstring);
+ $checksumtype =~ s/([0-9]+)/-$1/;
+ $checksumtype .= "-1" unless $checksumtype =~ /[0-9]/;
+ open(REC, "<", "$repobase/$filename");
+ my $ctx = Digest->new($checksumtype);
+ $ctx->addfile(*REC);
+ my $newfilechksum = $ctx->hexdigest();
+ close (REC);
+ my $nstat = stat("$repobase/$filename");
+ my $newfiletime = $nstat->mtime;
+ my $newfilesize = $nstat->size;
+ $record->{'checksum'} = { 'type' => $checksumstring, '_content' =>
$newfilechksum };
+ $record->{'timestamp'} = $newfiletime;
+ $record->{'size'} = $newfilesize if $record->{'size'};
}
-print NEWDIR "\n";
-close ( NEWDIR );
+
+open (REPOMD, ">", "$repodir/repomd.xml");
+print REPOMD "\n";
+print REPOMD XMLout($ABXML::repomd, $repomd);
+close (REPOMD);
}
my $rsyncable = "";
my $arg = shift @ARGV;
-my $tmpdir = `mktemp -d /tmp/mk_listings.XX`;
+my $tmpdir = `mktemp -d /tmp/rezip_repo_rsyncable.XX`;
chomp ($tmpdir);
if ( $arg ) {
die("need an argument") unless ( -d $arg );
@@ -51,6 +62,8 @@
$arg = "$pwd/$arg";
}
+$arg .= "/repodata" unless $arg =~ /\/repodata/;
+
system ("touch", "$tmpdir/fff");
system (`gzip --rsyncable "$tmpdir/fff" >/dev/null 2>/dev/null`)
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2014-02-28 16:22:21
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2013-09-23 09:32:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2014-02-28 16:22:23.0 +0100
@@ -1,0 +2,11 @@
+Tue Feb 25 15:36:18 CET 2014 - r...@suse.de
+
+- fix typo in last change
+
+---
+Wed Feb 19 17:51:38 CET 2014 - r...@suse.de
+
+- update create_package_descr: also recognize new rpm tags
+ for Suggests and Enhances (thanks to mls for the patch)
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.9iXBpV/_old 2014-02-28 16:22:25.0 +0100
+++ /var/tmp/diff_new_pack.9iXBpV/_new 2014-02-28 16:22:25.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# 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
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2013-09-20
11:57:18.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2014-02-25
15:36:17.0 +0100
@@ -298,7 +298,10 @@
1156, 1157, 1158,
1159, 1160, 1161,
1027, 1116, 1117, 1118, 1030, 1028,
1095, 1096,
- 1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124);
+ 1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124,
+ 5046, 5047, 5048, 5049, 5050, 5051,
+ 5052, 5053, 5054, 5055, 5056, 5057,
+ );
# skip delta rpms (if PAYLOADFORMAT eq drpm)
next if ($res{1124}[0] && $res{1124}[0] eq "drpm");
@@ -308,8 +311,15 @@
RPMQ::rpmq_add_flagsvers(\%res, 1047, 1112, 1113); # provides
RPMQ::rpmq_add_flagsvers(\%res, 1090, 1114, 1115); # obsoletes
RPMQ::rpmq_add_flagsvers(\%res, 1054, 1053, 1055); # conflicts
- RPMQ::rpmq_add_flagsvers(\%res, 1156, 1158, 1157); # suggests
- RPMQ::rpmq_add_flagsvers(\%res, 1159, 1161, 1160); # enhances
+
+ RPMQ::rpmq_add_flagsvers(\%res, 1156, 1158, 1157) if $res{1156}; #
oldsuggests
+ RPMQ::rpmq_add_flagsvers(\%res, 1159, 1161, 1160) if $res{1159}; #
oldenhances
+
+ RPMQ::rpmq_add_flagsvers(\%res, 5046, 5048, 5047) if $res{5046}; #
recommends
+ RPMQ::rpmq_add_flagsvers(\%res, 5049, 5051, 5050) if $res{5049}; # suggests
+ RPMQ::rpmq_add_flagsvers(\%res, 5052, 5054, 5053) if $res{5052}; #
supplements
+ RPMQ::rpmq_add_flagsvers(\%res, 5055, 5057, 5056) if $res{5055}; # enhances
+
my $rpm_name = $res{1000}[0];
if ( $IGNORE_PACKAGE{$rpm_name} && $IGNORE_PACKAGE{$rpm_name} eq "yes" ) {
$ignored_packages .= " $rpm_name";
@@ -421,10 +431,14 @@
WriteMEntry( $pkg_main, "Prv", @{$res{1047}} );
WriteMEntry( $pkg_main, "Con", @{$res{1054}} );
WriteMEntry( $pkg_main, "Obs", @{$res{1090}} );
- WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158));
- WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158));
- WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161));
- WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161));
+ WriteMEntry( $pkg_main, "Rec", @{$res{5046}} ) if $res{5046};
+ WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158)) if
!$res{5046} && $res{1156};
+ WriteMEntry( $pkg_main, "Sug", @{$res{5049}} ) if $res{5049};
+ WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158)) if
!$res{5049} && $res{1156};
+ WriteMEntry( $pkg_main, "Sup", @{$res{5052}} ) if $res{5052};
+ WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161)) if
!$res{5052} && $res{1159};
+ WriteMEntry( $pkg_main, "Enh", @{$res{5055}} ) if $res{5055};
+ WriteMEntry( $pkg_main, "Enh", filter_weak(
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2013-09-23 09:32:44
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2013-04-05 07:36:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2013-09-23 09:32:48.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 20 11:57:36 CEST 2013 - r...@suse.de
+
+- also add Requires(pre) and Requires(post) to Prq sections
+
+---
Other differences:
--
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2013-04-03
12:05:42.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2013-09-20
11:57:18.0 +0200
@@ -662,7 +662,8 @@
$_ .= '=' if $flags[0] & 8;
$_ .= " $vers[0]";
}
-if ( $flags[0] & 64 ) {
+# set on RPMSENSE_PREREQ, RPMSENSE_SCRIPT_PRE and RPMSENSE_SCRIPT_POST
+if ( $flags[0] & (64+512+1024) ) {
push ( @prereq, $_ );
}
shift @flags;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2013-04-05 07:31:54
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2013-01-29 10:46:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2013-04-05 07:36:27.0 +0200
@@ -1,0 +2,8 @@
+Wed Apr 3 12:03:43 CEST 2013 - r...@suse.de
+
+- remove pdb code from create_package_descr
+- create_sha1sums: replace "which" by "type -p"
+- create_repo_for_patch.sh: same change
+- RPMQ: fix for name-version-release > 64 characters
+
+---
Other differences:
--
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2013-01-25
01:22:42.0 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2013-04-03
12:05:42.0 +0200
@@ -62,9 +62,8 @@
my $add_vendor = 0;
my $allow_shr = 1;
my %used_fallbacks;
-my $num_pdb_records = 0;
my $checksum_binary = "sha1sum";
-my $pdb_data_dir = "";
+my $unused_data_dir = "";
my $eula_data_dir = "";
my $ignore_file = "";
my $ignore_dir = "";
@@ -83,7 +82,6 @@
my $exit_code=shift || 1;
print "Usage: create_package_descr [OPTIONS]\n";
print " [-d DATADIR1 [-d DATADIR2 [... ] ] ] (default cwd)\n";
-print " [-p PDB_DATA_DIR ]\n";
print " [-e EULA_DIR ]\n";
print " [-x EXTRA_PROV_FILE ]\n";
print " [-r EXTRA_REQUIRES_FILE]\n";
@@ -160,7 +158,7 @@
elsif ( $arg eq "-l" ) { push @LANGUAGES , shift @ARGV ; }
elsif (( $arg eq "-h" ) || ( $arg eq "--help" )) { shift @ARGV ; usage(0); }
elsif ( $arg eq "-o" ) { $output_dir = shift @ARGV ; }
- elsif ( $arg eq "-p" ) { $pdb_data_dir = shift @ARGV ; }
+ elsif ( $arg eq "-p" ) { $unused_data_dir = shift @ARGV ; }
elsif ( $arg eq "-e" ) { $eula_data_dir = shift @ARGV ; }
elsif ( $arg eq "-r" ) { $extra_requires = shift @ARGV ; }
elsif ( $arg eq "-x" ) { $extra_provides = shift @ARGV ; }
@@ -188,12 +186,6 @@
print "INFO:datadirs : ".join(",",@DATADIRS)."\n";
print "INFO:languages : ".join(",",@LANGUAGES)."\n";
print "INFO:output dir : $output_dir\n";
-if ( -d $pdb_data_dir ) {
- print "INFO:pdb data : $pdb_data_dir\n";
-} elsif ( $pdb_data_dir ) {
- print "$pdb_data_dir is not a directory: ignoring\n";
- $pdb_data_dir = "";
-}
if ( $extra_provides ) {
if ( -f $extra_provides ) {
@@ -451,89 +443,6 @@
my $found_in = $SEEN_PACKAGE{"$rpm_name $res{1001}[0]
$res{1002}[0]"};
WriteSEntry( $pkg_main, "Shr", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $found_in");
} else {
- if ( $pdb_data_dir ) {
- my $pac_rpm_name = $rpm_name;
- $num_pdb_records++;
- delete $INC{"$pdb_data_dir/$pac_rpm_name.pl"};
- if ( ! -f "$pdb_data_dir/$pac_rpm_name.pl" ) {
- $pac_rpm_name =~ s/-32bit$//;
- $pac_rpm_name =~ s/-64bit$//;
- $pac_rpm_name =~ s/-x86$//;
- $pac_rpm_name =~ s/-ia32$//;
- $pac_rpm_name =~ s/-lang$//;
- $pac_rpm_name =~ s/-debuginfo$//;
- $pac_rpm_name =~ s/-debugsource$//;
- $pac_rpm_name =~ s/-kmp-[^-]*$/-KMP/;
- }
- if ( -f "$pdb_data_dir/$pac_rpm_name.pl") {
- require "$pdb_data_dir/$pac_rpm_name.pl";
- } else {
- # no pdb data for this package, use rpm summary
- #warn "ERROR: no pdb data for $pac_rpm_name\n";
- $pacdata{$pac_rpm_name}{$default_lang}{'label'} =
"$res{1004}[0]";
- }
- if ( ! $pacdata{$pac_rpm_name}{$default_lang}{'label'} ) {
- warn "ERROR: no pdb data for $pac_rpm_name received\n";
- }
- if ( $pacdata{$pac_rpm_name}{$default_lang}{'label'} =~ /\n/ ) {
- warn "ERROR: newline in summary for package
$pac_rpm_name\n";
- $pacdata{$pac_rpm_name}{$default_lang}{'label'} =~ s/\n/ /g;
- }
- WriteMEntry( $pkg_main, "Aut",
@{$pacdata{$pac_rpm_name}{"authorname"}} );
- if ( $do_keywords eq "1" && $pacdata{$pac_rpm_name}{"keywor
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2013-01-29 10:46:36
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2012-12-14 09:18:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2013-01-29 10:46:38.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 25 01:23:46 CET 2013 - r...@suse.de
+
+- use "strict" for create_package_descr
+- add support for -e (eula_dir) parameter in create_package_descr
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.PkcXxv/_old 2013-01-29 10:46:39.0 +0100
+++ /var/tmp/diff_new_pack.PkcXxv/_new 2013-01-29 10:46:39.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2012-12-05
13:30:13.0 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2013-01-25
01:22:42.0 +0100
@@ -32,11 +32,11 @@
use File::stat;
use FileHandle;
-use strict 'refs';
+use strict;
use RPMQ;
use Digest::MD5 ();
-local
(@DATADIRS,@IGNOREDIRS,@LANGUAGES,%SEEN_PACKAGE,%IGNORE_PACKAGE,@SHA_CACHEDIR);
+my
(@DATADIRS,@IGNOREDIRS,@LANGUAGES,%SEEN_PACKAGE,%IGNORE_PACKAGE,@SHA_CACHEDIR);
my %lang_alias = ( "czech"=>"cs",
"english"=>"en",
"french"=>"fr",
@@ -64,12 +64,27 @@
my %used_fallbacks;
my $num_pdb_records = 0;
my $checksum_binary = "sha1sum";
+my $pdb_data_dir = "";
+my $eula_data_dir = "";
+my $ignore_file = "";
+my $ignore_dir = "";
+my $output_dir = "";
+my $extra_requires = "";
+my $extra_provides = "";
+my $extra_tags = "";
+my $with_links = "";
+
+my %xprovlist;
+my %xreqlist;
+my %xtaglist;
+my %pkg_lang;
sub usage {
my $exit_code=shift || 1;
print "Usage: create_package_descr [OPTIONS]\n";
print " [-d DATADIR1 [-d DATADIR2 [... ] ] ] (default cwd)\n";
print " [-p PDB_DATA_DIR ]\n";
+print " [-e EULA_DIR ]\n";
print " [-x EXTRA_PROV_FILE ]\n";
print " [-r EXTRA_REQUIRES_FILE]\n";
print " [-i IGNORE_DIR [ -i IGNORE_DIR [... ] ] ]\n";
@@ -125,7 +140,7 @@
push @SAVEARGS, $_;
}
-while ( $arg = shift ( @ARGV ) ) {
+while ( my $arg = shift ( @ARGV ) ) {
if ( $arg eq "-d" ) { push @DATADIRS , shift @ARGV ; }
elsif ( $arg eq "-B" ) { $src_requires = 1; }
elsif ( $arg eq "-V" ) { $add_vendor = 1; }
@@ -146,6 +161,7 @@
elsif (( $arg eq "-h" ) || ( $arg eq "--help" )) { shift @ARGV ; usage(0); }
elsif ( $arg eq "-o" ) { $output_dir = shift @ARGV ; }
elsif ( $arg eq "-p" ) { $pdb_data_dir = shift @ARGV ; }
+ elsif ( $arg eq "-e" ) { $eula_data_dir = shift @ARGV ; }
elsif ( $arg eq "-r" ) { $extra_requires = shift @ARGV ; }
elsif ( $arg eq "-x" ) { $extra_provides = shift @ARGV ; }
elsif ( $arg eq "-T" ) { $extra_tags = shift @ARGV ; }
@@ -216,7 +232,7 @@
if ( @IGNOREDIRS ) {
foreach $ignore_dir (@IGNOREDIRS) {
if ( -d "$ignore_dir" && opendir ( IGNDIR, "$ignore_dir") ) {
- while ( $ign = readdir( IGNDIR ) ) {
+ while ( my $ign = readdir( IGNDIR ) ) {
next if ( $ign =~ /^\./ );
$IGNORE_PACKAGE{$ign} = "yes";
}
@@ -228,7 +244,7 @@
if ( "$ignore_file" ) {
if ( -f "$ignore_file" && open ( IGNFILE, "$ignore_file" ) ) {
-while ( $ign = ) {
+while ( my $ign = ) {
chomp ( $ign );
$IGNORE_PACKAGE{$ign} = "yes";
}
@@ -241,23 +257,23 @@
print "WARNING: ignoring all source packages\n";
}
-$pkg_main = OpenFileWrite ( "$output_dir/packages" );
+my $pkg_main = OpenFileWrite ( "$output_dir/packages" );
WriteSEntry( $pkg_main, "Ver", "2.0" );
-foreach $lang (@LANGUAGES) {
+foreach my $lang (@LANGUAGES) {
$pkg_lang{$lang} = OpenFileWrite ( "$output_dir/packages.$lang_alias{$lang}"
);
WriteSEntry( $pkg_lang{$lang}, "Ver", "2.0" );
}
-$pkg_du = OpenFileWrite ( "$ou
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2012-12-14 09:18:37
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2012-09-23 08:04:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2012-12-14 09:18:41.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 5 13:27:11 CET 2012 - r...@suse.de
+
+- update create_md5sums to get the key files witout a pubring.gpg
+
+---
Other differences:
--
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2012-09-13
16:18:24.0 +0200
+++ new/inst-source-utils/usr/bin/create_sha1sums 2012-12-05
13:30:13.0 +0100
@@ -52,8 +52,11 @@
function signit(){
if [ "$(which sign 2>/dev/null)" != "" ]; then
sign $SIGN_OPTS -d $1
+ sign $SIGN_OPTS -p > $1.key
else
gpg -a -b $1
+ KEY_ID=`gpg -b < /dev/null | gpg --list-packets | sed -n -e
"/^:signature/s@.*keyid @@p"`
+ gpg --export --armor $KEY_ID > $1.key
fi
}
@@ -123,9 +126,11 @@
if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then
/usr/bin/create_sha1sum $CHECKSUM_O --quiet
"$SLIDESHOWDIR"
fi
- for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do
- signit "$sha1sumfile"
- done
+ if [ $SIGN = "yes" ]; then
+ for sha1sumfile in $(find $SLIDESHOWDIR -name
$CHECKSUM_F); do
+ signit "$sha1sumfile"
+ done
+ fi
fi
fi
@@ -150,32 +155,6 @@
test -f $CDS_PRIM/${file} || continue
signit $CDS_PRIM/${file}
done
-
- # GPG file handling starts here
- if [ -f $CDS_PRIM/pubring.gpg ]; then
- KEY_ID=`gpg --verify --no-default-keyring --keyring
$CDS_PRIM/pubring.gpg $CDS_PRIM/content.asc $CDS_PRIM/content 2>&1 | sed -ne
"s@.*key ID @@p" | tr [A-Z] [a-z]`
- KEY_FILE=`ls $CDS_PRIM/gpg-pubkey-$KEY_ID-* 2>/dev/null | tail -1`
- if [ -f "$KEY_FILE" ] ; then
- for file in media.1/products.key content.key; do
- test -f $CDS_PRIM/$file && rm $CDS_PRIM/$file
- cp -a $KEY_FILE $CDS_PRIM/$file
- done
- if [ x"$REPOFILE" != x"" ] ; then
- cp -a $KEY_FILE $CDS_PRIM/$REPOFILE.key
- fi
-if [ -n "$SLIDESHOWDIR" ]; then
-for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do
-cp -a $KEY_FILE ${sha1sumfile}.key
-# : check if this is needed
-create_directory.yast $(dirname "$sha1sumfile")
-done
-fi
- else
- echo "ERROR: Could not find public key file for
$CDS_PRIM/pubring.gpg in $CDS_PRIM/gpg-pubkey-*" >&2
- fi
- else
- echo "WARNING: CDS_PRIM/pubring.gpg not found" >&2
- fi
fi
# make sure everything is readable for all
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2012-09-23 08:04:44
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2012-02-29 14:07:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2012-09-23 08:04:45.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 13 16:15:54 CEST 2012 - r...@suse.de
+
+- add recent fixes
+
+---
Other differences:
--
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/compress_susetags
new/inst-source-utils/usr/bin/compress_susetags
--- old/inst-source-utils/usr/bin/compress_susetags 2011-10-16
21:55:30.0 +0200
+++ new/inst-source-utils/usr/bin/compress_susetags 2012-09-13
16:18:24.0 +0200
@@ -26,6 +26,7 @@
system (`rm -f "$tmpdir/fff" "$tmpdir/fff.gz"`);
for my $packfile (glob("$arg/packages*"),glob("$arg/*.pat")) {
+next if ( $packfile !~ /^[A-Z0-9\-\._]*$/i );
next unless ( -f "$packfile" || -l "$packfile" );
next if ( $packfile =~ /\.gz$/ );
if ( -l "$packfile" ) {
@@ -33,13 +34,15 @@
chomp ($l);
next if ( $packfile =~ /\.gz$/ );
$l .= ".gz" unless ( $l =~ /\.gz$/ );
- system (`rm -f $packfile ; ln -sf $l $packfile.gz`);
+ system ("rm", "-f", $packfile );
+system ("ln", "-s", "-f", $l, $packfile.'.gz');
next;
}
-system (`gzip -f -9 $rsyncable $packfile`);
+system ("gzip", "-f", "-9", $rsyncable, $packfile);
}
-system("rm -rf $tmpdir");
-system("rm -f $arg/patterns");
-system("cd $arg ; ls *.pat *.pat.gz > patterns 2>/dev/null");
+system("rm", "-r", "-f", $tmpdir);
+system("rm", "-f", "$arg/patterns");
+chdir($arg);
+system("ls *.pat *.pat.gz > patterns 2>/dev/null");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2011-10-16
21:55:30.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2012-09-13
16:18:24.0 +0200
@@ -553,15 +553,15 @@
print "INFO:now recoding to UTF-8: ";
foreach $file ("packages","packages.DU") {
print "$file ";
-system ( "recode ISO-8859-1...UTF-8 \"$output_dir/$file\"" );
+system ( "recode", "ISO-8859-1...UTF-8", "$output_dir/$file" );
}
foreach $lang (@LANGUAGES) {
$file = "packages.$lang_alias{$lang}";
print "$file ";
if ( $lang eq "czech" || $lang eq "hungarian" ) {
- system ( "recode ISO-8859-2...UTF-8 \"$output_dir/$file\"" );
+ system ( "recode", "ISO-8859-2...UTF-8", "$output_dir/$file" );
} else {
- system ( "recode ISO-8859-1...UTF-8 \"$output_dir/$file\"" );
+ system ( "recode", "ISO-8859-1...UTF-8", "$output_dir/$file" );
}
}
print "\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/rezip_repo_rsyncable
new/inst-source-utils/usr/bin/rezip_repo_rsyncable
--- old/inst-source-utils/usr/bin/rezip_repo_rsyncable 2011-10-16
21:55:30.0 +0200
+++ new/inst-source-utils/usr/bin/rezip_repo_rsyncable 2012-09-13
16:18:24.0 +0200
@@ -51,38 +51,38 @@
$arg = "$pwd/$arg";
}
-system (`touch "$tmpdir/fff"`);
+system ("touch", "$tmpdir/fff");
system (`gzip --rsyncable "$tmpdir/fff" >/dev/null 2>/dev/null`);
if ( -f "$tmpdir/fff.gz" ) {
$rsyncable = "--rsyncable";
}
-system (`rm -f "$tmpdir/fff" "$tmpdir/fff.gz"`);
+system ("rm", "-f", "$tmpdir/fff", "$tmpdir/fff.gz");
if ( $rsyncable ) {
my @GZIPPED = glob("$arg/*.gz");
for (@GZIPPED) {
-system (`gunzip -f $_`);
+system ("gunzip", "-f", $_);
$_ =~ s/.gz$//;
-system (`gzip -9 $rsyncable $_`);
+system ("gzip", "-9", $rsyncable, $_);
}
my $has_sign = "";
$has_sign = "1" if ( -f "$arg/repomd.xml.asc" );
- system (`cp -a "$arg/repomd.xml.key" "$tmpdir"`) if ( -f
"$arg/repomd.xml.key" );
+ system ("cp", "-a", "$arg/repomd.xml.key", $tmpdir) if ( -f
"$arg/repomd.xml.key" );
if ( -f "$arg/repomd.xml" ) {
unlink "$arg/repomd.xml";
GenerateRepomdXml($arg);
}
if ( $has_sign ) {
unlink "$arg/repomd.xml.asc";
-system (`sign -d "$arg/repomd.xml"`);
+system ("sign", "-d", "$ar
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2012-02-29 14:07:52 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils", Maintainer is "lr...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2012-02-02 17:57:44.0 +0100 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2012-02-29 14:07:53.0 +0100 @@ -1,0 +2,6 @@ +Wed Feb 29 10:55:46 CET 2012 - r...@suse.de + +- mk_changelog: calculate time (two years ago) differently to + avoid error on leap days. + +--- Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.leJfed/_old 2012-02-29 14:07:54.0 +0100 +++ /var/tmp/diff_new_pack.leJfed/_new 2012-02-29 14:07:54.0 +0100 @@ -24,7 +24,8 @@ Release:0 Url:http://en.opensuse.org/Inst-source-utils BuildArch: noarch -Requires: gpg2 recode +Requires: gpg2 +Requires: recode Obsoletes: autoyast2-utils <= 2.14.10 Provides: autoyast2-utils = 2.14.10 Recommends: create-repo-utils ++ inst-source-utils.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/mk_changelog new/inst-source-utils/usr/bin/mk_changelog --- old/inst-source-utils/usr/bin/mk_changelog 2011-10-16 21:55:30.0 +0200 +++ new/inst-source-utils/usr/bin/mk_changelog 2012-02-29 10:55:32.0 +0100 @@ -35,7 +35,8 @@ use RPMQ; # current date minus two years -my $min_date = timelocal(0,0,0,localtime->mday,localtime->mon , localtime->year+1898 ); +#my $min_date = timelocal(0,0,0,localtime->mday,localtime->mon , localtime->year+1898 ); +my $min_date = localtime(time - 2*365*24*3600); my %month_to_num = (Jan=>0,Feb=>1,Mar=>2,Apr=>3,May=>4,Jun=>5,Jul=>6,Aug=>7,Sep=>8,Oct=>9,Nov=>10,Dec=>11); my $delimiter = "--"; my $actual = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2012-02-02 17:57:40
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2011-10-16 22:46:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2012-02-02 17:57:44.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 2 11:10:39 UTC 2012 - adr...@suse.de
+
+- write SHA256 sums into CHECKSUMS file
+
+---
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.hESpGK/_old 2012-02-02 17:57:45.0 +0100
+++ /var/tmp/diff_new_pack.hESpGK/_new 2012-02-02 17:57:45.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,13 @@
#
-
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2011.10.16
-Release:1
-Url:http://en.opensuse.org/Inst-source-utils
License:GPL-2.0+
Group: System/YaST
+Version:2011.10.16
+Release:0
+Url:http://en.opensuse.org/Inst-source-utils
BuildArch: noarch
Requires: gpg2 recode
Obsoletes: autoyast2-utils <= 2.14.10
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sum
new/inst-source-utils/usr/bin/create_sha1sum
--- old/inst-source-utils/usr/bin/create_sha1sum2011-10-16
21:55:30.0 +0200
+++ new/inst-source-utils/usr/bin/create_sha1sum2012-02-02
12:10:28.0 +0100
@@ -57,7 +57,7 @@
-h|--help) usage 0 ;;
-m|--meta) CREATE_META=1 ; shift ;;
-q|--quiet) QUIET="yes" ; shift ;;
- -2) CHECKSUM="sha256sum" ; CHECKSUM_F="SHA256SUMS" ; shift ;;
+ -2) CHECKSUM="sha256sum" ; CHECKSUM_F="CHECKSUMS" ; shift ;;
*) break ;;
esac
done
@@ -100,7 +100,7 @@
test $IS_SKIP = true && continue
}
case "$FILE" in
- (*.swp|SHA1SUMS*|SHA256SUMS*|MD5SUMS*)
+ (*.swp|SHA1SUMS*|CHECKSUMS*|MD5SUMS*)
continue
;;
(*)
@@ -109,7 +109,7 @@
esac
done
if [ $NFILES -eq 0 ]; then
-rm -f SHA1SUMS* SHA256SUMS*
+rm -f SHA1SUMS* CHECKSUMS*
else
echo -n > $TMPFILE
for FILE in "${FILES[@]}"; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2011-10-16
21:55:30.0 +0200
+++ new/inst-source-utils/usr/bin/create_sha1sums 2012-02-02
12:10:05.0 +0100
@@ -40,7 +40,7 @@
function usage() {
echo "Usage: `basename $0` [OPTIONS] "
echo " -n : don't re-sign the generated files"
- echo " -m : include SHA1SUMS files (or SHA256SUMS files for
sha256)"
+ echo " -m : include SHA1SUMS files (or CHECKSUMS files for
others)"
echo " -2 : use sha256 instead of sha1"
echo " -x : add sha1sums for extra files"
echo
@@ -71,7 +71,7 @@
;;
2) CHECKSUM="sha256sum"
CHECKSUM_T="SHA256"
- CHECKSUM_F="SHA256SUMS"
+ CHECKSUM_F="CHECKSUMS"
CHECKSUM_O="-2"
;;
esac
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2011-12-06 18:19:31 Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) Package is "inst-source-utils", Maintainer is "lr...@suse.com" Changes: Other differences: -- ++ inst-source-utils.spec ++ --- /var/tmp/diff_new_pack.7OI0QT/_old 2011-12-06 18:33:54.0 +0100 +++ /var/tmp/diff_new_pack.7OI0QT/_new 2011-12-06 18:33:54.0 +0100 @@ -22,7 +22,7 @@ Version:2011.10.16 Release:1 Url:http://en.opensuse.org/Inst-source-utils -License:GPLv2+ +License:GPL-2.0+ Group: System/YaST BuildArch: noarch Requires: gpg2 recode -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Sun Oct 16 22:45:00 CEST 2011.
--- openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2011-10-16 12:50:35.0 +0200
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-10-16 21:57:34.0 +0200
@@ -1,0 +2,5 @@
+Sun Oct 16 19:55:51 UTC 2011 - l...@linux-schulserver.de
+
+- to too much quoting in create_package_descr
+
+---
calling whatdependson for head-i586
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.4aqoHj/_old 2011-10-16 22:44:51.0 +0200
+++ /var/tmp/diff_new_pack.4aqoHj/_new 2011-10-16 22:44:51.0 +0200
@@ -19,12 +19,11 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2011.10.14
+Version:2011.10.16
Release:1
Url:http://en.opensuse.org/Inst-source-utils
License:GPLv2+
Group: System/YaST
-AutoReqProv:on
BuildArch: noarch
Requires: gpg2 recode
Obsoletes: autoyast2-utils <= 2.14.10
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2011-10-14
19:04:26.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2011-10-16
21:55:30.0 +0200
@@ -242,7 +242,7 @@
}
$pkg_main = OpenFileWrite ( "$output_dir/packages" );
-WriteSEntry( "$pkg_main", "Ver", "2.0" );
+WriteSEntry( $pkg_main, "Ver", "2.0" );
foreach $lang (@LANGUAGES) {
$pkg_lang{$lang} = OpenFileWrite ( "$output_dir/packages.$lang_alias{$lang}"
);
WriteSEntry( $pkg_lang{$lang}, "Ver", "2.0" );
@@ -250,8 +250,8 @@
$pkg_du = OpenFileWrite ( "$output_dir/packages.DU" );
$pkg_fl = OpenFileWrite ( "$output_dir/packages.FL" ) if $do_file_list;
-WriteSEntry( "$pkg_du", "Ver", "2.0" );
-WriteSEntry( "$pkg_fl", "Ver", "2.0" ) if $do_file_list;
+WriteSEntry( $pkg_du, "Ver", "2.0" );
+WriteSEntry( $pkg_fl, "Ver", "2.0" ) if $do_file_list;
$media_number = 0;
$allcounter = 0;
@@ -392,44 +392,44 @@
}
}
-WriteSeparator( "$pkg_main" );
-WriteComment( "$pkg_main", @SAVEARGS ) unless $wrote_comment;
-WriteSeparator( "$pkg_main" ) unless $wrote_comment;
+WriteSeparator( $pkg_main );
+WriteComment( $pkg_main, @SAVEARGS ) unless $wrote_comment;
+WriteSeparator( $pkg_main ) unless $wrote_comment;
$wrote_comment = 1;
-WriteSEntry( "$pkg_main", "Pkg", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $file_arch");
+WriteSEntry( $pkg_main, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0]
$file_arch");
if ($do_sha256 eq "1") {
- WriteSEntry( "$pkg_main", "Cks", "SHA256 $checksum") if ($checksum);
+ WriteSEntry( $pkg_main, "Cks", "SHA256 $checksum") if ($checksum);
} else {
- WriteSEntry( "$pkg_main", "Cks", "SHA1 $checksum") if ($checksum);
+ WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum);
}
if ( $res{1044}[0] ) {
# has src, so it's a binary package
- WriteMEntry( "$pkg_main", "Req", @{$res{1049}} );
- WriteMEntry( "$pkg_main", "Prq", @prereq );
- WriteMEntry( "$pkg_main", "Prv", @{$res{1047}} );
- WriteMEntry( "$pkg_main", "Con", @{$res{1054}} );
- WriteMEntry( "$pkg_main", "Obs", @{$res{1090}} );
- WriteMEntry( "$pkg_main", "Rec", filter_strong(\%res, 1156, 1158));
- WriteMEntry( "$pkg_main", "Sug", filter_weak(\%res, 1156, 1158));
- WriteMEntry( "$pkg_main", "Sup", filter_strong(\%res, 1159, 1161));
- WriteMEntry( "$pkg_main", "Enh", filter_weak(\%res, 1159, 1161));
- WriteSEntry( "$pkg_main", "Grp", $res{1016}[0] );
- WriteSEntry( "$pkg_main", "Lic", $res{1014}[0] );
- WriteSEntry( "$pkg_main", "Vnd", $res{1011}[0] ) if $add_vendor;
- WriteSEntry( "$pkg_main", "Src", $srcrpm );
- WriteSEntry( "$pkg_main", "Tim", $res{1006}[0] );
-WriteSEntry( "$pkg_main", "Loc", "$media_number $filename");
+ WriteMEntry( $pkg_main, "Req", @{$res{1049}} );
+ WriteMEntry( $pkg_main, "Prq", @prereq );
+ WriteMEntry( $pkg_main, "Prv", @{$res{1047}} );
+ WriteMEntry( $pkg_main, "Con", @{$res{1054}} );
+ WriteMEntry( $pkg_main, "Obs", @{$res{1090}} );
+ WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161));
+ WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161));
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Sun Oct 16 12:50:27 CEST 2011.
--- openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2011-09-23 02:03:34.0 +0200
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-10-14 19:07:04.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct 14 17:04:57 UTC 2011 - lr...@suse.de
+
+- handle spaces in path in create_package_descr (bnc#604730)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.lOk7pU/_old 2011-10-16 12:50:24.0 +0200
+++ /var/tmp/diff_new_pack.lOk7pU/_new 2011-10-16 12:50:24.0 +0200
@@ -19,7 +19,7 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2011.5.25
+Version:2011.10.14
Release:1
Url:http://en.opensuse.org/Inst-source-utils
License:GPLv2+
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2011-05-25
10:26:31.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2011-10-14
19:04:26.0 +0200
@@ -208,14 +208,14 @@
}
}
-unless ( -d $output_dir ) {
+unless ( -d "$output_dir" ) {
print "INFO:creating output directory $output_dir\n";
- mkdir_p($output_dir);
+ mkdir_p("$output_dir");
}
if ( @IGNOREDIRS ) {
foreach $ignore_dir (@IGNOREDIRS) {
-if ( -d $ignore_dir && opendir ( IGNDIR, "$ignore_dir") ) {
+if ( -d "$ignore_dir" && opendir ( IGNDIR, "$ignore_dir") ) {
while ( $ign = readdir( IGNDIR ) ) {
next if ( $ign =~ /^\./ );
$IGNORE_PACKAGE{$ign} = "yes";
@@ -226,8 +226,8 @@
}
}
-if ( $ignore_file ) {
- if ( -f $ignore_file && open ( IGNFILE, "$ignore_file" ) ) {
+if ( "$ignore_file" ) {
+ if ( -f "$ignore_file" && open ( IGNFILE, "$ignore_file" ) ) {
while ( $ign = ) {
chomp ( $ign );
$IGNORE_PACKAGE{$ign} = "yes";
@@ -242,7 +242,7 @@
}
$pkg_main = OpenFileWrite ( "$output_dir/packages" );
-WriteSEntry( $pkg_main, "Ver", "2.0" );
+WriteSEntry( "$pkg_main", "Ver", "2.0" );
foreach $lang (@LANGUAGES) {
$pkg_lang{$lang} = OpenFileWrite ( "$output_dir/packages.$lang_alias{$lang}"
);
WriteSEntry( $pkg_lang{$lang}, "Ver", "2.0" );
@@ -250,8 +250,8 @@
$pkg_du = OpenFileWrite ( "$output_dir/packages.DU" );
$pkg_fl = OpenFileWrite ( "$output_dir/packages.FL" ) if $do_file_list;
-WriteSEntry( $pkg_du, "Ver", "2.0" );
-WriteSEntry( $pkg_fl, "Ver", "2.0" ) if $do_file_list;
+WriteSEntry( "$pkg_du", "Ver", "2.0" );
+WriteSEntry( "$pkg_fl", "Ver", "2.0" ) if $do_file_list;
$media_number = 0;
$allcounter = 0;
@@ -259,7 +259,7 @@
foreach $datapath (@DATADIRS) {
$media_number++;
- open ( FIND, "find $datapath -maxdepth 2 $with_links -name \"*.[rs]pm\"
-print | sort |" );
+ open ( FIND, "find '$datapath' -maxdepth 2 $with_links -name \"*.[rs]pm\"
-print | sort |" );
my @pkg_arr = ();
my @src_arr = ();
while ( ) {
@@ -275,22 +275,22 @@
foreach my $package (@pkg_arr,@src_arr) {
$allcounter++;
print "INFO:CD$media_number - Pkg: $allcounter\r" if ( -t STDOUT );
- $filespec = $package;
+ $filespec = "$package";
chomp ( $filespec );
$filespec =~ /\/([^\/]*)$/;
$filename = $1;
$filesize = stat($filespec)->size;
# name, version, release, arch, obsolete, requires, provides,
# conflicts, copyright, group, buildtime, size, sourcerpm
- my %res = RPMQ::rpmq_many($package, 1000, 1001, 1002, 1022,
- 1090, 1114, 1115,
- 1047, 1112, 1113,
- 1049, 1048, 1050,
- 1054, 1053, 1055,
- 1156, 1157, 1158,
- 1159, 1160, 1161,
- 1027, 1116, 1117, 1118, 1030, 1028,
1095, 1096,
- 1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124);
+ my %res = RPMQ::rpmq_many("$package", 1000, 1001, 1002, 1022,
+ 1090, 1114, 1115,
+ 1047, 1112, 1113,
+ 1049, 1048, 1050,
+ 1054, 1053, 1055,
+ 1156, 1157, 1158,
+ 1159, 1160, 1161,
+
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Wed May 25 11:23:59 CEST 2011.
--- inst-source-utils/inst-source-utils.changes 2011-05-05 12:26:20.0
+0200
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-05-25 10:19:00.0 +0200
@@ -1,0 +2,5 @@
+Wed May 25 08:18:37 UTC 2011 - adr...@suse.de
+
+- fix header generation for SHA256 mode (no SHA1 tag)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.eE8oPV/_old 2011-05-25 11:23:41.0 +0200
+++ /var/tmp/diff_new_pack.eE8oPV/_new 2011-05-25 11:23:41.0 +0200
@@ -19,7 +19,7 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2011.5.5
+Version:2011.5.25
Release:1
Url:http://en.opensuse.org/Inst-source-utils
License:GPLv2+
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2011-05-05
12:25:51.0 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2011-05-25
10:26:31.0 +0200
@@ -397,7 +397,11 @@
WriteSeparator( $pkg_main ) unless $wrote_comment;
$wrote_comment = 1;
WriteSEntry( $pkg_main, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0]
$file_arch");
-WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum);
+if ($do_sha256 eq "1") {
+ WriteSEntry( $pkg_main, "Cks", "SHA256 $checksum") if ($checksum);
+} else {
+ WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum);
+}
if ( $res{1044}[0] ) {
# has src, so it's a binary package
WriteMEntry( $pkg_main, "Req", @{$res{1049}} );
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Mon May 9 10:43:02 CEST 2011.
--- inst-source-utils/inst-source-utils.changes 2011-04-28 18:25:52.0
+0200
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-05-05 12:26:20.0 +0200
@@ -1,0 +2,6 @@
+Thu May 5 12:20:17 CEST 2011 - r...@suse.de
+
+- create_sha1sum and create_sha1sums now understand option "-2"
+ to use/create sha256sum(s)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.8hRem6/_old 2011-05-09 10:41:48.0 +0200
+++ /var/tmp/diff_new_pack.8hRem6/_new 2011-05-09 10:41:48.0 +0200
@@ -19,7 +19,7 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2011.4.28
+Version:2011.5.5
Release:1
Url:http://en.opensuse.org/Inst-source-utils
License:GPLv2+
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sum
new/inst-source-utils/usr/bin/create_sha1sum
--- old/inst-source-utils/usr/bin/create_sha1sum2010-03-17
14:28:14.0 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sum2011-05-05
12:25:51.0 +0200
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301,
# USA.
#
-# $Id: create_sha1sum 110 2009-03-06 15:30:14Z lrupp $
+# $Id: create_sha1sum 421 2011-05-05 10:25:22Z ro $
#
function usage (){
@@ -41,13 +41,6 @@
fi
}
-if [ -z "$1" ]; then
- usage 1;
-fi
-if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]] ; then
- usage 0;
-fi
-
unset LANGUAGE
unset LANG
export LC_ALL=POSIX
@@ -55,14 +48,21 @@
CREATE_META=
QUIET="no"
+CHECKSUM="sha1sum"
+CHECKSUM_F="SHA1SUMS"
-if test "x$1" = "x--meta"; then
-CREATE_META=1
-shift
-fi
-if test "x$1" = "x--quiet"; then
- QUIET="yes"
- shift
+while test -n "$1" ; do
+case $1 in
+ --) shift ; break ;;
+-h|--help) usage 0 ;;
+ -m|--meta) CREATE_META=1 ; shift ;;
+ -q|--quiet) QUIET="yes" ; shift ;;
+ -2) CHECKSUM="sha256sum" ; CHECKSUM_F="SHA256SUMS" ; shift ;;
+ *) break ;;
+esac
+done
+if [ -z "$1" ]; then
+ usage 1;
fi
TMPFILE=$(mktemp /tmp/.create_sha1sums.XX)
@@ -100,7 +100,7 @@
test $IS_SKIP = true && continue
}
case "$FILE" in
- (*.swp|SHA1SUMS*|MD5SUMS*)
+ (*.swp|SHA1SUMS*|SHA256SUMS*|MD5SUMS*)
continue
;;
(*)
@@ -109,25 +109,25 @@
esac
done
if [ $NFILES -eq 0 ]; then
-rm -f SHA1SUMS*
+rm -f SHA1SUMS* SHA256SUMS*
else
echo -n > $TMPFILE
for FILE in "${FILES[@]}"; do
- sha1sum "$FILE" >> $TMPFILE
+ $CHECKSUM "$FILE" >> $TMPFILE
done
-test -e SHA1SUMS || touch SHA1SUMS
- cmp -s $TMPFILE SHA1SUMS || {
-mv $TMPFILE SHA1SUMS
- chmod 644 SHA1SUMS
-output "INFO: created SHA1SUMS in $DIR"
+test -e $CHECKSUM_F || touch $CHECKSUM_F
+ cmp -s $TMPFILE $CHECKSUM_F || {
+mv $TMPFILE $CHECKSUM_F
+ chmod 644 $CHECKSUM_F
+output "INFO: created $CHECKSUM_F in $DIR"
}
if test -n "$CREATE_META"; then
-test -e SHA1SUMS.meta || touch SHA1SUMS.meta
-sha1sum SHA1SUMS > $TMPFILE
-cmp -s $TMPFILE SHA1SUMS.meta || {
- mv $TMPFILE SHA1SUMS.meta
-chmod 644 SHA1SUMS.meta
-output "INFO: created SHA1SUMS.meta in $DIR"
+test -e $CHECKSUM_F.meta || touch $CHECKSUM_F.meta
+$CHECKSUM $CHECKSUM_F > $TMPFILE
+cmp -s $TMPFILE $CHECKSUM_F.meta || {
+ mv $TMPFILE $CHECKSUM_F.meta
+chmod 644 $CHECKSUM_F.meta
+output "INFO: created $CHECKSUM_F.meta in $DIR"
}
fi
rm -f $TMPFILE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2010-03-17
14:28:14.0 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums 2011-05-05
12:25:51.0 +0200
@@ -19,13 +19,19 @@
# Boston, MA 02110-1301,
# USA.
#
-# $Id: create_sha1sums,v 1.8 2009/10/12 21:13:11 lrupp Exp $
+# $Id:
commit inst-source-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Mon May 2 14:28:36 CEST 2011.
--- inst-source-utils/inst-source-utils.changes 2010-03-17 11:55:48.0
+0100
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-04-28 18:25:52.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 28 18:25:28 CEST 2011 - r...@suse.de
+
+- add option -D to use sha256 checksums in create_package_descr
+
+---
calling whatdependson for head-i586
Other differences:
--
++ inst-source-utils.spec ++
--- /var/tmp/diff_new_pack.TLwZPV/_old 2011-05-02 14:28:03.0 +0200
+++ /var/tmp/diff_new_pack.TLwZPV/_new 2011-05-02 14:28:03.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package inst-source-utils (Version 2010.3.17)
+# spec file for package inst-source-utils
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -19,7 +19,7 @@
Name: inst-source-utils
Summary:Utilities for creating customized installation sources
-Version:2010.3.17
+Version:2011.4.28
Release:1
Url:http://en.opensuse.org/Inst-source-utils
License:GPLv2+
++ inst-source-utils.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2010-03-17
14:28:14.0 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2011-04-28
18:24:03.0 +0200
@@ -52,6 +52,7 @@
my $prefer_yastdescr = "0";
my $add_licenses = "0";
my $do_checksums = "0";
+my $do_sha256 = "0";
my $do_keywords = "0";
my $have_sha_cache = 0;
my $do_file_list = 0;
@@ -62,6 +63,7 @@
my $allow_shr = 1;
my %used_fallbacks;
my $num_pdb_records = 0;
+my $checksum_binary = "sha1sum";
sub usage {
my $exit_code=shift || 1;
@@ -83,6 +85,7 @@
print " [-P ] (prefer_yastdescr)\n";
print " [-L ] (ignore_symlinks)\n";
print " [-C ] (do_checksums)\n";
+print " [-D ] (do_sha256_checksums)\n";
print " [-K ] (do_keywords)\n";
print " [-F ] (do_file_list)\n";
print " [-B ] (add requires for src
packages)\n\n";
@@ -127,6 +130,7 @@
elsif ( $arg eq "-B" ) { $src_requires = 1; }
elsif ( $arg eq "-V" ) { $add_vendor = 1; }
elsif ( $arg eq "-C" ) { $do_checksums = "1"; }
+ elsif ( $arg eq "-D" ) { $do_checksums = "1"; $do_sha256 = "1";
$checksum_binary = "sha256sum"; }
elsif ( $arg eq "-F" ) { $do_file_list = 1; }
elsif ( $arg eq "-I" ) { $ignore_file = shift @ARGV ; }
elsif ( $arg eq "-K" ) { $do_keywords = "1"; }
@@ -332,10 +336,15 @@
#print "INFO: re_using checksum for $package
($checksum)\n";
}
}
+ if ($do_sha256 eq "1") {
+ $checksum = "" unless length($checksum) == 64;
+ } else {
+ $checksum = "" unless length($checksum) == 40;
+ }
}
if ( ! $checksum ) {
if ( $res{1044}[0] || $ignore_sources eq "0") {
- ($checksum,$dummy) = split('\s+',`sha1sum $package`);
+ ($checksum,$dummy) = split('\s+',`$checksum_binary $package`);
if ( $have_sha_cache eq "1" ) {
open ( CSC, "> $SHA_CACHEDIR[0]/$rpm_name-$hash" );
print CSC $checksum;
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
