packages: radsecproxy/radsecproxy.spec, radsecproxy/radsecproxy-visinst.pat...

[blues]

Author: blues                        Date: Tue Dec 20 15:16:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.3 - fticksVISINST support

---- Files affected:
packages/radsecproxy:
   radsecproxy.spec (1.18 -> 1.19) , radsecproxy-visinst.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/radsecproxy/radsecproxy.spec
diff -u packages/radsecproxy/radsecproxy.spec:1.18 packages/radsecproxy/radsecproxy.spec:1.19
--- packages/radsecproxy/radsecproxy.spec:1.18	Tue Dec 20 13:42:26 2011
+++ packages/radsecproxy/radsecproxy.spec	Tue Dec 20 16:16:33 2011
@@ -4,7 +4,7 @@
 Summary:	RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
 Name:		radsecproxy
 Version:	1.5
-Release:	2
+Release:	3
 License:	GPLv2+ or BSD-like
 Group:		Networking/Daemons/Radius
 Source0:	http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch0:		%{name}-docbook2x.patch
 ## will be included in 1.6
 Patch1:		%{name}-fticks.patch
+Patch2:		%{name}-visinst.patch
 URL:		http://software.uninett.no/radsecproxy/
 # For manual creation:
 BuildRequires:	docbook2X
@@ -48,6 +49,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -118,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/12/20 15:16:33  blues
+- rel.3 - fticksVISINST support
+
 Revision 1.18  2011/12/20 12:42:26  blues
 - comment about fticks patch
 

================================================================
Index: packages/radsecproxy/radsecproxy-visinst.patch
diff -u /dev/null packages/radsecproxy/radsecproxy-visinst.patch:1.1
--- /dev/null	Tue Dec 20 16:16:38 2011
+++ packages/radsecproxy/radsecproxy-visinst.patch	Tue Dec 20 16:16:33 2011
@@ -0,0 +1,38 @@
+--- ./radsecproxy.c.org	2011-12-20 12:46:01.678987351 +0100
++++ ./radsecproxy.c	2011-12-20 15:44:24.186577784 +0100
+@@ -2690,6 +2690,7 @@ int confclient_cb(struct gconffile **cf,
+ 	    "rewriteattribute", CONF_STR, &conf->confrewriteusername,
+ #if defined(WANT_FTICKS)
+ 	    "fticksVISCOUNTRY", CONF_STR, &conf->fticks_viscountry,
++	    "fticksVISINST", CONF_STR, &conf->fticks_visinst,
+ #endif
+ 	    NULL
+ 	    ))
+--- ./radsecproxy.h.org	2011-12-20 12:46:01.685654326 +0100
++++ ./radsecproxy.h	2011-12-20 15:43:05.166261843 +0100
+@@ -131,6 +131,7 @@ struct clsrvconf {
+     struct list *clients;
+     struct server *servers;
+     char *fticks_viscountry;
++    char *fticks_visinst;
+ };
+ 
+ #include "tlscommon.h"
+--- ./fticks.c.org	2011-12-20 12:46:01.678987351 +0100
++++ ./fticks.c	2011-12-20 15:51:30.612937428 +0100
+@@ -107,8 +107,13 @@ fticks_log(const struct options *options
+ 
+     memset(visinst, 0, sizeof(visinst));
+     if (options->fticks_reporting == RSP_FTICKS_REPORTING_FULL) {
+-	snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
+-		 client->conf->name);
++	    if (client->conf->fticks_visinst != NULL ) {
++		    snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
++				    client->conf->fticks_visinst);
++	    } else {
++		    snprintf((char *) visinst, sizeof(visinst), "VISINST=%s#",
++				    client->conf->name);
++	    }
+     }
+ 
+     memset(macout, 0, sizeof(macout));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radsecproxy/radsecproxy.spec?r1=1.18&r2=1.19&f=u