Hello community,
here is the log from the commit of package yast2-backup
checked in at Thu Oct 23 22:46:41 CEST 2008.
--------
--- yast2-backup/yast2-backup.changes 2008-09-22 14:31:54.000000000 +0200
+++ /d/STABLE/yast2-backup/yast2-backup.changes 2008-10-20 16:16:01.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 20 16:15:52 CEST 2008 - locilka@suse.cz
+
+- Fixed storing the symlinks.
+- Correctly escaping shell commands (both bnc #421214).
+- 2.17.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-backup-2.17.0.tar.bz2
New:
----
yast2-backup-2.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-backup.spec ++++++
--- /var/tmp/diff_new_pack.C24394/_old 2008-10-23 22:45:53.000000000 +0200
+++ /var/tmp/diff_new_pack.C24394/_new 2008-10-23 22:45:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-backup (Version 2.17.0)
+# spec file for package yast2-backup (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-backup
-Version: 2.17.0
+Version: 2.17.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-backup-2.17.0.tar.bz2
+Source0: yast2-backup-2.17.1.tar.bz2
Prefix: /usr
Summary: YaST2 - System Backup
BuildArch: noarch
@@ -70,7 +70,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-backup-2.17.0
+%setup -n yast2-backup-2.17.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -109,6 +109,10 @@
%{prefix}/share/applications/YaST2/backup.desktop
%doc %{prefix}/share/doc/packages/yast2-backup
%changelog
+* Mon Oct 20 2008 locilka@suse.cz
+- Fixed storing the symlinks.
+- Correctly escaping shell commands (both bnc #421214).
+- 2.17.1
* Mon Sep 08 2008 locilka@suse.cz
- Merged texts from proofread.
- Adapted testsuite.
++++++ yast2-backup-2.17.0.tar.bz2 -> yast2-backup-2.17.1.tar.bz2 ++++++
++++ 3169 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-backup-2.17.0/configure.in new/yast2-backup-2.17.1/configure.in
--- old/yast2-backup-2.17.0/configure.in 2008-09-22 14:37:27.000000000 +0200
+++ new/yast2-backup-2.17.1/configure.in 2008-10-23 17:21:51.000000000 +0200
@@ -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-backup, 2.17.0, http://bugs.opensuse.org/, yast2-backup)
+AC_INIT(yast2-backup, 2.17.1, http://bugs.opensuse.org/, yast2-backup)
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.0"
+VERSION="2.17.1"
RPMNAME="yast2-backup"
MAINTAINER="Lukas Ocilka "
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-backup-2.17.0/src/scripts/backup_search.pl new/yast2-backup-2.17.1/src/scripts/backup_search.pl
--- old/yast2-backup-2.17.0/src/scripts/backup_search.pl 2008-06-03 18:41:27.000000000 +0200
+++ new/yast2-backup-2.17.1/src/scripts/backup_search.pl 2008-10-20 16:16:20.000000000 +0200
@@ -16,7 +16,7 @@
# package. Output is list of files and optional more
# information about progress of search.
#
-# $Id: backup_search.pl 48033 2008-06-03 16:41:26Z locilka $
+# $Id: backup_search.pl 52368 2008-10-20 14:16:21Z locilka $
#
use Getopt::Long;
@@ -229,6 +229,20 @@
my %package_files_inodes;
my %dups;
+# bnc #421214
+sub Quote ($) {
+ my $string = shift;
+
+ if (not defined $string || $string eq "") {
+ return '';
+ };
+
+ $string =~ s/\'/\'"\'"\'/g;
+ $string = '\''.$string.'\'';
+
+ return $string;
+}
+
# read list of all package's files if searching not owned files is required
# or MD5 sum is not used in searching modified files
if ($search_files or $no_md5)
@@ -269,7 +283,7 @@
# TODO: this approach is not 100% reliable - a device can mounted after this check
if ($same_fs)
{
- open(MOUNT, "/bin/mount |");
+ open(MOUNT, "-|", "LC_ALL=C /bin/mount");
while (my $line = <MOUNT>)
{
@@ -329,7 +343,7 @@
sub ReadAllPackages()
{
# read all installed packages
- open(RPMQA, "rpm -qa |")
+ open(RPMQA, "-|", "LC_ALL=C rpm -qa")
or die "Command 'rpm -qa' failed\n";
print "Reading installed packages\n";
@@ -483,7 +497,7 @@
# check if Mtime changed file is in more than one package
if ($mtime and !$size and $no_md5 and $$$refref_duplicates_file{$file})
{
- open(RPMQFILE, "rpm -qf $file |");
+ open(RPMQFILE, "-|", "LC_ALL=C rpm -qf ".Quote ($file));
my @packages_list = ();
while (my $pkg = <RPMQFILE>)
@@ -503,7 +517,7 @@
# so all files in package are verified
# in this verification is not MD5 test excluded
# TODO LATER: don't grep but cache results of all files from package
- open(RPMVRF, "rpm -V $pack --nodeps | grep $file |");
+ open(RPMVRF, "-|", "LC_ALL=C rpm -V ".Quote ($pack)." --nodeps | grep ".Quote ($file));
my $fl = <RPMVRF>;
@@ -544,7 +558,7 @@
sub PrintOutInstPrefix ($) {
my $package = shift;
- my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.$package;
+ my $rpm_query = 'LC_ALL=C rpm -q --queryformat "%{INSTPREFIXES}" '.Quote ($package);
print "Installed: ".`$rpm_query`."\n";
}
@@ -556,13 +570,14 @@
### Printing out all unavailable packages and their content
if (keys %{$unavail}) {
- open(RPML,
- 'LC_ALL=C '.
- 'rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '.
- join(' ', (keys %{$unavail})).
- ' |'
- ) || do {
- warn "Cannot run: ".'rpm -q --filesbypkg '.join(' ', (keys %{$unavail})).' |';
+ my $command = "";
+ foreach my $pack (keys %{$unavail}) {
+ $command .= ' '.Quote ($pack);
+ }
+
+ $command = 'LC_ALL=C rpm -q --queryformat "FULL-PACKAGE-NAME: %{NAME}-%{VERSION}-%{RELEASE}\n" --filesbypkg '.$command;
+ open(RPML, "-|", $command) || do {
+ warn "Cannot run: ".$command;
};
my $current_package_name = '';
while (my $l = <RPML>) {
@@ -603,7 +618,7 @@
}
# verification of the package - do not check package dependencies
- open(RPMV, "LC_ALL=C rpm -V $package $md5_param --nodeps |")
+ open(RPMV, "-|", "LC_ALL=C rpm -V ".Quote ($package)." $md5_param --nodeps")
or die "Verification of package $package failed.";
while (my $line = <RPMV>) {
@@ -625,7 +640,7 @@
my ($all_files, $pkg_inodes) = @_;
my %duplicates;
- open(RPMQAL, "rpm -qal |")
+ open(RPMQAL, "-|", "LC_ALL=C rpm -qal")
or die "Command 'rpm -qal' failed\n";
if ($output_progress)
@@ -671,12 +686,15 @@
{
my ($filename) = @_;
- open(RPMQFILE, 'rpm -qf '.$filename.' 2>/dev/null |');
+ open(RPMQFILE, '-|', 'LANG=C rpm -qf '.Quote ($filename).' 2>/dev/null');
my $inpackage = 0;
while (my $pkg = <RPMQFILE>)
{
- $inpackage = 1;
+ # bnc #421214, backup also symbolic links
+ if ( $pkg !~ /is not owned by any package$/ ) {
+ $inpackage = 1;
+ }
}
close(RPMQFILE);
@@ -792,7 +810,7 @@
foreach my $fsys (@fs)
{
- open(MOUNTT, "export LC_ALL=C; mount -t $fsys |")
+ open(MOUNTT, "-|", "export LC_ALL=C; mount -t ".Quote ($fsys))
or next;
while ($line = <MOUNTT>)
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-backup-2.17.0/VERSION new/yast2-backup-2.17.1/VERSION
--- old/yast2-backup-2.17.0/VERSION 2008-09-22 14:23:32.000000000 +0200
+++ new/yast2-backup-2.17.1/VERSION 2008-10-20 16:15:45.000000000 +0200
@@ -1 +1 @@
-2.17.0
+2.17.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org