From c2c3a33c7c592b40f747f12c458d87d88ea79c0f Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Sep 22 2016 09:01:40 +0000 Subject: new upstream release and package cleanup --- diff --git a/debootstrap-path.patch b/debootstrap-path.patch deleted file mode 100644 index 5c73673..0000000 --- a/debootstrap-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 62d667c03f02dc781c77878c9f7fef254e8e6f4e Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 29 Apr 2014 15:00:04 +0200 -Subject: [PATCH] Fix PATH for chroots - -We don't use /bin and /sbin anymore since we separated /usr ---- - functions | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/functions b/functions -index 5746ff5..57c1c33 100644 ---- a/functions -+++ b/functions -@@ -900,7 +900,7 @@ extract () { ( - ); } - - in_target_nofail () { -- if ! $CHROOT_CMD "$@" 2>/dev/null; then -+ if ! PATH=/bin:/usr/bin:/sbin:/usr/sbin $CHROOT_CMD "$@" 2>/dev/null; then - true - fi - return 0 -@@ -911,7 +911,7 @@ in_target_failmsg () { - local msg="$2" - local arg="$3" - shift; shift; shift -- if ! $CHROOT_CMD "$@"; then -+ if ! PATH=/bin:/usr/bin:/sbin:/usr/sbin $CHROOT_CMD "$@"; then - warning "$code" "$msg" "$arg" - # Try to point user at actual failing package. - msg="See %s for details" --- -2.4.3 - diff --git a/debootstrap-perms.patch b/debootstrap-perms.patch deleted file mode 100644 index 336b603..0000000 --- a/debootstrap-perms.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fd22f4e5a3647bd5065ef688cee02bac6f649a27 Mon Sep 17 00:00:00 2001 -From: Jan Vcelak -Date: Wed, 17 Sep 2014 19:30:25 +0200 -Subject: [PATCH] fix installation without fakeroot - ---- - Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 1020cbc..b68030c 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,14 +20,13 @@ install: - mkdir -p $(DESTDIR)/usr/sbin - - cp -a scripts/* $(DSDIR)/scripts/ -- install -o root -g root -m 0644 functions $(DSDIR)/ -+ install -m 0644 functions $(DSDIR)/ - - 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: --- -2.4.3 - diff --git a/debootstrap.spec b/debootstrap.spec index 61bd5bd..83852ef 100644 --- a/debootstrap.spec +++ b/debootstrap.spec @@ -1,5 +1,5 @@ Name: debootstrap -Version: 1.0.81 +Version: 1.0.83 Release: 1%{?dist} Summary: Debian GNU/Linux bootstrapper @@ -7,9 +7,7 @@ Group: System Environment/Base License: MIT URL: https://wiki.debian.org/Debootstrap Source0: http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz -Patch0: debootstrap-perms.patch -Patch1: debootstrap-arch.patch -Patch2: debootstrap-path.patch +Patch0: debootstrap-arch.patch BuildArch: noarch BuildRequires: fakeroot @@ -18,7 +16,6 @@ Requires: gettext, wget, tar, gzip, binutils, xz Recommends: debian-keyring, ubu-keyring %endif - %description debootstrap is used to create a Debian base system from scratch, without requiring the availability of dpkg or apt. It does this by downloading @@ -30,61 +27,43 @@ Debian GNU/Linux guest system. %prep -%setup -q +%setup -q -n %{name} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # fix hardcoded paths sed -i -e 's;/usr/sbin;%{_sbindir};' Makefile +# fix hardcoded path and preserve timestamp +mv debootstrap debootstrap.orig +sed -e 's;/usr/share;%{_datadir};' debootstrap.orig > debootstrap +touch -r debootstrap.orig debootstrap +rm debootstrap.orig %build -# no need for _smp_mflags -# no MAKEDEV, need to create necessary devices -fakeroot make MAKEDEV='mkdir -p fd && \ - mknod console c 5 1 && \ - mknod core c 1 6 && \ - mknod full c 1 7 && \ - mknod mem c 1 1 && \ - mknod null c 1 3 && \ - mknod port c 1 4 && \ - mknod ptmx c 5 2 && \ - mknod random c 1 8 && \ - mknod tty c 5 0 && \ - mknod urandom c 1 9 && \ - mknod zero c 1 5 && \ - ln -sf ../proc/self/fd fd && \ - ln -sf ../proc/self/fd/0 fd/stdin && \ - ln -sf ../proc/self/fd/1 fd/stdout && \ - ln -sf ../proc/self/fd/2 fd/stderr && \ -:' - +# nothing to do %install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_datadir}/debootstrap/scripts/ -install -d $RPM_BUILD_ROOT%{_sbindir} -install -d $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 0644 debootstrap.8 $RPM_BUILD_ROOT%{_mandir}/man8 -make install DESTDIR=$RPM_BUILD_ROOT \ - VERSION="%{version}-%{release}" \ - DSDIR=$RPM_BUILD_ROOT%{_datadir}/debootstrap -# substitute the rpm macro path -sed -i -e 's;/usr/share;%{_datadir};' $RPM_BUILD_ROOT%{_sbindir}/debootstrap -# correct the debootstrap script timestamp -touch -r debootstrap $RPM_BUILD_ROOT%{_sbindir}/debootstrap +fakeroot make install DESTDIR=%{buildroot} VERSION="%{version}-%{release}" +# install manual page +mkdir -p %{buildroot}%{_mandir}/man8 +install -p -m 0644 debootstrap.8 %{buildroot}%{_mandir}/man8 %files -%defattr(-,root,root,-) +%doc debian/changelog README +%license debian/copyright %{_datadir}/debootstrap %{_sbindir}/debootstrap %{_mandir}/man8/debootstrap.8* -%doc debian/changelog debian/copyright README - %changelog +* Thu Sep 22 2016 Jan Vcelak - 1.0.83-1 +- new upstream release: + + validate installed suite against Release file (Debian #837075) + + support for merged /usr with --merged-usr option (Debian #810301) + + fix installation with tar from busybox (Debian #837185) + + remove devices.tar.gz code (Debian #830869) + * Fri Jun 24 2016 Jan Vcelak - 1.0.81-1 - new upstream release (RHBZ #1332736) + add Ubuntu yakkety as a symlink to gutsy diff --git a/sources b/sources index 8dffe9b..4d43a34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6a5dd0d68b93c0787843966dbcfbe89 debootstrap_1.0.81.tar.gz +fa5a79d4fddeb50465a9506df9b464bc debootstrap_1.0.83.tar.gz