Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/freeradius/files: freeradius-2.1.6-versionless-la-files.patch freeradius-2.1.6-pkglibdir.patch freeradius-2.1.6-ssl.patch freeradius-2.1.6-qafixes.patch
Date: Sun, 23 Aug 2009 10:38:06
Message-Id: E1MfASa-0007W9-JP@stork.gentoo.org
1 mrness 09/08/23 10:38:04
2
3 Added: freeradius-2.1.6-versionless-la-files.patch
4 freeradius-2.1.6-pkglibdir.patch
5 freeradius-2.1.6-ssl.patch
6 freeradius-2.1.6-qafixes.patch
7 Log:
8 Version bump.
9 (Portage version: 2.1.6.13/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch?rev=1.1&content-type=text/plain
16
17 Index: freeradius-2.1.6-versionless-la-files.patch
18 ===================================================================
19 diff -Nru freeradius-server-2.1.6.orig/src/lib/Makefile freeradius-server-2.1.6/src/lib/Makefile
20 --- freeradius-server-2.1.6.orig/src/lib/Makefile 2009-05-18 13:13:55.000000000 +0200
21 +++ freeradius-server-2.1.6/src/lib/Makefile 2009-08-23 10:45:51.000000000 +0200
22 @@ -53,8 +53,6 @@
23 $(INSTALL) -d -m 755 $(R)$(libdir)
24 $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
25 $(R)$(libdir)/$(TARGET).la
26 - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
27 - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
28
29 .PHONY: scan
30 scan:
31 diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile
32 --- freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile 2009-05-18 13:13:55.000000000 +0200
33 +++ freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile 2009-08-23 10:44:15.000000000 +0200
34 @@ -44,5 +44,3 @@
35 install: all
36 $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
37 $(R)$(libdir)/$(TARGET).la
38 - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
39 - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
40 diff -Nru freeradius-server-2.1.6.orig/src/modules/rules.mak freeradius-server-2.1.6/src/modules/rules.mak
41 --- freeradius-server-2.1.6.orig/src/modules/rules.mak 2009-05-18 13:13:55.000000000 +0200
42 +++ freeradius-server-2.1.6/src/modules/rules.mak 2009-08-23 10:44:15.000000000 +0200
43 @@ -171,8 +171,6 @@
44 if [ "x$(TARGET)" != "x" ]; then \
45 $(LIBTOOL) --mode=install $(INSTALL) -c \
46 $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
47 - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
48 - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
49 fi
50
51 .PHONY: scan
52
53
54
55 1.1 net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch
56
57 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch?rev=1.1&view=markup
58 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch?rev=1.1&content-type=text/plain
59
60 Index: freeradius-2.1.6-pkglibdir.patch
61 ===================================================================
62 diff -Nru freeradius-server-2.1.6.orig/Make.inc.in freeradius-server-2.1.6/Make.inc.in
63 --- freeradius-server-2.1.6.orig/Make.inc.in 2009-05-18 13:13:55.000000000 +0200
64 +++ freeradius-server-2.1.6/Make.inc.in 2009-08-23 10:49:43.000000000 +0200
65 @@ -10,6 +10,7 @@
66 sysconfdir = @sysconfdir@
67 localstatedir = @localstatedir@
68 libdir = @libdir@
69 +pkglibdir = @libdir@/freeradius
70 bindir = @bindir@
71 sbindir = @sbindir@
72 docdir = @docdir@
73 diff -Nru freeradius-server-2.1.6.orig/raddb/radiusd.conf.in freeradius-server-2.1.6/raddb/radiusd.conf.in
74 --- freeradius-server-2.1.6.orig/raddb/radiusd.conf.in 2009-05-18 13:13:55.000000000 +0200
75 +++ freeradius-server-2.1.6/raddb/radiusd.conf.in 2009-08-23 10:49:43.000000000 +0200
76 @@ -103,7 +103,7 @@
77 # make
78 # make install
79 #
80 -libdir = @libdir@
81 +libdir = @libdir@/freeradius
82
83 # pidfile: Where to place the PID of the RADIUS server.
84 #
85 diff -Nru freeradius-server-2.1.6.orig/src/modules/Makefile freeradius-server-2.1.6/src/modules/Makefile
86 --- freeradius-server-2.1.6.orig/src/modules/Makefile 2009-05-18 13:13:55.000000000 +0200
87 +++ freeradius-server-2.1.6/src/modules/Makefile 2009-08-23 10:49:43.000000000 +0200
88 @@ -12,7 +12,7 @@
89 @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
90
91 install:
92 - $(INSTALL) -d -m 755 $(R)$(libdir)
93 + $(INSTALL) -d -m 755 $(R)$(pkglibdir)
94 @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
95
96 clean:
97 diff -Nru freeradius-server-2.1.6.orig/src/modules/rules.mak freeradius-server-2.1.6/src/modules/rules.mak
98 --- freeradius-server-2.1.6.orig/src/modules/rules.mak 2009-08-23 10:46:57.000000000 +0200
99 +++ freeradius-server-2.1.6/src/modules/rules.mak 2009-08-23 10:49:43.000000000 +0200
100 @@ -123,7 +123,7 @@
101 $(TARGET).la: $(LT_OBJS)
102 $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
103 -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
104 - -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
105 + -rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
106
107 #######################################################################
108 #
109 @@ -164,13 +164,13 @@
110 # Do any module-specific installation.
111 #
112 # If there isn't a TARGET defined, then don't do anything.
113 -# Otherwise, install the libraries into $(libdir)
114 +# Otherwise, install the libraries into $(pkglibdir)
115 #
116 install:
117 @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
118 if [ "x$(TARGET)" != "x" ]; then \
119 $(LIBTOOL) --mode=install $(INSTALL) -c \
120 - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
121 + $(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
122 fi
123
124 .PHONY: scan
125
126
127
128 1.1 net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch
129
130 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch?rev=1.1&view=markup
131 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch?rev=1.1&content-type=text/plain
132
133 Index: freeradius-2.1.6-ssl.patch
134 ===================================================================
135 diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile
136 --- freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile 2009-08-23 10:46:57.000000000 +0200
137 +++ freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile 2009-08-23 10:47:38.000000000 +0200
138 @@ -9,6 +9,7 @@
139 SRCS = eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
140 ifneq ($(OPENSSL_LIBS),)
141 SRCS += cb.c eap_tls.c mppe_keys.c tls.c
142 +LIBS += $(OPENSSL_LIBS)
143 endif
144 LT_OBJS = $(SRCS:.c=.lo)
145 INCLUDES = eap_types.h eap_tls.h
146
147
148
149 1.1 net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch
150
151 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch?rev=1.1&view=markup
152 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch?rev=1.1&content-type=text/plain
153
154 Index: freeradius-2.1.6-qafixes.patch
155 ===================================================================
156 diff -Nru freeradius-server-2.1.6.orig/configure.in freeradius-server-2.1.6/configure.in
157 --- freeradius-server-2.1.6.orig/configure.in 2009-05-18 13:13:55.000000000 +0200
158 +++ freeradius-server-2.1.6/configure.in 2009-08-23 10:48:53.000000000 +0200
159 @@ -544,7 +544,19 @@
160 ],
161 [ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
162
163 -AC_LIB_READLINE
164 +AC_CHECK_LIB(readline, readline,
165 + [ LIBREADLINE="-lreadline"
166 + AC_DEFINE(HAVE_LIBREADLINE, 1,
167 + [Define to 1 if you have a readline compatible library.])
168 + AC_DEFINE(HAVE_READLINE_READLINE_H, 1,
169 + [Define to 1 if you have the <readline/readline.h> header file.])
170 + AC_DEFINE(HAVE_READLINE_HISTORY, 1,
171 + [Define if your readline library has \`add_history'])
172 + AC_DEFINE(HAVE_READLINE_HISTORY_H, 1,
173 + [Define to 1 if you have the <readline/history.h> header file.])
174 + ],
175 + [ LIBREADLINE="" ])
176 +AC_SUBST(LIBREADLINE)
177
178 dnl #############################################################
179 dnl #
180 diff -Nru freeradius-server-2.1.6.orig/src/lib/Makefile freeradius-server-2.1.6/src/lib/Makefile
181 --- freeradius-server-2.1.6.orig/src/lib/Makefile 2009-08-23 10:46:57.000000000 +0200
182 +++ freeradius-server-2.1.6/src/lib/Makefile 2009-08-23 10:48:53.000000000 +0200
183 @@ -41,7 +41,7 @@
184
185 $(TARGET).la: $(LT_OBJS)
186 $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
187 - $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
188 + $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS)
189
190 $(LT_OBJS): $(INCLUDES)
191
192 diff -Nru freeradius-server-2.1.6.orig/src/main/listen.c freeradius-server-2.1.6/src/main/listen.c
193 --- freeradius-server-2.1.6.orig/src/main/listen.c 2009-05-18 13:13:55.000000000 +0200
194 +++ freeradius-server-2.1.6/src/main/listen.c 2009-08-23 10:48:53.000000000 +0200
195 @@ -45,6 +45,9 @@
196 #include <fcntl.h>
197 #endif
198
199 +#ifdef WITH_UDPFROMTO
200 +#include <freeradius-devel/udpfromto.h>
201 +#endif
202
203 /*
204 * We'll use this below.
205 diff -Nru freeradius-server-2.1.6.orig/src/include/radiusd.h freeradius-server-2.1.6/src/include/radiusd.h
206 --- freeradius-server-2.1.6.orig/src/include/radiusd.h 2009-05-18 13:13:55.000000000 +0200
207 +++ freeradius-server-2.1.6/src/include/radiusd.h 2009-08-23 11:34:17.000000000 +0200
208 @@ -637,6 +637,7 @@
209 void event_new_fd(rad_listen_t *listener);
210
211 /* evaluate.c */
212 +int radius_get_vp(REQUEST *request, const char *name, VALUE_PAIR **vp_p);
213 int radius_evaluate_condition(REQUEST *request, int modreturn, int depth,
214 const char **ptr, int evaluate_it, int *presult);
215 int radius_update_attrlist(REQUEST *request, CONF_SECTION *cs,
216 diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_passwd/rlm_passwd.c freeradius-server-2.1.6/src/modules/rlm_passwd/rlm_passwd.c
217 --- freeradius-server-2.1.6.orig/src/modules/rlm_passwd/rlm_passwd.c 2009-05-18 13:13:55.000000000 +0200
218 +++ freeradius-server-2.1.6/src/modules/rlm_passwd/rlm_passwd.c 2009-08-23 11:29:38.000000000 +0200
219 @@ -247,8 +247,7 @@
220
221 static struct mypasswd * get_next(char *name, struct hashtable *ht)
222 {
223 -#define passwd ((struct mypasswd *) ht->buffer)
224 - struct mypasswd * hashentry;
225 + struct mypasswd * hashentry, * passwd;
226 char buffer[1024];
227 int len;
228 char *list, *nextlist;
229 @@ -267,6 +266,7 @@
230 }
231 /* printf("try to find in file\n"); */
232 if (!ht->fp) return NULL;
233 + passwd = (struct mypasswd *) ht->buffer;
234 while (fgets(buffer, 1024,ht->fp)) {
235 if(*buffer && *buffer!='\n' && (len = string_to_entry(buffer, ht->nfields, ht->delimiter, passwd, sizeof(ht->buffer)-1)) &&
236 (!ht->ignorenis || (*buffer !='-' && *buffer != '+') ) ){
237 @@ -288,7 +288,6 @@
238 fclose(ht->fp);
239 ht->fp = NULL;
240 return NULL;
241 -#undef passwd
242 }
243
244 static struct mypasswd * get_pw_nam(char * name, struct hashtable* ht)
Report Message
Find on MARC Find on Google Groups