radiusclient/radiusclient.patch

Wed, 08 Feb 2012 20:07:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 08 Feb 2012 20:07:00 +0200
changeset 588
300d43423c2e
parent 13
cb59d6afeb61
permissions
-rw-r--r--

Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.

     1 Index: configure
     2 --- configure.orig	2007-02-05 13:53:08 +0100
     3 +++ configure	2007-02-05 17:15:19 +0100
     4 @@ -2580,7 +2580,7 @@
     5  LIBVERSION=2:0:0
     8 -pkgsysconfdir=${sysconfdir}/$PACKAGE
     9 +pkgsysconfdir=${sysconfdir}
    12  # Check whether --enable-shared was given.
    13 Index: lib/Makefile.in
    14 --- lib/Makefile.in.orig	2007-02-05 14:02:08 +0100
    15 +++ lib/Makefile.in	2007-02-05 17:17:41 +0100
    16 @@ -204,7 +204,7 @@
    17  AUTOMAKE_OPTIONS = foreign
    18  INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir)
    19  CLEANFILES = *~
    20 -lib_LTLIBRARIES = libradiusclient-ng.la
    21 +lib_LTLIBRARIES = libradiusclient.la
    22  libradiusclient_ng_la_SOURCES = buildreq.c clientid.c env.c sendserver.c \
    23  	avpair.c config.c dict.c ip_util.c log.c md5.c util.c lock.c \
    24  	options.h md5.h
    25 @@ -270,7 +270,7 @@
    26  	  echo "rm -f \"$${dir}/so_locations\""; \
    27  	  rm -f "$${dir}/so_locations"; \
    28  	done
    29 -libradiusclient-ng.la: $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_DEPENDENCIES) 
    30 +libradiusclient.la: $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_DEPENDENCIES) 
    31  	$(libradiusclient_ng_la_LINK) -rpath $(libdir) $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_LIBADD) $(LIBS)
    33  mostlyclean-compile:
    34 Index: src/Makefile.in
    35 --- src/Makefile.in.orig	2007-02-05 14:02:08 +0100
    36 +++ src/Makefile.in	2007-02-05 17:18:08 +0100
    37 @@ -62,24 +62,24 @@
    38  am_radacct_OBJECTS = radacct.$(OBJEXT)
    39  radacct_OBJECTS = $(am_radacct_OBJECTS)
    40  radacct_LDADD = $(LDADD)
    41 -radacct_DEPENDENCIES = ../lib/libradiusclient-ng.la
    42 +radacct_DEPENDENCIES = ../lib/libradiusclient.la
    43  am_radexample_OBJECTS = radexample.$(OBJEXT)
    44  radexample_OBJECTS = $(am_radexample_OBJECTS)
    45  radexample_LDADD = $(LDADD)
    46 -radexample_DEPENDENCIES = ../lib/libradiusclient-ng.la
    47 +radexample_DEPENDENCIES = ../lib/libradiusclient.la
    48  am_radiusclient_OBJECTS = radiusclient.$(OBJEXT)
    49  radiusclient_OBJECTS = $(am_radiusclient_OBJECTS)
    50  radiusclient_LDADD = $(LDADD)
    51 -radiusclient_DEPENDENCIES = ../lib/libradiusclient-ng.la
    52 +radiusclient_DEPENDENCIES = ../lib/libradiusclient.la
    53  am_radlogin_OBJECTS = radlogin.$(OBJEXT) radius.$(OBJEXT) \
    54  	local.$(OBJEXT)
    55  radlogin_OBJECTS = $(am_radlogin_OBJECTS)
    56  radlogin_LDADD = $(LDADD)
    57 -radlogin_DEPENDENCIES = ../lib/libradiusclient-ng.la
    58 +radlogin_DEPENDENCIES = ../lib/libradiusclient.la
    59  am_radstatus_OBJECTS = radstatus.$(OBJEXT)
    60  radstatus_OBJECTS = $(am_radstatus_OBJECTS)
    61  radstatus_LDADD = $(LDADD)
    62 -radstatus_DEPENDENCIES = ../lib/libradiusclient-ng.la
    63 +radstatus_DEPENDENCIES = ../lib/libradiusclient.la
    64  DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
    65  depcomp = $(SHELL) $(top_srcdir)/depcomp
    66  am__depfiles_maybe = depfiles
    67 @@ -221,7 +221,7 @@
    68  top_srcdir = @top_srcdir@
    69  AUTOMAKE_OPTIONS = foreign
    70  INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir)
    71 -LDADD = ../lib/libradiusclient-ng.la
    72 +LDADD = ../lib/libradiusclient.la
    73  CLEANFILES = *~
    74  noinst_HEADERS = radlogin.h
    75  radlogin_SOURCES = radlogin.c radius.c local.c
    76 Index: etc/Makefile.in
    77 --- etc/Makefile.in.orig	2008-02-24 01:04:31.031421286 +0100
    78 +++ etc/Makefile.in	2008-02-24 01:04:38.951886176 +0100
    79 @@ -382,6 +382,7 @@
    80  radiusclient.conf: radiusclient.conf.in
    81  	sed -e 's|@sbin''dir@|$(sbindir)|g' \
    82  	    -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \
    83 +	    -e 's|@localstate''dir@|$(localstatedir)/radiusclient|g' \
    84  	    <$(srcdir)/radiusclient.conf.in >radiusclient.conf
    86  install-data-local: servers
    87 Index: etc/radiusclient.conf.in
    88 --- etc/radiusclient.conf.in.orig	2008-02-24 00:54:01.643791239 +0100
    89 +++ etc/radiusclient.conf.in	2008-02-24 00:55:07.378684108 +0100
    90 @@ -54,7 +54,7 @@
    92  # file which holds sequence number for communication with the
    93  # RADIUS server
    94 -seqfile		/var/run/radius.seq
    95 +seqfile		@localstatedir@/radius.seq
    97  # file which specifies mapping between ttyname and NAS-Port attribute
    98  mapfile		@pkgsysconfdir@/port-id-map

mercurial