Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2012-12-14 09:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inst-source-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2012-09-23 08:04:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2012-12-14 09:18:41.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 5 13:27:11 CET 2012 - [email protected] + +- update create_md5sums to get the key files witout a pubring.gpg + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 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 2012-09-13 16:18:24.000000000 +0200 +++ new/inst-source-utils/usr/bin/create_sha1sums 2012-12-05 13:30:13.000000000 +0100 @@ -52,8 +52,11 @@ function signit(){ if [ "$(which sign 2>/dev/null)" != "" ]; then sign $SIGN_OPTS -d $1 + sign $SIGN_OPTS -p > $1.key else gpg -a -b $1 + KEY_ID=`gpg -b < /dev/null | gpg --list-packets | sed -n -e "/^:signature/s@.*keyid @@p"` + gpg --export --armor $KEY_ID > $1.key fi } @@ -123,9 +126,11 @@ if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then /usr/bin/create_sha1sum $CHECKSUM_O --quiet "$SLIDESHOWDIR" fi - for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do - signit "$sha1sumfile" - done + if [ $SIGN = "yes" ]; then + for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do + signit "$sha1sumfile" + done + fi fi fi @@ -150,32 +155,6 @@ test -f $CDS_PRIM/${file} || continue signit $CDS_PRIM/${file} done - - # GPG file handling starts here - if [ -f $CDS_PRIM/pubring.gpg ]; then - KEY_ID=`gpg --verify --no-default-keyring --keyring $CDS_PRIM/pubring.gpg $CDS_PRIM/content.asc $CDS_PRIM/content 2>&1 | sed -ne "s@.*key ID @@p" | tr [A-Z] [a-z]` - KEY_FILE=`ls $CDS_PRIM/gpg-pubkey-$KEY_ID-* 2>/dev/null | tail -1` - if [ -f "$KEY_FILE" ] ; then - for file in media.1/products.key content.key; do - test -f $CDS_PRIM/$file && rm $CDS_PRIM/$file - cp -a $KEY_FILE $CDS_PRIM/$file - done - if [ x"$REPOFILE" != x"" ] ; then - cp -a $KEY_FILE $CDS_PRIM/$REPOFILE.key - fi - if [ -n "$SLIDESHOWDIR" ]; then - for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do - cp -a $KEY_FILE ${sha1sumfile}.key - # XXXX: check if this is needed - create_directory.yast $(dirname "$sha1sumfile") - done - fi - else - echo "ERROR: Could not find public key file for $CDS_PRIM/pubring.gpg in $CDS_PRIM/gpg-pubkey-*" >&2 - fi - else - echo "WARNING: CDS_PRIM/pubring.gpg not found" >&2 - fi fi # make sure everything is readable for all -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
