summaryrefslogtreecommitdiff
path: root/source/a/tcsh
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/a/tcsh
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/a/tcsh')
-rw-r--r--source/a/tcsh/doinst.sh6
-rw-r--r--source/a/tcsh/tcsh-6.18.01-crypt.diff11
-rwxr-xr-xsource/a/tcsh/tcsh.SlackBuild80
3 files changed, 48 insertions, 49 deletions
diff --git a/source/a/tcsh/doinst.sh b/source/a/tcsh/doinst.sh
index d351e505..00c81536 100644
--- a/source/a/tcsh/doinst.sh
+++ b/source/a/tcsh/doinst.sh
@@ -1,8 +1,4 @@
-if fgrep tcsh etc/shells 1> /dev/null 2> /dev/null ; then
- GOOD=y
-else
+if ! grep -q tcsh etc/shells 2> /dev/null ; then
echo "/bin/tcsh" >> etc/shells
echo "/bin/csh" >> etc/shells
fi
-( cd bin ; rm -rf csh )
-( cd bin ; ln -sf tcsh csh )
diff --git a/source/a/tcsh/tcsh-6.18.01-crypt.diff b/source/a/tcsh/tcsh-6.18.01-crypt.diff
deleted file mode 100644
index db7306e2..00000000
--- a/source/a/tcsh/tcsh-6.18.01-crypt.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tc.func.c.orig 2013-05-16
-+++ tc.func.c 2013-05-16
-@@ -733,7 +733,7 @@ auto_lock(void)
- pp = xgetpass("Password:");
-
- crpp = XCRYPT(pw, pp, srpp);
-- if ((strcmp(crpp, srpp) == 0)
-+ if ((crpp && (strcmp(crpp, srpp) == 0))
- #ifdef AFS
- || (ka_UserAuthenticateGeneral(KA_USERAUTH_VERSION,
- afsname, /* name */
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index 44e398c0..2fe0f1c2 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,25 +21,28 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=6.18.01
-BUILD=${BUILD:-2}
+PKGNAM=tcsh
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-tcsh
+PKG=$TMP/package-${PKGNAM}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
@@ -47,18 +50,16 @@ elif [ "$ARCH" = "x86_64" ]; then
fi
rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/etc
cd $TMP
-rm -rf tcsh-$VERSION
-tar xvf $CWD/tcsh-$VERSION.tar.?z* || exit 1
-cd tcsh-$VERSION
-
-zcat $CWD/tcsh-6.18.01-crypt.diff.gz | patch -p0 --verbose || exit 1
+rm -rf ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
# The LS_COLORS variable shared by tcsh has new options in recent
# versions of coreutils that cause tcsh to exit, so disable the
# built-in color ls:
-zcat $CWD/tcsh.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/${PKGNAM}.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
@@ -67,36 +68,49 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
- --prefix= \
- $ARCH-slackware-linux
-make -j4 || exit 1
-mkdir -p $PKG/etc
-mkdir -p $PKG/bin
-cat tcsh > $PKG/bin/tcsh
-chmod 755 $PKG/bin/tcsh
-mkdir -p $PKG/usr/man/man1
-cat tcsh.man | gzip -9c > $PKG/usr/man/man1/tcsh.1.gz
-echo '.so man1/tcsh.1' | gzip -9c > $PKG/usr/man/man1/csh.1.gz
+ --prefix=/usr \
+ --bindir=/bin \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --mandir=/usr/man \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+( cd $PKG/bin ; ln -sf tcsh csh )
+( cd $PKG/usr/share/man/man1 ; ln -sf tcsh.1 csh.1 )
+mv $PKG/usr/share/man $PKG/usr
+
+# Strip binaries:
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
)
-mkdir -p $PKG/usr/doc/tcsh-$VERSION
+
+# Compress manual pages:
+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 a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
- BUGS FAQ Fixes NewThings Ported README README.imake WishList Y2K \
- $PKG/usr/doc/tcsh-$VERSION
+ BUGS Copyright FAQ Fixes NewThings Ported README* WishList Y2K \
+ complete.tcsh \
+ $PKG/usr/doc/${PKGNAM}-$VERSION
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
# Build the package:
cd $PKG
-makepkg -l y -c n $TMP/tcsh-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-# Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
- rm -rf $TMP/tcsh-${VERSION}
- rm -rf $PKG
-fi