Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2015-12-13 09:39:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inst-source-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2015-11-04 15:31:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2015-12-13 09:39:34.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Dec 9 16:01:55 CET 2015 - r...@suse.de + +- update rezip_repo_rsyncable again: fix up filenames if they + are checksum prefixed, do not change timestamps of the + files recompressed (bnc#958511) + +------------------------------------------------------------------- +Tue Dec 8 12:10:41 CET 2015 - r...@suse.de + +- rezip_repo_rsyncable: add "-n" option for gzip + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.BN93LN/_old 2015-12-13 09:39:35.000000000 +0100 +++ /var/tmp/diff_new_pack.BN93LN/_new 2015-12-13 09:39:35.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Utilities for creating customized installation sources License: GPL-2.0+ Group: System/YaST -Version: 2015.10.27 +Version: 2015.12.9 Release: 0 Url: http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums new/inst-source-utils/usr/bin/create_sha1sums --- old/inst-source-utils/usr/bin/create_sha1sums 2015-10-27 15:16:22.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sums 2015-12-09 15:58:20.000000000 +0100 @@ -51,8 +51,13 @@ function signit(){ if [ "$(type -p sign 2>/dev/null)" != "" ]; then - sign $SIGN_OPTS -d $1 - sign $SIGN_OPTS -p > $1.key +# if sign -t ; then + sign $SIGN_OPTS -d $1 + sign $SIGN_OPTS -p > $1.key +# else +# : > $1.asc +# cp //keys/default $1.key +# fi else gpg -a -b $1 KEY_ID=`gpg -b < /dev/null | gpg --list-packets | sed -n -e "/^:signature/s@.*keyid @@p"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/rezip_repo_rsyncable new/inst-source-utils/usr/bin/rezip_repo_rsyncable --- old/inst-source-utils/usr/bin/rezip_repo_rsyncable 2015-10-27 15:10:01.000000000 +0100 +++ new/inst-source-utils/usr/bin/rezip_repo_rsyncable 2015-12-09 15:58:20.000000000 +0100 @@ -28,11 +28,17 @@ my $checksumtype = uc($checksumstring); $checksumtype =~ s/([0-9]+)/-$1/; $checksumtype .= "-1" unless $checksumtype =~ /[0-9]/; - open(REC, "<", "$repobase/$filename"); + next unless open(REC, "<", "$repobase/$filename"); my $ctx = Digest->new($checksumtype); $ctx->addfile(*REC); my $newfilechksum = $ctx->hexdigest(); close (REC); + if ($filename =~ /^([^\/]*\/)?[0-9a-f][0-9a-f]*-(.*\.gz)$/) { + my $new_filename = "$1$newfilechksum-$2"; + rename ("$repobase/$filename","$repobase/$new_filename"); + $filename = $new_filename; + $record->{'location'}->{'href'} = $filename; + } my $nstat = stat("$repobase/$filename"); my $newfiletime = $nstat->mtime; my $newfilesize = $nstat->size; @@ -75,9 +81,12 @@ if ( $rsyncable ) { my @GZIPPED = glob("$arg/*.gz"); for (@GZIPPED) { + system ("touch", "--reference", "$_", "$_.timestamp"); system ("gunzip", "-f", $_); $_ =~ s/.gz$//; - system ("gzip", "-9", $rsyncable, $_); + system ("gzip", "-9", "-n", $rsyncable, $_); + system ("touch", "--reference", "$_.gz.timestamp", "$_.gz"); + unlink ("$_.gz.timestamp"); } my $has_sign = ""; $has_sign = "1" if ( -f "$arg/repomd.xml.asc" );
