From 14cbd9b62dde6bfbbb7b61ffa5a60bc15704877dd424d2487239564d3a8a648b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 29 Jun 2017 07:24:43 +0000 Subject: [PATCH] Accepting request 506822 from home:markoschandras:branches:devel:tools - Version bump to 1.0.90 * Add (Ubuntu) artful as a symlink to gutsy. * Improve /dev/ptmx handling (deb#817236) * Add autopkgtest support to test various scenarios. * Uniformize COMPONENTS/USE_COMPONENTS handling. * Strip the arch-qualifier (deb#836525) * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps (deb#844221) * remove scratchbox2 support (deb#796189) * Reword split_inline_sig (deb#842591) * Add support for downloading and validating InRelease files, by splitting up detached signature from signed data. * Switch default mirror to deb.debian.org. * Add (Ubuntu) zesty as a symlink to gutsy. * Add jessie-kfreebsd to merged-/usr blacklist. * No longer Build-Depend on makedev. The code using it was already removed in debootstrap 1.0.82. * Do not use `tar -k` for older releases which might have file conflicts between the packages to be installed. (deb#838388) * Error out when seeing short options. (deb#548880) * Add oldoldstable -> sid script symlink. (deb#792734) * Add buster -> sid and bullseye -> sid script symlinks. * Only unpack and configure the base system when there are actually packages to install. (deb#825034) * debootstrap.8: Use stretch instead of wheezy in examples. * Enable merged-/usr by default. (deb#839046) * Add support for xz-compressed Packages indices. (deb#837649) * functions: Validate that the requested suite is listed in the Release file's Suite or Codename field. (deb#837075) * Add support for merged-/usr, enabled by a new --merged-usr option (deb#810301) Feign install of dpkg in second stage. This avoids problems when OBS-URL: https://build.opensuse.org/request/show/506822 OBS-URL: https://build.opensuse.org/package/show/devel:tools/debootstrap?expand=0&rev=33 --- debootstrap-norootforbuild.patch | 16 ++++--------- debootstrap.changes | 39 ++++++++++++++++++++++++++++++++ debootstrap.spec | 6 ++--- debootstrap_1.0.79.tar.gz | 3 --- debootstrap_1.0.90.tar.gz | 3 +++ devices.tar.gz | 3 --- 6 files changed, 49 insertions(+), 21 deletions(-) delete mode 100644 debootstrap_1.0.79.tar.gz create mode 100644 debootstrap_1.0.90.tar.gz delete mode 100644 devices.tar.gz diff --git a/debootstrap-norootforbuild.patch b/debootstrap-norootforbuild.patch index 394a5e7..cb8f166 100644 --- a/debootstrap-norootforbuild.patch +++ b/debootstrap-norootforbuild.patch @@ -1,7 +1,8 @@ -diff -ur debootstrap.orig/Makefile debootstrap/Makefile ---- debootstrap.orig/Makefile 2011-08-10 13:59:34.000000000 +0200 -+++ debootstrap/Makefile 2011-08-12 21:57:41.329074862 +0200 -@@ -19,14 +19,13 @@ +diff --git a/Makefile b/Makefile +index 8516803..21a9a39 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,8 +11,7 @@ install: mkdir -p $(DESTDIR)/usr/sbin cp -a scripts/* $(DSDIR)/scripts/ @@ -11,10 +12,3 @@ diff -ur debootstrap.orig/Makefile debootstrap/Makefile sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap chmod 0755 $(DESTDIR)/usr/sbin/debootstrap - - ifeq ($(shell uname),Linux) -- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ -+ install -m 0644 devices.tar.gz $(DSDIR)/ - endif - - devices.tar.gz: diff --git a/debootstrap.changes b/debootstrap.changes index a3ac548..6407e9e 100644 --- a/debootstrap.changes +++ b/debootstrap.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Wed Jun 28 13:38:35 UTC 2017 - mchandras@suse.de + +- Version bump to 1.0.90 + * Add (Ubuntu) artful as a symlink to gutsy. + * Improve /dev/ptmx handling (deb#817236) + * Add autopkgtest support to test various scenarios. + * Uniformize COMPONENTS/USE_COMPONENTS handling. + * Strip the arch-qualifier (deb#836525) + * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps (deb#844221) + * remove scratchbox2 support (deb#796189) + * Reword split_inline_sig (deb#842591) + * Add support for downloading and validating InRelease files, by splitting + up detached signature from signed data. + * Switch default mirror to deb.debian.org. + * Add (Ubuntu) zesty as a symlink to gutsy. + * Add jessie-kfreebsd to merged-/usr blacklist. + * No longer Build-Depend on makedev. The code using it was already + removed in debootstrap 1.0.82. + * Do not use `tar -k` for older releases which might have file + conflicts between the packages to be installed. (deb#838388) + * Error out when seeing short options. (deb#548880) + * Add oldoldstable -> sid script symlink. (deb#792734) + * Add buster -> sid and bullseye -> sid script symlinks. + * Only unpack and configure the base system when there are actually + packages to install. (deb#825034) + * debootstrap.8: Use stretch instead of wheezy in examples. + * Enable merged-/usr by default. (deb#839046) + * Add support for xz-compressed Packages indices. (deb#837649) + * functions: Validate that the requested suite is listed in the + Release file's Suite or Codename field. (deb#837075) + * Add support for merged-/usr, enabled by a new --merged-usr option (deb#810301) + Feign install of dpkg in second stage. This avoids problems when + using dpkg-deb together with busybox' tar. (deb#837185) + * Excise all devices.tar.gz code. (deb#830869) + * Add (Ubuntu) yakkety as a symlink to gutsy. + * scripts/gutsy: Support kfreebsd & hurd arches on Ubuntu targets (deb#818748) +- Remove obsolete devices.tar.gz file + ------------------------------------------------------------------- Sat Mar 5 13:50:54 UTC 2016 - sor.alexei@meowr.ru diff --git a/debootstrap.spec b/debootstrap.spec index 4a72bdf..13203eb 100644 --- a/debootstrap.spec +++ b/debootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package debootstrap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Frank Lichtenheld # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,13 @@ Name: debootstrap -Version: 1.0.79 +Version: 1.0.90 Release: 0 Summary: Bootstrap a basic Debian system License: MIT Group: Development/Tools/Other Url: https://packages.debian.org/debootstrap Source0: http://httpredir.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz -Source1: devices.tar.gz Patch0: %{name}-norootforbuild.patch %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -43,7 +42,6 @@ into. %prep %setup -q %patch0 -p1 -cp -f %{SOURCE1} . %build # Nothing to build. diff --git a/debootstrap_1.0.79.tar.gz b/debootstrap_1.0.79.tar.gz deleted file mode 100644 index 2289774..0000000 --- a/debootstrap_1.0.79.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11ee0dca0c0e0b5ccb0f80c885f62467c67b90abcbdd7f48dd8ca66af4ec5fc0 -size 64390 diff --git a/debootstrap_1.0.90.tar.gz b/debootstrap_1.0.90.tar.gz new file mode 100644 index 0000000..c1238c7 --- /dev/null +++ b/debootstrap_1.0.90.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d1f434b093051a27fe9482063e2b09aa88cdcc51877228b04729e302ba9145e +size 69936 diff --git a/devices.tar.gz b/devices.tar.gz deleted file mode 100644 index 7acab01..0000000 --- a/devices.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbb8d5752451ef7beaeaaaab4eb1f5b8dbb8d44378c4520d9c4fa03b915c8936 -size 775