Packaging cleanup

* Declare compliance with policy 4.5.1
* Bump debhelper compat level to 13
* Set Rule-Requires-Root: no
* Change URLs to https:// where possible
* Re-organise non-upstream config files
* Reformat files

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -1,13 +1,14 @@
 Source: pptpd
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: http://poptop.sourceforge.net/dox/
-Standards-Version: 3.9.8
+Standards-Version: 4.5.1
 Vcs-Browser: https://git.in-ulm.de/cbiedl/pptpd
 Vcs-Git: https://git.in-ulm.de/cbiedl/pptpd.git
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper-compat (= 13),
     libwrap0-dev,
     ppp-dev (>= 2.4.7-1+~),
 Priority: optional
+Rules-Requires-Root: no
 Section: net
 
 Package: pptpd

debian/copyright

@@ -1,21 +1,22 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: poptop
 Source: http://poptop.sourceforge.net/dox/
 
 Files: *
 Copyright: James Cameron <quozl at laptop dot org> et.al.
-Comment: See AUTHORS for full list
 License: GPL-2.0+
+Comment: See AUTHORS for full list
 
-Files: bcrelay.8
+Files:
+ bcrelay.8
 Copyright: Nguyen Vinh
 License: GPL-2.0+
 
 Files:
-    getopt.c
-    our_getopt.h
+ getopt.c
+ our_getopt.h
 Copyright: 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
-    Free Software Foundation, Inc.
+ Free Software Foundation, Inc.
 License: GPL-2.0+
 
 License: GPL-2.0+
@@ -30,7 +31,7 @@ License: GPL-2.0+
  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, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/patches/local.build_hardening-flags.patch

@@ -1,6 +1,6 @@
 Subject: Enable hardened build flags
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Bug-Debian: http://bugs.debian.org/656650
+Bug-Debian: https://bugs.debian.org/656650
 Forwarded: not-needed
 Last-Update: 2015-12-04
 

debian/patches/local.install-nonroot.patch

@@ -0,0 +1,18 @@
+Subject: Don't install files as root
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: 2020-12-26
+Forwarded: no
+
+    Not needed in Debian, breaks Rules-Requires-Root: no
+
+--- a/plugins/Makefile
++++ b/plugins/Makefile
+@@ -4,7 +4,7 @@
+ CPPFLAGS	= $(shell dpkg-buildflags --get CPPFLAGS)
+ LDFLAGS	= $(shell dpkg-buildflags --get LDFLAGS) -shared
+ LDADD   = -lutil
+-INSTALL	= install -o root
++INSTALL	= install
+ prefix  = /usr/local
+ 
+ PLUGINS = pptpd-logwtmp.so

debian/patches/series

@@ -10,3 +10,4 @@ cherry-pick.1.4.0-20-g4da603d.propagate-cc-to-subdirectories.patch
 local.build_hardening-flags.patch
 local.build_plugin.patch
 local.fix-typos.patch
+local.install-nonroot.patch

debian/pptpd.docs

@@ -1,8 +1,8 @@
 AUTHORS
 README
 README.inetd
-README.slirp
 README.logwtmp
 README.portslave
+README.slirp
 TODO
 html/poptop_ads_howto

debian/pptpd.install

@@ -4,9 +4,9 @@ usr/share/man/man8/pptpctrl.8
 usr/sbin/pptpd
 usr/share/man/man8/pptpd.8
 
-debian/pptpd.conf               etc/
+debian/etc/modules-load.d/pptpd.conf    etc/modules-load.d/
+debian/etc/ppp/pptpd-options            etc/ppp/
+debian/etc/pptpd.conf                   etc/
 usr/share/man/man5/pptpd.conf.5
-debian/pptpd-options            etc/ppp/
 
 usr/lib/pptpd/pptpd-logwtmp.so
-

debian/pptpd.lintian-overrides

@@ -1,3 +1,3 @@
 
-# side effect of teardown, see http://bugs.debian.org/700868
+# side effect of teardown, see https://bugs.debian.org/700868
 pptpd: init.d-script-possible-missing-stop etc/init.d/pptpd 0 6

debian/rules

@@ -12,15 +12,11 @@ override_dh_auto_configure:
 		--with-libwrap \
 		--enable-bcrelay
 
-override_dh_install:
-	dh_install --fail-missing
-	install -D -m 644 debian/modules-load.conf debian/pptpd/etc/modules-load.d/pptpd.conf
-
 override_dh_installdocs:
 	dh_installdocs --exclude=test.txt
 
 override_dh_installinit:
 	dh_installinit -- start 20 2 3 4 5 . stop 20 1 .
 
-override_dh_systemd_enable:
-	dh_systemd_enable --no-enable
+override_dh_installsystemd:
+	dh_installsystemd --no-enable