Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Jun 14 13:35:06 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-06-09 10:26:21.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-06-12 15:57:11.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jun 12 16:00:30 CEST 2006 - mvidner@suse.cz
+
+- Respect /etc/sysconfig/security:CHECK_SIGNATURES in callbacks.
+- 2.13.135
+
+-------------------------------------------------------------------
+Mon Jun 12 11:09:01 CEST 2006 - jsrain@suse.cz
+
+- ask user to confirm a license if product added via the
+ inst_source module (#183733)
+- 2.13.134
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.133.tar.bz2
New:
----
yast2-packager-2.13.135.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.WWqmMg/_old 2006-06-14 13:34:55.000000000 +0200
+++ /var/tmp/diff_new_pack.WWqmMg/_new 2006-06-14 13:34:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.133)
+# spec file for package yast2-packager (Version 2.13.135)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.13.133
+Version: 2.13.135
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.133.tar.bz2
+Source0: yast2-packager-2.13.135.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 checkmedia yast2-country
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.133
+%setup -n yast2-packager-2.13.135
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +82,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Mon Jun 12 2006 - mvidner@suse.cz
+- Respect /etc/sysconfig/security:CHECK_SIGNATURES in callbacks.
+- 2.13.135
+* Mon Jun 12 2006 - jsrain@suse.cz
+- ask user to confirm a license if product added via the
+ inst_source module (#183733)
+- 2.13.134
* Fri Jun 09 2006 - jsrain@suse.cz
- handle list of all resolvables needed to be selected in 2nd stage
of the installation (#181198)
++++++ yast2-packager-2.13.133.tar.bz2 -> yast2-packager-2.13.135.tar.bz2 ++++++
++++ 1823 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.133/VERSION new/yast2-packager-2.13.135/VERSION
--- old/yast2-packager-2.13.133/VERSION 2006-06-09 10:03:09.000000000 +0200
+++ new/yast2-packager-2.13.135/VERSION 2006-06-12 15:56:01.000000000 +0200
@@ -1 +1 @@
-2.13.133
+2.13.135
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.133/configure.in new/yast2-packager-2.13.135/configure.in
--- old/yast2-packager-2.13.133/configure.in 2006-06-09 10:23:59.000000000 +0200
+++ new/yast2-packager-2.13.135/configure.in 2006-06-12 16:00:46.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.133, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.135, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.133"
+VERSION="2.13.135"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.133/src/clients/inst_source.ycp new/yast2-packager-2.13.135/src/clients/inst_source.ycp
--- old/yast2-packager-2.13.133/src/clients/inst_source.ycp 2006-06-09 09:55:41.000000000 +0200
+++ new/yast2-packager-2.13.135/src/clients/inst_source.ycp 2006-06-12 14:24:59.000000000 +0200
@@ -24,6 +24,7 @@
import "Label";
import "Popup";
+ import "AddOnProduct";
// Do not sync the changes to ZenWorks even if rug is present
// This is handy for repairing an already out-of-sync situation
@@ -96,6 +97,13 @@
UI::ChangeWidget( `id( `table ), `Items, items );
}
+ boolean LicenseAccepted (integer id) {
+ Wizard::CreateDialog ();
+ boolean ret = AddOnProduct::AcceptedLicenseAndInfoFile (id);
+ UI::CloseDialog ();
+ return ret;
+ }
+
define symbol createSource( string url ) ``{
if ( url != "" )
{
@@ -158,10 +166,17 @@
}
}
foreach( integer id, newSources, ``{
+ if (! LicenseAccepted (id))
+ {
+ Pkg::SourceDelete (id);
+ }
+ else
+ {
map src_data = Pkg::SourceGeneralData (id);
boolean auto_refresh = src_data["autorefresh"]:false;
map sourceState = $[ "SrcId": id, "enabled": true, "autorefresh" : auto_refresh ];
sourceStatesOut = add( sourceStatesOut, sourceState );
+ }
} );
return `ok;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.133/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.135/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.13.133/src/modules/SignatureCheckCallbacks.ycp 2006-05-30 09:22:17.000000000 +0200
+++ new/yast2-packager-2.13.135/src/modules/SignatureCheckCallbacks.ycp 2006-06-12 14:24:59.000000000 +0200
@@ -15,6 +15,12 @@
import "SignatureCheckDialogs";
+ /**
+ * Default return when signatures shouldn't be checked
+ * @see SignatureCheckDialogs::CheckSignaturesInYaST()
+ */
+ boolean default_return_unchecked = true;
+
/* ============================ < Callbacks for Sources > ============================ */
// Name of the callback handler function. Required callback prototype is
@@ -28,6 +34,10 @@
//
/* function for CallbackAcceptUnsignedFile() */
global boolean AcceptUnsignedFile (string filename) {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
string dont_show_dialog_ident = "-AcceptUnsignedFile-";
// Show the popup?
@@ -50,6 +60,10 @@
//
/* function for CallbackAcceptFileWithoutChecksum() */
global boolean AcceptFileWithoutChecksum (string filename) {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
string dont_show_dialog_ident = "-AcceptFileWithoutChecksum-";
// Show the popup?
@@ -72,6 +86,10 @@
//
/* function for CallbackAcceptUnknownGpgKey() */
global boolean AcceptUnknownGpgKey (string filename, string keyid, string keyname, string fingerprint) {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
string dont_show_dialog_ident = "-AcceptUnknownGpgKey-";
// Show the popup?
@@ -93,6 +111,10 @@
//
/* function for CallbackImportGpgKey() */
global boolean ImportGpgKey (string keyid, string keyname, string fingerprint) {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
// There are no details from the callback, maybe in the future
return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint);
}
@@ -106,6 +128,10 @@
//
/* function for CallbackAcceptVerificationFailed() */
global boolean AcceptVerificationFailed (string filename, string keyid, string keyname, string fingerprint) {
+ // Check signatures at all?
+ if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
+ return default_return_unchecked;
+
return SignatureCheckDialogs::UseCorruptedItem(`file, filename, keyid, keyname, fingerprint);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.133/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.135/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.133/src/modules/SignatureCheckDialogs.ycp 2006-05-30 09:22:17.000000000 +0200
+++ new/yast2-packager-2.13.135/src/modules/SignatureCheckDialogs.ycp 2006-06-12 13:51:41.000000000 +0200
@@ -16,6 +16,8 @@
import "Popup";
import "Message";
import "DontShowAgain";
+ import "Stage";
+ import "Linuxrc";
/* --------------------------- Don't show this dialog again Magic --------------------------- */
@@ -132,6 +134,64 @@
/* --------------------------- Don't show this dialog again Magic --------------------------- */
+ // /etc/sysconfig/security:CHECK_SIGNATURES
+
+ boolean check_signatures = nil; // lazy
+
+ /**
+ * A semi-public helper. Convert the kernel parameter
+ * to the sysconfig string
+ * @return sysconfig value: yes, yast, no
+ */
+ global string CheckSignatures () {
+ string cmdline = Linuxrc::InstallInf ("Cmdline");
+ y2milestone ("Cmdline: %1", cmdline);
+
+ string val = regexpsub (cmdline, "CHECK_SIGNATURES=([[:alpha:]]+)", "\\1");
+ if (val == nil)
+ {
+ val = regexpsub (cmdline, "no_sig_check=([^[:digit:]]+)", "\\1");
+ if (val != nil)
+ {
+ map trans = $[
+ "0": "yes",
+ "1": "yast",
+ "2": "no",
+ ];
+ val = trans[val]:nil;
+ }
+ }
+ if (val == nil)
+ {
+ val = "yes";
+ }
+ return val;
+ }
+
+ /**
+ * Should signatures be checked at all? Check a sysconfig variable
+ * (or a kernel parameter for the 1st installation stage).
+ * @return do checking?
+ */
+ global boolean CheckSignaturesInYaST () {
+ if (check_signatures == nil)
+ {
+ string chs = nil;
+ if (Stage::initial ())
+ {
+ chs = CheckSignatures ();
+ }
+ else
+ {
+ // default is "yes"
+ chs = (string) SCR::Read (.sysconfig.security.CHECK_SIGNATURES);
+ }
+ y2milestone ("CHECK_SIGNATURES: %1", chs);
+ check_signatures = chs != "no";
+ }
+ return check_signatures;
+ }
+
/**
* Function adds delimiter between after_chars characters in the string
*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org