Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Tue Oct 14 19:31:56 CEST 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-10-13 13:57:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2008-10-14 16:51:14.134414000 +0200
@@ -1,0 +2,10 @@
+Tue Oct 14 14:18:06 CEST 2008 - lslezak@suse.cz
+
+- use Pkg::ResolvableProperties() instead of
+ Pkg::PkgPropertiesAll() when verifying availablity of all
+ packages, that's much faster
+- add 'Insecure: 1' to linuxrc.config file when the product is not
+ signed (bnc#421571)
+- 2.17.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.17.8.tar.bz2
New:
----
yast2-product-creator-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.f28691/_old 2008-10-14 19:31:42.000000000 +0200
+++ /var/tmp/diff_new_pack.f28691/_new 2008-10-14 19:31:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.17.8)
+# spec file for package yast2-product-creator (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.17.8.tar.bz2
+Source0: yast2-product-creator-2.17.9.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
@@ -49,7 +49,7 @@
%prep
-%setup -n yast2-product-creator-2.17.8
+%setup -n yast2-product-creator-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,13 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Tue Oct 14 2008 lslezak@suse.cz
+- use Pkg::ResolvableProperties() instead of
+ Pkg::PkgPropertiesAll() when verifying availablity of all
+ packages, that's much faster
+- add 'Insecure: 1' to linuxrc.config file when the product is not
+ signed (bnc#421571)
+- 2.17.9
* Mon Oct 13 2008 lslezak@suse.cz
- mark taboo packages when creating a product (bnc#421180)
- 2.17.8
++++++ yast2-product-creator-2.17.8.tar.bz2 -> yast2-product-creator-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.8/configure new/yast2-product-creator-2.17.9/configure
--- old/yast2-product-creator-2.17.8/configure 2008-10-13 13:48:49.000000000 +0200
+++ new/yast2-product-creator-2.17.9/configure 2008-10-14 16:50:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.17.8.
+# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2-product-creator 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-product-creator 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-product-creator 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.17.8
+yast2-product-creator configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-product-creator $as_me 2.17.8, which was
+It was created by yast2-product-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.17.8, which was
+This file was extended by yast2-product-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-product-creator config.status 2.17.8
+yast2-product-creator config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.8/configure.in new/yast2-product-creator-2.17.9/configure.in
--- old/yast2-product-creator-2.17.8/configure.in 2008-10-13 13:48:44.000000000 +0200
+++ new/yast2-product-creator-2.17.9/configure.in 2008-10-14 16:50:09.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.17.8, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.17.9, http://bugs.opensuse.org/, yast2-product-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.8/src/complex.ycp new/yast2-product-creator-2.17.9/src/complex.ycp
--- old/yast2-product-creator-2.17.8/src/complex.ycp 2008-08-11 12:02:47.000000000 +0200
+++ new/yast2-product-creator-2.17.9/src/complex.ycp 2008-10-14 14:21:02.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 49917 2008-08-11 10:02:47Z lslezak $
+ * $Id: complex.ycp 52175 2008-10-14 12:21:00Z lslezak $
*/
{
@@ -292,6 +292,13 @@
// progressbar label
progress_descriptions = add(progress_descriptions, _("Signing the source with a GPG key..."));
}
+ else
+ {
+ // label
+ progress_stages = add(progress_stages, _("Disable signature checks in linuxrc"));
+ // progressbar label
+ progress_descriptions = add(progress_descriptions, _("Disabling signature checks in linuxrc..."));
+ }
Progress::New(
_("Creating ISO image directory..."),
@@ -352,24 +359,15 @@
return `overview;
}
- if (gpg_key != "")
- {
- Progress::NextStage();
- if (!ProductCreator::SignSourceStep())
- {
- ProductCreator::ResetCallbacks();
- return `overview;
- }
- }
- else
+ Progress::NextStage();
+ if (!ProductCreator::SignSourceStep())
{
- // update content files if the source is not signed (bnc #368146)
- ProductCreator::UpdateContentFiles();
+ ProductCreator::ResetCallbacks();
+ return `overview;
}
integer i = 0;
-
Progress::Title(_("ISO image directory ready"));
Progress::Finish();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.8/src/ProductCreator.ycp new/yast2-product-creator-2.17.9/src/ProductCreator.ycp
--- old/yast2-product-creator-2.17.8/src/ProductCreator.ycp 2008-10-13 13:48:39.000000000 +0200
+++ new/yast2-product-creator-2.17.9/src/ProductCreator.ycp 2008-10-14 14:21:02.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 52128 2008-10-13 11:48:38Z lslezak $
+ * $Id: ProductCreator.ycp 52175 2008-10-14 12:21:00Z lslezak $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -1955,8 +1955,7 @@
});
});
- y2internal ("patterns + dependencies: %1", used_patterns);
-
+ y2milestone("patterns + dependencies: %1", used_patterns);
list<string> files = (list<string>)SCR::Read(.target.dir, sformat("%1/%2", skel_root, descrDir));
if (files == nil)
@@ -2027,11 +2026,24 @@
return success;
}
-// see http://en.opensuse.org/Secure_Installation_Sources
+/**
+ * see http://en.opensuse.org/Secure_Installation_Sources
+ * @param gpg_key GPG key ID or empty if the product should be unsigned
+ * @param initrd_file path to the initrd file
+ * @return boolean true on success
+ */
boolean InsertKeyToInitrd(string gpg_key, string initrd_file)
{
- y2milestone("Adding GPG key %1 to initrd %2", gpg_key, initrd_file);
- // initrd is cpio.gz archive
+ if (gpg_key == "")
+ {
+ y2milestone("Disabling signature checks in initrd %1", initrd_file);
+ }
+ else
+ {
+ y2milestone("Adding GPG key %1 to initrd %2", gpg_key, initrd_file);
+ }
+
+ // initrd is a cpio.gz archive
list<string> parts = splitstring(initrd_file, "/");
if (size(parts) > 1)
@@ -2041,25 +2053,46 @@
}
string base = mergestring(parts, "/");
- boolean ret = GPG::ExportPublicKey(gpg_key, sformat("%1/gpg-%2.gpg", base, gpg_key));
+ // uncompress the initrd
+ y2milestone("Uncompressing initrd: %1", initrd_file);
+ boolean ret = Exec(sformat("cd '%1' && gunzip < '%2' > '%2.cpio'", String::Quote(base), String::Quote(initrd_file)));
if (!ret) return false;
- // uncompress the archive and add the GPG key
- string command = sformat("cd '%1' && gunzip < '%2' > '%2.cpio' && echo 'gpg-%3.gpg' | cpio -o -H newc -A -F '%2.cpio'", String::Quote(base), String::Quote(initrd_file), gpg_key);
- y2milestone("command: %1", command);
+ string new_file = "";
- map out = (map)SCR::Execute(.target.bash_output, command);
- y2milestone("output: %1", out);
- ret = out["exit"]:-1 == 0;
+ if (gpg_key == "")
+ {
+ // unpack 'linuxrc.config' file
+ ret = Exec(sformat("cd '%1' && cpio -i -H newc -F '%2.cpio' linuxrc.config",
+ String::Quote(base), String::Quote(initrd_file)));
+ if (!ret) return false;
+
+ // add 'Insecure: 1' option
+ ret = Exec(sformat("cd '%1' && echo 'Insecure:\t1' >> linuxrc.config", String::Quote(base)));
+ if (!ret) return false;
+
+ // add linuxrc instead of a gpg key
+ new_file = "linuxrc.config";
+ }
+ else
+ {
+ ret = GPG::ExportPublicKey(gpg_key, sformat("%1/gpg-%2.gpg", base, gpg_key));
+ if (!ret) return false;
+
+ // add the exported GPG key
+ new_file = sformat("gpg-%1.gpg", gpg_key);
+ }
+
+ // uncompress the archive and add the GPG key or new linuxrc.config file
+ string command = sformat("cd '%1' && echo '%3' | cpio -o -H newc -A -F '%2.cpio'",
+ String::Quote(base), String::Quote(initrd_file), String::Quote(new_file));
+ ret = Exec(command);
if (!ret) return false;
// compress the archive, remove the temporary files
- command = sformat("gzip --best < '%1.cpio' > '%1' && rm -f '%1.cpio' '%2/gpg-%3.gpg'", String::Quote(initrd_file), String::Quote(base), gpg_key);
- y2milestone("command: %1", command);
-
- out = (map)SCR::Execute(.target.bash_output, command);
- y2milestone("output: %1", out);
- ret = out["exit"]:-1 == 0;
+ command = sformat("gzip --best < '%1.cpio' > '%1' && rm -f '%1.cpio' '%2'",
+ String::Quote(initrd_file), String::Quote(new_file));
+ ret = Exec(command);
return ret;
}
@@ -2342,6 +2375,14 @@
// insert the key into the installation initrd
success = success && InsertKeyToInitrds(gpg_key, skel_root);
}
+ else
+ {
+ // add 'Insecure: 1' to linuxrc.config
+ success = success && InsertKeyToInitrds("", skel_root);
+
+ // update content files if the source is not signed (bnc #368146)
+ success = success && UpdateContentFiles();
+ }
y2milestone("Source signed: %1", success);
return success;
@@ -2712,18 +2753,8 @@
toCopy = $[];
foreach(string package, selectedPackages, ``{
- list<map> package_data_list = Pkg::PkgPropertiesAll(package);
- map package_data = nil;
-
- // get the selected package
- foreach(map pkg_data, package_data_list,
- {
- if (pkg_data["status"]:`unknown == `selected)
- {
- package_data = pkg_data;
- }
- }
- );
+ list<map> package_data_list = Pkg::ResolvableProperties(package, `package, "");
+ map package_data = package_data_list[0]:$[];
if (package_data == nil || package_data == $[])
{
@@ -2733,8 +2764,8 @@
{
y2debug("package_data: %1", package_data);
string arch = package_data["arch"]:"noarch";
- integer src = package_data["srcid"]:0;
- integer medianr = package_data["medianr"]:1;
+ integer src = package_data["source"]:-1;
+ integer medianr = package_data["medium_nr"]:1;
list<map> pkglist = toCopy[src, medianr]:[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.8/VERSION new/yast2-product-creator-2.17.9/VERSION
--- old/yast2-product-creator-2.17.8/VERSION 2008-10-13 13:48:16.000000000 +0200
+++ new/yast2-product-creator-2.17.9/VERSION 2008-10-14 16:49:39.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org