Hello community,
here is the log from the commit of package yast2-add-on-creator
checked in at Thu Aug 2 22:08:34 CEST 2007.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2007-06-14 14:23:08.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-08-02 16:58:53.100152000 +0200
@@ -1,0 +2,19 @@
+Thu Aug 2 14:42:45 CEST 2007 - jsuchome@suse.cz
+
+- tag for suggested packages in pattern is Psg, not Prs
+- licenses saved in /media.1/license directory and not compressed,
+ license.txt duplicated as EULA.txt (F302018)
+- added button for importing package license text
+- 2.15.14
+
+-------------------------------------------------------------------
+Tue Jul 31 11:37:23 CEST 2007 - jsuchome@suse.cz
+
+- offered SLE10SP1 products as a base for new AddOn
+
+-------------------------------------------------------------------
+Thu Jun 14 14:15:55 CEST 2007 - jsuchome@suse.cz
+
+- enable resigning of the packages (#287447)
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-creator-2.15.13.tar.bz2
New:
----
yast2-add-on-creator-2.15.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.F14273/_old 2007-08-02 22:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.F14273/_new 2007-08-02 22:07:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.15.13)
+# spec file for package yast2-add-on-creator (Version 2.15.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-add-on-creator
-Version: 2.15.13
+Version: 2.15.14
Release: 1
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.15.13.tar.bz2
+Source0: yast2-add-on-creator-2.15.14.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -33,7 +33,7 @@
Jiř� Suchomel
%prep
-%setup -n yast2-add-on-creator-2.15.13
+%setup -n yast2-add-on-creator-2.15.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,7 +69,16 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
%changelog
+* Thu Aug 02 2007 - jsuchome@suse.cz
+- tag for suggested packages in pattern is Psg, not Prs
+- licenses saved in /media.1/license directory and not compressed,
+ license.txt duplicated as EULA.txt (F302018)
+- added button for importing package license text
+- 2.15.14
+* Tue Jul 31 2007 - jsuchome@suse.cz
+- offered SLE10SP1 products as a base for new AddOn
* Thu Jun 14 2007 - jsuchome@suse.cz
+- enable resigning of the packages (#287447)
- checkbox for marking pattern as required (#224342)
- 2.15.13
* Fri Jun 08 2007 - jsuchome@suse.cz
++++++ yast2-add-on-creator-2.15.13.tar.bz2 -> yast2-add-on-creator-2.15.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.13/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.14/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.15.13/src/AddOnCreator.ycp 2007-06-14 12:49:43.000000000 +0200
+++ new/yast2-add-on-creator-2.15.14/src/AddOnCreator.ycp 2007-08-02 15:58:03.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: AddOnCreator settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: AddOnCreator.ycp 38336 2007-06-07 11:19:37Z jsuchome $
+ * $Id: AddOnCreator.ycp 39816 2007-07-30 19:20:09Z jsuchome $
*
* Representation of the configuration of add-on-creator.
* Input and output routines.
@@ -340,7 +340,7 @@
"type" : "package-list",
"defval" : [],
],
- "Prs" : $[
+ "Psg" : $[
// label for 'Prs' pattern key
"label" : _("Suggested packages"),
// help text for 'Prs' pattern key
@@ -485,6 +485,32 @@
],
];
+// script used for signing rpm's
+string expect_script =
+"#!/usr/bin/expect --
+exp_internal 0
+
+set stat 0
+foreach rpm $argv {
+ spawn -noecho rpm --delsign $rpm
+ expect {
+ eof {}
+ }
+ spawn -noecho rpm --define \"_signature gpg\" --define \"_gpg_name %1\" --define \"_gpgbin /usr/bin/gpg\" --resign $rpm
+ expect \"pass phrase:\" {send \"%2\r\"}
+ expect {
+ \"is good.\" {send \"\n\"}
+ eof {}
+ }
+ wait
+ spawn -noecho rpm --define \"_signature gpg\" --define \"_gpg_name %1\" --define \"_gpgbin /usr/bin/gpg\" --checksig $rpm
+ expect {
+ -re \": .*(gpg|pgp).*OK\" {continue;}
+ eof {set stat 1;}
+ }
+}
+exit $stat";
+
// just key:value mapping
global map content_map = $[];
@@ -596,11 +622,14 @@
global map package2filename = $[];
// mapping of source package name to full file name
-global map srcpackage2filename = $[];
+global map srcpackage2filename = $[];
// if we want only to sign existing product (and possibly create iso of it)
global boolean only_sign_product = false;
+// also sign all rpm's (see bug #287447)
+global boolean resign_packages = false;
+
/**
* Data was modified?
*/
@@ -869,12 +898,30 @@
// read the license files
string license_path = dir_path + "/media.1/license.zip";
+ out = $[];
if (FileUtils::Exists (license_path))
{
SCR::Execute (.target.bash_output,
sformat ("/usr/bin/unzip -o %1 -d %2", license_path, tmpdir));
- map out = (map) SCR::Execute (.target.bash_output,
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("ls -A1 %1/license*.txt 2>/dev/null", tmpdir));
+ }
+ else if (FileUtils::IsDirectory (dir_path + "/media.1/license") == true)
+ {
+ license_path = dir_path + "/media.1/license";
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("ls -A1 %1/media.1/license/license*.txt 2>/dev/null",
+ dir_path));
+ }
+ else if (FileUtils::Exists (dir_path + "/EULA.txt"))
+ {
+ SCR::Execute (.target.bash,
+ sformat ("/bin/cp %1/EULA.txt %2/license.txt", dir_path, tmpdir));
+ out = (map) SCR::Execute (.target.bash_output,
sformat ("ls -A1 %1/license*.txt 2>/dev/null", tmpdir));
+ }
+ if (out != $[])
+ {
foreach (string f, splitstring(out["stdout"]:"", "\n"), {
if (f == "") return;
string name = substring (f, findlastof (f, "/") + 1);
@@ -1348,11 +1395,13 @@
// write license.txt files in media.1 dir
global boolean WriteLicensesFiles (string media_path, map files){
- if (!Package::Install ("zip") || !FileUtils::Exists (media_path))
+ if (!FileUtils::Exists (media_path))
return false;
boolean ret = true;
string cmd = "";
+ if (size (files) > 0)
+ SCR::Execute (.target.mkdir, media_path +"/license");
foreach (string file, string cont, files, {
if (cont != "")
{
@@ -1360,14 +1409,12 @@
if (pos == nil || substring (file, pos) != ".txt")
file = file + ".txt";
cmd = cmd + " " + file;
- ret = ret && SCR::Write(.target.string, media_path +"/"+ file,cont);
+ ret = ret &&
+ SCR::Write (.target.string, media_path +"/license/"+ file,cont);
+ if (file == "license.txt")
+ SCR::Write (.target.string, base_output_path+"/EULA.txt", cont);
}
});
- if (ret && cmd != "")
- {
- cmd = sformat ("cd %1; zip license.zip -m%2", media_path, cmd);
- ret = SCR::Execute (.target.bash, cmd) == 0;
- }
return ret;
}
@@ -1436,11 +1483,9 @@
string dir = in_path + "/" + arch;
if (FileUtils::Exists (dir))
{
- string target = full_data_path + "/" + arch;
- SCR::Execute (.target.mkdir, target);
- y2milestone ("copying from %1 to %2...", dir, target);
+ y2milestone ("copying from %1 to %2...", dir, full_data_path);
SCR::Execute (.target.bash_output,
- sformat ("/bin/cp -r %1/*.rpm '%2/'", dir, target));
+ sformat ("/bin/cp -r %1 '%2/'", dir, full_data_path));
}
});
}
@@ -1452,6 +1497,10 @@
if (arch != "ZZZ_imported" && arch != "ZZZ_required" &&
FileUtils::Exists (out_dir))
{
+ // arch_directories will be needed later for CreateMD5SUMS and
+ // resign_packages
+ arch_directories = (list<string>)
+ union (arch_directories, [arch]);
if (size (package2filename) > 0 && arch != "src")
{
foreach (string p, (list<string>) pa, {
@@ -1672,6 +1721,25 @@
SCR::Execute (.target.bash, command, $["LANG" : "C"]);
});
+ // sign the packages
+ if (resign_packages)
+ {
+ string expect = tmpdir + "/sign.ex";
+ SCR::Write (.target.string, expect,
+ sformat (expect_script, key, passphrase));
+ list<string> dirs = maplist (string arch_dir, arch_directories, {
+ return full_data_path + "/" + arch_dir;
+ });
+ foreach (string full_path, dirs, {
+ if (dir_has_files (full_path))
+ {
+ string cmd = sformat ("LANG=C expect %1 %2/*.rpm", expect, full_path);
+ out = (map) SCR::Execute (.target.bash_output, cmd);
+ }
+ });
+ SCR::Execute (.target.bash, sformat ("rm %1", expect));
+ }
+
// sign the content file
SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path));
out = (map) SCR::Execute (.target.bash_output, sformat("
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.13/src/complex.ycp new/yast2-add-on-creator-2.15.14/src/complex.ycp
--- old/yast2-add-on-creator-2.15.13/src/complex.ycp 2007-06-08 15:45:34.000000000 +0200
+++ new/yast2-add-on-creator-2.15.14/src/complex.ycp 2007-08-02 16:17:53.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: complex.ycp 38364 2007-06-08 13:45:34Z jsuchome $
+ * $Id: complex.ycp 39831 2007-07-31 10:34:20Z jsuchome $
*/
{
@@ -213,10 +213,22 @@
// radio button label
_("SUSE Linux &Enterprise Server 10"),
requires == "sles-release-10")),
+ `Left (`RadioButton(`id(`sles10sp1), `opt (`notify),
+ // radio button label
+ _("SUSE &Linux Enterprise Server 10 SP1"),
+ requires == "product:SUSE_SLES = 10.1")),
`Left (`RadioButton(`id(`sled10), `opt (`notify),
// radio button label
_("SUSE Linux Enterprise &Desktop 10"),
requires == "sled-release-10")),
+ `Left (`RadioButton(`id(`sled10sp1), `opt (`notify),
+ // radio button label
+ _("SUSE L&inux Enterprise &Desktop 10 SP1"),
+ requires == "product:SUSE_SLED = 10.1")),
+ `Left (`RadioButton(`id(`sle10sp1), `opt (`notify),
+ // radio button label
+ _("S&USE Linux Enterprise 10 SP1"),
+ requires == "product:SUSE_SLE = 10.1")),
`HBox (
`Left(`RadioButton(`id(`other), `opt (`notify),
// radio button label
@@ -295,10 +307,22 @@
requires = "sles-release-10";
UI::ChangeWidget (`id(`other_val), `Enabled, false);
}
+ else if (ret == `sles10sp1) {
+ requires = "product:SUSE_SLES = 10.1";
+ UI::ChangeWidget (`id(`other_val), `Enabled, false);
+ }
else if (ret == `sled10) {
requires = "sled-release-10";
UI::ChangeWidget (`id(`other_val), `Enabled, false);
}
+ else if (ret == `sled10sp1) {
+ requires = "product:SUSE_SLED = 10.1";
+ UI::ChangeWidget (`id(`other_val), `Enabled, false);
+ }
+ else if (ret == `sle10sp1) {
+ requires = "product:SUSE_SLE = 10.1";
+ UI::ChangeWidget (`id(`other_val), `Enabled, false);
+ }
else if (ret == `suse101) {
requires = "suse-release-10.1";
UI::ChangeWidget (`id(`other_val), `Enabled, false);
@@ -898,6 +922,8 @@
`HBox(
`PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()),
`PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()),
+ // push button label
+ `PushButton(`id(`import),`opt (`key_F3), _("I&mport")),
`PushButton(`id(`help),`opt (`key_F2), Label::HelpButton())
)
),
@@ -917,6 +943,20 @@
{
Wizard::ShowHelp (help);
}
+ if (result == `import)
+ {
+ string file = UI::AskForExistingFile (
+ AddOnCreator::base_output_path, "",
+ // popup for file selection dialog
+ _("Choose the file with the text to be imported")
+ );
+ if (file != nil)
+ {
+ string text = (string) SCR::Read (.target.string, file);
+ if (text != nil)
+ UI::ChangeWidget (`id(`val), `Value, text);
+ }
+ }
if (result == `ok)
{
ret = $[
@@ -1311,6 +1351,11 @@
),
// password entry label
`Password (`id(`pw), _("&Passphrase"), AddOnCreator::passphrase),
+ // checkbox label
+ `Left (`CheckBox (`id (`resign),
+ _("Re&sign all packages with selected key"),
+ AddOnCreator::resign_packages)
+ ),
`VSpacing (0.7)
), `HSpacing ());
@@ -1337,8 +1382,15 @@
}
}
else if (ret == `next) {
+ boolean resign = (boolean) UI::QueryWidget(`id(`resign), `Value);
+ if (resign && !Package::Install ("expect"))
+ {
+ UI::ChangeWidget (`id (`resign), `Value, false);
+ continue;
+ }
AddOnCreator::gpg_key = key;
AddOnCreator::passphrase = (string)UI::QueryWidget(`id(`pw),`Value);
+ AddOnCreator::resign_packages = resign;
break;
}
else if (ret == `abort || ret == `cancel) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.13/src/helps.ycp new/yast2-add-on-creator-2.15.14/src/helps.ycp
--- old/yast2-add-on-creator-2.15.13/src/helps.ycp 2007-06-14 14:01:29.000000000 +0200
+++ new/yast2-add-on-creator-2.15.14/src/helps.ycp 2007-07-31 07:35:04.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Suchomel
*
- * $Id: helps.ycp 35715 2007-01-31 08:02:45Z jsuchome $
+ * $Id: helps.ycp 39816 2007-07-30 19:20:09Z jsuchome $
*/
{
@@ -131,7 +131,10 @@
"signing" : _("<p>Here, configure the signing of the add-on product. Choose a secret key from the list of keys available or create a new one with <b>Create</b>.</p>") +
// help text for signing dialog, cont.
- _("<p>Enter the passphrase needed to unlock the secret key.</p>"),
+ _("<p>Enter the passphrase needed to unlock the secret key.</p>") +
+
+ // help text for signing dialog, cont.
+ _("<p>Select if you want to <b>sign all packages</b> of the add-on product with selected key. All previous package signatures will be removed.</p>"),
// help text for generating new key dialog
"generate" : _("<p>Enter the values necessary for generating the new primary key pair.</p>") +
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.13/src/patterns.ycp new/yast2-add-on-creator-2.15.14/src/patterns.ycp
--- old/yast2-add-on-creator-2.15.13/src/patterns.ycp 2007-06-14 13:59:20.000000000 +0200
+++ new/yast2-add-on-creator-2.15.14/src/patterns.ycp 2007-06-14 14:23:24.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for patterns and selections
* Authors: Jiri Suchomel
*
- * $Id: patterns.ycp 36738 2007-03-06 12:44:51Z jsuchome $
+ * $Id: patterns.ycp 38455 2007-06-14 12:23:24Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.13/VERSION new/yast2-add-on-creator-2.15.14/VERSION
--- old/yast2-add-on-creator-2.15.13/VERSION 2007-06-14 14:16:49.000000000 +0200
+++ new/yast2-add-on-creator-2.15.14/VERSION 2007-08-02 16:40:55.000000000 +0200
@@ -1 +1 @@
-2.15.13
+2.15.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org