head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.3.4.2 OPENPKG_E1_FP:1.3.4.2 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3.4.2 OPENPKG_2_STABLE:1.3.0.4 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.2 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.8 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.6 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.4 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.2 OPENPKG_2_0_SOLID_BP:1.2; locks; strict; comment @# @; 1.7 date 2008.12.07.18.11.31; author rse; state Exp; branches; next 1.6; commitid 4hb472AMliSpXytt; 1.6 date 2007.06.30.08.15.44; author rse; state Exp; branches; next 1.5; commitid 7BDUX9PQrAjizUns; 1.5 date 2007.01.14.20.36.52; author rse; state Exp; branches; next 1.4; commitid 20foBAVDWvym2w2s; 1.4 date 2006.12.11.12.50.07; author rse; state Exp; branches; next 1.3; commitid ESeks0yCtv5Yx6Yr; 1.3 date 2005.06.03.15.54.53; author rse; state Exp; branches 1.3.4.1; next 1.2; 1.2 date 2003.06.28.19.18.26; author rse; state dead; branches; next 1.1; 1.1 date 2003.06.13.09.05.44; author rse; state Exp; branches; next ; 1.3.4.1 date 2005.06.03.15.54.53; author rse; state dead; branches; next 1.3.4.2; commitid iZxwRSmmWscPXUQr; 1.3.4.2 date 2006.10.16.14.55.26; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.7 log @upgrading package: radius 1.5 -> 1.6 @ text @Index: configure --- configure.orig 2008-12-06 16:13:00 +0100 +++ configure 2008-12-07 19:05:46 +0100 @@@@ -36843,7 +36843,7 @@@@ for path in /usr/local/pgsql/lib /usr/pgsql/lib do - LIBS="$save_LIBS -L$path -lpq" + LIBS="$save_LIBS -L$path -lpq -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -36884,7 +36884,7 @@@@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ra_cv_lib_pq=" -L$path -lpq" + ra_cv_lib_pq=" -L$path -lpq -lssl -lcrypto" break else echo "$as_me: failed program was:" >&5 @ 1.6 log @upgrading package: radius 1.4 -> 1.5 @ text @d2 3 a4 3 --- configure.orig 2006-11-24 13:43:29 +0100 +++ configure 2007-01-14 21:11:53 +0100 @@@@ -46112,7 +46112,7 @@@@ d13 4 a16 4 @@@@ -46169,7 +46169,7 @@@@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @ 1.5 log @add optional MySQL, PostgreSQL and ODBC support; add a bunch of packaging comments @ text @a0 65 Index: lib/argp-help.c --- lib/argp-help.c.orig 2006-09-08 15:46:06 +0200 +++ lib/argp-help.c 2006-12-10 17:05:53 +0100 @@@@ -38,14 +38,7 @@@@ # include #endif -#ifdef _LIBC -# include -# undef dgettext -# define dgettext(domain, msgid) \ - INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) -#else -# include "gettext.h" -#endif +#include "gettext.h" #include "argp.h" #include "argp-fmtstream.h" Index: lib/argp-parse.c --- lib/argp-parse.c.orig 2006-09-08 15:46:06 +0200 +++ lib/argp-parse.c 2006-12-10 17:05:53 +0100 @@@@ -30,14 +30,7 @@@@ #include #include -#ifdef _LIBC -# include -# undef dgettext -# define dgettext(domain, msgid) \ - INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES) -#else -# include "gettext.h" -#endif +#include "gettext.h" #define N_(msgid) msgid #include "argp.h" Index: lib/error.c --- lib/error.c.orig 2006-09-08 11:32:36 +0200 +++ lib/error.c 2006-12-11 13:47:58 +0100 @@@@ -57,10 +57,11 @@@@ /* This variable is incremented each time `error' is called. */ unsigned int error_message_count; +#define program_name "radius" + #ifdef _LIBC /* In the GNU C library, there is a predefined variable for this. */ -# define program_name program_invocation_name # include # include # include @@@@ -92,10 +93,6 @@@@ char *strerror_r (); # endif -/* The calling program should define program_name and set it to the - name of the executing program. */ -extern char *program_name; - # if HAVE_STRERROR_R || defined strerror_r # define __strerror_r strerror_r # endif /* HAVE_STRERROR_R || defined strerror_r */ @ 1.4 log @upgrading package: radius 1.3 -> 1.4 @ text @d66 21 @ 1.3 log @remove old Solaris 2.6 hack; fix gettext related build problems @ text @d2 4 a5 4 --- lib/argp-help.c.orig 2003-08-15 15:31:00.000000000 +0200 +++ lib/argp-help.c 2005-06-03 16:35:10.975522742 +0200 @@@@ -56,18 +56,7 @@@@ # include d8 7 a14 11 -#ifndef _ -/* This is for other GNU distributions with internationalized messages. */ -# if defined HAVE_LIBINTL_H || defined _LIBC -# include -# ifdef _LIBC -# undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) -# endif -# else # define dgettext(domain, msgid) (msgid) -# endif d16 1 d21 5 a25 5 --- lib/argp-parse.c.orig 2002-05-16 18:24:38.000000000 +0200 +++ lib/argp-parse.c 2005-06-03 16:35:33.778383554 +0200 @@@@ -36,23 +36,9 @@@@ # include #endif d27 7 a33 16 -#ifndef _ -/* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ -# if defined HAVE_LIBINTL_H || defined _LIBC -# include -# ifdef _LIBC -# undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) -# endif -# else # define dgettext(domain, msgid) (msgid) # define gettext(msgid) (msgid) -# endif -#endif -#ifndef N_ # define N_(msgid) msgid d35 23 d59 7 a65 2 #if _LIBC - 0 #include @ 1.3.4.1 log @file radius.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:26 +0000 @ text @d1 49 @ 1.3.4.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 49 Index: lib/argp-help.c --- lib/argp-help.c.orig 2003-08-15 15:31:00.000000000 +0200 +++ lib/argp-help.c 2005-06-03 16:35:10.975522742 +0200 @@@@ -56,18 +56,7 @@@@ # include #endif -#ifndef _ -/* This is for other GNU distributions with internationalized messages. */ -# if defined HAVE_LIBINTL_H || defined _LIBC -# include -# ifdef _LIBC -# undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) -# endif -# else # define dgettext(domain, msgid) (msgid) -# endif -#endif #include "argp.h" #include "argp-fmtstream.h" Index: lib/argp-parse.c --- lib/argp-parse.c.orig 2002-05-16 18:24:38.000000000 +0200 +++ lib/argp-parse.c 2005-06-03 16:35:33.778383554 +0200 @@@@ -36,23 +36,9 @@@@ # include #endif -#ifndef _ -/* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ -# if defined HAVE_LIBINTL_H || defined _LIBC -# include -# ifdef _LIBC -# undef dgettext -# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) -# endif -# else # define dgettext(domain, msgid) (msgid) # define gettext(msgid) (msgid) -# endif -#endif -#ifndef N_ # define N_(msgid) msgid -#endif #if _LIBC - 0 #include @ 1.2 log @upgrading package: radius 0.96.4 -> 1.0 @ text @d1 6 a6 9 --- include/log.h.orig Tue Mar 19 15:32:00 2002 +++ include/log.h Fri Jun 13 10:52:25 2003 @@@@ -111,7 +111,7 @@@@ void initlog(char*); void radlog_open(int category); void radlog_close(); -void radlog(/*int, char *, ...*/); +void radlog(int, char *, ...); int __insist_failure(char *, char *, int); d8 20 a27 2 /* Debugging facilities */ @@@@ -137,7 +137,7 @@@@ d30 17 a46 229 void _debug_print(char *file, int line, char *func_name, char *str); -char *_debug_format_string(/* char *fmt, ... */); +char *_debug_format_string(char *fmt, ... ); /* Parsing */ --- include/radiusd.h.orig Mon Aug 5 15:25:12 2002 +++ include/radiusd.h Fri Jun 13 10:56:16 2003 @@@@ -166,9 +166,9 @@@@ #define stat_inc(m,a,c) \ do {\ NAS *nas;\ - server_stat->##m . ##c ++;\ + server_stat->m.c++;\ if ((nas = nas_lookup_ip(a)) != NULL && nas->app_data)\ - ((struct nas_stat*)nas->app_data)-> ##m . ##c ++;\ + ((struct nas_stat*)nas->app_data)->m.c++;\ } while (0) extern struct radstat radstat; --- include/display.h.orig Tue Mar 19 15:32:00 2002 +++ include/display.h Fri Jun 13 11:00:09 2003 @@@@ -34,4 +34,4 @@@@ void scroll(int); void page(int); void clearmsg(); -int msg(); +int msg(int, char *, ...); --- radlib/debug.c.orig Tue Mar 19 15:32:02 2002 +++ radlib/debug.c Fri Jun 13 10:40:36 2003 @@@@ -31,7 +31,7 @@@@ #include #include #include -#include +#include #include #include #include --- radlib/logger.c.orig Tue Mar 19 15:32:02 2002 +++ radlib/logger.c Fri Jun 13 10:53:05 2003 @@@@ -27,7 +27,7 @@@@ #include #include #include -#include +#include #include #include #include @@@@ -35,36 +35,27 @@@@ /*PRINTFLIKE2*/ void -radlog(lvl, msg, va_alist) - int lvl; - char *msg; - va_dcl +radlog(int lvl, char *msg, ...) { va_list ap; int ec = 0; if (lvl & L_PERROR) ec = errno; - va_start(ap); + va_start(ap, msg); vlog(lvl, NULL, 0, NULL, ec, msg, ap); va_end(ap); } void -_dolog(level, file, line, func_name, fmt, va_alist) - int level; - char *file; - int line; - char *func_name; - char *fmt; - va_dcl +_dolog(int level, char *file, int line, char *func_name, char *fmt, ...) { va_list ap; int ec = 0; if (level & L_PERROR) ec = errno; - va_start(ap); + va_start(ap, fmt); vlog(level, file, line, func_name, ec, fmt, ap); va_end(ap); } @@@@ -81,15 +72,12 @@@@ } char * -_debug_format_string(va_alist) - va_dcl +_debug_format_string(char *fmt, ...) { va_list ap; - char *fmt; char *str = NULL; - va_start(ap); - fmt = va_arg(ap,char*); + va_start(ap, fmt); vasprintf(&str, fmt, ap); va_end(ap); return str; --- radlib/applog.c.orig Tue Mar 19 15:32:02 2002 +++ radlib/applog.c Fri Jun 13 10:53:43 2003 @@@@ -27,7 +27,7 @@@@ #include #include #include -#include +#include #include #include #include --- radiusd/log.c.orig Tue Mar 19 15:32:00 2002 +++ radiusd/log.c Fri Jun 13 10:56:47 2003 @@@@ -23,7 +23,7 @@@@ #include #include #include -#include +#include #include #include #include --- radiusd/rewrite.y.orig Wed Jul 31 13:56:18 2002 +++ radiusd/rewrite.y Fri Jun 13 10:57:52 2003 @@@@ -28,7 +28,7 @@@@ #include #include #include -#include +#include #include #include #include @@@@ -4590,11 +4590,7 @@@@ /*VARARGS3*/ int -va_run_init(name, request, typestr, va_alist) - char *name; - VALUE_PAIR *request; - char *typestr; - va_dcl +va_run_init(char *name, VALUE_PAIR *request, char *typestr, ...) { FILE *fp; va_list ap; @@@@ -4626,7 +4622,7 @@@@ /* Pass arguments */ nargs = 0; - va_start(ap); + va_start(ap, typestr); while (*typestr) { nargs++; switch (*typestr++) { --- radiusd/snmpserv.c.orig Tue Mar 19 15:32:00 2002 +++ radiusd/snmpserv.c Fri Jun 13 10:58:11 2003 @@@@ -28,7 +28,7 @@@@ #include #include -#include +#include #include #include #include --- raduse/raduse.c.orig Wed Mar 20 12:35:13 2002 +++ raduse/raduse.c Fri Jun 13 10:58:40 2003 @@@@ -60,7 +60,7 @@@@ PORT_STAT *port; } port_usage_t; -#define AP(p,m) (((port_usage_t*)(p)->app_data)-> ##m) +#define AP(p,m) (((port_usage_t*)(p)->app_data)->m) /* various options */ int width = 5; /* width for time output (5 - hh:mm, 8 - hh:mm:ss) */ --- raduse/display.c.orig Tue Mar 19 15:32:04 2002 +++ raduse/display.c Fri Jun 13 11:00:10 2003 @@@@ -26,7 +26,7 @@@@ #include #include #include -#include +#include #include #include #include @@@@ -139,16 +139,13 @@@@ /*VARARGS2*/ -msg(type, msgfmt, va_alist) - int type; - char *msgfmt; - va_dcl +int msg(int type, char *msgfmt, ...) { register int i; va_list ap; char next_msg[128]; - va_start(ap); + va_start(ap, msgfmt); next_msg[0] = ' '; i = 1 + vsprintf(next_msg+1, msgfmt, ap); --- radtest/gram.y.orig Wed Aug 14 16:11:13 2002 +++ radtest/gram.y Fri Jun 13 11:00:49 2003 @@@@ -41,7 +41,7 @@@@ #include #include #include -#include +#include #include #include #include @@@@ -368,14 +368,11 @@@@ } d48 2 a49 25 void -parse_error(va_alist) - va_dcl +parse_error(char *fmt, ...) { va_list ap; - char *fmt; - va_start(ap); - fmt = va_arg(ap, char*); + va_start(ap, fmt); fprintf(stderr, "%s:%d: ", source_filename, source_line_num); vfprintf(stderr, fmt, ap); va_end(ap); --- radtest/radtest.h.orig Tue Mar 19 15:32:04 2002 +++ radtest/radtest.h Fri Jun 13 11:01:07 2003 @@@@ -69,7 +69,7 @@@@ int open_input(char *name); void close_input(); void set_yydebug(); -void parse_error(); +void parse_error(char *fmt, ...); void print(Variable *var); void radtest_send(int port, int code, Variable *var); void putback(char *str); @ 1.1 log @pastime: convert from varargs to stdarg @ text @@