← Back to branch summary

~ubuntu-branches/ubuntu/natty/freeradius/natty-updates

« back to all changes in this revision

Viewing changes to debian/patches/06_libtool14_vs_rlm_eap_tls.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Paul Hampson
  • Date: 2006-01-15 13:34:13 UTC
  • mto: (3.1.3 dapper) (4.1.3 sid) (1.1.14 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20060115133413-zo1dslttvdoalqym
Tags: upstream-1.1.0
Import upstream version 1.1.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_libtool14_vs_rlm_eap_tls.dpatch
1
1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 07_libtool14_vs_rlm_eap_tls.dpatch by Paul Hampson <Paul.Hampson@anu.edu.au>
 
2
## 06_libtool14_vs_rlm_eap_tls.dpatch by Paul Hampson <Paul.Hampson@anu.edu.au>
3
3
##
4
4
## All lines beginning with `## DP:' are a description of the patch.
5
5
## DP: libtool 1.4 is the libtool for the FreeRADIUS 1.0 series,
12
12
## DP: the correct rlm_eap_* is used.
13
13
## DP: From FreeRADIUS bugzilla #75 http://bugs.freeradius.org/show_bug.cgi?id=75
14
14
## DP: Patch ID #77 by Luca Landi
 
15
## DP: Modified to match a patch by Petr Salinger in Debian BTS 288547
 
16
## DP: to access needed modules by directly referencing the .la instead
 
17
## DP: of -L-l-ing them. This however requires libeap to be installed
 
18
## DP: before rlm_eap_sim, so there's a little Makefile hackery here to
 
19
## DP: add RLM_PREINSTALL to the Rules.mak file and use it to install
 
20
## DP: libeap before rlm_eap, or rlm_eap fails to link.
15
21
 
16
22
@DPATCH@
17
 
diff -urNad --exclude=CVS --exclude=.svn ./src/modules/rlm_eap/types/Makefile /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/Makefile
18
 
--- ./src/modules/rlm_eap/types/Makefile        2005-04-12 07:18:28.000000000 +1000
19
 
+++ /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/Makefile   2005-08-04 00:12:46.000000000 +1000
 
23
diff -ruN freeradius-1.1.0.orig/src/modules/rlm_eap/Makefile.in freeradius-1.1.0/src/modules/rlm_eap/Makefile.in
 
24
--- freeradius-1.1.0.orig/src/modules/rlm_eap/Makefile.in       2006-01-01 18:28:15.656525768 +0100
 
25
+++ freeradius-1.1.0/src/modules/rlm_eap/Makefile.in    2006-01-01 18:54:16.318269120 +0100
 
26
@@ -2,14 +2,15 @@
 
27
 SRCS        = rlm_eap.c eap.c mem.c state.c
 
28
 HEADERS     = eap.h rlm_eap.h
 
29
 RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/libeap
 
30
-CLIENTLIBS  = -Llibeap -leap -L../../lib -lradius
 
31
-RLM_LIBS    = -Llibeap -leap
 
32
+RLM_LIBS    = @srcdir@/libeap/libeap.la
 
33
+CLIENTLIBS  = $(RLM_LIBS) -L../../lib -lradius
 
34
 #RLM_LIBS    = $(shell for x in types/rlm_eap*/rlm_eap*.la;do echo -dlpreopen $$x;done)
 
35
+RLM_PREINSTALL = install-libeap
 
36
 RLM_INSTALL = install-types
 
37
 RLM_SUBDIRS = libeap @eaptypes@ 
 
38
 RLM_UTILS   = radeapclient
 
39
 
 
40
-.PHONY: all install-types common
 
41
+.PHONY: all install-types install-libeap common
 
42
 
 
43
 $(STATIC_OBJS): $(HEADERS)
 
44
 
 
45
@@ -32,8 +33,15 @@
 
46
 radeapclient.o: radeapclient.c $(INCLUDES)
 
47
        $(CC) $(CFLAGS) ${RLM_CFLAGS} -c radeapclient.c
 
48
 
 
49
+install-libeap: 
 
50
+       @echo "Making install in libeap..."
 
51
+       @(cd libeap && $(MAKE) $(MFLAGS) install)
 
52
+
 
53
 install-types: 
 
54
-       @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common
 
55
+       @for dir in @eaptypes@; do  \
 
56
+               echo "Making install in $$dir..."; \
 
57
+               (cd $$dir && $(MAKE) $(MFLAGS) install) || exit $?;\
 
58
+       done
 
59
        $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT)       $(R)$(bindir)
 
60
 
 
61
 common:
 
62
diff -ruN freeradius-1.1.0.orig/src/modules/rlm_eap/types/Makefile freeradius-1.1.0/src/modules/rlm_eap/types/Makefile
 
63
--- freeradius-1.1.0.orig/src/modules/rlm_eap/types/Makefile    2006-01-01 18:28:15.663524704 +0100
 
64
+++ freeradius-1.1.0/src/modules/rlm_eap/types/Makefile 2006-01-01 18:54:16.320268816 +0100
20
65
@@ -16,7 +16,7 @@
21
66
        $(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
22
67
 
26
71
                what=$(WHAT_TO_MAKE); \
27
72
                [ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \
28
73
                if [ -d $$mod ] && [ -f $$mod/Makefile ]; then \
29
 
diff -urNad --exclude=CVS --exclude=.svn ./src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
30
 
--- ./src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in        2004-06-04 01:49:23.000000000 +1000
31
 
+++ /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in   2005-08-04 00:12:46.000000000 +1000
 
74
diff -ruN freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
 
75
--- freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in    2006-01-01 18:28:15.672523336 +0100
 
76
+++ freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in 2006-01-01 18:54:16.321268664 +0100
32
77
@@ -3,7 +3,7 @@
33
78
 RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ -I../rlm_eap_tls -DOPENSSL_NO_KRB5 -I@srcdir@/../../libeap
34
79
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_peap.h ../../eap.h ../../rlm_eap.h
35
80
 RLM_INSTALL = 
36
81
-RLM_LIBS    = -L@srcdir@/../../libeap -leap @eap_peap_ldflags@
37
 
+RLM_LIBS    = -L@srcdir@/../../libeap -leap -L@srcdir@/../rlm_eap_tls -lrlm_eap_tls @eap_peap_ldflags@
38
 
 
39
 
 $(STATIC_OBJS): $(HEADERS)
40
 
 
41
 
diff -urNad --exclude=CVS --exclude=.svn ./src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
42
 
--- ./src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in        2004-06-04 01:49:24.000000000 +1000
43
 
+++ /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in   2005-08-04 00:12:46.000000000 +1000
 
82
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la @srcdir@/../rlm_eap_tls/librlm_eap_tls.la @eap_peap_ldflags@
 
83
 
 
84
 $(STATIC_OBJS): $(HEADERS)
 
85
 
 
86
diff -ruN freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in
 
87
--- freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in     2006-01-01 18:28:15.684521512 +0100
 
88
+++ freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in  2006-01-01 18:54:16.322268512 +0100
 
89
@@ -2,7 +2,7 @@
 
90
 SRCS        = rlm_eap_sim.c 
 
91
 RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. -I@srcdir@/../../libeap
 
92
 HEADERS     = eap_sim.h
 
93
-RLM_LIBS    = -L@srcdir@/../../libeap -leap
 
94
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la
 
95
 RLM_INSTALL = 
 
96
 
 
97
 $(STATIC_OBJS): $(HEADERS)
 
98
diff -ruN freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
 
99
--- freeradius-1.1.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in    2006-01-01 18:28:15.694519992 +0100
 
100
+++ freeradius-1.1.0/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in 2006-01-01 18:54:16.324268208 +0100
44
101
@@ -3,7 +3,7 @@
45
102
 RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. -I@srcdir@/../../libeap @eap_ttls_cflags@ -I../rlm_eap_tls -DOPENSSL_NO_KRB5
46
103
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_ttls.h ../../eap.h ../../rlm_eap.h
47
104
 RLM_INSTALL = 
48
105
-RLM_LIBS    = -L@srcdir@/../../libeap -leap @eap_ttls_ldflags@
49
 
+RLM_LIBS    = -L@srcdir@/../../libeap -leap -L@srcdir@/../rlm_eap_tls -lrlm_eap_tls @eap_ttls_ldflags@
 
106
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la @srcdir@/../rlm_eap_tls/librlm_eap_tls.la @eap_ttls_ldflags@
50
107
 
51
108
 $(STATIC_OBJS): $(HEADERS)
52
109
 
53
 
diff -urNad --exclude=CVS --exclude=.svn ./src/modules/rules.mak /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rules.mak
54
 
--- ./src/modules/rules.mak     2005-04-12 07:19:38.000000000 +1000
55
 
+++ /tmp/dpep-work.ntxebS/freeradius-1.0.4/src/modules/rules.mak        2005-08-04 00:12:46.000000000 +1000
 
110
diff -ruN freeradius-1.1.0.orig/src/modules/rules.mak freeradius-1.1.0/src/modules/rules.mak
 
111
--- freeradius-1.1.0.orig/src/modules/rules.mak 2006-01-01 18:28:15.628530024 +0100
 
112
+++ freeradius-1.1.0/src/modules/rules.mak      2006-01-01 18:54:16.326267904 +0100
56
113
@@ -98,6 +98,13 @@
57
114
        $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
58
115
        -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
75
132
        @[ "x$(RLM_SUBDIRS)" = "x" ] || $(MAKE) $(MFLAGS) WHAT_TO_MAKE=clean common
76
133
 
77
134
 distclean: clean
 
135
@@ -155,6 +163,7 @@
 
136
 #  Otherwise, install the libraries into $(libdir)
 
137
 #
 
138
 install:
 
139
+       @[ "x$(RLM_PREINSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_PREINSTALL)
 
140
        if [ "x$(TARGET)" != "x" ]; then \
 
141
            $(LIBTOOL) --mode=install $(INSTALL) -c \
 
142
                $(TARGET).la $(R)$(libdir)/$(TARGET).la; \