Hello community, here is the log from the commit of package inst-source-utils checked in at Thu Oct 9 18:45:55 CEST 2008. -------- --- inst-source-utils/inst-source-utils.changes 2008-07-21 19:13:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2008-10-09 17:56:28.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 9 17:46:48 CEST 2008 - lrupp@suse.de + +- quick fix for bnc#409927: + - create_sha1sums: + + create SHA1SUM files and sign them in the slideshow directory + - added create_sha1sum which is a copy of create_md5sums + (can't use create_sha1sum_s_ as this name is already in use) +- removed NoSource tags + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- copy-build.sh New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.c22477/_old 2008-10-09 18:44:41.000000000 +0200 +++ /var/tmp/diff_new_pack.c22477/_new 2008-10-09 18:44:41.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package inst-source-utils (Version 2008.7.21) +# spec file for package inst-source-utils (Version 2008.10.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,13 +25,10 @@ Obsoletes: autoyast2-utils <= 2.14.10 Provides: autoyast2-utils = 2.14.10 Summary: Utilities for creating customized installation sources -Version: 2008.10.8 +Version: 2008.10.9 Release: 1 Source: inst-source-utils.tar.bz2 -Source1: copy-build.sh -Source2: split.pl -NoSource: 1 -NoSource: 2 +Source1: split.pl BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,6 +60,13 @@ %_datadir/%name %changelog +* Thu Oct 09 2008 lrupp@suse.de +- quick fix for bnc#409927: + - create_sha1sums: + + create SHA1SUM files and sign them in the slideshow directory + - added create_sha1sum which is a copy of create_md5sums + (can't use create_sha1sum_s_ as this name is already in use) +- removed NoSource tags * Mon Jul 21 2008 lrupp@suse.de - create_directory_yast: + add "-f" option to overwrite existing directory.yast files ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sum new/inst-source-utils/usr/bin/create_sha1sum --- old/inst-source-utils/usr/bin/create_sha1sum 1970-01-01 01:00:00.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sum 2008-10-09 17:51:41.000000000 +0200 @@ -0,0 +1,135 @@ +#!/bin/bash +# +# Copyright (C) 2008 Novell Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, +# Fifth Floor, +# Boston, MA 02110-1301, +# USA. +# +# $Id: create_sha1um,v 1.8 2008/06/25 12:18:19 lrupp Exp lrupp $ +# + +function usage (){ + echo + echo "Usage: `basename $0` [--meta] <targetdir>" + echo " --meta : also create MD5SUMS.meta file" + echo " --quiet: don't output anything" + echo + echo " Creates SHA1SUMS files in each subdirectory." + echo " Sometimes useful for debugging inst-source problems ;-)" + echo + exit $1 +} + +function output(){ + if [ "$QUIET" != "yes" ]; then + echo "$1" + fi +} + +if [ -z "$1" ]; then + usage 1; +fi +if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]] ; then + usage 0; +fi + +unset LANGUAGE +unset LANG +export LC_ALL=POSIX +umask 022 + +CREATE_META= +QUIET="no" + +if test "x$1" = "x--meta"; then + CREATE_META=1 + shift +fi +if test "x$1" = "x--quiet"; then + QUIET="yes" + shift +fi + +ROOTDIRS="$*" +TMPFILE=$(mktemp /tmp/.create_sha1sums.XXXXXX) +MYPWD=$(pwd) + +test -z "$ROOTDIRS" && ROOTDIRS="$MYPWD" + +for ROOTDIR in "$ROOTDIRS" ; do + case "$ROOTDIR" in + /*) ;; + *) ROOTDIR="$MYPWD/$ROOTDIR" ;; + esac + + test -d "$ROOTDIR" || { + echo "WARNING: $ROOTDIR is not a directory. Skipping it." >&2 + } + + for DIR in $(find "$ROOTDIR" -type d) ; do + cd "$DIR" + FILES=$( + for FILE in * ; do + test -f "$FILE" || continue + test -L "$FILE" && continue + test -n "$SHA1SUM_SKIPFILES" && { + IS_SKIP=false + set -f + for i in $SHA1SUM_SKIPFILES ; do + set +f + case "$FILE" in + ($i) IS_SKIP=true + break + ;; + esac + done + set +f + test $IS_SKIP = true && continue + } + case "$FILE" in + (*.swp|SHA1SUMS*) + continue + ;; + (*) + echo $FILE + ;; + esac + done) + if test -z "$FILES" ; then + rm -f SHA1SUMS* + else + echo "$FILES" | xargs sha1sum > $TMPFILE + test -e SHA1SUMS || touch SHA1SUMS + cmp -s $TMPFILE SHA1SUMS || { + mv $TMPFILE SHA1SUMS + chmod 644 SHA1SUMS + output "Info: created SHA1SUMS in $DIR" + } + if test -n "$CREATE_META"; then + test -e SHA1SUMS.meta || touch SHA1SUMS.meta + sha1sum SHA1SUMS > $TMPFILE + cmp -s $TMPFILE SHA1SUMS.meta || { + mv $TMPFILE SHA1SUMS.meta + chmod 644 SHA1SUMS.meta + output "Info: created SHA1SUMS.meta in $DIR" + } + fi + rm -f $TMPFILE + fi + done +done 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 2008-10-09 00:40:03.000000000 +0200 +++ new/inst-source-utils/usr/bin/create_sha1sums 2008-10-09 17:51:41.000000000 +0200 @@ -97,6 +97,20 @@ test -f $i || continue sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content done + # check if we need to include additional files for > 11.0 + if grep -q CONTENTSTYLE $CDS_PRIM/content; then + DATADIR=$(grep DATADIR content | awk '" " { print $2 }') + if [ -d "$CDS_PRIM/$DATADIR/setup/slide" ]; then + SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" + fi + create_sha1sum --quiet "$SLIDESHOWDIR" + for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do + signit "$sha1sumfile" + # XXXX: check if this is needed + create_directory.yast $(dirname "$sha1sumfile") + done + fi + fi if [ "$INCLUDE_SHA1SUMS" = "yes" ]; then for i in $(find $CDS_PRIM/ -name SHA1SUMS | sed -e "s|./||"); do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org