Hello community,
here is the log from the commit of package yast2-packager
checked in at Sat Nov 8 20:41:07 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-11-05 17:16:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-11-07 16:38:05.608456000 +0100
@@ -1,0 +2,9 @@
+Fri Nov 7 13:26:09 CET 2008 - lslezak@suse.cz
+
+- fixed URL logging (bnc#441944)
+- use Pkg::SourceProvideDigestedFile() and
+ Pkg::SourceProvideSignedFile() functions for downloading files
+ from the installation repository (bnc#409927)
+- 2.17.40
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.39.tar.bz2
New:
----
yast2-packager-2.17.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.dT7407/_old 2008-11-08 20:40:29.000000000 +0100
+++ /var/tmp/diff_new_pack.dT7407/_new 2008-11-08 20:40:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.39)
+# spec file for package yast2-packager (Version 2.17.40)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,26 +19,26 @@
Name: yast2-packager
-Version: 2.17.39
+Version: 2.17.40
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.39.tar.bz2
+Source0: yast2-packager-2.17.40.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
BuildRequires: yast2-transfer
-# PackagesUI.ycp
-BuildRequires: yast2 >= 2.17.40
+# URL::HidePassword()
+BuildRequires: yast2 >= 2.17.47
# "order" flag for pattern resolvables
BuildRequires: yast2-pkg-bindings >= 2.17.13
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
# "order" flag for pattern resolvables
Requires: yast2-pkg-bindings >= 2.17.13
-# PackagesUI.ycp
-Requires: yast2 >= 2.17.40
+# URL::HidePassword()
+Requires: yast2 >= 2.17.47
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.39
+%setup -n yast2-packager-2.17.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,12 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Nov 07 2008 lslezak@suse.cz
+- fixed URL logging (bnc#441944)
+- use Pkg::SourceProvideDigestedFile() and
+ Pkg::SourceProvideSignedFile() functions for downloading files
+ from the installation repository (bnc#409927)
+- 2.17.40
* Wed Nov 05 2008 locilka@suse.cz
- Fixed copying files from inst-sys to the system, some might be
symbolic links (bnc #441829).
++++++ yast2-packager-2.17.39.tar.bz2 -> yast2-packager-2.17.40.tar.bz2 ++++++
++++ 3368 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.17.39/configure.in new/yast2-packager-2.17.40/configure.in
--- old/yast2-packager-2.17.39/configure.in 2008-10-09 19:19:24.000000000 +0200
+++ new/yast2-packager-2.17.40/configure.in 2008-11-07 16:39:41.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.27, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.40, http://bugs.opensuse.org/, yast2-packager)
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.27"
+VERSION="2.17.40"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
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.17.39/src/include/load_release_notes.ycp new/yast2-packager-2.17.40/src/include/load_release_notes.ycp
--- old/yast2-packager-2.17.39/src/include/load_release_notes.ycp 2008-09-29 16:25:12.000000000 +0200
+++ new/yast2-packager-2.17.40/src/include/load_release_notes.ycp 2008-11-07 16:37:28.000000000 +0100
@@ -38,14 +38,14 @@
// try 'en_UK' for 'en_UK'
string tmp = sformat (path_templ, Language::language);
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, true /* optional */);
// try 'es' for 'es_ES'
if (tmp == nil)
{
tmp = sformat (path_templ, substring (Language::language, 0, 2));
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, true /* optional */);
}
// try 'en'
@@ -53,7 +53,7 @@
{
tmp = sformat (path_templ, "en");
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, true /* optional */);
}
// no other fallback
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.17.39/src/include/repositories_include.ycp new/yast2-packager-2.17.40/src/include/repositories_include.ycp
--- old/yast2-packager-2.17.39/src/include/repositories_include.ycp 2008-10-30 13:06:41.000000000 +0100
+++ new/yast2-packager-2.17.40/src/include/repositories_include.ycp 2008-11-07 12:15:47.000000000 +0100
@@ -43,7 +43,7 @@
}
define symbol createSource( string url, boolean plaindir, boolean download, string preffered_name ) ``{
- y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", url, plaindir, download, preffered_name);
+ y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", URL::HidePassword(url), plaindir, download, preffered_name);
if ( url != "" )
{
@@ -175,7 +175,7 @@
// probe repository type (do not probe plaindir repo)
string repo_type = (plaindir) ? plaindir_type : Pkg::RepositoryProbe(url, prod_dir);
- y2milestone("Repository type (%1,%2): %3", url, prod_dir, repo_type);
+ y2milestone("Repository type (%1,%2): %3", URL::HidePassword(url), prod_dir, repo_type);
// the probing has failed
if (repo_type == nil || repo_type == "NONE")
@@ -269,7 +269,7 @@
{
// popup message part 1
string _msg1 = sformat( _("Unable to create repository
-from URL '%1'."), url );
+from URL '%1'."), URL::HidePassword(url) );
// popup message part 2
string _msg2 = _("Try again?");
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.17.39/src/modules/AddOnProduct.ycp new/yast2-packager-2.17.40/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.17.39/src/modules/AddOnProduct.ycp 2008-09-25 15:20:42.000000000 +0200
+++ new/yast2-packager-2.17.40/src/modules/AddOnProduct.ycp 2008-11-07 16:06:13.000000000 +0100
@@ -419,7 +419,7 @@
}
boolean IntegrateY2Update (integer src_id) {
- string binaries = Pkg::SourceProvideOptionalFile (src_id, 1, "/y2update.tgz");
+ string binaries = Pkg::SourceProvideDigestedFile (src_id, 1, "/y2update.tgz", true /* optional */);
// File /y2update.tgz exists
if (binaries != nil)
{
@@ -602,7 +602,7 @@
y2milestone ("Using cached contentfile %1", contentfile);
} else {
y2milestone ("Checking contentfile from repository");
- string sourcefile = Pkg::SourceProvideOptionalFile (src_id, 1, "/content");
+ string sourcefile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true);
if (sourcefile == nil) {
y2warning ("Cannot obtain content file!");
return nil;
@@ -686,7 +686,7 @@
symbol ret = nil;
- string control = Pkg::SourceProvideOptionalFile (src_id, 1, "/installation.xml");
+ string control = Pkg::SourceProvideDigestedFile (src_id, 1, "/installation.xml", true /* optional */);
if (control != nil) {
y2milestone ("Add-On has own control file");
ret = DoInstall_WithControlFile (control);
@@ -811,7 +811,7 @@
*/
void HandleProductPATTERNS (integer srcid) {
// FATE #302398: PATTERNS keyword in content file
- string content_file = Pkg::SourceProvideOptionalFile (srcid, 1, "/content");
+ string content_file = Pkg::SourceProvideSignedFile (srcid, 1, "/content", true);
if (content_file == nil) {
y2warning ("Add-On %1 doesn't have a content file", srcid);
@@ -830,7 +830,7 @@
y2milestone ("Integrating repository %1", srcid);
// Updating inst-sys
- string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz");
+ string y2update = Pkg::SourceProvideDigestedFile (srcid, 1, "/y2update.tgz", true /* optional */);
if (y2update == nil) {
y2milestone ("No YaST update found on the media");
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.17.39/src/modules/InstURL.ycp new/yast2-packager-2.17.40/src/modules/InstURL.ycp
--- old/yast2-packager-2.17.39/src/modules/InstURL.ycp 2008-09-18 16:10:25.000000000 +0200
+++ new/yast2-packager-2.17.40/src/modules/InstURL.ycp 2008-11-07 13:26:52.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose: Convert /etc/install.inf data to URL
*
*
- * $Id: InstURL.ycp 50813 2008-09-08 14:43:57Z locilka $
+ * $Id: InstURL.ycp 53060 2008-11-07 12:24:43Z lslezak $
*/
{
@@ -27,10 +27,8 @@
* @return string new URL with hidden password
*/
global string HidePassword(string url) {
- // Url::Build(Url::Parse) transforms the URL too much, see #247249#c41
- // replace ://user:password@ by ://user:PASSWORD@
- string subd = regexpsub (url, "(://[^/:]*):[^/@]*@,", "://\\1:PASSWORD@");
- return subd == nil? url: subd;
+ y2warning("InstURL::HidePassword() is obsoleted, use URL::HidePassword() instead");
+ return URL::HidePassword(url);
}
/**
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.17.39/src/modules/Packages.ycp new/yast2-packager-2.17.40/src/modules/Packages.ycp
--- old/yast2-packager-2.17.39/src/modules/Packages.ycp 2008-11-05 17:17:16.000000000 +0100
+++ new/yast2-packager-2.17.40/src/modules/Packages.ycp 2008-11-07 16:26:47.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 52677 2008-10-29 14:34:55Z lslezak $
+ * $Id: Packages.ycp 53075 2008-11-07 15:24:37Z lslezak $
*/
{
@@ -972,7 +972,7 @@
y2milestone ("Installing via network, not checking the content file");
return true;
}
- string media_content = Pkg::SourceProvideFile (source, 1, "/content");
+ string media_content = Pkg::SourceProvideSignedFile(source, 1, "/content", false);
string media = (string)SCR::Read (.target.string, media_content);
string ramdisk = (string)SCR::Read (.target.string, "/content");
boolean ret = (media == ramdisk);
@@ -1391,7 +1391,7 @@
string file = one_aop[0]:"";
string type = one_aop[1]:"";
- tmp_add_on_products = Pkg::SourceProvideOptionalFile (initial_source, 1, file);
+ tmp_add_on_products = Pkg::SourceProvideDigestedFile (initial_source, 1, file, true);
if (tmp_add_on_products != nil) {
add_on_products_list = sformat ("%1/add_on_products", SCR::Read (.target.tmpdir));
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.17.39/src/modules/ProductLicense.ycp new/yast2-packager-2.17.40/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.17.39/src/modules/ProductLicense.ycp 2008-10-17 09:09:19.000000000 +0200
+++ new/yast2-packager-2.17.40/src/modules/ProductLicense.ycp 2008-11-07 16:03:33.000000000 +0100
@@ -439,14 +439,14 @@
void SearchForLicense_AddOnProduct (integer src_id, string fallback_dir) {
y2milestone ("Getting license info from repository %1", src_id);
- info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt");
+ info_file = Pkg::SourceProvideDigestedFile (src_id, 1, "/media.1/info.txt", true /* optional */);
// using a separate license directory for all products
tmpdir = sformat ("%1/product-license/%2/", (string) SCR::Read(.target.tmpdir), src_id);
// FATE #302018 comment #54
string license_file_location = "/license.tar.gz";
- string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, license_file_location);
+ string license_file = Pkg::SourceProvideDigestedFile (src_id, 1, license_file_location, true /* optional */);
if (license_file != nil) {
y2milestone ("Using file %1 with licenses", license_file);
@@ -465,7 +465,7 @@
// New format didn't work, try the old one 1stMedia:/media.1/license.zip
license_dir = tmpdir;
- license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip");
+ license_file = Pkg::SourceProvideDigestedFile (src_id, 1, "/media.1/license.zip", true /* optional */);
// no license present
if (license_file == 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.17.39/src/modules/SourceDialogs.ycp new/yast2-packager-2.17.40/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.17.39/src/modules/SourceDialogs.ycp 2008-10-06 14:43:48.000000000 +0200
+++ new/yast2-packager-2.17.40/src/modules/SourceDialogs.ycp 2008-11-07 11:50:10.000000000 +0100
@@ -1258,9 +1258,11 @@
parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value);
}
- y2milestone("Entered URL: %1", parsed);
+ // do not log the entered password
+ y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed));
_url = URL::Build (parsed);
- y2milestone("URL::Build: %1", _url);
+ y2milestone("URL::Build: %1", URL::HidePassword(_url));
+
if (UI::WidgetExists (`id (`ch_iso)))
{
boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value);
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.17.39/VERSION new/yast2-packager-2.17.40/VERSION
--- old/yast2-packager-2.17.39/VERSION 2008-11-05 17:16:45.000000000 +0100
+++ new/yast2-packager-2.17.40/VERSION 2008-11-07 16:25:25.000000000 +0100
@@ -1 +1 @@
-2.17.39
+2.17.40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org