diff options
author | wigums <pioneer22675@gmail.com> | 2018-04-06 14:44:57 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-04-07 08:13:13 +0700 |
commit | 07aea7446e6dabf6c2f2ea959ed2e12b6d04e496 (patch) | |
tree | 0f6127ca46583439b8e13e79cc3bb788c5df5e44 /network/3proxy | |
parent | fe7b32658acd8dd66581eb5976cd35e3b44e4c57 (diff) |
network/3proxy: Updated for version 0.8.11 + new maintainer.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'network/3proxy')
-rw-r--r-- | network/3proxy/3proxy.SlackBuild | 25 | ||||
-rw-r--r-- | network/3proxy/3proxy.info | 10 | ||||
-rw-r--r-- | network/3proxy/patches/Makefile.Linux.patch | 21 | ||||
-rw-r--r-- | network/3proxy/patches/add3proxyuser.sh.patch | 15 | ||||
-rw-r--r-- | network/3proxy/patches/fix_etcdir.patch | 12 | ||||
-rw-r--r-- | network/3proxy/patches/fixup_manpages.patch | 33 |
6 files changed, 14 insertions, 102 deletions
diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild index 7f30c3add6fb3..668da176f5f02 100644 --- a/network/3proxy/3proxy.SlackBuild +++ b/network/3proxy/3proxy.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for 3proxy # Copyright 2008, 2009 Ilya INSTE Ponetayev, <inste@mail.ru> +# Copyright 2018 wigums pioneer22675@gmail.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=3proxy -VERSION=${VERSION:-0.6.1} +VERSION=${VERSION:-0.8.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then @@ -56,9 +57,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM -rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tgz -cd $PRGNAM-$VERSION +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -66,11 +66,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/patches/Makefile.Linux.patch -patch -p1 < $CWD/patches/fix_etcdir.patch -patch -p1 < $CWD/patches/add3proxyuser.sh.patch -patch -p1 < $CWD/patches/fixup_manpages.patch - make -f Makefile.Linux \ EXTRA_CFLAGS="$SLKCFLAGS" \ prefix=/usr \ @@ -98,22 +93,20 @@ mkdir -p $PKG/etc/rc.d cat $CWD/rc.3proxy > $PKG/etc/rc.d/rc.3proxy.new chmod 0755 $PKG/etc/rc.d/rc.3proxy.new -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 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changelog authors copying Readme news doc cfg contrib scripts \ +cp -a authors copying Readme doc cfg scripts \ $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -find $PKG/usr/doc/$PRGNAM-$VERSION/contrib/ -type d -exec chmod 755 {} \; -find $PKG/usr/doc/$PRGNAM-$VERSION/contrib/ -type f -exec chmod 644 {} \; - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/3proxy/3proxy.info b/network/3proxy/3proxy.info index 3623220526f97..5ee0b4f06b6e1 100644 --- a/network/3proxy/3proxy.info +++ b/network/3proxy/3proxy.info @@ -1,10 +1,10 @@ PRGNAM="3proxy" -VERSION="0.6.1" +VERSION="0.8.11" HOMEPAGE="https://3proxy.ru/" -DOWNLOAD="https://3proxy.ru/0.6.1/3proxy-0.6.1.tgz" -MD5SUM="03790467a12e16ed8785ae688ecf9b68" +DOWNLOAD="https://3proxy.ru/0.8.11/3proxy-0.8.11.tgz" +MD5SUM="cb3a1cc688f01b8311c6e84848c0f62e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ilya Ponetayev" -EMAIL="inste@mail.ru" +MAINTAINER="wigums" +EMAIL="pioneer22675@gmail.com" diff --git a/network/3proxy/patches/Makefile.Linux.patch b/network/3proxy/patches/Makefile.Linux.patch deleted file mode 100644 index e8705daee3f65..0000000000000 --- a/network/3proxy/patches/Makefile.Linux.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur 3proxy-0.6.orig/Makefile.Linux 3proxy-0.6/Makefile.Linux ---- 3proxy-0.6.orig/Makefile.Linux 2008-09-30 08:58:43.000000000 -0500 -+++ 3proxy-0.6/Makefile.Linux 2009-06-24 12:01:44.148796740 -0500 -@@ -11,7 +11,7 @@ - BUILDDIR = - CC = gcc - --CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS = -Wall -g $(EXTRA_CFLAGS) -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL - COUT = -o - LN = gcc - DCFLAGS = -fpic -@@ -69,7 +69,7 @@ - - install-bin: - $(INSTALL_BIN) -d $(BINDIR) -- $(INSTALL_BIN) -s $(INSTALL_OBJS) $(BINDIR) -+ $(INSTALL_BIN) $(INSTALL_OBJS) $(BINDIR) - - install-etc-dir: - $(INSTALL_BIN) -d $(ETCDIR) diff --git a/network/3proxy/patches/add3proxyuser.sh.patch b/network/3proxy/patches/add3proxyuser.sh.patch deleted file mode 100644 index 8a0ca8800686f..0000000000000 --- a/network/3proxy/patches/add3proxyuser.sh.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur 3proxy-0.6.orig/scripts/add3proxyuser.sh 3proxy-0.6/scripts/add3proxyuser.sh ---- 3proxy-0.6.orig/scripts/add3proxyuser.sh 2007-06-11 03:18:12.000000000 -0500 -+++ 3proxy-0.6/scripts/add3proxyuser.sh 2009-06-24 12:27:33.614202884 -0500 -@@ -1,8 +1,8 @@ - #!/bin/sh - if [ $4 ]; then -- echo $1:`/usr/local/etc/3proxy/bin/mycrypt $$ $2` >> /usr/local/etc/3proxy/passwd -- echo countin \"`wc -l /usr/local/etc/3proxy/counters|awk '{print $1}'`/$1\" D $3 $1 >> /usr/local/etc/3proxy/counters -- echo bandlimin $4 $1 >> /usr/local/etc/3proxy/bandlimiters -+ echo $1:`/usr/bin/mycrypt $$ $2` >> /etc/3proxy/passwd -+ echo countin \"$(wc -l /etc/3proxy/counters | awk '{print $1}')/$1\" D $3 $1 >> /etc/3proxy/counters -+ echo bandlimin $4 $1 >> /etc/3proxy/bandlimiters - else - echo usage: $0 username password day_limit bandwidth - echo " "day_limit - traffic limit in MB per day diff --git a/network/3proxy/patches/fix_etcdir.patch b/network/3proxy/patches/fix_etcdir.patch deleted file mode 100644 index 1390d3c630b3b..0000000000000 --- a/network/3proxy/patches/fix_etcdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur 3proxy-0.6.orig/src/stringtable.c 3proxy-0.6/src/stringtable.c ---- 3proxy-0.6.orig/src/stringtable.c 2008-02-03 05:28:24.000000000 -0600 -+++ 3proxy-0.6/src/stringtable.c 2009-06-24 12:21:01.637499557 -0500 -@@ -38,7 +38,7 @@ - /* 24 */ NULL, - #ifndef TPROXY_CONF - #ifndef _WIN32 --/* 25 */ (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg", -+/* 25 */ (unsigned char *)"/etc/3proxy/3proxy.cfg", - #else - /* 25 */ (unsigned char *)"3proxy.cfg", - #endif diff --git a/network/3proxy/patches/fixup_manpages.patch b/network/3proxy/patches/fixup_manpages.patch deleted file mode 100644 index 90bfc86c6a919..0000000000000 --- a/network/3proxy/patches/fixup_manpages.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur 3proxy-0.6.orig/man/3proxy.8 3proxy-0.6/man/3proxy.8 ---- 3proxy-0.6.orig/man/3proxy.8 2007-03-01 06:08:33.000000000 -0600 -+++ 3proxy-0.6/man/3proxy.8 2009-06-24 12:36:24.277595082 -0500 -@@ -84,7 +84,7 @@ - configuration from stdin. It makes it possible to use 3proxy.cfg file as - executable script just by setting +x mode and adding - .br --#!/usr/local/3proxy/3proxy -+#!/usr/bin/3proxy - .br - as a first line in 3proxy.cfg - .TP -@@ -133,7 +133,7 @@ - wget to automate this task. - .SH FILES - .TP --.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)" -+.I "/etc/3proxy/3proxy.cfg (3proxy.cfg)" - .BR 3proxy - configuration file - .SH BUGS -diff -Nur 3proxy-0.6.orig/man/3proxy.cfg.3 3proxy-0.6/man/3proxy.cfg.3 ---- 3proxy-0.6.orig/man/3proxy.cfg.3 2009-02-02 04:00:11.000000000 -0600 -+++ 3proxy-0.6/man/3proxy.cfg.3 2009-06-24 12:37:03.844291883 -0500 -@@ -30,7 +30,7 @@ - File inclusion:
- .br
- You can include file by using $FILENAME macro (replace FILENAME with a path
--to file, for example $/usr/local/etc/3proxy/conf.incl or
-+to file, for example $/etc/3proxy/conf.incl or
- $"c:\\Program Files\\3proxy\\include.cfg" Quotation is
- required in last example because path contains space character.
- For included file <CR> (end of line characters) is treated as space character
|