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

psmisc: FTBFS on hurd-i386



Package: psmisc
Version: 22.16-1
Severity: important
Tags: patch

Hello,

psmisc currently FTBFS on hurd-i386, due to PATH_MAX use in fuser.
Since fuser would actually not work yet on GNU/Hurd, the attached
patches simply disable it on hurd-i386.

Could you please apply it soon?  psmisc is needed for php5, and thus all
php packages.

Samuel

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.4 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages psmisc depends on:
ii  libc6      2.13-32
ii  libtinfo5  5.9-7

psmisc recommends no packages.

psmisc suggests no packages.

-- no debconf information

-- 
Samuel Thibault <samuel.thibault@fnac.net>
<macavity> bash: ls: Computer bought the farm
<macavity> THAT frightens ppl! :P
<macavity> id rather see: "bash: ls: Initialization of googol(AWAX)
        disengaged in HYPER32/64 mode due to faulty page request at
        AX:12A34F84B"
<macavity> at least that would give me the feeling that the
        *programmers* knows what is going on :P
(lovely Hurd...)
--- debian/rules.orig	2012-05-19 00:47:55.000000000 +0200
+++ debian/rules	2012-05-19 00:48:02.000000000 +0200
@@ -2,7 +2,7 @@
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 %:
-	dh $@
+	dh $@ --with-autoreconf
 
 override_dh_auto_install:
 	dh_auto_install
@@ -6,7 +6,9 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	mv debian/psmisc/usr/bin/fuser debian/psmisc/bin/fuser
+	if [ "$(DEB_HOST_ARCH_OS)" != "hurd" ] ; then \
+	  mv debian/psmisc/usr/bin/fuser debian/psmisc/bin/fuser ; \
+	fi
 	if [ "$(DEB_HOST_ARCH_OS)" = "kfreebsd" ] ; then \
 	  rm debian/psmisc/usr/share/man/man1/peekfd.1 ; \
 	fi
--- debian/control.orig	2012-05-19 00:48:12.000000000 +0200
+++ debian/control	2012-05-19 00:48:21.000000000 +0200
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer:  Craig Small <csmall@debian.org>
-Build-Depends: debhelper (>= 9.0.0), libncurses-dev, gettext
+Build-Depends: debhelper (>= 9.0.0), libncurses-dev, gettext, dh-autoreconf
 Standards-Version: 3.9.2
 
 Package: psmisc
--- a/src/Makefile.am.orig	2012-05-19 00:51:06.000000000 +0200
+++ b/src/Makefile.am	2012-05-19 00:51:20.000000000 +0200
@@ -1,7 +1,10 @@
 
 AM_CFLAGS = -Wall -DLOCALEDIR=\"/usr/share/locale\" @HARDEN_CFLAGS@
 
-bin_PROGRAMS = fuser killall pstree prtstat
+bin_PROGRAMS = killall pstree prtstat
+if WANT_FUSER
+  bin_PROGRAMS += fuser
+endif
 if WANT_PEEKFD_I386
   bin_PROGRAMS += peekfd
   AM_CFLAGS += -DI386
--- a/configure.ac.original	2012-05-19 01:01:50.000000000 +0200
+++ b/configure.ac	2012-05-19 01:02:17.000000000 +0200
@@ -7,6 +7,7 @@
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.10])
 AC_LANG([C])
+AC_CANONICAL_TARGET
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -113,6 +114,16 @@
 AC_CHECK_MEMBERS([struct pt_regs.regs,
                   struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>])
 
+case ${target_os} in
+  gnu*)
+    want_fuser=no
+    ;;
+  *)
+    want_fuser=yes
+    ;;
+esac
+AM_CONDITIONAL(WANT_FUSER, test $want_fuser = yes)
+
 AM_CONDITIONAL(WANT_PEEKFD_I386,
  test $ac_cv_member_struct_user_regs_struct_orig_eax = yes &&
    test $ac_cv_member_struct_user_regs_struct_eax = yes &&

Reply to: