aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/tnftp/tnftp.SlackBuild22
-rw-r--r--network/tnftp/tnftp.info6
2 files changed, 17 insertions, 11 deletions
diff --git a/network/tnftp/tnftp.SlackBuild b/network/tnftp/tnftp.SlackBuild
index 3b6f930511b5..6c1dac60e88c 100644
--- a/network/tnftp/tnftp.SlackBuild
+++ b/network/tnftp/tnftp.SlackBuild
@@ -23,6 +23,7 @@
# Now maintained by B. Watson <yalhcru@gmail.com>.
+# 20201024 bkw: update for v20200705.
# 20180629 bkw:
# - Take over maintenance.
# - Add 'todo' to docdir, BUILD=2.
@@ -30,8 +31,8 @@
# - Script simplification.
PRGNAM=tnftp
-VERSION=${VERSION:-20151004}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200705}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -70,11 +71,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-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 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# ./configure --enable-ipv6 --with-socks
# configure: WARNING: IPv6 is incompatible with socks, disabling IPv6 support
@@ -83,7 +81,14 @@ find -L . \
# /usr/bin/tnftp, and tell the user he can call the socks one by name,
# or replace the symlink.
-# These configure options are used for both builds:
+# These configure options are used for both builds. A word about libedit:
+# --enable-editcomplete enables linking with the system libedit (if it
+# exists). If there is no system libedit, it builds and links with the
+# bundled libedit in the tnftp source. To avoid nasty surprises
+# caused by libedit changes (since libedit is not one of my builds),
+# I'm going to force it to use the bundled libedit. The disadvantage
+# is that it doubles the sizes of the binaries, but they're still well
+# under 1MB each.
runconfig() {
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -95,6 +100,7 @@ runconfig() {
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux \
--enable-editcomplete \
+ --with-local-libedit \
--enable-ssl \
"$@"
}
diff --git a/network/tnftp/tnftp.info b/network/tnftp/tnftp.info
index ab6241890aec..61ac2b566be5 100644
--- a/network/tnftp/tnftp.info
+++ b/network/tnftp/tnftp.info
@@ -1,8 +1,8 @@
PRGNAM="tnftp"
-VERSION="20151004"
+VERSION="20200705"
HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp"
-DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20151004.tar.gz"
-MD5SUM="a49fbe752318d5a7893f900046ea00d5"
+DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20200705.tar.gz"
+MD5SUM="fc6a6bfa3d14005b3275b5508c47b8e9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""