devil-linux-commit

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19997

Modified Files:
	portslave ppp poptop 
Added Files:
	radiusclient 
Log Message:

- updated ppp to 2.4.3
- fixed portslave compilation 


--- NEW FILE: radiusclient ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/radiusclient,v $
# $Revision: 1.2 $
# $Date: 2006/01/15 11:45:01 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       radiusclient
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

#MYNAME=

case $1 in
    build )
	if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_PORTSLAVE" = "y" ]; then
	    ./configure -prefix=/usr --sysconfdir=/etc
	    make 
	    strip_debug
    	    make install
	fi
        ;;
	
    install )
	if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_PORTSLAVE" = "y" ]; then
            rm -rf $TMPDIR || exit 1
    	    mkdir -p $TMPDIR || exit 1
	    make install DESTDIR=$TMPDIR || exit 1
	    rm -rf $TMPDIR/usr/include || exit 1
#	    rm -f $TMPDIR/usr/lib/libradiusclient.*a || exit 1
            copy_files $TMPDIR/usr $CDDIR || exit 1
	    copy_files $TMPDIR/etc $ETCDIR/ || exit 1
            rm -rf $TMPDIR || exit 1
	fi
    	;;

    * )
    	echo "ERROR ($0)"
        echo "please add parameter so I know what to do"
        exit 1
        ;;
esac


Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ppp	15 Aug 2005 13:06:38 -0000	1.20
+++ ppp	15 Jan 2006 11:45:01 -0000	1.21
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       ppp
-# Required-Start: $basebuildtools $libs pptp-patches pppoe-patch4 portslave
+# Required-Start: $basebuildtools $libs pptp-patches pppoe-patch4 
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -32,9 +32,11 @@
 				cat ../ppp-patches/* | patch -p1 || exit 1
 				touch .patches_done
 			fi
-			./configure || exit 1
+			./configure --prefix=/usr || exit 1
 			replace_str pppd/Makefile "#CBCP=y" "CBCP=y"
-			replace_str pppd/Makefile "USE_PAM=y" "#USE_PAM=y"
+#			replace_str pppd/Makefile "USE_PAM=y" "#USE_PAM=y"
+			replace_str pppd/plugins/Makefile.linux "# SUBDIRS += radius" "SUBDIRS += radius"
+			replace_str pppd/Makefile 'LIBDIR = $(DESTDIR)/usr/lib/$(shell' 'LIBDIR = /lib/$(shell'
 			make $PMAKE all || exit 1
 			strip_debug
 

Index: poptop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/poptop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- poptop	12 Dec 2004 21:48:08 -0000	1.7
+++ poptop	15 Jan 2006 11:45:01 -0000	1.8
@@ -30,7 +30,7 @@
 case $1 in
     build )
 		if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_POPTOP" = "y" ]; then
-			replace_str ./plugins/patchlevel.h "2.4.3" "2.4.2"
+			replace_str ./plugins/patchlevel.h "2.4.2" "2.4.3"
 			./configure --prefix=/usr || exit 1
 			make $PMAKE all || exit 1
 			strip_debug

Index: portslave
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/portslave,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- portslave	12 Dec 2004 21:48:08 -0000	1.16
+++ portslave	15 Jan 2006 11:45:01 -0000	1.17
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       portslave
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs radiusclient ppp
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,9 +28,9 @@
 case $1 in
     build )
 	if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_PORTSLAVE" = "y" ]; then
-	    PPPDIR=$(find_src_dir ppp)
-	    PPPDIR=${PPPDIR##/*/}
-	    PATCHDIR=$(pwd)/patches/$PPPDIR
+		#PPPDIR=$(find_src_dir ppp)
+		#PPPDIR=${PPPDIR##/*/}
+		#PATCHDIR=$(pwd)/patches/$PPPDIR
 	    # patch pppd
 	    #pushd ../$PPPDIR > /dev/null || exit 1
 	    #for PATCH in $(ls $PATCHDIR/*.diff)
@@ -38,9 +38,10 @@
 		#patch -p1 < $PATCH || exit 1
 	    #done
 	    #popd > /dev/null || exit 1
-            ln -sf ../$PPPDIR ppp-2.4.1
-            echo "" > extract_and_patch.in
-	    ./configure --prefix=/usr --with-pppdir=$PPPDIR --sysconfdir=/etc/portslave --enable-ipv6 || exit 1
+		#    ln -sf ../$PPPDIR ppp-2.4.1
+		#    echo "" > extract_and_patch.in
+		#./configure --prefix=/usr --with-pppdir=$PPPDIR --sysconfdir=/etc/portslave --enable-ipv6 || exit 1
+		./configure --prefix=/usr --enable-shadow --enable-ipv6 --with-pppdradius=/usr/sbin/pppd || exit 1
 	    make $PMAKE -C src dep
 	    make $PMAKE || exit 1
 	    strip_debug
@@ -51,12 +52,14 @@
 	if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_PORTSLAVE" = "y" ]; then
             rm -rf $TMPDIR || exit 1
     	    mkdir -p $TMPDIR || exit 1
-	    make install INST_PREFIX=$TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
 	    mkdir -p $DOCDIR/portslave || exit 1
 	    cp -p docs/* $DOCDIR/portslave || exit 1
 	    copy_docs $TMPDIR
             copy_files $TMPDIR/usr $CDDIR || exit 1
-	    copy_files $TMPDIR/etc $ETCDIR/ || exit 1
+#	    copy_files $TMPDIR/etc $ETCDIR/ || exit 1
+		install -d -m 755 -o root $ETCDIR/etc/portslave/
+	    install -c -m 644 pslave.conf  $ETCDIR/etc/portslave/pslave.conf.sample
             rm -rf $TMPDIR || exit 1
 	fi
     	;;