Imported Upstream version 0.1.0-201406100617

ChangeLog

+commit cf67ab5e5be2da58a6f4733210a20552b5733535
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 22:46:43 2014 +0000
+
+    Fixed permissions of conf file and log dir
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
+commit d640a8e0cc5d020a43944a55b4ed2d1e6b2a680d
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 22:30:13 2014 +0000
+
+    Fix race condition in mkdir, slight cleanup
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
+commit 5c7b463dfbe35126bda5e8d31191cab270c557b1
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 22:25:55 2014 +0000
+
+    Fixed copyright to reflect GPL-3+ as it should
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
+commit f07c648d170376ad932da808d2cd81ba901a4a6c
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 22:25:09 2014 +0000
+
+    Fixed wrong license file being included
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
+commit 04ac4e02c9490235f9e43bbe1e7561c11933286a
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 22:22:13 2014 +0000
+
+    Fixed watch file, ucscan no longer fails
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
+commit f3e045a278e0d89656562a92caea50916e5d5935
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 21:46:46 2014 +0000
+
+    Fixed package description
+    
+    Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
+
 commit b75a167d6dc2851204668a1ebea202d296c66e93
 Author: Nigel Kukard <nkukard@lbsd.net>
 Date:   Mon Jun 9 11:36:20 2014 +0000

debian/changelog

-ppp-gatekeeper (0.1.0~201406091140-1) unstable; urgency=low
-  * Updated to upstream v0.1.0-201406091140
- -- Nigel Kukard <nkukard@lbsd.net>  Mon, 09 Jun 2014 14:00:40 +0200
+ppp-gatekeeper (0.1.0~201406100617-1) unstable; urgency=low
+  * Updated to upstream v0.1.0-201406100617
+ -- Nigel Kukard <nkukard@lbsd.net>  Tue, 10 Jun 2014 08:22:03 +0200

debian/control

@@ -14,7 +14,10 @@ Depends: ${perl:Depends}, ${misc:Depends},
 	libconfig-inifiles-perl, libio-pty-perl,
 	ppp, iptables, conntrack
 Suggests: shorewall
-Description: PPP Gatekeeper
- PPP Gatekeeper is a daemon that manages PPPOE connections supporting
- various levels of redundancy and failover
-
+Description: PPP Gatekeeper manages redundant and failover PPPOE connections
+	PPP Gatekeeper is a daemon that manages PPPOE connections supporting
+	various levels of redundancy and failover.
+	.
+	Traffic can be routed using round-robin and random strategies over links
+	of similar priority. Static IP route lists can also be provided for specific
+	routing purposes. DNS can also be load balanced over multiple links.

debian/copyright

@@ -3,24 +3,20 @@ Source: https://gitlab.devlabs.linuxassist.net/ppp-gatekeeper/ppp-gatekeeper
 
 Files: *
 Copyright: Copyright (C) 2010-2014, Linux Based Systems Design
-License: GPL-2+
- 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.
+License: GPL-3+
+ 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 3 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.
+ 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
+

debian/ppp-gatekeeper.init

@@ -29,18 +29,17 @@ test -x "${DAEMON}" || exit 0
 if [ ! -e "${LOGFILE1}" ]
 then
 	touch "${LOGFILE1}"
-	chmod 640 "${LOGFILE1}"
+	chmod 0640 "${LOGFILE1}"
 fi
 if [ ! -e "${LOGFILE2}" ]
 then
 	touch "${LOGFILE2}"
-	chmod 640 "${LOGFILE2}"
+	chmod 0640 "${LOGFILE2}"
 fi
 
 if [ ! -d "${RUNDIR}" ]
 then
-	mkdir -p "${RUNDIR}"
-	chmod 750 "${RUNDIR}"
+	mkdir -p --mode=0750 "${RUNDIR}"
 fi
 
 case "${1}" in

debian/ppp-gatekeeper.install

 # Main daemon
 ppp-gatekeeper usr/sbin
 
-# Configs
-ppp-gatekeeper.conf etc/ppp
-
 # Modprobe for xt_recent
 contrib/ppp-gatekeeper.modprobe etc/modprobe.d
 

debian/ppp-gatekeeper.postinst

-#!/bin/sh
-
-set -e
-
-
-case "${1}" in
-	configure)
-		chmod 0750 /var/log/ppp-gatekeeper
-		chmod 0750 /var/run/ppp-gatekeeper
-		chmod 0600 /etc/ppp/ppp-gatekeeper.conf
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`${1}'" >&2
-		exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/rules

@@ -7,6 +7,8 @@ SHELL := /bin/bash
 
 override_dh_install:
 	dh_install
+	install -d -m 0750 debian/ppp-gatekeeper/var/log/ppp-gatekeeper
+	install -D -m 0640 ppp-gatekeeper.conf debian/ppp-gatekeeper/etc/ppp/ppp-gatekeeper.conf
 	mv debian/ppp-gatekeeper/etc/modprobe.d/ppp-gatekeeper.{modprobe,conf}
 	mv debian/ppp-gatekeeper/etc/dnsmasq.d/ppp-gatekeeper.{dnsmasq,conf}
 	mv debian/ppp-gatekeeper/etc/shorewall/start{.shorewall,}

debian/watch

 version=3
-opts=pgpsigurlmangle=s/$/.asc/,downloadurlmangle=s/(.*)/$1\/ppp-gatekeeper-$1\.tar\.gz/ \
-http://download.allworldit.org/ppp-gatekeeper/v(.+)
+opts=pgpsigurlmangle=s/$/.asc/,\
+downloadurlmangle=s/\/(v?\d+\.\d+\.\d+.*)$/\/$1\/ppp-gatekeeper-$1.tar.xz/,\
+filenamemangle=s/v?(\d+\.\d+\.\d+.*)$/ppp-gatekeeper-$1.tar.xz/ \
+http://download.allworldit.org/ppp-gatekeeper/v?(\d+\.\d+\.\d+.*)

ppp-gatekeeper

@@ -32,7 +32,7 @@ use POSIX qw(WNOHANG setsid);
 use Data::Dumper;
 
 
-my $VERSION = "0.1.0-201406091140";
+my $VERSION = "0.1.0-201406100617";
 
 
 # DO NOT CHANGE THESE