Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 22 Apr 2006 01:29:23 +0200 (CEST)
  • Message-id: <20060421232923.51CE98C44D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Sat Apr 22 01:29:23 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-04-19 15:09:48.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-20 15:36:26.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 20 16:05:04 CEST 2006 - locilka@xxxxxxx
+
+- GnuPG dialogs enhanced with optional fingeprint parameter,
+ dialogs should handle both defined and undefined one (#167519).
+- 2.13.91
+
+-------------------------------------------------------------------

Old:
----
yast2-packager-2.13.90.tar.bz2

New:
----
yast2-packager-2.13.91.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.pZ7Baf/_old 2006-04-22 01:29:18.000000000 +0200
+++ /var/tmp/diff_new_pack.pZ7Baf/_new 2006-04-22 01:29:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.90)
+# spec file for package yast2-packager (Version 2.13.91)
#
# 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.90
-Release: 1
+Version: 2.13.91
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.90.tar.bz2
+Source0: yast2-packager-2.13.91.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 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.90
+%setup -n yast2-packager-2.13.91

%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager

%changelog -n yast2-packager
+* Thu Apr 20 2006 - locilka@xxxxxxx
+- GnuPG dialogs enhanced with optional fingeprint parameter,
+ dialogs should handle both defined and undefined one (#167519).
+- 2.13.91
* Wed Apr 19 2006 - jsuchome@xxxxxxx
- after finishing sources configuration, restart menu.ycp (#162966)
- 2.13.90

++++++ yast2-packager-2.13.90.tar.bz2 -> yast2-packager-2.13.91.tar.bz2 ++++++
++++ 2448 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.90/Makefile.am new/yast2-packager-2.13.91/Makefile.am
--- old/yast2-packager-2.13.90/Makefile.am 2006-04-07 11:33:00.000000000 +0200
+++ new/yast2-packager-2.13.91/Makefile.am 2006-04-20 15:40:28.000000000 +0200
@@ -8,6 +8,7 @@

#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool

VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done

pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)

install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi

spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck

# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))

@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done

-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local

-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion

check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +200,13 @@
false; \
fi

+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable

checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable


# For po/ modules
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.90/VERSION new/yast2-packager-2.13.91/VERSION
--- old/yast2-packager-2.13.90/VERSION 2006-04-19 15:05:10.000000000 +0200
+++ new/yast2-packager-2.13.91/VERSION 2006-04-20 15:36:26.000000000 +0200
@@ -1 +1 @@
-2.13.90
+2.13.91
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.90/configure.in new/yast2-packager-2.13.91/configure.in
--- old/yast2-packager-2.13.90/configure.in 2006-04-07 11:33:00.000000000 +0200
+++ new/yast2-packager-2.13.91/configure.in 2006-04-20 15:40:28.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.70, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.91, http://www.suse.de/feedback, 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.70"
+VERSION="2.13.91"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

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.90/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.91/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.13.90/src/modules/SignatureCheckCallbacks.ycp 2006-04-12 08:52:31.000000000 +0200
+++ new/yast2-packager-2.13.91/src/modules/SignatureCheckCallbacks.ycp 2006-04-20 15:36:25.000000000 +0200
@@ -62,13 +62,13 @@
// (+DontShowAgain functionality) -- for one run in memory
//
/* function for CallbackAcceptUnknownGpgKey() */
- global boolean AcceptUnknownGpgKey (string filename, string keyid, string keyname) {
+ global boolean AcceptUnknownGpgKey (string filename, string keyid, string keyname, string fingerprint) {
string dont_show_dialog_ident = "-AcceptUnknownGpgKey-";

// Show the popup?
if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) {
// Unknown keyname == "Unknown Key"
- return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, dont_show_dialog_ident);
+ return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, fingerprint, dont_show_dialog_ident);
// Return the default value entered by user
} else {
return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident);
@@ -83,8 +83,9 @@
// zypp: askUserToTrustKey
//
/* function for CallbackImportGpgKey() */
- global boolean ImportGpgKey (string keyid, string keyname, string keydetails) {
- return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, keydetails);
+ global boolean ImportGpgKey (string keyid, string keyname, string fingerprint) {
+ // There are no details from the callback, maybe in the future
+ return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint, "");
}

// Name of the callback handler function. Required callback prototype is
@@ -95,8 +96,8 @@
// zypp: askUserToAcceptVerificationFailed
//
/* function for CallbackAcceptVerificationFailed() */
- global boolean AcceptVerificationFailed (string filename, string keyid, string keyname) {
- return SignatureCheckDialogs::UseCorruptedItem(`file, filename, keyid, keyname);
+ global boolean AcceptVerificationFailed (string filename, string keyid, string keyname, string fingerprint) {
+ return SignatureCheckDialogs::UseCorruptedItem(`file, filename, keyid, keyname, fingerprint);
}

/* ============================ < Callbacks for Sources > ============================ */
@@ -106,8 +107,8 @@
// that a trusted key has been added.
//
/* function for CallbackTrustedKeyAdded() */
- void TrustedKeyAdded (string keyid, string keyname) {
- y2milestone("Trusted key has been added: %1 (%2)", keyid, keyname);
+ void TrustedKeyAdded (string keyring, string keyid, string keyname, string fingerprint) {
+ y2milestone("Trusted key has been added: %1 / %2 (%3)", keyid, fingerprint, keyname);
return nil;
}

@@ -116,8 +117,8 @@
// that a trusted key has been removed.
//
/* function for CallbackTrustedKeyRemoved() */
- void TrustedKeyRemoved (string keyid, string keyname) {
- y2milestone("Trusted key has been removed: %1 (%2)", keyid, keyname);
+ void TrustedKeyRemoved (string keyring, string keyid, string keyname, string fingerprint) {
+ y2milestone("Trusted key has been removed: %1 / %2 (%3)", keyid, fingerprint, keyname);
return nil;
}
}
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.90/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.91/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.90/src/modules/SignatureCheckDialogs.ycp 2006-04-12 12:31:03.000000000 +0200
+++ new/yast2-packager-2.13.91/src/modules/SignatureCheckDialogs.ycp 2006-04-20 15:36:25.000000000 +0200
@@ -345,9 +345,12 @@
*
* @param symbol item_type `file or `package
* @param string item_name file name or package name
+ * @param string key_id
+ * @param string key_name
+ * @param string fingerprint
* @return boolean use or don't use ('true' if 'yes')
*/
- global boolean UseCorruptedItem (symbol item_type, string item_name, string key_id, string key_name) {
+ global boolean UseCorruptedItem (symbol item_type, string item_name, string key_id, string key_name, string fingerprint) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
_("Package %1 is signed with
@@ -370,7 +373,11 @@
for the integrity and security of your system.

Install it anyway?")
- ), item_name, key_id, key_name);
+ ),
+ item_name,
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, fingerprint)),
+ key_name
+ );

UI::OpenDialog(
`opt(`decorated),
@@ -400,10 +407,11 @@
* @param symbol item_type `file or `package
* @param string item_name file name or package name
* @param string key_id
+ * @param string fingerprint
* @param string dont_show_dialog_ident for the identification in magic "don't show" functions
* @return boolean true if 'yes, use file'
*/
- global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string dont_show_dialog_ident) {
+ global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string fingerprint, string dont_show_dialog_ident) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the key ID
_("The package %1 is digitally signed
@@ -424,7 +432,11 @@
of your system at risk.

Use it anyway?")
- ), item_name, key_id);
+ ),
+ item_name,
+ // If fingerprint is defined, show it
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n%2", key_id, fingerprint))
+ );

UI::OpenDialog(
`opt(`decorated),
@@ -562,7 +574,10 @@
public keys, meaning that you trust the owner of the key.
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
- key_id, key_name, key_location);
+ key_id,
+ key_name,
+ key_location
+ );

UI::OpenDialog(
`opt(`decorated),
@@ -629,10 +644,11 @@
*
* @param string key_id
* @param string key_name
+ * @param string fingerprint
* @param string key_detailed_description
* @return boolean whether zypp should import the key into the keyring of trusted keys
*/
- global boolean ImportUntrustedGPGKeyIntoTrustedDialog (string key_id, string key_name, string key_detailed_description) {
+ global boolean ImportUntrustedGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint, string key_detailed_description) {
// additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID
string warning_text = sformat(_("<p>The owner of the key may distribute updates,
packages, and package repositories that your system will trust and offer
@@ -649,7 +665,7 @@
is not signed by a trusted (imported) key. If you do not import the key,
packages created by the owner of key <tt>%1</tt> show this warning.</p>"), key_id);

- // popup message, %1 stands for GPG key ID, %2 for key name
+ // popup message, %1 stands for string "GPG key ID\nfingerprint", %2 for key name
string dialog_text = sformat(_("The GnuPG key '%1 (%2)'
has been found.

@@ -657,7 +673,9 @@
public keys, meaning that you trust the owner of the key.
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
- key_id, key_name);
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, fingerprint)),
+ key_name
+ );

UI::OpenDialog(
`opt(`decorated),


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >