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

Bug#600558: unblock: dma/0.0.2010.06.17-6



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

Please unblock package dma

I'm really sorry to bother you again, but... the day before
I uploaded a new version of dma, with a *real* fix for
the GNU/Hurd build; this ought to be the last time, honest! :)
Attached is the debdiff - the build fix, switching to bzip2, and
another little speed-up of the build, using := instead of = for
shell commands in the rules file.

unblock dma/0.0.2010.06.17-6

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'oldstable'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diffstat for dma-0.0.2010.06.17-6

 changelog                 |    8 ++++++++
 patches/37-gnu-hurd.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 patches/series            |    1 +
 rules                     |    6 +++---
 source/options            |    2 ++
 5 files changed, 56 insertions(+), 3 deletions(-)

diff -urN dma-0.0.2010.06.17-5/debian/changelog dma-0.0.2010.06.17-6/debian/changelog
--- dma-0.0.2010.06.17-5/debian/changelog	2010-10-07 11:42:24.000000000 +0300
+++ dma-0.0.2010.06.17-6/debian/changelog	2010-10-17 00:08:38.000000000 +0300
@@ -1,3 +1,11 @@
+dma (0.0.2010.06.17-6) unstable; urgency=low
+
+  * Add the 37-gnu-hurd patch to really fix the FTBFS on GNU/Hurd.
+  * Convert several shell output assignments from = to :=
+  * Switch to bzip2 compression for the Debian tarball.
+
+ -- Peter Pentchev <roam@ringlet.net>  Sun, 17 Oct 2010 00:08:33 +0300
+
 dma (0.0.2010.06.17-5) unstable; urgency=low
 
   * Only use SA_NOCLDWAIT if available to fix the Hurd FTBFS.
diff -urN dma-0.0.2010.06.17-5/debian/patches/37-gnu-hurd.patch dma-0.0.2010.06.17-6/debian/patches/37-gnu-hurd.patch
--- dma-0.0.2010.06.17-5/debian/patches/37-gnu-hurd.patch	1970-01-01 02:00:00.000000000 +0200
+++ dma-0.0.2010.06.17-6/debian/patches/37-gnu-hurd.patch	2010-10-16 18:54:00.000000000 +0300
@@ -0,0 +1,42 @@
+Description: Further fixes to the build on the GNU Hurd
+ - include <sys/file.h> for LOCK_EX
+ - define MAXHOSTNAMELEN if absent
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-10-16
+
+--- a/spool.c
++++ b/spool.c
+@@ -32,6 +32,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <sys/file.h>
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
+--- a/util.c
++++ b/util.c
+@@ -33,6 +33,7 @@
+  */
+ 
+ #include <sys/param.h>
++#include <sys/file.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+@@ -43,6 +44,14 @@
+ 
+ #include "dma.h"
+ 
++/**
++ * A quick'n'dirty hack to get dma to build on the GNU Hurd.
++ * A real fix would dynamically allocate the hostname array.
++ */
++#ifndef MAXHOSTNAMELEN
++#define MAXHOSTNAMELEN	1024
++#endif
++
+ const char *
+ hostname(void)
+ {
diff -urN dma-0.0.2010.06.17-5/debian/patches/series dma-0.0.2010.06.17-6/debian/patches/series
--- dma-0.0.2010.06.17-5/debian/patches/series	2010-10-07 11:18:28.000000000 +0300
+++ dma-0.0.2010.06.17-6/debian/patches/series	2010-10-16 18:54:13.000000000 +0300
@@ -19,3 +19,4 @@
 34-manpage-defaults.patch
 35-delivery-retry.patch
 36-sa_nocldwait.patch
+37-gnu-hurd.patch
diff -urN dma-0.0.2010.06.17-5/debian/rules dma-0.0.2010.06.17-6/debian/rules
--- dma-0.0.2010.06.17-5/debian/rules	2010-06-18 18:27:07.000000000 +0300
+++ dma-0.0.2010.06.17-6/debian/rules	2010-10-16 18:58:37.000000000 +0300
@@ -5,9 +5,9 @@
 DDIR=		$(CURDIR)/debian
 D=		$(DDIR)/dma
 
-CFLAGS=		$(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS=	$(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS=	$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 
 CFLAGS+=	-DNEED_GETPROGNAME -DNEED_REALLOCF -DNEED_STRLCPY
 
diff -urN dma-0.0.2010.06.17-5/debian/source/options dma-0.0.2010.06.17-6/debian/source/options
--- dma-0.0.2010.06.17-5/debian/source/options	1970-01-01 02:00:00.000000000 +0200
+++ dma-0.0.2010.06.17-6/debian/source/options	2010-10-16 19:05:03.000000000 +0300
@@ -0,0 +1,2 @@
+compression = "bzip2"
+compression-level = 9

Attachment: signature.asc
Description: Digital signature


Reply to: