| 1 |
mrness 09/03/01 13:57:04 |
| 2 |
|
| 3 |
Added: freeradius-2.1.3-ssl.patch |
| 4 |
freeradius-2.1.3-versionless-la-files.patch |
| 5 |
freeradius-2.1.3-qafixes.patch |
| 6 |
freeradius-2.1.3-pkglibdir.patch |
| 7 |
Log: |
| 8 |
Version bump. Remove static libraries and install rlm modules in pkglibdir (#253136). |
| 9 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: freeradius-2.1.3-ssl.patch |
| 18 |
=================================================================== |
| 19 |
diff -Nru freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile |
| 20 |
--- freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile 2008-12-05 16:37:56.000000000 +0000 |
| 21 |
+++ freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile 2009-03-01 11:35:56.000000000 +0000 |
| 22 |
@@ -9,6 +9,7 @@ |
| 23 |
SRCS = eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c |
| 24 |
ifneq ($(OPENSSL_LIBS),) |
| 25 |
SRCS += cb.c eap_tls.c mppe_keys.c tls.c |
| 26 |
+LIBS += $(OPENSSL_LIBS) |
| 27 |
endif |
| 28 |
LT_OBJS = $(SRCS:.c=.lo) |
| 29 |
INCLUDES = eap_types.h eap_tls.h |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: freeradius-2.1.3-versionless-la-files.patch |
| 39 |
=================================================================== |
| 40 |
diff -Nru freeradius-server-2.1.3.orig/src/lib/Makefile freeradius-server-2.1.3/src/lib/Makefile |
| 41 |
--- freeradius-server-2.1.3.orig/src/lib/Makefile 2008-12-05 16:37:56.000000000 +0000 |
| 42 |
+++ freeradius-server-2.1.3/src/lib/Makefile 2009-03-01 11:37:10.000000000 +0000 |
| 43 |
@@ -53,5 +53,3 @@ |
| 44 |
$(INSTALL) -d -m 755 $(R)$(libdir) |
| 45 |
$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \ |
| 46 |
$(R)$(libdir)/$(TARGET).la |
| 47 |
- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; |
| 48 |
- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la |
| 49 |
diff -Nru freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile |
| 50 |
--- freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile 2009-03-01 11:36:40.000000000 +0000 |
| 51 |
+++ freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile 2009-03-01 11:37:10.000000000 +0000 |
| 52 |
@@ -45,5 +45,3 @@ |
| 53 |
install: all |
| 54 |
$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \ |
| 55 |
$(R)$(libdir)/$(TARGET).la |
| 56 |
- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; |
| 57 |
- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la |
| 58 |
diff -Nru freeradius-server-2.1.3.orig/src/modules/rules.mak freeradius-server-2.1.3/src/modules/rules.mak |
| 59 |
--- freeradius-server-2.1.3.orig/src/modules/rules.mak 2008-12-05 16:37:56.000000000 +0000 |
| 60 |
+++ freeradius-server-2.1.3/src/modules/rules.mak 2009-03-01 11:37:10.000000000 +0000 |
| 61 |
@@ -165,6 +165,4 @@ |
| 62 |
if [ "x$(TARGET)" != "x" ]; then \ |
| 63 |
$(LIBTOOL) --mode=install $(INSTALL) -c \ |
| 64 |
$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ |
| 65 |
- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \ |
| 66 |
- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ |
| 67 |
fi |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: freeradius-2.1.3-qafixes.patch |
| 77 |
=================================================================== |
| 78 |
diff -Nru freeradius-server-2.1.3.orig/src/main/listen.c freeradius-server-2.1.3/src/main/listen.c |
| 79 |
--- freeradius-server-2.1.3.orig/src/main/listen.c 2008-12-05 16:37:56.000000000 +0000 |
| 80 |
+++ freeradius-server-2.1.3/src/main/listen.c 2009-03-01 12:16:55.000000000 +0000 |
| 81 |
@@ -45,6 +45,9 @@ |
| 82 |
#include <fcntl.h> |
| 83 |
#endif |
| 84 |
|
| 85 |
+#ifdef WITH_UDPFROMTO |
| 86 |
+#include <freeradius-devel/udpfromto.h> |
| 87 |
+#endif |
| 88 |
|
| 89 |
/* |
| 90 |
* We'll use this below. |
| 91 |
diff -Nru freeradius-server-2.1.3.orig/src/main/radmin.c freeradius-server-2.1.3/src/main/radmin.c |
| 92 |
--- freeradius-server-2.1.3.orig/src/main/radmin.c 2008-12-05 16:37:56.000000000 +0000 |
| 93 |
+++ freeradius-server-2.1.3/src/main/radmin.c 2009-03-01 12:22:44.000000000 +0000 |
| 94 |
@@ -47,6 +47,7 @@ |
| 95 |
#else /* !defined(HAVE_READLINE_H) */ |
| 96 |
extern char *readline (); |
| 97 |
#endif /* !defined(HAVE_READLINE_H) */ |
| 98 |
+#include <readline/history.h> |
| 99 |
char *cmdline = NULL; |
| 100 |
#else /* !defined(HAVE_READLINE_READLINE_H) */ |
| 101 |
/* no readline */ |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.1 net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch?rev=1.1&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch?rev=1.1&content-type=text/plain |
| 109 |
|
| 110 |
Index: freeradius-2.1.3-pkglibdir.patch |
| 111 |
=================================================================== |
| 112 |
diff -Nru freeradius-server-2.1.3.orig/Make.inc.in freeradius-server-2.1.3/Make.inc.in |
| 113 |
--- freeradius-server-2.1.3.orig/Make.inc.in 2008-12-05 16:37:56.000000000 +0000 |
| 114 |
+++ freeradius-server-2.1.3/Make.inc.in 2009-03-01 13:19:54.000000000 +0000 |
| 115 |
@@ -10,6 +10,7 @@ |
| 116 |
sysconfdir = @sysconfdir@ |
| 117 |
localstatedir = @localstatedir@ |
| 118 |
libdir = @libdir@ |
| 119 |
+pkglibdir = @libdir@/freeradius |
| 120 |
bindir = @bindir@ |
| 121 |
sbindir = @sbindir@ |
| 122 |
docdir = @docdir@ |
| 123 |
diff -Nru freeradius-server-2.1.3.orig/raddb/radiusd.conf.in freeradius-server-2.1.3/raddb/radiusd.conf.in |
| 124 |
--- freeradius-server-2.1.3.orig/raddb/radiusd.conf.in 2008-12-05 16:37:56.000000000 +0000 |
| 125 |
+++ freeradius-server-2.1.3/raddb/radiusd.conf.in 2009-03-01 13:16:14.000000000 +0000 |
| 126 |
@@ -103,7 +103,7 @@ |
| 127 |
# make |
| 128 |
# make install |
| 129 |
# |
| 130 |
-libdir = @libdir@ |
| 131 |
+libdir = @libdir@/freeradius |
| 132 |
|
| 133 |
# pidfile: Where to place the PID of the RADIUS server. |
| 134 |
# |
| 135 |
diff -Nru freeradius-server-2.1.3.orig/src/modules/Makefile freeradius-server-2.1.3/src/modules/Makefile |
| 136 |
--- freeradius-server-2.1.3.orig/src/modules/Makefile 2008-12-05 16:37:56.000000000 +0000 |
| 137 |
+++ freeradius-server-2.1.3/src/modules/Makefile 2009-03-01 13:18:39.000000000 +0000 |
| 138 |
@@ -12,7 +12,7 @@ |
| 139 |
@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common |
| 140 |
|
| 141 |
install: |
| 142 |
- $(INSTALL) -d -m 755 $(R)$(libdir) |
| 143 |
+ $(INSTALL) -d -m 755 $(R)$(pkglibdir) |
| 144 |
@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common |
| 145 |
|
| 146 |
clean: |
| 147 |
diff -Nru freeradius-server-2.1.3.orig/src/modules/rules.mak freeradius-server-2.1.3/src/modules/rules.mak |
| 148 |
--- freeradius-server-2.1.3.orig/src/modules/rules.mak 2009-03-01 13:02:14.000000000 +0000 |
| 149 |
+++ freeradius-server-2.1.3/src/modules/rules.mak 2009-03-01 13:19:13.000000000 +0000 |
| 150 |
@@ -117,7 +117,7 @@ |
| 151 |
$(TARGET).la: $(LT_OBJS) |
| 152 |
$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ |
| 153 |
-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \ |
| 154 |
- -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) |
| 155 |
+ -rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) |
| 156 |
|
| 157 |
####################################################################### |
| 158 |
# |
| 159 |
@@ -158,11 +158,11 @@ |
| 160 |
# Do any module-specific installation. |
| 161 |
# |
| 162 |
# If there isn't a TARGET defined, then don't do anything. |
| 163 |
-# Otherwise, install the libraries into $(libdir) |
| 164 |
+# Otherwise, install the libraries into $(pkglibdir) |
| 165 |
# |
| 166 |
install: |
| 167 |
@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL) |
| 168 |
if [ "x$(TARGET)" != "x" ]; then \ |
| 169 |
$(LIBTOOL) --mode=install $(INSTALL) -c \ |
| 170 |
- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ |
| 171 |
+ $(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \ |
| 172 |
fi |
Archives