SOURCES: freeradius-eap_install_order.patch, freeradius-linking.pa...

baggins baggins at pld-linux.org
Thu Mar 9 18:06:37 CET 2006 

Author: baggins                      Date: Thu Mar  9 17:06:37 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.1.0

---- Files affected:
SOURCES:
   freeradius-eap_install_order.patch (1.1 -> 1.2) , freeradius-linking.patch (1.2 -> 1.3) , freeradius-moduledir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/freeradius-eap_install_order.patch
diff -u SOURCES/freeradius-eap_install_order.patch:1.1 SOURCES/freeradius-eap_install_order.patch:1.2
--- SOURCES/freeradius-eap_install_order.patch:1.1	Thu Aug  4 12:43:48 2005
+++ SOURCES/freeradius-eap_install_order.patch	Thu Mar  9 18:06:32 2006
@@ -12,6 +12,6 @@
 -	    rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
 +		$(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la && \
 +	    rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la && \
- 	    ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
+ 	    ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $?; \
  	fi
 -	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)

================================================================
Index: SOURCES/freeradius-linking.patch
diff -u SOURCES/freeradius-linking.patch:1.2 SOURCES/freeradius-linking.patch:1.3
--- SOURCES/freeradius-linking.patch:1.2	Fri Oct 15 11:51:22 2004
+++ SOURCES/freeradius-linking.patch	Thu Mar  9 18:06:32 2006
@@ -22,7 +22,7 @@
 diff -dur freeradius-1.0.1.orig/src/main/Makefile.in freeradius-1.0.1/src/main/Makefile.in
 --- freeradius-1.0.1.orig/src/main/Makefile.in	2004-06-02 18:17:06.000000000 +0200
 +++ freeradius-1.0.1/src/main/Makefile.in	2004-10-13 15:35:16.353063344 +0200
-@@ -57,94 +57,94 @@
+@@ -57,98 +57,98 @@
  		$(PTHREADLIB) $(LIBLTDL) $(LCRYPT)
  
  radiusd.o: radiusd.c $(INCLUDES)  ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
@@ -133,20 +133,27 @@
 -	$(CC) $(CFLAGS) -c radwho.c
 +	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
  
- radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o
--	$(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
- 
- radzap.o: radzap.c $(INCLUDES)
--	$(CC) $(CFLAGS) -c radzap.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radzap.c
- 
- radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
+ radwho: radwho.o util.o log.o conffile.o ../lib/libradius.a
+-	$(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
  
  clean:
  	rm -rf *.o *.so *~ $(BINARIES) .libs
+ 
+ install:
+-	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd$(EXEEXT)	$(R)$(sbindir)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT)	$(R)$(bindir)
+-	$(INSTALL) -m 755    radzap			$(R)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radiusd	$(R)$(sbindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radwho	$(R)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radzap	$(R)$(bindir)
+ 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
+-	$(INSTALL) -m 755    radclient$(EXEEXT)		$(R)$(bindir)
+-	$(INSTALL) -m 755    radrelay$(EXEEXT)		$(R)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radclient	$(R)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radrelay	$(R)$(bindir)
+ 	$(INSTALL) -m 755    radtest 			$(R)$(bindir)
+ 	$(INSTALL) -m 755    checkrad.pl		$(R)$(sbindir)/checkrad
 diff -dur freeradius-1.0.1.orig/src/modules/rlm_eap/Makefile.in freeradius-1.0.1/src/modules/rlm_eap/Makefile.in
 --- freeradius-1.0.1.orig/src/modules/rlm_eap/Makefile.in	2004-01-28 16:38:40.000000000 +0100
 +++ freeradius-1.0.1/src/modules/rlm_eap/Makefile.in	2004-10-13 15:36:58.340017666 +0200
@@ -180,23 +187,3 @@
  
  static: $(TARGET).a
  
-diff -dur freeradius-1.0.1.orig/src/main/Makefile.in freeradius-1.0.1/src/main/Makefile.in
---- freeradius-1.0.1.orig/src/main/Makefile.in	2004-10-15 10:46:40.000000000 +0200
-+++ freeradius-1.0.1/src/main/Makefile.in	2004-10-15 10:49:00.465445152 +0200
-@@ -150,11 +150,11 @@
- 	rm -rf *.o *.so *~ $(BINARIES) .libs
- 
- install:
--	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd$(EXEEXT)	$(R)$(sbindir)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT)	$(R)$(bindir)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) radzap$(EXEEXT)	$(R)$(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radiusd	$(R)$(sbindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radwho	$(R)$(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radzap	$(R)$(bindir)
- 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
--	$(INSTALL) -m 755    radclient$(EXEEXT)		$(R)$(bindir)
--	$(INSTALL) -m 755    radrelay$(EXEEXT)		$(R)$(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radclient	$(R)$(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 radrelay	$(R)$(bindir)
- 	$(INSTALL) -m 755    radtest 			$(R)$(bindir)
- 	$(INSTALL) -m 755    checkrad.pl		$(R)$(sbindir)/checkrad

================================================================
Index: SOURCES/freeradius-moduledir.patch
diff -u SOURCES/freeradius-moduledir.patch:1.1 SOURCES/freeradius-moduledir.patch:1.2
--- SOURCES/freeradius-moduledir.patch:1.1	Thu Oct 14 09:19:56 2004
+++ SOURCES/freeradius-moduledir.patch	Thu Mar  9 18:06:32 2006
@@ -51,7 +51,7 @@
 @@ -96,7 +96,7 @@
  $(TARGET).la: $(DYNAMIC_OBJS)
  	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- 	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \
+ 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
 -	-o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
 +	-o $@ -rpath $(libdir)/freeradius $^ $(RLM_LIBS) $(LIBS)
  
@@ -69,9 +69,9 @@
  	    $(LIBTOOL) --mode=install $(INSTALL) -c \
 -		$(TARGET).la $(R)$(libdir)/$(TARGET).la; \
 -	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
+-	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $?; \
 +		$(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la; \
 +	    rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+	    ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
++	    ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $?; \
  	fi
  	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/freeradius-eap_install_order.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/freeradius-linking.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/freeradius-moduledir.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list