diff options
| -rw-r--r-- | network/ipvsadm/ipvsadm-1.25-popt.patch | 19 | ||||
| -rw-r--r-- | network/ipvsadm/ipvsadm.SlackBuild | 15 | ||||
| -rw-r--r-- | network/ipvsadm/ipvsadm.info | 10 |
3 files changed, 38 insertions, 6 deletions
diff --git a/network/ipvsadm/ipvsadm-1.25-popt.patch b/network/ipvsadm/ipvsadm-1.25-popt.patch new file mode 100644 index 0000000000..2826002843 --- /dev/null +++ b/network/ipvsadm/ipvsadm-1.25-popt.patch @@ -0,0 +1,19 @@ +diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile +--- ipvsadm-1.25.orig/Makefile 2008-09-23 18:14:46.000000000 +0200 ++++ ipvsadm-1.25/Makefile 2008-12-22 20:03:53.793372130 +0100 +@@ -62,14 +62,7 @@ RPMBUILD = $(shell \ + fi ) + + ifeq (,$(FORCE_GETOPT)) +-LIB_SEARCH = /lib /usr/lib /usr/local/lib +-POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ +- if [ -f $$i/libpopt.a ]; then \ +- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ +- echo "-lpopt"; \ +- fi; \ +- fi; \ +-done) ++POPT_LIB = "-lpopt" + endif + + ifneq (,$(POPT_LIB)) diff --git a/network/ipvsadm/ipvsadm.SlackBuild b/network/ipvsadm/ipvsadm.SlackBuild index 9e14b1526e..7fb175cf4e 100644 --- a/network/ipvsadm/ipvsadm.SlackBuild +++ b/network/ipvsadm/ipvsadm.SlackBuild @@ -6,7 +6,7 @@ # Modified by the slackbuilds.org project PRGNAM=ipvsadm -VERSION=${VERSION:-1.24} +VERSION=${VERSION:-1.25} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="" fi set -e @@ -39,7 +42,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# fix not detecting popt by default +patch -p1 -i $CWD/ipvsadm-1.25-popt.patch + +# use SLKCFLAGS +sed -i "s/-Wall/-Wall $SLKCFLAGS/" Makefile +sed -i "s/-Wall/-Wall $SLKCFLAGS/" libipvs/Makefile + make + make BUILD_ROOT=$PKG install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -57,4 +68,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/ipvsadm/ipvsadm.info b/network/ipvsadm/ipvsadm.info index 35cb6f0410..4dec694d3e 100644 --- a/network/ipvsadm/ipvsadm.info +++ b/network/ipvsadm/ipvsadm.info @@ -1,8 +1,10 @@ PRGNAM="ipvsadm" -VERSION="1.24" +VERSION="1.25" HOMEPAGE="http://www.linuxvirtualserver.org/" -DOWNLOAD="http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.24.tar.gz" -MD5SUM="fb99dce274d2e0c7c3df244388289677" +DOWNLOAD="http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.25.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="772a053f5fe888cd25784c5f55d31fc3" +MD5SUM_x86_64="" MAINTAINER="luoyi" EMAIL="luoyi.ly@gmail.com" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="David Somero,pprkut"
\ No newline at end of file |