SOURCES: radiusd-cistron-DESTDIR.patch - up to fit 1.6.8

[duddits]

Author: duddits                      Date: Sat Mar 14 12:36:57 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to fit 1.6.8

---- Files affected:
SOURCES:
   radiusd-cistron-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/radiusd-cistron-DESTDIR.patch
diff -u SOURCES/radiusd-cistron-DESTDIR.patch:1.1 SOURCES/radiusd-cistron-DESTDIR.patch:1.2
--- SOURCES/radiusd-cistron-DESTDIR.patch:1.1	Sat Aug 10 13:19:45 2002
+++ SOURCES/radiusd-cistron-DESTDIR.patch	Sat Mar 14 13:36:51 2009
@@ -1,7 +1,7 @@
-diff -urN radiusd-cistron-1.6.6.org/src/Make.inc radiusd-cistron-1.6.6/src/Make.inc
---- radiusd-cistron-1.6.6.org/src/Make.inc	Sat Aug 10 02:18:10 2002
-+++ radiusd-cistron-1.6.6/src/Make.inc	Sat Aug 10 02:19:53 2002
-@@ -118,41 +118,41 @@
+diff -burNp radiusd-cistron-1.6.8-orig/src/Make.inc radiusd-cistron-1.6.8-dud/src/Make.inc
+--- radiusd-cistron-1.6.8-orig/src/Make.inc	2003-04-10 12:51:47.000000000 +0200
++++ radiusd-cistron-1.6.8-dud/src/Make.inc	2009-03-14 12:57:02.551657188 +0100
+@@ -115,36 +115,36 @@ clean:
  
  install:
  	# Install the binaries
@@ -11,7 +11,6 @@
 -	$(INSTALL) -m 755 -s radiusd  $(SBINDIR)/radiusd
 -	$(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay
 -	$(INSTALL) -m 755 -s radwho  $(BINDIR)
--	$(INSTALL) -m 755 -s raduse  $(BINDIR)
 -	$(INSTALL) -m 755 -s radzap  $(BINDIR)
 -	$(INSTALL) -m 755 -s radclient $(BINDIR)
 -	test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(BINDIR)
@@ -24,7 +23,6 @@
 +	$(INSTALL) -m 755 -s radiusd  $(DESTDIR)$(SBINDIR)/radiusd
 +	$(INSTALL) -m 755 -s radrelay $(DESTDIR)$(SBINDIR)/radrelay
 +	$(INSTALL) -m 755 -s radwho  $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 -s raduse  $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 755 -s radzap  $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 755 -s radclient $(DESTDIR)$(BINDIR)
 +	test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(DESTDIR)$(BINDIR)
@@ -43,25 +41,18 @@
  	done
 -	test -n "$(DBM)" || rm -f $(MANDIR)/man8/builddbm.8rad
 -	@if [ -d /etc/pam.d/ ] && [ ! -f /etc/pam.d/radius ]; then \
--		$(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\
 +	test -n "$(DBM)" || rm -f $(DESTDIR)$(MANDIR)/man8/builddbm.8rad
 +	@if [ -d $(DESTDIR)/etc/pam.d/ ] && [ ! -f $(DESTDIR)/etc/pam.d/radius ]; then \
-+		-$(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\
+ 		$(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\
  	fi
- 	# Install the config files
+ 	@# Install the config files
  	@echo; echo "Creating/updating files in $(RADIUS_DIR)"; \
  	cd ../raddb; \
  	for i in [a-c]* [e-z]*; do \
 -		[ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
 +		[ ! -f $(DESTDIR)$(RADIUS_DIR)/$$i ] && cp $$i $(DESTDIR)$(RADIUS_DIR)/$$i; \
- 	done; \
- 	for i in dictionary*; do \
--		[ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
--		if [ "`find $$i -newer $(RADIUS_DIR)/$$i`" ]; then \
--			echo "** $(RADIUS_DIR)/$$i"; \
-+		[ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(DESTDIR)$(RADIUS_DIR)/$$i; \
-+		if [ "`find $$i -newer $(DESTDIR)$(RADIUS_DIR)/$$i`" ]; then \
-+			echo "** $(DESTDIR)$(RADIUS_DIR)/$$i"; \
- 			nt=1; \
- 		fi; \
- 	done; \
+ 	done; true
+ 	@# Install the dictionary files
+-	@sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR)
++	@sh dict-install.sh ../raddb $(DESTDIR)$(RADIUS_DIR) $(SHAREDIR)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/radiusd-cistron-DESTDIR.patch?r1=1.1&r2=1.2&f=u