commit inst-source-utils for openSUSE:Factory
Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at Mon May 2 14:28:36 CEST 2011. -------- --- inst-source-utils/inst-source-utils.changes 2010-03-17 11:55:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2011-04-28 18:25:52.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 28 18:25:28 CEST 2011 - ro@suse.de + +- add option -D to use sha256 checksums in create_package_descr + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.TLwZPV/_old 2011-05-02 14:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.TLwZPV/_new 2011-05-02 14:28:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package inst-source-utils (Version 2010.3.17) +# spec file for package inst-source-utils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: inst-source-utils Summary: Utilities for creating customized installation sources -Version: 2010.3.17 +Version: 2011.4.28 Release: 1 Url: http://en.opensuse.org/Inst-source-utils License: GPLv2+ ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr new/inst-source-utils/usr/bin/create_package_descr --- old/inst-source-utils/usr/bin/create_package_descr 2010-03-17 14:28:14.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_package_descr 2011-04-28 18:24:03.000000000 +0200 @@ -52,6 +52,7 @@ my $prefer_yastdescr = "0"; my $add_licenses = "0"; my $do_checksums = "0"; +my $do_sha256 = "0"; my $do_keywords = "0"; my $have_sha_cache = 0; my $do_file_list = 0; @@ -62,6 +63,7 @@ my $allow_shr = 1; my %used_fallbacks; my $num_pdb_records = 0; +my $checksum_binary = "sha1sum"; sub usage { my $exit_code=shift || 1; @@ -83,6 +85,7 @@ print " [-P ] (prefer_yastdescr)\n"; print " [-L ] (ignore_symlinks)\n"; print " [-C ] (do_checksums)\n"; + print " [-D ] (do_sha256_checksums)\n"; print " [-K ] (do_keywords)\n"; print " [-F ] (do_file_list)\n"; print " [-B ] (add requires for src packages)\n\n"; @@ -127,6 +130,7 @@ elsif ( $arg eq "-B" ) { $src_requires = 1; } elsif ( $arg eq "-V" ) { $add_vendor = 1; } elsif ( $arg eq "-C" ) { $do_checksums = "1"; } + elsif ( $arg eq "-D" ) { $do_checksums = "1"; $do_sha256 = "1"; $checksum_binary = "sha256sum"; } elsif ( $arg eq "-F" ) { $do_file_list = 1; } elsif ( $arg eq "-I" ) { $ignore_file = shift @ARGV ; } elsif ( $arg eq "-K" ) { $do_keywords = "1"; } @@ -332,10 +336,15 @@ #print "INFO: re_using checksum for $package ($checksum)\n"; } } + if ($do_sha256 eq "1") { + $checksum = "" unless length($checksum) == 64; + } else { + $checksum = "" unless length($checksum) == 40; + } } if ( ! $checksum ) { if ( $res{1044}[0] || $ignore_sources eq "0") { - ($checksum,$dummy) = split('\s+',`sha1sum $package`); + ($checksum,$dummy) = split('\s+',`$checksum_binary $package`); if ( $have_sha_cache eq "1" ) { open ( CSC, "> $SHA_CACHEDIR[0]/$rpm_name-$hash" ); print CSC $checksum; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de