From 6bfc632bcf954ea2c45cd613307755327690d51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kolbj=C3=B8rn=20Barmen?= <kolbjorn.barmen@uninett.no>
Date: Mon, 14 Dec 2015 16:07:17 +0100
Subject: [PATCH] =?UTF-8?q?Oppdatert=20til=201.6.6=20-=20p=C3=A5=20tide=20?=
 =?UTF-8?q?=C3=A5=20se=20p=C3=A5=20differ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/debian/patches/patch-aa | 18 ++++++++++++++++++
 files/debian/patches/patch-ab | 18 ++++++++++++++++++
 files/debian/patches/patch-ac | 30 ++++++++++++++++++++++++++++++
 files/debian/patches/patch-ad | 16 ++++++++++++++++
 files/debian/patches/series   |  5 ++++-
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 files/debian/patches/patch-aa
 create mode 100644 files/debian/patches/patch-ab
 create mode 100644 files/debian/patches/patch-ac
 create mode 100644 files/debian/patches/patch-ad

diff --git a/files/debian/patches/patch-aa b/files/debian/patches/patch-aa
new file mode 100644
index 0000000..436f60e
--- /dev/null
+++ b/files/debian/patches/patch-aa
@@ -0,0 +1,18 @@
+$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 file system.
+
+--- radsecproxy.c.orig	2010-06-03 14:44:10.000000000 +0200
++++ radsecproxy.c
+@@ -419,7 +419,9 @@ struct request *newrqref(struct request 
+ 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)
diff --git a/files/debian/patches/patch-ab b/files/debian/patches/patch-ab
new file mode 100644
index 0000000..e0b691a
--- /dev/null
+++ b/files/debian/patches/patch-ab
@@ -0,0 +1,18 @@
+$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 file system.
+
+--- udp.c.orig	2010-06-03 14:44:11.000000000 +0200
++++ udp.c
+@@ -308,7 +308,9 @@ void *udpserverwr(void *arg) {
+ 	    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);
+     }
+ }
diff --git a/files/debian/patches/patch-ac b/files/debian/patches/patch-ac
new file mode 100644
index 0000000..f5345d6
--- /dev/null
+++ b/files/debian/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Use NOTICE for requests as well
+
+--- radsecproxy.c.orig	2010-12-23 14:01:35.000000000 +0100
++++ radsecproxy.c
+@@ -1261,12 +1261,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);
+     }
+@@ -1469,7 +1469,7 @@
+     userascii = radattr2ascii(attr);
+     if (!userascii)
+ 	goto rmclrqexit;
+-    debug(DBG_DBG, "%s with username: %s", radmsgtype2string(msg->code), userascii);
++    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);
diff --git a/files/debian/patches/patch-ad b/files/debian/patches/patch-ad
new file mode 100644
index 0000000..b2a061a
--- /dev/null
+++ b/files/debian/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Don't overwrite LDFLAGS, only add to it.  We might get flags
+via the build environment, but not during the configure stage.
+
+--- Makefile.in.orig	2012-04-16 13:08:14.000000000 +0000
++++ Makefile.in
+@@ -207,7 +207,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS += @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
diff --git a/files/debian/patches/series b/files/debian/patches/series
index a0dcb96..78bd92a 100644
--- a/files/debian/patches/series
+++ b/files/debian/patches/series
@@ -1 +1,4 @@
-fix_manpages
+patch-aa
+patch-ab
+patch-ac
+patch-ad
-- 
GitLab