tags -1 patch user debian-rele...@lists.debian.org usertags -1 + bsp-2018-12-ch-bern thanks
Find attached the fix for netkit-rwall.
For a full explanation, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911154#44
Regards,
Christoph
diff -Nru netkit-rwall-0.17/debian/compat netkit-rwall-0.17/debian/compat
--- netkit-rwall-0.17/debian/compat 2018-12-05 19:20:50.000000000 +0100
+++ netkit-rwall-0.17/debian/compat 2010-01-15 17:17:00.000000000 +0100
@@ -1 +1 @@
-7
+10
diff -Nru netkit-rwall-0.17/debian/control netkit-rwall-0.17/debian/control
--- netkit-rwall-0.17/debian/control 2018-12-05 19:20:50.000000000 +0100
+++ netkit-rwall-0.17/debian/control 2010-01-15 17:17:00.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Alberto Gonzalez Iniesta <a...@inittab.org>
Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 10~), cmake
Package: rwalld
Architecture: any
diff -Nru netkit-rwall-0.17/debian/not-installed
netkit-rwall-0.17/debian/not-installed
--- netkit-rwall-0.17/debian/not-installed 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/not-installed 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man8/rwalld.8
diff -Nru netkit-rwall-0.17/debian/patches/define-salen.patch
netkit-rwall-0.17/debian/patches/define-salen.patch
--- netkit-rwall-0.17/debian/patches/define-salen.patch 1970-01-01
01:00:00.000000000 +0100
+++ netkit-rwall-0.17/debian/patches/define-salen.patch 2010-01-15
17:17:00.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Define initial value for salen
+Author: Herbert Xu <herb...@debian.org> (presumably)
+Date: 1999-11-03
+Last-Update: 2018-11-25
+
+--- a/rpc.rwalld/rwalld.c
++++ b/rpc.rwalld/rwalld.c
+@@ -78,8 +78,8 @@
+ {
+ SVCXPRT *transp;
+ int s;
+- socklen_t salen;
+ struct sockaddr_in sa;
++ socklen_t salen = sizeof(sa);
+ int sock = 0;
+ int proto = 0;
+
diff -Nru netkit-rwall-0.17/debian/patches/fix-typo.patch
netkit-rwall-0.17/debian/patches/fix-typo.patch
--- netkit-rwall-0.17/debian/patches/fix-typo.patch 1970-01-01
01:00:00.000000000 +0100
+++ netkit-rwall-0.17/debian/patches/fix-typo.patch 2010-01-15
17:17:00.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Fix typo in manpage
+Author: A. Costa" <agco...@gis.net>
+Bug-Debian: https://bugs.debian.org/432058
+Last-Update: 2018-11-25
+
+--- a/rwall/rwall.1
++++ b/rwall/rwall.1
+@@ -63,7 +63,7 @@
+ .It rwall: RPC: Port mapper failure - RPC: Timed out
+ The remote host is not running the portmapper (see
+ .Xr portmap 8 ),
+-and cannot accomodate any RPC-based services. The host may be down.
++and cannot accommodate any RPC-based services. The host may be down.
+ .El
+ .Sh SEE ALSO
+ .Xr wall 1 ,
diff -Nru netkit-rwall-0.17/debian/patches/series
netkit-rwall-0.17/debian/patches/series
--- netkit-rwall-0.17/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/patches/series 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1,3 @@
+define-salen.patch
+fix-typo.patch
+use-cmake-as-buildsystem.patch
diff -Nru netkit-rwall-0.17/debian/patches/use-cmake-as-buildsystem.patch
netkit-rwall-0.17/debian/patches/use-cmake-as-buildsystem.patch
--- netkit-rwall-0.17/debian/patches/use-cmake-as-buildsystem.patch
1970-01-01 01:00:00.000000000 +0100
+++ netkit-rwall-0.17/debian/patches/use-cmake-as-buildsystem.patch
2010-01-15 17:17:00.000000000 +0100
@@ -0,0 +1,102 @@
+Description: Use cmake as build system
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Bug-Debian: https://bugs.debian.org/912129
+Last-Update: 2018-11-25
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,9 @@
++cmake_minimum_required(VERSION 3.7)
++project(netkit-rwall)
++
++set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++set(SBIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
++
++add_subdirectory(rpc.rwalld)
++add_subdirectory(rwall)
+--- /dev/null
++++ b/rpc.rwalld/CMakeLists.txt
+@@ -0,0 +1,43 @@
++
++include_directories(
++ BEFORE
++ ${CMAKE_CURRENT_BINARY_DIR}
++)
++
++set(
++ RWALLX
++ ${CMAKE_CURRENT_SOURCE_DIR}/../include/rpcsvc/rwall.x
++)
++
++add_executable(
++ rpc.rwalld
++ daemon.c
++ rwalld.c
++ rwall.h
++)
++install(
++ TARGETS rpc.rwalld
++ DESTINATION ${SBIN_DIR}
++)
++
++add_custom_command(
++ COMMENT "Creating rwall.h"
++ OUTPUT rwall.h
++ COMMAND rpcgen
++ ARGS
++ -h
++ -o rwall.h
++ ${RWALLX}
++ DEPENDS ${RWALLX}
++)
++
++install(
++ FILES rpc.rwalld.8
++ DESTINATION ${MAN_DIR}/man8/
++)
++install(
++ CODE "execute_process( \
++ COMMAND ${CMAKE_COMMAND} -E create_symlink \
++ rpc.rwalld.8 \$ENV{DESTDIR}${MAN_DIR}/man8/rwalld.8 \
++ )"
++)
+--- /dev/null
++++ b/rwall/CMakeLists.txt
+@@ -0,0 +1,36 @@
++
++include_directories(
++ BEFORE
++ ${CMAKE_CURRENT_BINARY_DIR}
++)
++
++set(
++ RWALLX
++ ${CMAKE_CURRENT_SOURCE_DIR}/../include/rpcsvc/rwall.x
++)
++
++add_executable(
++ rwall
++ rwall.c
++ rwall.h
++)
++install(
++ TARGETS rwall
++ DESTINATION ${BIN_DIR}
++)
++
++add_custom_command(
++ COMMENT "Creating rwall.h"
++ OUTPUT rwall.h
++ COMMAND rpcgen
++ ARGS
++ -h
++ -o rwall.h
++ ${RWALLX}
++ DEPENDS ${RWALLX}
++)
++
++install(
++ FILES rwall.1
++ DESTINATION ${MAN_DIR}/man1/
++)
diff -Nru netkit-rwall-0.17/debian/rules netkit-rwall-0.17/debian/rules
--- netkit-rwall-0.17/debian/rules 2018-12-05 19:20:50.000000000 +0100
+++ netkit-rwall-0.17/debian/rules 2010-01-15 17:17:00.000000000 +0100
@@ -1,83 +1,7 @@
#!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Copyright (c) 1999 Herbert Xu <herb...@debian.org>
-# $Id: rules,v 1.5 2003/10/31 09:51:51 herbert Exp $
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --buildsystem=cmake --no-parallel
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=2
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-build:
- dh_testdir
-
- if [ ! -f MCONFIG ]; then \
- ./configure; \
- sed -e 's/^CFLAGS=\(.*\)$$/CFLAGS= -g \1/' MCONFIG \
- > MCONFIG.new; \
- mv MCONFIG.new MCONFIG; \
- fi
- $(MAKE)
-
-clean:
- dh_testdir
- dh_testroot
-
- [ ! -f MCONFIG ] || $(MAKE) distclean
-
- dh_clean
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- install rwall/rwall debian/rwall/usr/bin
- install rpc.rwalld/rwalld debian/rwalld/usr/sbin/rpc.rwalld
- cp rwall/rwall.1 debian/rwall/usr/share/man/man1
- cp rpc.rwalld/rpc.rwalld.8 debian/rwalld/usr/share/man/man8
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installinfo
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: install
-# (Uncomment this next line if you have such packages.)
-# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: install
- make -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru netkit-rwall-0.17/debian/rwalld.dirs
netkit-rwall-0.17/debian/rwalld.dirs
--- netkit-rwall-0.17/debian/rwalld.dirs 2018-12-05 19:20:50.000000000
+0100
+++ netkit-rwall-0.17/debian/rwalld.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/man/man8
diff -Nru netkit-rwall-0.17/debian/rwalld.install
netkit-rwall-0.17/debian/rwalld.install
--- netkit-rwall-0.17/debian/rwalld.install 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/rwalld.install 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1,2 @@
+
+usr/sbin/rpc.rwalld
diff -Nru netkit-rwall-0.17/debian/rwall.dirs
netkit-rwall-0.17/debian/rwall.dirs
--- netkit-rwall-0.17/debian/rwall.dirs 2018-12-05 19:20:50.000000000 +0100
+++ netkit-rwall-0.17/debian/rwall.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff -Nru netkit-rwall-0.17/debian/rwalld.manpages
netkit-rwall-0.17/debian/rwalld.manpages
--- netkit-rwall-0.17/debian/rwalld.manpages 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/rwalld.manpages 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man8/rpc.rwalld.8
diff -Nru netkit-rwall-0.17/debian/rwall.install
netkit-rwall-0.17/debian/rwall.install
--- netkit-rwall-0.17/debian/rwall.install 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/rwall.install 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1,2 @@
+
+usr/bin/rwall
diff -Nru netkit-rwall-0.17/debian/rwall.manpages
netkit-rwall-0.17/debian/rwall.manpages
--- netkit-rwall-0.17/debian/rwall.manpages 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/rwall.manpages 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man1/rwall.1
diff -Nru netkit-rwall-0.17/debian/source/format
netkit-rwall-0.17/debian/source/format
--- netkit-rwall-0.17/debian/source/format 1970-01-01 01:00:00.000000000
+0100
+++ netkit-rwall-0.17/debian/source/format 2010-01-15 17:17:00.000000000
+0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru netkit-rwall-0.17/rpc.rwalld/Makefile
netkit-rwall-0.17/rpc.rwalld/Makefile
--- netkit-rwall-0.17/rpc.rwalld/Makefile 2018-12-05 19:20:50.000000000
+0100
+++ netkit-rwall-0.17/rpc.rwalld/Makefile 1999-12-12 19:05:05.000000000
+0100
@@ -5,7 +5,7 @@
RPCGEN=rpcgen
-rwalld: rwalld.o
+rwalld: rwalld.o daemon.o
$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
rwalld.o: rwall.h daemon.h ../version.h
diff -Nru netkit-rwall-0.17/rpc.rwalld/rwalld.c
netkit-rwall-0.17/rpc.rwalld/rwalld.c
--- netkit-rwall-0.17/rpc.rwalld/rwalld.c 2018-12-05 19:20:50.000000000
+0100
+++ netkit-rwall-0.17/rpc.rwalld/rwalld.c 1999-12-12 19:05:05.000000000
+0100
@@ -78,8 +78,8 @@
{
SVCXPRT *transp;
int s;
+ socklen_t salen;
struct sockaddr_in sa;
- socklen_t salen = sizeof(sa);
int sock = 0;
int proto = 0;
diff -Nru netkit-rwall-0.17/rwall/rwall.1 netkit-rwall-0.17/rwall/rwall.1
--- netkit-rwall-0.17/rwall/rwall.1 2018-12-05 19:20:50.000000000 +0100
+++ netkit-rwall-0.17/rwall/rwall.1 2000-07-31 01:57:05.000000000 +0200
@@ -63,7 +63,7 @@
.It rwall: RPC: Port mapper failure - RPC: Timed out
The remote host is not running the portmapper (see
.Xr portmap 8 ),
-and cannot accommodate any RPC-based services. The host may be down.
+and cannot accomodate any RPC-based services. The host may be down.
.El
.Sh SEE ALSO
.Xr wall 1 ,
signature.asc
Description: PGP signature
