Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Steven Chamberlain]

Hi Sven,

Looks good with that last patch.  Thanks!

$ dpkg -c ../procps_3.3.12-3_kfreebsd-amd64.deb
drwxr-xr-x root/root 0 2016-07-16 07:16 ./
drwxr-xr-x root/root 0 2016-07-16 07:16 ./bin/
-rwxr-xr-x root/root 26704 2016-07-16 07:16 ./bin/kill.procps
-rwxr-xr-x root/root129328 2016-07-16 07:16 ./bin/ps
drwxr-xr-x root/root 0 2016-07-16 07:16 ./usr/
drwxr-xr-x root/root 0 2016-07-16 07:16 ./usr/bin/
-rwxr-xr-x root/root 18512 2016-07-16 07:16 ./usr/bin/free
-rwxr-xr-x root/root 26712 2016-07-16 07:16 ./usr/bin/pgrep
-rwxr-xr-x root/root 30808 2016-07-16 07:16 ./usr/bin/pmap
-rwxr-xr-x root/root 10312 2016-07-16 07:16 ./usr/bin/pwdx
-rwxr-xr-x root/root 26704 2016-07-16 07:16 ./usr/bin/skill
-rwxr-xr-x root/root 14424 2016-07-16 07:16 ./usr/bin/tload
-rwxr-xr-x root/root108304 2016-07-16 07:16 ./usr/bin/top
-rwxr-xr-x root/root 10312 2016-07-16 07:16 ./usr/bin/uptime
-rwxr-xr-x root/root 34912 2016-07-16 07:16 ./usr/bin/vmstat
-rwxr-xr-x root/root 18504 2016-07-16 07:16 ./usr/bin/w.procps
-rwxr-xr-x root/root 22952 2016-07-16 07:16 ./usr/bin/watch
drwxr-xr-x root/root 0 2016-07-16 07:16 ./usr/share/[...]

Regards,
-- 
Steven Chamberlain
ste...@pyro.eu.org


signature.asc
Description: Digital signature

Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Sven Joachim]

On 2016-07-16 19:11 +0100, Steven Chamberlain wrote:

> Sven Joachim wrote:
>> Attached is a patch which should fix that.  I am fairly confident that
>> it works, but as I don't have a kfreebsd system it is not tested.
>
> I've tested this from procps Git, but currently not working:
>
> | mkdir /home/steven/procps/debian/tmp/bbin
> | mv /home/steven/procps/debian/tmp/bin/kill 
> /home/steven/procps/debian/tmp/bbin/
> | mv /home/steven/procps/debian/tmp/bin/ps 
> /home/steven/procps/debian/tmp/bbin/
> | # Rename w as there are two of them
> | (cd /home/steven/procps/debian/tmp/bin && mv w w.procps )
> | (cd /home/steven/procps/debian/tmp/usr/share/man/man1 && mv w.1 w.procps.1 )
> | rm -f \
> | /home/steven/procps/debian/tmp/bin/slabtop \
> | /home/steven/procps/debian/tmp/usr/share/man/man1/slabtop.1 \
> | /home/steven/procps/debian/tmp/sbin/sysctl \
> | /home/steven/procps/debian/tmp/usr/share/man/man8/sysctl.8 \
> | /home/steven/procps/debian/tmp/usr/share/man/man5/sysctl.conf.5 \
> | 
> | (cd /home/steven/procps/debian/tmp/bin && mv kill kill.procps )
> | mv: cannot stat ‘kill’: No such file or directory
> | debian/rules:44: recipe for target 'override_dh_auto_install' failed
> | make[1]: *** [override_dh_auto_install] Error 1
> | make[1]: Leaving directory '/home/steven/procps'
> | debian/rules:24: recipe for target 'binary-arch' failed
> | make: *** [binary-arch] Error 2
>
> $ ls debian/tmp/bin
> free   pkill  pwdx   snice  top vmstat  w.procps
> pgrep  pmap   skill  tload  uptime  watch
>
> $ ls debian/tmp/bbin
> kill  ps

Thanks for testing!  The attached patch should take care of this.

Cheers,
   Sven

>From 5c2293e8a2e8b3e1611bcf3a57f2ab3abccebf3c Mon Sep 17 00:00:00 2001
From: Sven Joachim 
Date: Sat, 16 Jul 2016 20:23:34 +0200
Subject: [PATCH] Fix renaming kill and ps in debian/rules

Thanks to Steven Chamberlain for noticing this.
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0414541..82f9a9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ ifneq ($(DEB_HOST_ARCH_OS), linux)
 		$(NULL)
 
 # Rename kill as there are two of them
-	(cd $(DEBROOT)/bin && mv kill kill.procps )
+	(cd $(DEBROOT)/bbin && mv kill kill.procps )
 	(cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
 endif
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -79,7 +79,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
 	(cd $(DEBROOT)/usr/share/man/man1 && mv uptime.1 uptime.procps.1 )
 
 	# Rename ps as there are two of them
-	(cd $(DEBROOT)/bin && mv ps ps.procps )
+	(cd $(DEBROOT)/bbin && mv ps ps.procps )
 	(cd $(DEBROOT)/usr/share/man/man1 && mv ps.1 ps.procps.1 )
 endif
 
-- 
2.8.1

Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Steven Chamberlain]

Hi,

Sven Joachim wrote:
> Attached is a patch which should fix that.  I am fairly confident that
> it works, but as I don't have a kfreebsd system it is not tested.

I've tested this from procps Git, but currently not working:

| mkdir /home/steven/procps/debian/tmp/bbin
| mv /home/steven/procps/debian/tmp/bin/kill 
/home/steven/procps/debian/tmp/bbin/
| mv /home/steven/procps/debian/tmp/bin/ps /home/steven/procps/debian/tmp/bbin/
| # Rename w as there are two of them
| (cd /home/steven/procps/debian/tmp/bin && mv w w.procps )
| (cd /home/steven/procps/debian/tmp/usr/share/man/man1 && mv w.1 w.procps.1 )
| rm -f \
|   /home/steven/procps/debian/tmp/bin/slabtop \
|   /home/steven/procps/debian/tmp/usr/share/man/man1/slabtop.1 \
|   /home/steven/procps/debian/tmp/sbin/sysctl \
|   /home/steven/procps/debian/tmp/usr/share/man/man8/sysctl.8 \
|   /home/steven/procps/debian/tmp/usr/share/man/man5/sysctl.conf.5 \
|   
| (cd /home/steven/procps/debian/tmp/bin && mv kill kill.procps )
| mv: cannot stat ‘kill’: No such file or directory
| debian/rules:44: recipe for target 'override_dh_auto_install' failed
| make[1]: *** [override_dh_auto_install] Error 1
| make[1]: Leaving directory '/home/steven/procps'
| debian/rules:24: recipe for target 'binary-arch' failed
| make: *** [binary-arch] Error 2

$ ls debian/tmp/bin
free   pkill  pwdx   snice  top vmstat  w.procps
pgrep  pmap   skill  tload  uptime  watch

$ ls debian/tmp/bbin
kill  ps

Regards,
-- 
Steven Chamberlain
ste...@pyro.eu.org


signature.asc
Description: Digital signature

Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Sven Joachim]

Control: tags -1 + patch

On 2016-07-14 21:25 +0200, Sven Joachim wrote:

> Package: procps
> Version: 2:3.3.12-2
>
> After the fix for bug #816237, the procps.install files for kfreebsd and
> hurd install kill(1) as /bin/kill.procps/kill.  I suppose that is not
> what has been intended, but sadly it is not possible to rename files
> with dh_install (unless you make them executable and run them via
> dh_exec, that is).

Attached is a patch which should fix that.  I am fairly confident that
it works, but as I don't have a kfreebsd system it is not tested.

Cheers,
   Sven

>From eca4ea81fd9c81142fb575df6a40ca44e05969af Mon Sep 17 00:00:00 2001
From: Sven Joachim 
Date: Fri, 15 Jul 2016 07:38:17 +0200
Subject: [PATCH] Fix path for kill on kfreebsd systems

Use the same code as for hurd in debian/rules and rename kill to
kill.procps there rather than trying to do it in the install file
which does not work as intended.  This has the additional advantage
that there will be a manpage for kill.procs.
---
 debian/procps.install.kfreebsd |  2 +-
 debian/rules   | 13 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/procps.install.kfreebsd b/debian/procps.install.kfreebsd
index 186d81b..0dcae1a 100644
--- a/debian/procps.install.kfreebsd
+++ b/debian/procps.install.kfreebsd
@@ -1,4 +1,4 @@
 # Files to install for kfreebsd systems
-bbin/kill bin/kill.procps
+bbin/kill.procps bin
 bbin/ps bin
 bin/* /usr/bin
diff --git a/debian/rules b/debian/rules
index 111491e..0414541 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,21 +59,16 @@ ifneq ($(DEB_HOST_ARCH_OS), linux)
 		$(DEBROOT)/usr/share/man/man8/sysctl.8 \
 		$(DEBROOT)/usr/share/man/man5/sysctl.conf.5 \
 		$(NULL)
-endif
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-	rm -f \
-		$(DEBROOT)/bin/kill \
-		$(DEBROOT)/usr/share/man/man1/kill.1 \
-		$(NULL)
+
+# Rename kill as there are two of them
+	(cd $(DEBROOT)/bin && mv kill kill.procps )
+	(cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
 endif
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
 	rm -f \
 		$(DEBROOT)/bin/pmap \
 		$(DEBROOT)/usr/share/man/man1/pmap.1 \
 		$(NULL)
-# Rename kill as there are two of them
-	(cd $(DEBROOT)/bin && mv kill kill.procps )
-	(cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
 
 	# Rename vmstat as there are two of them
 	(cd $(DEBROOT)/bin && mv vmstat vmstat.procps )
-- 
2.8.1

Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Craig Small]

Thanks Sven,
  Ill have to look into this and see if I can fudge  it for hurd and
kfreebsd.

Alternatively they could both use sensible filesystem structures :-P

- Craig

On Fri, 15 Jul 2016 05:27 Sven Joachim  wrote:

> Package: procps
> Version: 2:3.3.12-2
>
> After the fix for bug #816237, the procps.install files for kfreebsd and
> hurd install kill(1) as /bin/kill.procps/kill.  I suppose that is not
> what has been intended, but sadly it is not possible to rename files
> with dh_install (unless you make them executable and run them via
> dh_exec, that is).
>
>
> -- System Information:
> Debian Release: stretch/sid
>   APT prefers unstable
>   APT policy: (500, 'unstable'), (101, 'experimental')
> Architecture: i386 (x86_64)
>
> Kernel: Linux 4.6.4-nouveau (SMP w/2 CPU cores)
> Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
>
> Versions of packages procps depends on:
> ii  init-system-helpers  1.39
> ii  libc62.23-1
> ii  libncurses5  6.0+20160625-1
> ii  libncursesw5 6.0+20160625-1
> ii  libprocps6   2:3.3.12-2
> ii  libtinfo56.0+20160625-1
> ii  lsb-base 9.20160629
>
> Versions of packages procps recommends:
> ii  psmisc  22.21-2.1
>
> procps suggests no packages.
>
> -- no debconf information
>
-- 
Craig Small (@smallsees)   http://dropbear.xyz/ csmall at : enc.com.au
Debian GNU/Linux   http://www.debian.org/   csmall at : debian.org
GPG fingerprint:5D2F B320 B825 D939 04D2  0519 3938 F96B DF50 FEA5

Bug#831348: procps: includes /bin/kill.procps/kill on kfreebsd

[Sven Joachim]

Package: procps
Version: 2:3.3.12-2

After the fix for bug #816237, the procps.install files for kfreebsd and
hurd install kill(1) as /bin/kill.procps/kill.  I suppose that is not
what has been intended, but sadly it is not possible to rename files
with dh_install (unless you make them executable and run them via
dh_exec, that is).


-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: i386 (x86_64)

Kernel: Linux 4.6.4-nouveau (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages procps depends on:
ii  init-system-helpers  1.39
ii  libc62.23-1
ii  libncurses5  6.0+20160625-1
ii  libncursesw5 6.0+20160625-1
ii  libprocps6   2:3.3.12-2
ii  libtinfo56.0+20160625-1
ii  lsb-base 9.20160629

Versions of packages procps recommends:
ii  psmisc  22.21-2.1

procps suggests no packages.

-- no debconf information