- BR: nettle-devel (for fticks)

Changed files:
    radsecproxy-visinst.patch -> 1.2
    radsecproxy.spec -> 1.20

diff --git a/radsecproxy-visinst.patch b/radsecproxy-visinst.patch
index 197867ceaf27305e363106a830f3ef264272e1fa..f6844d8f6a8709cc5364fe0bb38d103a5d92b775 100644 (file)
--- a/radsecproxy-visinst.patch
+++ b/radsecproxy-visinst.patch
@@ -36,3 +36,40 @@
      }
  
      memset(macout, 0, sizeof(macout));
+--- ./radsecproxy.conf-example.org     2011-12-20 12:46:01.682320839 +0100
++++ ./radsecproxy.conf-example 2011-12-20 16:32:38.963596053 +0100
+@@ -36,7 +36,7 @@
+ #   Full  -- Do log in F-Ticks format and do log VISINST.
+ # Please note that in order to get F-Ticks logging for a given client,
+ # its matching client configuration block has to contain the
+-# fticksVISCOUNTRY option.
++# fticksVISCOUNTRY option and it can contain the fticksVISINST option.
+ 
+ # You can optionally specify FTicksMAC in order to determine if and
+ # how Calling-Station-Id (users Ethernet MAC address) is being logged.
+--- ./radsecproxy.conf.5.xml.org       2011-12-20 16:26:32.610010659 +0100
++++ ./radsecproxy.conf.5.xml   2011-12-20 16:32:01.411861864 +0100
+@@ -479,9 +479,9 @@ blocktype name {
+       <literal>certificateNameCheck</literal>,
+       <literal>matchCertificateAttribute</literal>,
+       <literal>duplicateInterval</literal>, <literal>AddTTL</literal>,
+-      <literal>fticksVISCOUNTRY</literal>, <literal>rewrite</literal>,
+-      <literal>rewriteIn</literal>, <literal>rewriteOut</literal>, and
+-      <literal>rewriteAttribute</literal>.
++      <literal>fticksVISCOUNTRY</literal>, <literal>fticksVISINST</literal>,
++      <literal>rewrite</literal>, <literal>rewriteIn</literal>,
++      <literal>rewriteOut</literal>, and <literal>rewriteAttribute</literal>.
+ 
+       We already discussed the <literal>host</literal> option. The
+       value of <literal>type</literal> must be one of
+@@ -543,6 +543,10 @@ blocktype name {
+       <literal>FTicksReporting</literal> basic option.
+     </para>
+     <para>
++      The <literal>fticksVISINST</literal> option overwrites 
++      <literal>VISINST</literal> value.
++    </para>
++    <para>
+       The <literal>rewrite</literal> option is deprecated. Use
+       <literal>rewriteIn</literal> instead.
+     </para>

diff --git a/radsecproxy.spec b/radsecproxy.spec
index 92d5754f7df41e96b56f6d8f021ae671ce03497f..2cf7e84553436c357915d37298c5859f5c03d9a5 100644 (file)
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -18,6 +18,7 @@ Patch2:               %{name}-visinst.patch
 URL:           http://software.uninett.no/radsecproxy/
 # For manual creation:
 BuildRequires: docbook2X
+BuildRequires: nettle-devel
 Requires:      openssl >= 1.0.0b
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts >= 0.4.3.0