From 9e0e955daf57b997792ca55a236498694ce634e2 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Fri, 6 Jan 2017 00:30:43 +0100 Subject: [PATCH] Update Debian package - Update debhelper compatibility to version 9. - Update build-dependencies. - Change group of ngircd.conf to "irc" in postinst script (this makes starting ngIRCd as user "irc" easier, for example when using systemd). - Don't create /var/run/ircd during installation: this is handled by the SysV init script and the systemd service already. --- contrib/Debian/compat | 2 +- contrib/Debian/control | 4 ++-- contrib/Debian/ngircd.postinst | 2 +- contrib/Debian/rules | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/contrib/Debian/compat b/contrib/Debian/compat index b8626c4c..ec635144 100644 --- a/contrib/Debian/compat +++ b/contrib/Debian/compat @@ -1 +1 @@ -4 +9 diff --git a/contrib/Debian/control b/contrib/Debian/control index 59a74ab5..158d9533 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -2,13 +2,13 @@ Source: ngircd Section: net Priority: optional Maintainer: Alexander Barton -Build-Depends: debhelper (>> 4.0.0), +Build-Depends: debhelper (>> 9.0.0), autotools-dev, expect, libz-dev, libwrap0-dev, libident-dev, - libgnutls-dev, + libgnutls28-dev, libpam0g-dev, telnet | telnet-ssl, Standards-Version: 3.9.1 diff --git a/contrib/Debian/ngircd.postinst b/contrib/Debian/ngircd.postinst index 55679342..f6e3c4f7 100755 --- a/contrib/Debian/ngircd.postinst +++ b/contrib/Debian/ngircd.postinst @@ -1,7 +1,6 @@ #!/bin/sh # # Debian post-installation script -# $Id: ngircd.postinst,v 1.2 2006/12/26 14:44:40 alex Exp $ # set -e @@ -12,6 +11,7 @@ case "$1" in # make sure that the configuration file is not # world-readable, it contains passwords! chmod o= /etc/ngircd/ngircd.conf + chgrp irc /etc/ngircd/ngircd.conf fi ;; esac diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 1630a015..609a8dd6 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors +# Copyright (c)2001-2016 Alexander Barton (alex@barton.de) and Contributors # # 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 @@ -140,7 +140,6 @@ install-ngircd: build-ngircd $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL* rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING* - mkdir -p $(CURDIR)/debian/ngircd/var/run/ircd cat $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/sample-ngircd.conf | \ sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \ @@ -157,7 +156,6 @@ install-ngircd-full: build-ngircd-full $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/INSTALL* rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/COPYING* - mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \ sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \ @@ -176,7 +174,6 @@ install-ngircd-full-dbg: build-ngircd-full-dbg $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/INSTALL* rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/COPYING* - mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \ sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \ @@ -222,6 +219,6 @@ binary-arch: build install binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install # -eof- -- 2.39.2