tags -1 patch user debian-rele...@lists.debian.org usertags -1 + bsp-2018-12-ch-bern thanks
Find attached the fix for netkit-rwho.
For a full explanation, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911154#44
Regards,
Christoph
diff -Nru netkit-rwho-0.17/debian/compat netkit-rwho-0.17/debian/compat
--- netkit-rwho-0.17/debian/compat 2013-06-05 10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/compat 2013-06-05 10:21:50.000000000 +0200
@@ -1 +1 @@
-7
+10
diff -Nru netkit-rwho-0.17/debian/control netkit-rwho-0.17/debian/control
--- netkit-rwho-0.17/debian/control 2013-06-05 10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/control 2013-06-05 10:21:50.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Alberto Gonzalez Iniesta <a...@inittab.org>
Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 10~), cmake
Package: rwhod
Architecture: any
diff -Nru netkit-rwho-0.17/debian/patches/pre-0.17-13-changes.patch
netkit-rwho-0.17/debian/patches/pre-0.17-13-changes.patch
--- netkit-rwho-0.17/debian/patches/pre-0.17-13-changes.patch 2013-06-05
10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/patches/pre-0.17-13-changes.patch 2013-06-05
10:21:50.000000000 +0200
@@ -2,8 +2,8 @@
Origin: Several people in history
Reviewed-by: Alberto Gonzalez Iniesta
Last-Update: 2013-06-13
---- netkit-rwho-0.17.orig/ruptime/ruptime.c
-+++ netkit-rwho-0.17/ruptime/ruptime.c
+--- a/ruptime/ruptime.c
++++ b/ruptime/ruptime.c
@@ -212,7 +212,7 @@
static char resbuf[32];
int days, hours, minutes;
@@ -26,35 +26,8 @@
updown, hours, minutes);
return(resbuf);
}
---- netkit-rwho-0.17.orig/rwho/Makefile
-+++ netkit-rwho-0.17/rwho/Makefile
-@@ -3,8 +3,6 @@
- include ../MCONFIG
- include ../MRULES
-
--CFLAGS += -I../include
--
- rwho: rwho.o
- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
---- netkit-rwho-0.17.orig/rwhod/Makefile
-+++ netkit-rwho-0.17/rwhod/Makefile
-@@ -3,8 +3,11 @@
- include ../MCONFIG
- include ../MRULES
-
--CFLAGS += -I../include
--OBJS = rwhod.o daemon.o
-+ifneq ($(USE_GLIBC),1)
-+CFLAGS += -D_GNU_SOURCE
-+endif
-+
-+OBJS = rwhod.o
-
- rwhod: $(OBJS)
- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
---- netkit-rwho-0.17.orig/rwhod/rwhod.8
-+++ netkit-rwho-0.17/rwhod/rwhod.8
+--- a/rwhod/rwhod.8
++++ b/rwhod/rwhod.8
@@ -32,7 +32,10 @@
.\" from: @(#)rwhod.8 6.5 (Berkeley) 3/16/91
.\" $Id: rwhod.8,v 1.16 2000/07/30 23:57:06 dholland Exp $
@@ -181,8 +154,8 @@
+.Pp
+Philippe Troin <p...@fifi.org> implemented forwarding and interface
+selection flags.
---- netkit-rwho-0.17.orig/rwhod/rwhod.c
-+++ netkit-rwho-0.17/rwhod/rwhod.c
+--- a/rwhod/rwhod.c
++++ b/rwhod/rwhod.c
@@ -29,6 +29,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
diff -Nru netkit-rwho-0.17/debian/patches/series
netkit-rwho-0.17/debian/patches/series
--- netkit-rwho-0.17/debian/patches/series 2013-06-05 10:21:50.000000000
+0200
+++ netkit-rwho-0.17/debian/patches/series 2013-06-05 10:21:50.000000000
+0200
@@ -1,2 +1,3 @@
pre-0.17-13-changes.patch
show_in_all_ifaces.patch
+use-cmake-as-buildsystem.patch
diff -Nru netkit-rwho-0.17/debian/patches/use-cmake-as-buildsystem.patch
netkit-rwho-0.17/debian/patches/use-cmake-as-buildsystem.patch
--- netkit-rwho-0.17/debian/patches/use-cmake-as-buildsystem.patch
1970-01-01 01:00:00.000000000 +0100
+++ netkit-rwho-0.17/debian/patches/use-cmake-as-buildsystem.patch
2013-06-05 10:21:50.000000000 +0200
@@ -0,0 +1,70 @@
+Description: Use cmake as build system
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Bug-Debian: https://bugs.debian.org/912130
+Last-Update: 2018-11-25
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,10 @@
++cmake_minimum_required(VERSION 3.7)
++project(netkit-rwho)
++
++set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++set(SBIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
++
++add_subdirectory(ruptime)
++add_subdirectory(rwho)
++add_subdirectory(rwhod)
+--- /dev/null
++++ b/ruptime/CMakeLists.txt
+@@ -0,0 +1,14 @@
++
++add_executable(
++ ruptime
++ ruptime.c
++)
++install(
++ TARGETS ruptime
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES ruptime.1
++ DESTINATION ${MAN_DIR}/man1/
++)
+--- /dev/null
++++ b/rwho/CMakeLists.txt
+@@ -0,0 +1,14 @@
++
++add_executable(
++ rwho
++ rwho.c
++)
++install(
++ TARGETS rwho
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES rwho.1
++ DESTINATION ${MAN_DIR}/man1/
++)
+--- /dev/null
++++ b/rwhod/CMakeLists.txt
+@@ -0,0 +1,15 @@
++
++add_executable(
++ rwhod
++ rwhod.c
++ daemon.c
++)
++install(
++ TARGETS rwhod
++ DESTINATION ${SBIN_DIR}
++)
++
++install(
++ FILES rwhod.8
++ DESTINATION ${MAN_DIR}/man8/
++)
diff -Nru netkit-rwho-0.17/debian/rules netkit-rwho-0.17/debian/rules
--- netkit-rwho-0.17/debian/rules 2013-06-05 10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/rules 2013-06-05 10:21:50.000000000 +0200
@@ -1,19 +1,7 @@
#!/usr/bin/make -f
-%:
- dh $@
-
-override_dh_auto_clean:
- [ ! -f MCONFIG ] || dh_auto_clean
-override_dh_auto_configure:
- ./configure; \
- sed -e 's/^CFLAGS=\(.*\)$$/CFLAGS= -g \1/' MCONFIG > MCONFIG.new; \
- mv MCONFIG.new MCONFIG;
+%:
+ dh $@ --buildsystem=cmake
-override_dh_auto_install:
- install rwhod/rwhod debian/rwhod/usr/sbin
- install rwho/rwho debian/rwho/usr/bin
- install ruptime/ruptime debian/rwho/usr/bin
- cp rwhod/rwhod.8 debian/rwhod/usr/share/man/man8
- cp rwho/rwho.1 debian/rwho/usr/share/man/man1
- cp ruptime/ruptime.1 debian/rwho/usr/share/man/man1
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru netkit-rwho-0.17/debian/rwhod.dirs netkit-rwho-0.17/debian/rwhod.dirs
--- netkit-rwho-0.17/debian/rwhod.dirs 2013-06-05 10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/rwhod.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/man/man8
diff -Nru netkit-rwho-0.17/debian/rwhod.install
netkit-rwho-0.17/debian/rwhod.install
--- netkit-rwho-0.17/debian/rwhod.install 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwho-0.17/debian/rwhod.install 2013-06-05 10:21:50.000000000
+0200
@@ -0,0 +1,2 @@
+
+usr/sbin/rwhod
diff -Nru netkit-rwho-0.17/debian/rwho.dirs netkit-rwho-0.17/debian/rwho.dirs
--- netkit-rwho-0.17/debian/rwho.dirs 2013-06-05 10:21:50.000000000 +0200
+++ netkit-rwho-0.17/debian/rwho.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff -Nru netkit-rwho-0.17/debian/rwhod.manpages
netkit-rwho-0.17/debian/rwhod.manpages
--- netkit-rwho-0.17/debian/rwhod.manpages 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwho-0.17/debian/rwhod.manpages 2013-06-05 10:21:50.000000000
+0200
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man8/rwhod.8
diff -Nru netkit-rwho-0.17/debian/rwho.install
netkit-rwho-0.17/debian/rwho.install
--- netkit-rwho-0.17/debian/rwho.install 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwho-0.17/debian/rwho.install 2013-06-05 10:21:50.000000000
+0200
@@ -0,0 +1,3 @@
+
+usr/bin/ruptime
+usr/bin/rwho
diff -Nru netkit-rwho-0.17/debian/rwho.manpages
netkit-rwho-0.17/debian/rwho.manpages
--- netkit-rwho-0.17/debian/rwho.manpages 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwho-0.17/debian/rwho.manpages 2013-06-05 10:21:50.000000000
+0200
@@ -0,0 +1,3 @@
+
+debian/tmp/usr/share/man/man1/rwho.1
+debian/tmp/usr/share/man/man1/ruptime.1
signature.asc
Description: PGP signature
