tags -1 patch user debian-rele...@lists.debian.org usertags -1 + bsp-2018-12-ch-bern thanks
Find attached the fix for netkit-bootparamd.
For a full explanation, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911154#44
Additional remarks:
* Bogus debian/bootparams.5 was removed
* Consider restricting architecture to linux-*
Christoph
diff -Nru netkit-bootparamd-0.17/debian/bootparamd.dirs netkit-bootparamd-0.17/debian/bootparamd.dirs --- netkit-bootparamd-0.17/debian/bootparamd.dirs 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/debian/bootparamd.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -etc -usr/sbin -usr/share/doc/bootparamd -usr/share/man/man5 -usr/share/man/man8 diff -Nru netkit-bootparamd-0.17/debian/bootparamd.install netkit-bootparamd-0.17/debian/bootparamd.install --- netkit-bootparamd-0.17/debian/bootparamd.install 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/bootparamd.install 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1,2 @@ + +debian/bootparams etc/ diff -Nru netkit-bootparamd-0.17/debian/bootparams.5 netkit-bootparamd-0.17/debian/bootparams.5 --- netkit-bootparamd-0.17/debian/bootparams.5 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/debian/bootparams.5 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -.\" bootparams - bootparamd(8) configuration file -.\" Copyright (c) 1999 by Martin Schulze <j...@debian.org> -.\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 2 of the License, or -.\" (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program; if not, write to the Free Software -.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -.\" -.TH BOOTPARAMS 5 "24 October 1999" "" "Linux System Administration" -.SH NAME -bootparams \- bootparamd(8) configuration file -.SH DESCRIPTION -The -.I bootparams -file is the main configuration file for the -.BR bootparamd (8) -that answers to boot parameter requests. This daemon is used by old -HP9000 boxes, for example. -.SH FORMAT -The format of this file is very easy. Each line starting with a hash -sign (`#') is considered a comment. All other lines look like: - -.IP -.nf -client id=server:path -.fi -.LP - -Where -.I client -is the name of the client machine, -.I server -is the hostname, fqdn or ip address of the server and -.I path -is the path to the resource in question. Fields are separated by -whitespace characters. Each entry has its own line. - -You may break up lines by using the backslash (`\\') character. In -that case you will have to use a whitespace character before the -backslash or the server will run into an endless loop. You may use -whitespace characters at the beginning of a new line. -.SH EXAMPLES -This will configure the host kataja: -.IP -.nf -kataja root=finlandia:/var/lib/nfs/kataja -.fi -.LP -While this configures the host kuusi, probably using the same scheme: -.IP -.nf -kuusi.infodrom.north.de \\ - root=finlandia.infodrom.north.de:/var/lib/nfs/kuusi -.fi -.LP -.SH FILES -.IR /etc/bootparams . -.SH "SEE ALSO" -.BR bootparamd (8). diff -Nru netkit-bootparamd-0.17/debian/compat netkit-bootparamd-0.17/debian/compat --- netkit-bootparamd-0.17/debian/compat 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/debian/compat 2008-03-21 19:02:52.000000000 +0100 @@ -1 +1 @@ -6 +10 diff -Nru netkit-bootparamd-0.17/debian/control netkit-bootparamd-0.17/debian/control --- netkit-bootparamd-0.17/debian/control 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/debian/control 2008-03-21 19:02:52.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Alberto Gonzalez Iniesta <a...@inittab.org> Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 10~), cmake Package: bootparamd Architecture: any diff -Nru netkit-bootparamd-0.17/debian/patches/fix-getopt-return-type.patch netkit-bootparamd-0.17/debian/patches/fix-getopt-return-type.patch --- netkit-bootparamd-0.17/debian/patches/fix-getopt-return-type.patch 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/patches/fix-getopt-return-type.patch 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1,16 @@ +Description: Fixed getopt return type +Author: Tomas Berndtsson <to...@nocrew.org> +Bug-Debian: https://bugs.debian.org/75806 +Last-Update: 2018-11-25 + +--- a/rpc.bootparamd/main.c ++++ b/rpc.bootparamd/main.c +@@ -37,7 +37,7 @@ + int s, pid; + struct hostent *he; + struct stat buf; +- char c; ++ int c; + + progname = rindex(argv[0],'/'); + if (progname) progname++; diff -Nru netkit-bootparamd-0.17/debian/patches/series netkit-bootparamd-0.17/debian/patches/series --- netkit-bootparamd-0.17/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/patches/series 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1,3 @@ +fix-getopt-return-type.patch +use-cmake-as-buildsystem.patch +use-cmake-as-buildsystem-debian-extras.patch diff -Nru netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch --- netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1,45 @@ +Description: Debian-specific changes to the cmake build system +Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de> +Forwarded: not-needed +Last-Update: 2018-11-25 + +--- a/rpc.bootparamd/CMakeLists.txt ++++ b/rpc.bootparamd/CMakeLists.txt +@@ -27,17 +27,6 @@ + TARGETS rpc.bootparamd + DESTINATION ${SBIN_DIR} + ) +-install( +- FILES bootparamd.8 +- DESTINATION ${MAN_DIR}/man8/ +- RENAME rpc.bootparamd.8 +-) +-install( +- CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- rpc.bootparamd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/tftpd.8 \ +- )" +-) + + add_custom_command( + COMMENT "Creating bootparam_prot.x" +@@ -87,3 +76,19 @@ + -o bootparam_prot_svc.c + DEPENDS bootparam_prot.x + ) ++ ++install( ++ FILES bootparams.5 ++ DESTINATION ${MAN_DIR}/man5/ ++) ++ ++install( ++ FILES bootparamd.8 ++ DESTINATION ${MAN_DIR}/man8/ ++) ++install( ++ CODE "execute_process( \ ++ COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ bootparamd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/rpc.bootparamd.8 \ ++ )" ++) diff -Nru netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem.patch netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem.patch --- netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem.patch 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/patches/use-cmake-as-buildsystem.patch 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1,108 @@ +Description: Use cmake as build system +Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de> +Bug-Debian: https://bugs.debian.org/912124 +Last-Update: 2018-11-25 + +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,8 @@ ++cmake_minimum_required(VERSION 3.7) ++project(netkit-bootparamd) ++ ++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.bootparamd) +--- /dev/null ++++ b/rpc.bootparamd/CMakeLists.txt +@@ -0,0 +1,89 @@ ++include_directories( ++ BEFORE ++ ${CMAKE_CURRENT_BINARY_DIR} ++) ++ ++add_executable( ++ rpc.bootparamd ++ ++ bootparam_prot_svc.c ++ bootparam_prot_xdr.c ++ rpc.bootparamd.c ++ main.c ++ ++ bootparam_prot.h ++) ++add_executable( ++ callbootd ++ ++ callbootd.c ++ bootparam_prot_clnt.c ++ bootparam_prot_xdr.c ++ ++ bootparam_prot.h ++) ++ ++install( ++ TARGETS rpc.bootparamd ++ DESTINATION ${SBIN_DIR} ++) ++install( ++ FILES bootparamd.8 ++ DESTINATION ${MAN_DIR}/man8/ ++ RENAME rpc.bootparamd.8 ++) ++install( ++ CODE "execute_process( \ ++ COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ rpc.bootparamd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/tftpd.8 \ ++ )" ++) ++ ++add_custom_command( ++ COMMENT "Creating bootparam_prot.x" ++ OUTPUT bootparam_prot.x ++ COMMAND ++ ${CMAKE_COMMAND} -E copy ++ ${CMAKE_CURRENT_SOURCE_DIR}/bootparam_prot.x.real bootparam_prot.x ++ DEPENDS bootparam_prot.x.real ++) ++ ++add_custom_command( ++ COMMENT "Creating bootparam_prot.h" ++ OUTPUT bootparam_prot.h ++ COMMAND rpcgen ++ ARGS ++ -h bootparam_prot.x ++ -o bootparam_prot.h ++ DEPENDS bootparam_prot.x ++) ++ ++add_custom_command( ++ COMMENT "Creating bootparam_prot_xdr.c" ++ OUTPUT bootparam_prot_xdr.c ++ COMMAND rpcgen ++ ARGS ++ -c bootparam_prot.x ++ -o ${CMAKE_CURRENT_BINARY_DIR}/bootparam_prot_xdr.c ++ DEPENDS bootparam_prot.x ++) ++ ++add_custom_command( ++ COMMENT "Creating bootparam_prot_clnt.c" ++ OUTPUT bootparam_prot_clnt.c ++ COMMAND rpcgen ++ ARGS ++ -l bootparam_prot.x ++ -o bootparam_prot_clnt.c ++ DEPENDS bootparam_prot.x ++) ++ ++add_custom_command( ++ COMMENT "Creating bootparam_prot_svc.c" ++ OUTPUT bootparam_prot_svc.c ++ COMMAND rpcgen ++ ARGS ++ -m bootparam_prot.x ++ -o bootparam_prot_svc.c ++ DEPENDS bootparam_prot.x ++) diff -Nru netkit-bootparamd-0.17/debian/rules netkit-bootparamd-0.17/debian/rules --- netkit-bootparamd-0.17/debian/rules 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/debian/rules 2008-03-21 19:02:52.000000000 +0100 @@ -1,77 +1,4 @@ #!/usr/bin/make -f -# GNU copyright 1997 to 1999 by Joey Hess. -# $Id: rules,v 1.6 2003/10/30 11:30:49 herbert Exp $ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -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: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - install rpc.bootparamd/bootparamd \ - debian/bootparamd/usr/sbin/rpc.bootparamd - cp rpc.bootparamd/bootparams.5 debian/bootparamd/usr/share/man/man5 - cp rpc.bootparamd/bootparamd.8 \ - debian/bootparamd/usr/share/man/man8 - ln -s bootparamd.8 \ - debian/bootparamd/usr/share/man/man8/rpc.bootparamd.8 - cp debian/bootparams debian/bootparamd/etc - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install -# dh_testversion - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installemacsen -# dh_installpam - dh_installinit - dh_installcron -# dh_installmanpages - dh_installinfo -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - # You may want to make some executables suid here. -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --buildsystem=cmake --no-parallel diff -Nru netkit-bootparamd-0.17/debian/source/format netkit-bootparamd-0.17/debian/source/format --- netkit-bootparamd-0.17/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ netkit-bootparamd-0.17/debian/source/format 2008-03-21 19:02:52.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru netkit-bootparamd-0.17/rpc.bootparamd/main.c netkit-bootparamd-0.17/rpc.bootparamd/main.c --- netkit-bootparamd-0.17/rpc.bootparamd/main.c 2018-12-05 19:20:47.000000000 +0100 +++ netkit-bootparamd-0.17/rpc.bootparamd/main.c 2000-07-22 18:23:56.000000000 +0200 @@ -37,7 +37,7 @@ int s, pid; struct hostent *he; struct stat buf; - int c; + char c; progname = rindex(argv[0],'/'); if (progname) progname++;
signature.asc
Description: PGP signature
