packages: radsecproxy/radsecproxy-docbook2x.patch, radsecproxy/radsecproxy....
blues
blues at pld-linux.org
Tue Dec 20 12:45:44 CET 2011
Author: blues Date: Tue Dec 20 11:45:44 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel. 1.9 - fticks support. More manual fixes/workarounds
---- Files affected:
packages/radsecproxy:
radsecproxy-docbook2x.patch (1.1 -> 1.2) , radsecproxy.spec (1.15 -> 1.16) , radsecproxy-fticks.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/radsecproxy/radsecproxy-docbook2x.patch
diff -u packages/radsecproxy/radsecproxy-docbook2x.patch:1.1 packages/radsecproxy/radsecproxy-docbook2x.patch:1.2
--- packages/radsecproxy/radsecproxy-docbook2x.patch:1.1 Tue Dec 20 12:27:18 2011
+++ packages/radsecproxy/radsecproxy-docbook2x.patch Tue Dec 20 12:45:39 2011
@@ -11,3 +11,14 @@
AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes")
AC_SUBST(TARGET_CFLAGS)
+--- ./Makefile.am.org 2011-10-08 15:33:24.000000000 +0200
++++ ./Makefile.am 2011-12-20 12:31:21.988362106 +0100
+@@ -65,7 +65,7 @@ endif
+
+ ####################
+ radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
+- docbook2x-man $<
++ docbook2X2man $<
+
+ # Build HTML version of radsecproxy.conf.5. NOTE: Only tested with
+ # 'openjade' package installed on Ubuntu 9.10.
================================================================
Index: packages/radsecproxy/radsecproxy.spec
diff -u packages/radsecproxy/radsecproxy.spec:1.15 packages/radsecproxy/radsecproxy.spec:1.16
--- packages/radsecproxy/radsecproxy.spec:1.15 Tue Dec 20 12:27:18 2011
+++ packages/radsecproxy/radsecproxy.spec Tue Dec 20 12:45:39 2011
@@ -2,7 +2,7 @@
Summary: RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
Name: radsecproxy
Version: 1.5
-Release: 1.5
+Release: 1.9
License: GPLv2+ or BSD-like
Group: Networking/Daemons/Radius
Source0: http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
Source2: %{name}.logrotate
Source3: %{name}.upstart
Patch0: %{name}-docbook2x.patch
+Patch1: %{name}-fticks.patch
URL: http://software.uninett.no/radsecproxy/
# For manual creation:
BuildRequires: docbook2X
@@ -43,12 +44,18 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__aclocal}
%{__autoconf}
-%configure
+%configure \
+ --enable-fticks
+# Some trash comes with tar:
+%{__make} clean
%{__make}
+# FIXME:
+mv ______radsecproxy.conf\ ____.5 radsecproxy.conf.5
%install
rm -rf $RPM_BUILD_ROOT
@@ -93,6 +100,7 @@
%attr(750,root,root) %dir %{_sysconfdir}/radsecproxy.conf.d
%attr(755,root,root) %{_sbindir}/radsecproxy
%attr(755,root,root) %{_bindir}/radsecproxy-conf
+%attr(755,root,root) %{_bindir}/radsecproxy-hash
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%{_mandir}/man1/*
%{_mandir}/man5/*
@@ -107,6 +115,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2011/12/20 11:45:39 blues
+- rel. 1.9 - fticks support. More manual fixes/workarounds
+
Revision 1.15 2011/12/20 11:27:18 blues
- create manual pages
================================================================
Index: packages/radsecproxy/radsecproxy-fticks.patch
diff -u /dev/null packages/radsecproxy/radsecproxy-fticks.patch:1.1
--- /dev/null Tue Dec 20 12:45:44 2011
+++ packages/radsecproxy/radsecproxy-fticks.patch Tue Dec 20 12:45:39 2011
@@ -0,0 +1,243 @@
+diff -Naur radsecproxy-1.5-orig/debug.c radsecproxy-1.5/debug.c
+--- radsecproxy-1.5-orig/debug.c 2011-10-01 10:26:44.000000000 +0200
++++ radsecproxy-1.5/debug.c 2011-12-12 14:43:32.000000000 +0100
+@@ -28,6 +28,9 @@
+ static char *debug_filepath = NULL;
+ static FILE *debug_file = NULL;
+ static int debug_syslogfacility = 0;
++#if defined(WANT_FTICKS)
++static int fticks_syslogfacility = 0;
++#endif
+ static uint8_t debug_timestamp = 0;
+
+ void debug_init(char *ident) {
+@@ -64,40 +67,60 @@
+ return debug_level;
+ }
+
+-int debug_set_destination(char *dest) {
+- static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
+- "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
+- "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
+- static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
+- LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
+- LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
++int debug_set_destination(char *dest, int log_type) {
++ static const char *facstrings[] = {
++ "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
++ "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
++ "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
++ static const int facvals[] = {
++ LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
++ LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
++ LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
+ extern int errno;
+ int i;
+
+ if (!strncasecmp(dest, "file:///", 8)) {
+- debug_filepath = stringcopy(dest + 7, 0);
+- debug_file = fopen(debug_filepath, "a");
+- if (!debug_file) {
+- debug_file = stderr;
+- debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
+- debug_filepath, strerror(errno));
++ if (log_type != LOG_TYPE_FTICKS) {
++ debug_filepath = stringcopy(dest + 7, 0);
++ debug_file = fopen(debug_filepath, "a");
++ if (!debug_file) {
++ debug_file = stderr;
++ debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
++ debug_filepath, strerror(errno));
++ }
++ setvbuf(debug_file, NULL, _IONBF, 0);
++ } else {
++ debug(DBG_WARN, "FTicksSyslogFacility starting with file:/// not "
++ "permitted, assuming default F-Ticks destination");
+ }
+- setvbuf(debug_file, NULL, _IONBF, 0);
+ return 1;
+ }
+- if (!strncasecmp(dest, "x-syslog://", 11)) {
+- dest += 11;
+- if (*dest == '/')
+- dest++;
++ if (!strncasecmp(dest, "x-syslog://", 11) || log_type == LOG_TYPE_FTICKS) {
++ if (!strncasecmp(dest, "x-syslog://", 11)) {
++ dest += 11;
++ if (*dest == '/')
++ dest++;
++ }
+ if (*dest) {
+ for (i = 0; facstrings[i]; i++)
+ if (!strcasecmp(dest, facstrings[i]))
+ break;
+ if (!facstrings[i])
+ debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
+- debug_syslogfacility = facvals[i];
+- } else
+- debug_syslogfacility = LOG_DAEMON;
++ if (log_type != LOG_TYPE_FTICKS)
++ debug_syslogfacility = facvals[i];
++#if defined(WANT_FTICKS)
++ else if (log_type == LOG_TYPE_FTICKS)
++ fticks_syslogfacility = facvals[i];
++#endif
++ } else {
++ if (log_type != LOG_TYPE_FTICKS)
++ debug_syslogfacility = LOG_DAEMON;
++#if defined(WANT_FTICKS)
++ else if (log_type == LOG_TYPE_FTICKS)
++ fticks_syslogfacility = 0;
++#endif
++ }
+ openlog(debug_ident, LOG_PID, debug_syslogfacility);
+ return 1;
+ }
+@@ -213,6 +236,20 @@
+ exit(err);
+ }
+
++#if defined(WANT_FTICKS)
++void fticks_debug(const char *format, ...) {
++ int priority;
++ va_list ap;
++ va_start(ap, format);
++ if (!debug_syslogfacility && !fticks_syslogfacility)
++ debug_logit(0xff, format, ap);
++ else {
++ priority = LOG_DEBUG | fticks_syslogfacility;
++ vsyslog(priority, format, ap);
++ va_end(ap);
++ }
++}
++#endif
+ /* Local Variables: */
+ /* c-file-style: "stroustrup" */
+ /* End: */
+diff -Naur radsecproxy-1.5-orig/debug.h radsecproxy-1.5/debug.h
+--- radsecproxy-1.5-orig/debug.h 2011-10-01 10:26:44.000000000 +0200
++++ radsecproxy-1.5/debug.h 2011-12-12 14:46:04.000000000 +0100
+@@ -17,6 +17,9 @@
+ #define DBG_WARN 64
+ #define DBG_ERR 128
+
++#define LOG_TYPE_DEBUG 0
++#define LOG_TYPE_FTICKS 1
++
+ void debug_init(char *ident);
+ void debug_set_level(uint8_t level);
+ void debug_timestamp_on();
+@@ -25,8 +28,11 @@
+ void debugx(int status, uint8_t level, char *format, ...);
+ void debugerrno(int err, uint8_t level, char *format, ...);
+ void debugerrnox(int err, uint8_t level, char *format, ...);
+-int debug_set_destination(char *dest);
++int debug_set_destination(char *dest, int log_type);
+ void debug_reopen_log();
++#if defined(WANT_FTICKS)
++void fticks_debug(const char *format, ...);
++#endif
+
+ /* Local Variables: */
+ /* c-file-style: "stroustrup" */
+diff -Naur radsecproxy-1.5-orig/fticks.c radsecproxy-1.5/fticks.c
+--- radsecproxy-1.5-orig/fticks.c 2011-10-08 16:03:47.000000000 +0200
++++ radsecproxy-1.5/fticks.c 2011-11-30 13:03:37.000000000 +0100
+@@ -152,7 +152,7 @@
+ }
+ }
+ }
+- debug(0xff,
++ fticks_debug(
+ "F-TICKS/eduroam/1.0#REALM=%s#VISCOUNTRY=%s#%sCSI=%s#RESULT=%s#",
+ realm,
+ client->conf->fticks_viscountry,
+diff -Naur radsecproxy-1.5-orig/radsecproxy.c radsecproxy-1.5/radsecproxy.c
+--- radsecproxy-1.5-orig/radsecproxy.c 2011-10-08 16:03:48.000000000 +0200
++++ radsecproxy-1.5/radsecproxy.c 2011-12-12 14:46:25.000000000 +0100
+@@ -3085,6 +3085,7 @@
+ "FTicksReporting", CONF_STR, &fticks_reporting_str,
+ "FTicksMAC", CONF_STR, &fticks_mac_str,
+ "FTicksKey", CONF_STR, &fticks_key_str,
++ "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
+ #endif
+ NULL
+ ))
+@@ -3239,8 +3240,18 @@
+ options.loglevel = loglevel;
+ else if (options.loglevel)
+ debug_set_level(options.loglevel);
+- if (!foreground)
+- debug_set_destination(options.logdestination ? options.logdestination : "x-syslog:///");
++ if (!foreground) {
++ debug_set_destination(options.logdestination
++ ? options.logdestination
++ : "x-syslog:///", LOG_TYPE_DEBUG);
++#if defined(WANT_FTICKS)
++ if (options.ftickssyslogfacility) {
++ debug_set_destination(options.ftickssyslogfacility,
++ LOG_TYPE_FTICKS);
++ free(options.ftickssyslogfacility);
++ }
++#endif
++ }
+ free(options.logdestination);
+
+ if (!list_first(clconfs))
+diff -Naur radsecproxy-1.5-orig/radsecproxy.conf.5.xml radsecproxy-1.5/radsecproxy.conf.5.xml
+--- radsecproxy-1.5-orig/radsecproxy.conf.5.xml 2011-10-08 15:59:25.000000000 +0200
++++ radsecproxy-1.5/radsecproxy.conf.5.xml 2011-11-30 13:03:58.000000000 +0100
+@@ -243,6 +243,24 @@
+ </varlistentry>
+
+ <varlistentry>
++ <term><literal>FTicksSyslogFacility</literal></term>
++ <listitem>
++ <para>
++ The FTicksSyslogFacility option is used to specify
++ a dedicated syslog facility for F-Ticks messages.
++ This allows easy filtering of F-Ticks messages.
++ By default, if FTicksSyslogFacility is not given,
++ F-Ticks messages are written to the LogDestination.
++ </para>
++ <para>
++ For F-Ticks messages always LOG_DEBUG level is used.
++ Note that FTicksSyslogFacility value specifying a file
++ (via file:/// prefix) is ignored.
++ </para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
+ <term><literal>ListenUDP</literal></term>
+ <listitem>
+ <para>
+diff -Naur radsecproxy-1.5-orig/radsecproxy.conf-example radsecproxy-1.5/radsecproxy.conf-example
+--- radsecproxy-1.5-orig/radsecproxy.conf-example 2011-10-08 15:00:14.000000000 +0200
++++ radsecproxy-1.5/radsecproxy.conf-example 2011-11-30 13:03:58.000000000 +0100
+@@ -57,6 +57,14 @@
+ #FTicksReporting None
+ #FTicksMAC Static
+
++# You can optionally specify FTicksSyslogFacility to use a dedicated
++# syslog facility for F-Ticks messages. This allows easy filtering
++# of F-Ticks messages.
++# For F-Ticks messages always LOG_DEBUG level is used.
++# Please note that FTicksSyslogFacility cannot specify a file (file:///...)
++#FTicksSyslogFacility log_local1
++#FTicksSyslogFacility x-syslog:///log_local1
++
+ # There is an option for doing some simple loop prevention. Note that
+ # the LoopPrevention directive can be used in server blocks too,
+ # overriding what's set here in the basic settings.
+diff -Naur radsecproxy-1.5-orig/radsecproxy.h radsecproxy-1.5/radsecproxy.h
+--- radsecproxy-1.5-orig/radsecproxy.h 2011-10-08 14:35:39.000000000 +0200
++++ radsecproxy-1.5/radsecproxy.h 2011-11-30 13:03:47.000000000 +0100
+@@ -55,6 +55,7 @@
+
+ struct options {
+ char *logdestination;
++ char *ftickssyslogfacility;
+ char *ttlattr;
+ uint32_t ttlattrtype[2];
+ uint8_t addttl;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radsecproxy/radsecproxy-docbook2x.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radsecproxy/radsecproxy.spec?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list