Bug#725990: pu: package torque/2.4.16+dfsg-1+deb7u2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
Hi Stable Release Managers
I know you are currently busy for the point release, so no hurry for
this one. During preparing the torque DSA-2770-1 I noticed that torque
FTBFS on kfreebsd-amd64 and kfreebsd-i386, and also did on wheezy
(a newer freebsd-utils package must have broken that, as previous
upload and build to unstable now in wheezy was fine)
I have filed #725870 and uploaded a fix to unstable on top of my
previous NMU already. The builds are now fine also for kfreebsd-amd64
and kfreebsd-i386[1].
[1] https://buildd.debian.org/status/package.php?p=torque
Could you accept the attached proposed debdiff trough
stable-proposed-updates? (I know it's to late for 7.2, but meant for
7.3).
Regards,
Salvatore
diff -Nru torque-2.4.16+dfsg/debian/changelog torque-2.4.16+dfsg/debian/changelog
--- torque-2.4.16+dfsg/debian/changelog 2013-10-08 20:24:47.000000000 +0200
+++ torque-2.4.16+dfsg/debian/changelog 2013-10-10 21:11:12.000000000 +0200
@@ -1,3 +1,12 @@
+torque (2.4.16+dfsg-1+deb7u2) wheezy; urgency=low
+
+ * Non-maintainer upload.
+ * Add fix-FTBFS-on-kfreebsd.patch patch.
+ Fix FTBFS on kfreebsd-{amd64,i386} due to use of deprecated header
+ <nlist.h>. Switch to use <bsd/nlist.h>. (Closes: #725870)
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Thu, 10 Oct 2013 21:08:17 +0200
+
torque (2.4.16+dfsg-1+deb7u1) wheezy-security; urgency=high
* Non-maintainer upload by the Security Team.
diff -Nru torque-2.4.16+dfsg/debian/patches/fix-FTBFS-on-kfreebsd.patch torque-2.4.16+dfsg/debian/patches/fix-FTBFS-on-kfreebsd.patch
--- torque-2.4.16+dfsg/debian/patches/fix-FTBFS-on-kfreebsd.patch 1970-01-01 01:00:00.000000000 +0100
+++ torque-2.4.16+dfsg/debian/patches/fix-FTBFS-on-kfreebsd.patch 2013-10-10 21:11:12.000000000 +0200
@@ -0,0 +1,20 @@
+Description: Fix FTBFS on kfreebsd-{amd64,i386}
+ Fix FTBFS on kfreebsd-{amd64,i386} due to use of deprecated header
+ <nlist.h>. Switch to use <bsd/nlist.h>.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/725870
+Forwarded: no
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2013-10-10
+
+--- a/src/resmom/freebsd5/mom_mach.c
++++ b/src/resmom/freebsd5/mom_mach.c
+@@ -109,7 +109,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <pwd.h>
+-#include <nlist.h>
++#include <bsd/nlist.h>
+ #include <fstab.h>
+ #include <kvm.h>
+ #include <signal.h>
diff -Nru torque-2.4.16+dfsg/debian/patches/series torque-2.4.16+dfsg/debian/patches/series
--- torque-2.4.16+dfsg/debian/patches/series 2013-10-08 20:24:47.000000000 +0200
+++ torque-2.4.16+dfsg/debian/patches/series 2013-10-10 21:11:12.000000000 +0200
@@ -5,3 +5,4 @@
xpbs_xpbsmon_tclIndex.patch
tcl85.patch
CVE-2013-4319.patch
+fix-FTBFS-on-kfreebsd.patch
Reply to: