Hello community, here is the log from the commit of package debootstrap for openSUSE:Factory checked in at 2015-06-15 17:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/debootstrap (Old) and /work/SRC/openSUSE:Factory/.debootstrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "debootstrap" Changes: -------- --- /work/SRC/openSUSE:Factory/debootstrap/debootstrap.changes 2015-03-23 12:18:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.debootstrap.new/debootstrap.changes 2015-06-15 17:49:48.000000000 +0200 @@ -1,0 +2,26 @@ +Sun Jun 14 19:20:21 UTC 2015 - [email protected] + +- bump to 1.0.70 + * Use tr instead of (missing in d-i) xargs (Closes: + #785693). Thanks, Julian Schauder! + + * Make sure to deduplicate package list in download_release to + avoid issues while counting downloaded packages. The failure + path could lead to printing some strange integer (Closes: + #709751, #768445, #785276, #774752). This was reported to + mostly happen whenever --no-resolve-deps is used. + + * Add support for --force-check-gpg so that one can + programmatically make sure keyring checks are used and that + no fallback to an https mirror happens (Closes: #661501, + #733179, #775454). * Switch default mirror from + ftp.us.debian.org to the new, official http redirector + service: httpredir.debian.org + * Make it possible to override the MAKEDEV variable (Closes: #734743). + Thanks, Wookey! + + * Update Standards to 3.9.6 (checked) + * Support the jessie-kfreebsd suite, by using the same script as + jessie (a symlink to sid) (Closes: #784927). + +------------------------------------------------------------------- Old: ---- debootstrap_1.0.67.tar.gz New: ---- debootstrap_1.0.70.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ debootstrap.spec ++++++ --- /var/tmp/diff_new_pack.5Pq5nq/_old 2015-06-15 17:49:48.000000000 +0200 +++ /var/tmp/diff_new_pack.5Pq5nq/_new 2015-06-15 17:49:48.000000000 +0200 @@ -18,7 +18,7 @@ Name: debootstrap -Version: 1.0.67 +Version: 1.0.70 Release: 0 Summary: Bootstrap a basic Debian system License: MIT ++++++ debootstrap_1.0.67.tar.gz -> debootstrap_1.0.70.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/Makefile new/debootstrap-1.0.70/Makefile --- old/debootstrap-1.0.67/Makefile 2014-12-30 05:00:48.000000000 +0100 +++ new/debootstrap-1.0.70/Makefile 2015-05-19 11:35:39.000000000 +0200 @@ -2,7 +2,7 @@ VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog) DATE := $(shell sed -n '/^ -- /{s/.*> \(.*\)/\1/p;q}' debian/changelog) -MAKEDEV := /sbin/MAKEDEV +MAKEDEV ?= /sbin/MAKEDEV ifeq ($(shell uname),Linux) all: devices.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/debian/changelog new/debootstrap-1.0.70/debian/changelog --- old/debootstrap-1.0.67/debian/changelog 2015-01-14 07:03:21.000000000 +0100 +++ new/debootstrap-1.0.70/debian/changelog 2015-05-19 11:38:28.000000000 +0200 @@ -1,3 +1,39 @@ +debootstrap (1.0.70) unstable; urgency=medium + + * Use tr instead of (missing in d-i) xargs (Closes: #785693). Thanks, + Julian Schauder! + + -- Cyril Brulebois <[email protected]> Tue, 19 May 2015 11:38:27 +0200 + +debootstrap (1.0.69) unstable; urgency=medium + + [ Cyril Brulebois ] + * Make sure to deduplicate package list in download_release to avoid + issues while counting downloaded packages. The failure path could lead + to printing some strange integer (Closes: #709751, #768445, #785276, + #774752). + This was reported to mostly happen whenever --no-resolve-deps is used. + * Add support for --force-check-gpg so that one can programmatically + make sure keyring checks are used and that no fallback to an https + mirror happens (Closes: #661501, #733179, #775454). + * Switch default mirror from ftp.us.debian.org to the new, official + http redirector service: httpredir.debian.org + * Make it possible to override the MAKEDEV variable (Closes: #734743). + Thanks, Wookey! + + [ Christian Perrier ] + * Update Standards to 3.9.6 (checked) + + -- Christian Perrier <[email protected]> Mon, 18 May 2015 14:07:43 +0200 + +debootstrap (1.0.68) unstable; urgency=medium + + [ Steven Chamberlain ] + * Support the jessie-kfreebsd suite, by using the same script as + jessie (a symlink to sid) (Closes: #784927). + + -- Christian Perrier <[email protected]> Mon, 11 May 2015 07:46:19 +0200 + debootstrap (1.0.67) unstable; urgency=medium [ Cyril Brulebois ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/debian/control new/debootstrap-1.0.70/debian/control --- old/debootstrap-1.0.67/debian/control 2014-11-08 05:00:45.000000000 +0100 +++ new/debootstrap-1.0.70/debian/control 2015-05-19 11:35:39.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Debian Install System Team <[email protected]> Uploaders: Junichi Uekawa <[email protected]>, Colin Watson <[email protected]>, Christian Perrier <[email protected]> Build-Depends: debhelper (>= 9), makedev (>= 2.3.1-69) [linux-any] -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/debootstrap.git Vcs-Git: git://anonscm.debian.org/d-i/debootstrap.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/debootstrap new/debootstrap-1.0.70/debootstrap --- old/debootstrap-1.0.67/debootstrap 2014-09-25 06:44:06.000000000 +0200 +++ new/debootstrap-1.0.70/debootstrap 2015-05-16 20:24:16.000000000 +0200 @@ -27,6 +27,7 @@ USE_COMPONENTS=main KEYRING="" DISABLE_KEYRING="" +FORCE_KEYRING="" VARIANT="" ARCH="" HOST_ARCH="" @@ -47,7 +48,7 @@ CHECKCERTIF="" PRIVATEKEY="" -DEF_MIRROR="http://ftp.us.debian.org/debian"; +DEF_MIRROR="http://httpredir.debian.org/debian"; DEF_HTTPS_MIRROR="https://mirrors.kernel.org/debian"; export LANG USE_COMPONENTS @@ -104,6 +105,9 @@ scratchbox, minbase) --keyring=K check Release files against keyring K --no-check-gpg avoid checking Release file signatures + --force-check-gpg force checking Release file signatures + (also disables automatic fallback to HTTPS in case + of a missing keyring), aborting otherwise --no-resolve-deps don't try to resolve dependencies automatically --unpack-tarball=T acquire .debs from a tarball instead of http @@ -319,6 +323,10 @@ shift 1 DISABLE_KEYRING=1 ;; + --force-check-gpg) + shift 1 + FORCE_KEYRING=1 + ;; --certificate|--certificate=?*) if [ "$1" = "--certificate" -a -n "$2" ]; then CERTIFICATE="--certificate=$2" @@ -356,6 +364,12 @@ fi ########################################################################### + +if [ -n "$DISABLE_KEYRING" -a -n "$FORCE_KEYRING" ]; then + error 1 BADARG "Both --no-check-gpg and --force-check-gpg specified, please pick one (at most)" +fi + +########################################################################### if [ "$SECOND_STAGE_ONLY" = "true" ]; then SUITE=$(cat $DEBOOTSTRAP_DIR/suite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/debootstrap.8 new/debootstrap-1.0.70/debootstrap.8 --- old/debootstrap-1.0.67/debootstrap.8 2013-12-30 07:59:03.000000000 +0100 +++ new/debootstrap-1.0.70/debootstrap.8 2015-05-16 20:24:16.000000000 +0200 @@ -93,6 +93,10 @@ .IP "\fB\-\-no-check-gpg\fP" Disables checking gpg signatures of retrieved Release files. .IP +.IP "\fB\-\-force-check-gpg\fP" +Forces checking Release file signatures, disabling automatic fallback to +HTTPS in case of a missing keyring. Incompatible with the previous option. +.IP .IP "\fB\-\-verbose\fP" Produce more info about downloading. .IP @@ -158,14 +162,14 @@ .PP To setup a \fIwheezy\fR system: .PP - debootstrap wheezy ./wheezy-chroot http://ftp.us.debian.org/debian + debootstrap wheezy ./wheezy-chroot http://httpredir.debian.org/debian .PP debootstrap wheezy ./wheezy-chroot file:///LOCAL_MIRROR/debian .PP Full process to create a complete Debian installation of \fIsid\fR (unstable) in a chroot: .PP - main # debootstrap sid sid-root http://ftp.us.debian.org/debian/ + main # debootstrap sid sid-root http://httpredir.debian.org/debian/ [ ... watch it download the whole system ] main # echo "proc sid-root/proc proc defaults 0 0" >> /etc/fstab main # mount proc sid-root/proc -t proc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/functions new/debootstrap-1.0.70/functions --- old/debootstrap-1.0.67/functions 2015-01-06 05:00:50.000000000 +0100 +++ new/debootstrap-1.0.70/functions 2015-05-19 11:35:50.000000000 +0200 @@ -200,11 +200,14 @@ if [ -e "$1" ]; then KEYRING="$1" elif [ -z "$DISABLE_KEYRING" ]; then - if [ -n "$DEF_HTTPS_MIRROR" ] && [ -z "$USER_MIRROR" ] ; then + if [ -n "$DEF_HTTPS_MIRROR" ] && [ -z "$USER_MIRROR" ] && [ -z "$FORCE_KEYRING" ]; then info KEYRING "Keyring file not available at %s; switching to https mirror %s" "$1" "$DEF_HTTPS_MIRROR" USER_MIRROR="$DEF_HTTPS_MIRROR" else warning KEYRING "Cannot check Release signature; keyring file not available %s" "$1" + if [ -n "$FORCE_KEYRING" ]; then + error 1 KEYRING "Keyring-based check was requested; aborting accordingly" + fi fi fi fi @@ -662,6 +665,11 @@ local totaldebs=0 local leftoverdebs="$*" + + # Fix possible duplicate package names, which would screw up counts: + leftoverdebs=$(printf "$leftoverdebs"|tr ' ' '\n'|sort -u|tr '\n' ' ') + numdebs=$(printf "$leftoverdebs"|wc -w) + for c in $COMPONENTS; do if [ "$countdebs" -ge "$numdebs" ]; then break; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.67/scripts/jessie-kfreebsd new/debootstrap-1.0.70/scripts/jessie-kfreebsd --- old/debootstrap-1.0.67/scripts/jessie-kfreebsd 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.70/scripts/jessie-kfreebsd 2015-06-15 17:49:48.000000000 +0200 @@ -0,0 +1 @@ +symbolic link to sid
