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