diff options
| -rw-r--r-- | network/xl2tpd/makefile.patch | 44 | ||||
| -rw-r--r-- | network/xl2tpd/xl2tpd.SlackBuild | 34 | ||||
| -rw-r--r-- | network/xl2tpd/xl2tpd.info | 6 |
3 files changed, 24 insertions, 60 deletions
diff --git a/network/xl2tpd/makefile.patch b/network/xl2tpd/makefile.patch deleted file mode 100644 index 5e46047ea4976..0000000000000 --- a/network/xl2tpd/makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile-orig 2010-04-09 20:02:02.000000000 +0400 -+++ Makefile 2010-04-09 20:02:39.000000000 +0400 -@@ -53,8 +53,8 @@ - # but we use a local copy if we don't find it. - # - #KERNELSRC=/lib/modules/`uname -r`/build/ --KERNELSRC?=./linux --OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ -+KERNELSRC=/usr/src/linux -+OSFLAGS= -DLINUX -I$(KERNELSRC)/include/ - # - # Uncomment the following to use the kernel interface under Linux - # This requires the pppol2tp-linux-2.4.27.patch patch from contrib -@@ -62,7 +62,7 @@ - # are packages seperately (eg kernel-headers on Fedora) - # Note: 2.6.23+ support still needs some changes in the xl2tpd source - # --#OSFLAGS+= -DUSE_KERNEL -+OSFLAGS+= -DUSE_KERNEL - # - # - # Uncomment the next line for FreeBSD -@@ -97,10 +97,10 @@ - #LIBS= $(OSLIBS) # -lefence # efence for malloc checking - EXEC=xl2tpd - --PREFIX?=/usr/local -+PREFIX?=/usr - SBINDIR?=$(DESTDIR)${PREFIX}/sbin - BINDIR?=$(DESTDIR)${PREFIX}/bin --MANDIR?=$(DESTDIR)${PREFIX}/share/man -+MANDIR?=$(DESTDIR)${PREFIX}/man - - - all: $(EXEC) pfc -@@ -113,7 +113,7 @@ - - pfc: - $(CC) $(CFLAGS) -c contrib/pfc.c -- $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o -+ $(CC) pfc.o $(LDFLAGS) -lpcap $(LDLIBS) -o pfc - - romfs: - $(ROMFSINST) /bin/$(EXEC) diff --git a/network/xl2tpd/xl2tpd.SlackBuild b/network/xl2tpd/xl2tpd.SlackBuild index 9b5a3367e755d..c3f84672c93ea 100644 --- a/network/xl2tpd/xl2tpd.SlackBuild +++ b/network/xl2tpd/xl2tpd.SlackBuild @@ -1,7 +1,12 @@ #!/bin/sh +# Slackware build script for xl2tpd + +# written by gshep <shepelev.georgy@googlemail.com> +# modified by the SlackBuilds.org project + PRGNAM=xl2tpd -VERSION=1.2.4 +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,29 +48,32 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # patching make file -patch -p0 -i $CWD/makefile.patch +sed -i \ + -e "s|share/man|man|" \ + -e "s|usr/local|usr|" \ + -e "s|-O2|$SLKCFLAGS|" \ + -e "s|^KERNELSRC=.*|KERNELSRC=/usr/src/linux|" \ + Makefile # build the program make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Add some sample config files -mkdir -p $PKG/etc/{xl2tpd,ppp} +mkdir -p $PKG/etc/xl2tpd $PKG/etc/ppp cat examples/xl2tpd.conf > $PKG/etc/xl2tpd/xl2tpd.conf.new cat examples/ppp-options.xl2tpd > $PKG/etc/ppp/options.xl2tpd.new cat examples/chapsecrets.sample > $PKG/etc/ppp/chap-secrets.new diff --git a/network/xl2tpd/xl2tpd.info b/network/xl2tpd/xl2tpd.info index 51b33e95412e9..ae33ca09efccf 100644 --- a/network/xl2tpd/xl2tpd.info +++ b/network/xl2tpd/xl2tpd.info @@ -1,8 +1,8 @@ PRGNAM="xl2tpd" -VERSION="1.2.4" +VERSION="1.3.2" HOMEPAGE="http://www.xelerance.com/software/xl2tpd/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/xl2tpd-1.2.4.tar.gz" -MD5SUM="d94fc8a13596f12a561240dfcea9f977" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xl2tpd-1.3.2.tar.gz" +MD5SUM="d1e44ad0055a02ac89a32b2a6eeb0719" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |