Move to buster, make build.sh agnostic to release, releasename in packagename

Dockerfile

-FROM debian:stretch
+FROM debian:buster
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl1.0-dev nettle-dev docbook2x
+RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl1.0-dev nettle-dev docbook2x lsb-release
 WORKDIR /root/
 COPY patches patches
 COPY build.sh build.sh

build.sh

@@ -2,9 +2,11 @@
 # set -x
 set -e
 
+lsb_release_name=$(lsb_release -sc)
+
 package="radsecproxy"
 version="1.8.0"
-revision="2~uninett"
+revision="3${lsb_release_name}~uninett"
 
 export TZ="Europe/Oslo"
 now=$(date +"%a, %d %b %Y %T %z")
@@ -14,9 +16,9 @@ here=$(pwd)
 export DEBIAN_FRONTEND=noninteractive
 
 cat >> /etc/apt/sources.list << EOF
-deb-src http://cdn-fastly.deb.debian.org/debian stretch main
-deb-src http://cdn-fastly.deb.debian.org/debian stretch-updates main
-deb-src http://security.debian.org stretch/updates main
+deb-src http://cdn-fastly.deb.debian.org/debian ${lsb_release_name} main
+deb-src http://cdn-fastly.deb.debian.org/debian ${lsb_release_name}-updates main
+deb-src http://security.debian.org ${lsb_release_name}/updates main
 EOF
 
 apt-get update
@@ -42,8 +44,7 @@ rm -r "${package}"-"${version}/debian/patches"
 cat > changelog << EOF
 radsecproxy (${version}-${revision}) unstable; urgency=medium
 
-  * New upstream release - 1.8.0
-    - all previous patches are now removed
+  * New upstream release - ${version}
 
  -- Kolbjørn Barmen <debian@kolla.no>  ${now}
 

patches/patch-aa

-$NetBSD$
-
-These syslog messages occur way too often.  ...and since Kolla
-likes to run with full debugging turned on, eliminate these so
-that we don't fill the /var/log file system.
-
---- a/radsecproxy.c	2016-03-14 15:14:55.000000000 +0100
-+++ b/radsecproxy.c	2016-08-03 15:27:28.504000000 +0200
-@@ -432,7 +432,9 @@
- void freerq(struct request *rq) {
-     if (!rq)
- 	return;
-+#if 0
-     debug(DBG_DBG, "freerq: called with refcount %d", rq->refcount);
-+#endif
-     if (--rq->refcount)
- 	return;
-     if (rq->origusername)

patches/patch-ab

-$NetBSD$
-
-These syslog messages occur way too often.  ...and since Kolla
-likes to run with full debugging turned on, eliminate these so
-that we don't fill the /var/log file system.
-
---- a/udp.c	2016-03-14 15:14:55.000000000 +0100
-+++ b/udp.c	2016-08-03 15:28:31.056000000 +0200
-@@ -310,7 +310,9 @@
- 	    if (sendto(reply->udpsock, reply->replybuf, RADLEN(reply->replybuf), 0, (struct sockaddr *)&to, SOCKADDR_SIZE(to)) < 0)
- 		debug(DBG_WARN, "udpserverwr: send failed");
- 	}
-+#if 0
- 	debug(DBG_DBG, "udpserverwr: refcount %d", reply->refcount);
-+#endif
- 	freerq(reply);
-     }
- }

patches/patch-ac

-$NetBSD$
-
-Use NOTICE for requests as well
-
---- a/radsecproxy.c	2017-08-02 23:52:38.000000000 +0200
-+++ b/radsecproxy.c	2017-08-03 00:02:37.000000000 +0200
-@@ -1287,12 +1287,12 @@
- 
-     attr = radmsg_gettype(msg, RAD_Attr_User_Name);
-     if (!attr) {
--	debug(DBG_INFO, "acclog: accounting-request from client %s (%s) without username attribute", from->conf->name, addr2string(from->addr));
-+	debug(DBG_NOTICE, "Accounting-Request from client %s (%s) without username attribute", from->conf->name, addr2string(from->addr));
- 	return;
-     }
-     username = radattr2ascii(attr);
-     if (username) {
--	debug(DBG_INFO, "acclog: accounting-request from client %s (%s) with username: %s", from->conf->name, addr2string(from->addr), username);
-+	debug(DBG_NOTICE, "Accounting-Request from client %s (%s) with username: %s", from->conf->name, addr2string(from->addr), username);
- 
- 	free(username);
-     }
-@@ -1526,7 +1526,7 @@
-     userascii = radattr2ascii(attr);
-     if (!userascii)
- 	goto rmclrqexit;
--    debug(DBG_DBG, "radsrv: got %s (id %d) with username: %s from client %s (%s)", radmsgtype2string(msg->code), msg->id, userascii, from->conf->name, addr2string(from->addr));
-+    debug(DBG_NOTICE, "%s from client %s (%s) with username: %s", radmsgtype2string(msg->code), from->conf->name, addr2string(from->addr), userascii);
- 
-     /* will return with lock on the realm */
-     to = findserver(&realm, attr, msg->code == RAD_Accounting_Request);