tags 873085 pending tags 912121 patch user debian-rele...@lists.debian.org usertags 912120 + bsp-2018-12-ch-bern thanks
Dear maintainer,
find attached the NMU I've prepared for bsd-finger (versioned as
0.17-15.2) and uploaded to DELAYED/10. Please feel free to tell me if I
should delay it longer.
This goes beyond the usual scope of an NMU but it seemed wise to brush
up the entire build system so it is robust for any forseeable changes to
the Debian toolchain.
For a full explanation, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911154#44
Regards,
Christoph
diff -Nru bsd-finger-0.17/debian/changelog bsd-finger-0.17/debian/changelog
--- bsd-finger-0.17/debian/changelog 2016-11-11 15:58:53.000000000 +0100
+++ bsd-finger-0.17/debian/changelog 2018-12-08 10:36:30.000000000 +0100
@@ -1,3 +1,10 @@
+bsd-finger (0.17-15.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Use cmake as build system. Closes: #873085, #912121
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Sat, 08 Dec 2018
10:36:30 +0100
+
bsd-finger (0.17-15.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru bsd-finger-0.17/debian/compat bsd-finger-0.17/debian/compat
--- bsd-finger-0.17/debian/compat 2012-06-18 06:56:36.000000000 +0200
+++ bsd-finger-0.17/debian/compat 2018-12-05 00:25:26.000000000 +0100
@@ -1 +1 @@
-9
+10
diff -Nru bsd-finger-0.17/debian/control bsd-finger-0.17/debian/control
--- bsd-finger-0.17/debian/control 2012-06-18 07:39:52.000000000 +0200
+++ bsd-finger-0.17/debian/control 2018-12-05 00:25:26.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Anibal Monsalve Salazar <ani...@debian.org>
Standards-Version: 3.9.3
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9)
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 10~), cmake
Package: finger
Architecture: any
diff -Nru bsd-finger-0.17/debian/fingerd.dirs
bsd-finger-0.17/debian/fingerd.dirs
--- bsd-finger-0.17/debian/fingerd.dirs 2007-02-09 00:42:03.000000000 +0100
+++ bsd-finger-0.17/debian/fingerd.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/man/man8
diff -Nru bsd-finger-0.17/debian/fingerd.install
bsd-finger-0.17/debian/fingerd.install
--- bsd-finger-0.17/debian/fingerd.install 1970-01-01 01:00:00.000000000
+0100
+++ bsd-finger-0.17/debian/fingerd.install 2018-12-05 00:25:27.000000000
+0100
@@ -0,0 +1,2 @@
+
+usr/sbin/in.fingerd
diff -Nru bsd-finger-0.17/debian/finger.dirs bsd-finger-0.17/debian/finger.dirs
--- bsd-finger-0.17/debian/finger.dirs 2007-02-09 00:42:03.000000000 +0100
+++ bsd-finger-0.17/debian/finger.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff -Nru bsd-finger-0.17/debian/fingerd.manpages
bsd-finger-0.17/debian/fingerd.manpages
--- bsd-finger-0.17/debian/fingerd.manpages 1970-01-01 01:00:00.000000000
+0100
+++ bsd-finger-0.17/debian/fingerd.manpages 2018-12-05 00:25:27.000000000
+0100
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man8/in.fingerd.8
diff -Nru bsd-finger-0.17/debian/finger.install
bsd-finger-0.17/debian/finger.install
--- bsd-finger-0.17/debian/finger.install 1970-01-01 01:00:00.000000000
+0100
+++ bsd-finger-0.17/debian/finger.install 2018-12-05 00:25:27.000000000
+0100
@@ -0,0 +1,2 @@
+
+usr/bin/finger
diff -Nru bsd-finger-0.17/debian/finger.manpages
bsd-finger-0.17/debian/finger.manpages
--- bsd-finger-0.17/debian/finger.manpages 1970-01-01 01:00:00.000000000
+0100
+++ bsd-finger-0.17/debian/finger.manpages 2018-12-05 00:25:27.000000000
+0100
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man1/finger.1
diff -Nru bsd-finger-0.17/debian/patches/series
bsd-finger-0.17/debian/patches/series
--- bsd-finger-0.17/debian/patches/series 2012-06-18 07:07:56.000000000
+0200
+++ bsd-finger-0.17/debian/patches/series 2018-12-05 00:25:27.000000000
+0100
@@ -4,3 +4,5 @@
04-468454-finger-ipv6.patch
05-547014-netgroup.patch
06-572211-decrease-timeout.patch
+use-cmake-as-buildsystem.patch
+use-cmake-as-buildsystem-debian-extras.patch
diff -Nru
bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
--- bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
1970-01-01 01:00:00.000000000 +0100
+++ bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
2018-12-05 00:25:27.000000000 +0100
@@ -0,0 +1,29 @@
+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/finger/CMakeLists.txt
++++ b/finger/CMakeLists.txt
+@@ -1,4 +1,9 @@
+
++set(
++ CMAKE_C_FLAGS
++ "${CMAKE_C_FLAGS} -D_GNU_SOURCE"
++)
++
+ add_executable(
+ finger
+ finger.c
+--- a/fingerd/CMakeLists.txt
++++ b/fingerd/CMakeLists.txt
+@@ -1,4 +1,9 @@
+
++set(
++ CMAKE_C_FLAGS
++ "${CMAKE_C_FLAGS} -D_GNU_SOURCE"
++)
++
+ add_executable(
+ in.fingerd
+ fingerd.c
diff -Nru bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem.patch
bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem.patch
--- bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem.patch
1970-01-01 01:00:00.000000000 +0100
+++ bsd-finger-0.17/debian/patches/use-cmake-as-buildsystem.patch
2018-12-05 00:47:42.000000000 +0100
@@ -0,0 +1,59 @@
+Description: Use cmake as build system
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Bug-Debian:
+ https://bugs.debian.org/873085
+ https://bugs.debian.org/912121
+Last-Update: 2018-11-25
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,9 @@
++cmake_minimum_required(VERSION 3.7)
++project(bsd-finger)
++
++set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++set(SBIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
++
++add_subdirectory(finger)
++add_subdirectory(fingerd)
+--- /dev/null
++++ b/finger/CMakeLists.txt
+@@ -0,0 +1,19 @@
++
++add_executable(
++ finger
++ finger.c
++ lprint.c
++ net.c
++ sprint.c
++ util.c
++ display.c
++)
++install(
++ TARGETS finger
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES finger.1
++ DESTINATION ${MAN_DIR}/man1/
++)
+--- /dev/null
++++ b/fingerd/CMakeLists.txt
+@@ -0,0 +1,15 @@
++
++add_executable(
++ in.fingerd
++ fingerd.c
++)
++install(
++ TARGETS in.fingerd
++ DESTINATION ${SBIN_DIR}
++)
++
++install(
++ FILES fingerd.8
++ DESTINATION ${MAN_DIR}/man8/
++ RENAME in.fingerd.8
++)
diff -Nru bsd-finger-0.17/debian/rules bsd-finger-0.17/debian/rules
--- bsd-finger-0.17/debian/rules 2016-11-11 15:58:47.000000000 +0100
+++ bsd-finger-0.17/debian/rules 2018-12-05 00:25:26.000000000 +0100
@@ -1,77 +1,7 @@
#!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Copyright (c) 1999 Herbert Xu <herb...@debian.org>
-# Copyright (C) 2004-2008 Anibal Monsalve Salazar <ani...@debian.org>
-export DH_VERBOSE=1
+%:
+ dh $@ --buildsystem=cmake
-export DH_OPTIONS
-
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- dh_testdir
- if [ ! -f MCONFIG ]; then \
- ./configure; \
- sed -e "s/^CFLAGS=\(.*\)$$/CFLAGS=-g -D_GNU_SOURCE
\1/;s/^LDFLAGS=\(.*\)$$/LDFLAGS=$$LDFLAGS \1/" \
- MCONFIG > MCONFIG.new; \
- mv MCONFIG.new MCONFIG; \
- fi
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
- touch MCONFIG
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
-
-install: DH_OPTIONS=
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- install finger/finger debian/finger/usr/bin
- install fingerd/fingerd debian/fingerd/usr/sbin/in.fingerd
- cp finger/finger.1 debian/finger/usr/share/man/man1
- cp fingerd/fingerd.8 debian/fingerd/usr/share/man/man8/in.fingerd.8
- dh_strip
- touch install-stamp
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installinfo
- dh_installchangelogs ChangeLog
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep: install
-
-binary-arch: install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-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
signature.asc
Description: PGP signature
