[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#926324: marked as done (unblock: sbuild/0.78.1-2)

Your message dated Wed, 03 Apr 2019 15:28:09 +0000
with message-id <E1hBho9-0000bL-Q9@respighi.debian.org>
and subject line unblock sbuild
has caused the Debian Bug report #926324,
regarding unblock: sbuild/0.78.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
926324: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926324
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package sbuild as discussed in #926161. Debdiff attached.

unblock sbuild/0.78.1-2

diff -Nru sbuild-0.78.1/debian/changelog sbuild-0.78.1/debian/changelog
--- sbuild-0.78.1/debian/changelog	2019-02-09 07:25:07.000000000 +0100
+++ sbuild-0.78.1/debian/changelog	2019-04-03 14:08:12.000000000 +0200
@@ -1,3 +1,16 @@
+sbuild (0.78.1-2) unstable; urgency=medium
+
+  [ Mike Gabriel ]
+  * debian/patches: Add support-gzip-in-wheezy.patch. The gzip command
+    in Debian wheezy lacks support for the --keep cmdline option, so
+    avoid using it. (closes: #926161)
+
+  [ Aurelien Jarno ]
+  * debian/patches: Add fix-disk-space-directory-check.patch. The right
+    directory has to be checked inside the chroot. (closes: #923484)
+
+ -- Johannes 'josch' Schauer <josch@debian.org>  Wed, 03 Apr 2019 14:08:12 +0200
+
 sbuild (0.78.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru sbuild-0.78.1/debian/patches/fix-disk-space-directory-check.patch sbuild-0.78.1/debian/patches/fix-disk-space-directory-check.patch
--- sbuild-0.78.1/debian/patches/fix-disk-space-directory-check.patch	1970-01-01 01:00:00.000000000 +0100
+++ sbuild-0.78.1/debian/patches/fix-disk-space-directory-check.patch	2019-04-03 13:59:20.000000000 +0200
@@ -0,0 +1,25 @@
+Description: test $pkgbuilddir inside the chroot instead of $dscdir outside of it
+Author: Aurelien Jarno <aurelien@aurel32.net>
+
+--- a/lib/Sbuild/Build.pm
++++ b/lib/Sbuild/Build.pm
+@@ -2776,16 +2776,14 @@ sub check_space {
+     my $sum = 0;
+ 
+     my $dscdir = $self->get('DSC Dir');
++    return -1 unless (defined $dscdir);
++
+     my $build_dir = $self->get('Build Dir');
+     my $pkgbuilddir = "$build_dir/$dscdir";
+ 
+     # if the source package was not yet unpacked, we will not attempt to compute
+     # the required space.
+-    unless( defined $dscdir && -d $dscdir)
+-    {
+-	return -1;
+-    }
+-
++    return -1 unless ($self->get('Session')->test_directory($pkgbuilddir));
+ 
+     my ($space, $spacenum);
+ 
diff -Nru sbuild-0.78.1/debian/patches/series sbuild-0.78.1/debian/patches/series
--- sbuild-0.78.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ sbuild-0.78.1/debian/patches/series	2019-04-03 13:59:20.000000000 +0200
@@ -0,0 +1,2 @@
+fix-disk-space-directory-check.patch
+support-gzip-in-wheezy.patch
diff -Nru sbuild-0.78.1/debian/patches/support-gzip-in-wheezy.patch sbuild-0.78.1/debian/patches/support-gzip-in-wheezy.patch
--- sbuild-0.78.1/debian/patches/support-gzip-in-wheezy.patch	1970-01-01 01:00:00.000000000 +0100
+++ sbuild-0.78.1/debian/patches/support-gzip-in-wheezy.patch	2019-04-03 13:58:53.000000000 +0200
@@ -0,0 +1,16 @@
+Description: gzip in wheezy lacks --keep option, so avoid using it.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/lib/Sbuild/ResolverBase.pm
++++ b/lib/Sbuild/ResolverBase.pm
+@@ -1445,8 +1445,8 @@
+     closedir($dh);
+ }
+ 
+-system('gzip', '--keep', '--force', 'Packages') == 0 or die "gzip failed: $?\n";
+-system('gzip', '--keep', '--force', 'Sources') == 0 or die "gzip failed: $?\n";
++system('gzip -c --force Packages > Packages.gz') == 0 or die "gzip failed: $?\n";
++system('gzip -c --force Sources  > Sources.gz' ) == 0 or die "gzip failed: $?\n";
+ 
+ my $packages_md5 = hash_file('Packages', 'md5sum');
+ my $sources_md5 = hash_file('Sources', 'md5sum');

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: