Hello community,

here is the log from the commit of package debootstrap for openSUSE:Factory 
checked in at 2013-04-07 14:21:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/debootstrap (Old)
 and      /work/SRC/openSUSE:Factory/.debootstrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "debootstrap", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/debootstrap/debootstrap.changes  2012-11-08 
08:03:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.debootstrap.new/debootstrap.changes     
2013-04-07 14:21:06.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Apr  5 20:18:04 UTC 2013 - frank.lichtenh...@sophos.com
+
+- update to 1.0.48
+* Disable InRelease support.  gpgv won't give us back the signed data, and
+  full gpg is not available inside d-i (deb#703889).
+* Move extract_release_components to after signature verification.
+
+-------------------------------------------------------------------
+Tue Mar 26 22:05:11 UTC 2013 - frank.lichtenh...@sophos.com
+
+- update to 1.0.47
+* Properly decrypt the InRelease file when downloading from an archive
+  where InRelease is used. This longstanding bug was masked by former
+  APT behaviour and was revealed only with recent APT versions
+  deb#703146
+* Add Requires on gpg2
+
+-------------------------------------------------------------------
@@ -12 +30 @@
-  message. (Ubuntu LP: #1017398)
+  message. lp#1017398
@@ -18 +36 @@
-* Add support for InRelease files (Debian Bug #638682)
+* Add support for InRelease files. deb#638682

Old:
----
  debootstrap_1.0.43.tar.gz

New:
----
  debootstrap_1.0.48.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ debootstrap.spec ++++++
--- /var/tmp/diff_new_pack.RI8D5A/_old  2013-04-07 14:21:07.000000000 +0200
+++ /var/tmp/diff_new_pack.RI8D5A/_new  2013-04-07 14:21:07.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package debootstrap
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Frank Lichtenheld <fr...@lichtenheld.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 
 
 Name:           debootstrap
-Version:        1.0.43
+Version:        1.0.48
 Release:        0
 Summary:        Bootstrap a basic Debian system
 License:        MIT

++++++ debootstrap_1.0.43.tar.gz -> debootstrap_1.0.48.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/debootstrap-1.0.43/debian/changelog 
new/debootstrap-1.0.48/debian/changelog
--- old/debootstrap-1.0.43/debian/changelog     2012-10-27 12:46:46.000000000 
+0200
+++ new/debootstrap-1.0.48/debian/changelog     2013-04-04 16:18:04.000000000 
+0200
@@ -1,3 +1,50 @@
+debootstrap (1.0.48) unstable; urgency=low
+
+  * Team upload
+
+  [ Julien Cristau ]
+  * Disable InRelease support.  gpgv won't give us back the signed data, and
+    full gpg is not available inside d-i (closes: #703889).
+  * Move extract_release_components to after signature verification.
+    Suggested by Ansgar Burchardt.
+
+ -- Didier Raboud <o...@debian.org>  Thu, 04 Apr 2013 16:17:57 +0200
+
+debootstrap (1.0.47) unstable; urgency=low
+
+  * Team upload
+  * Properly decrypt the InRelease file when downloading from an archive
+    where InRelease is used. This longstanding bug was masked by former
+    APT behaviour and was revealed only with recent APT versions
+    Closes: #703146
+    Thanks to Michael Vogt for the analysis and patch
+  * Add a dependency on gpg because of the above change.
+
+ -- Christian Perrier <bubu...@debian.org>  Wed, 20 Mar 2013 21:34:29 +0100
+
+debootstrap (1.0.46) unstable; urgency=low
+
+  * Team upload.
+  * Use `which` to find out sh only if /bin/sh does not exist.
+
+ -- Samuel Thibault <sthiba...@debian.org>  Thu, 27 Dec 2012 15:47:16 +0100
+
+debootstrap (1.0.45) unstable; urgency=low
+
+  [ Joey Hess ]
+  * Better support use on Android by not hardcoding /bin/sh
+    in a test file that's created, and instead putting in the
+    actual path to sh. Closes: #694310 Thanks, Shawn Landden
+
+ -- Christian Perrier <bubu...@debian.org>  Sat, 22 Dec 2012 12:56:32 +0100
+
+debootstrap (1.0.44) unstable; urgency=low
+
+  * Remove double quotes to fix for loop on GNU/kFreeBSD, thanks to
+    Oleg Ginzburg (Closes: #693718).
+
+ -- Cyril Brulebois <k...@debian.org>  Tue, 20 Nov 2012 23:55:53 +0100
+
 debootstrap (1.0.43) unstable; urgency=low
 
   [ Joey Hess ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/debootstrap-1.0.43/debootstrap 
new/debootstrap-1.0.48/debootstrap
--- old/debootstrap-1.0.43/debootstrap  2011-11-20 03:00:58.000000000 +0100
+++ new/debootstrap-1.0.48/debootstrap  2013-03-25 16:25:14.000000000 +0100
@@ -433,7 +433,7 @@
 fi
 
 if [ "$HOST_OS" = "kfreebsd" ] || [ "$HOST_OS" = "freebsd" ]; then
-       for module in "linprocfs fdescfs tmpfs linsysfs"; do
+       for module in linprocfs fdescfs tmpfs linsysfs; do
                kldstat -m "$module" > /dev/null 2>&1 || warning SANITYCHECK 
"Probably required module %s is not loaded" "$module"
        done
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/debootstrap-1.0.43/functions 
new/debootstrap-1.0.48/functions
--- old/debootstrap-1.0.43/functions    2012-09-06 03:00:54.000000000 +0200
+++ new/debootstrap-1.0.48/functions    2013-03-25 16:25:14.000000000 +0100
@@ -503,59 +503,40 @@
        local m1="$1"
        local reldest="$2"
        local relsigdest="$3"
-       local release_file_variant="$4"
 
        if [ -n "$KEYRING" ] && [ -z "$DISABLE_KEYRING" ]; then
-               if [ "$release_file_variant" != "IN" ]; then
-                       progress 0 100 DOWNRELSIG "Downloading Release file 
signature"
-                       progress_next 50
-                       get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" 
nocache ||
-                               error 1 NOGETRELSIG "Failed getting release 
signature file %s" \
-                               "$m1/dists/$SUITE/Release.gpg"
-                       progress 50 100 DOWNRELSIG "Downloading Release file 
signature"
-               fi
+               progress 0 100 DOWNRELSIG "Downloading Release file signature"
+               progress_next 50
+               get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
+                       error 1 NOGETRELSIG "Failed getting release signature 
file %s" \
+                       "$m1/dists/$SUITE/Release.gpg"
+               progress 50 100 DOWNRELSIG "Downloading Release file signature"
 
                info RELEASESIG "Checking Release signature"
                # Don't worry about the exit status from gpgv; parsing the 
output will
                # take care of that.
-               if [ "$release_file_variant" = "IN" ]; then
-                       (gpgv --status-fd 1 --keyring "$KEYRING" 
--ignore-time-conflict \
-                        "$relsigdest" || true) | read_gpg_status
-               else
-                       (gpgv --status-fd 1 --keyring "$KEYRING" 
--ignore-time-conflict \
-                        "$relsigdest" "$reldest" || true) | read_gpg_status
-               fi
+               (gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict 
\
+                "$relsigdest" "$reldest" || true) | read_gpg_status
                progress 100 100 DOWNRELSIG "Downloading Release file signature"
        elif [ -z "$DISABLE_KEYRING" ] && [ -n "$KEYRING_WANTED" ]; then
                warning KEYRING "Cannot check Release signature; keyring file 
not available %s" "$KEYRING_WANTED"
        fi
-       if [ "$release_file_variant" = "IN" ]; then
-               mv "$relsigdest" "$reldest"
-       fi
 }
 
 download_release_indices () {
        local m1="${MIRRORS%% *}"
        local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" 
"dists/$SUITE/Release")"
-       local inreldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" 
"dists/$SUITE/InRelease")"
        local relsigdest
-       local release_file_variant="IN"
        progress 0 100 DOWNREL "Downloading Release file"
        progress_next 100
-       if get "$m1/dists/$SUITE/InRelease" "$inreldest" nocache; then
-               extract_release_components $inreldest
-               relsigdest="$inreldest"
-       else
-               info RETRIEVING "Failed to retrieve InRelease"
-               get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
-                       error 1 NOGETREL "Failed getting release file %s" 
"$m1/dists/$SUITE/Release"
-               release_file_variant="GPG"
-               relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" 
"dists/$SUITE/Release.gpg")"
-               extract_release_components $reldest
-       fi
+       get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
+               error 1 NOGETREL "Failed getting release file %s" 
"$m1/dists/$SUITE/Release"
+       relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" 
"dists/$SUITE/Release.gpg")"
        progress 100 100 DOWNREL "Downloading Release file"
 
-       download_release_sig "$m1" "$reldest" "$relsigdest" 
"$release_file_variant"
+       download_release_sig "$m1" "$reldest" "$relsigdest"
+
+       extract_release_components $reldest
 
        local totalpkgs=0
        for c in $COMPONENTS; do
@@ -1299,8 +1280,11 @@
                ;;
        esac
 
+       SH=/bin/sh
+       [ -x $SH ] || SH=`which sh`
+
        cat > "$1/test-exec" <<EOF
-#! /bin/sh
+#! $SH
 :
 EOF
        chmod +x "$1/test-exec"

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to