Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Mon May 21 15:08:53 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-17 17:00:55.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-21 13:33:36.133287000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 13:21:12 CEST 2007 - jsuchome@suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.7.tar.bz2 New: ---- yast2-add-on-creator-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.s16174/_old 2007-05-21 15:08:48.000000000 +0200 +++ /var/tmp/diff_new_pack.s16174/_new 2007-05-21 15:08:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.7) +# spec file for package yast2-add-on-creator (Version 2.15.8) # # 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.7 +Version: 2.15.8 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.7.tar.bz2 +Source0: yast2-add-on-creator-2.15.8.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome@suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.7 +%setup -n yast2-add-on-creator-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,10 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Mon May 21 2007 - jsuchome@suse.cz +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 * Thu May 17 2007 - jsuchome@suse.cz - clear pattern data map before importing next one (#273528) - 2.15.7 ++++++ yast2-add-on-creator-2.15.7.tar.bz2 -> yast2-add-on-creator-2.15.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp 2007-05-17 16:42:04.000000000 +0200 +++ new/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp 2007-05-21 10:26:55.000000000 +0200 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.7/VERSION new/yast2-add-on-creator-2.15.8/VERSION --- old/yast2-add-on-creator-2.15.7/VERSION 2007-05-17 16:51:05.000000000 +0200 +++ new/yast2-add-on-creator-2.15.8/VERSION 2007-05-21 13:21:50.000000000 +0200 @@ -1 +1 @@ -2.15.7 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org