summaryrefslogtreecommitdiffstats
path: root/current
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-12-18 20:33:08 +0000
committer Eric Hameleers <alien@slackware.com>2015-12-18 20:33:08 +0000
commit343cf634c559d45566de937bd790c0c4915a84a3 (patch)
treef6af22cc44c1c4d1d58bc45f13cca7657e5a1807 /current
parentfd2206a8d1ef67d9516eff6a576d262f8d67f2b8 (diff)
downloadmultilib-343cf634c559d45566de937bd790c0c4915a84a3.tar.gz
multilib-343cf634c559d45566de937bd790c0c4915a84a3.tar.xz
glibc-multilib: fixed empty /etc/nscd.conf.new
Diffstat (limited to 'current')
-rwxr-xr-xcurrent/glibc/glibc-multilib.SlackBuild15
1 files changed, 12 insertions, 3 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index 3d3a0c0..ba47907 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -30,7 +30,7 @@
VERSION=${VERSION:-2.22}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2alien}
+BUILD=${BUILD:-3alien}
## Included in glibc now:
## glibc-libidn version
@@ -320,14 +320,16 @@ strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so*
strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so*
strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a
+# Back to the sources dir to add some files/docs:
+cd $TMP/glibc-$CVSVER
+
# We'll automatically install the config file for the Name Server Cache Daemon.
# Perhaps this should also have some commented-out startup code in rc.inet2...
mkdir -p $PKG/etc
cat nscd/nscd.conf > $PKG/etc/nscd.conf.new
-## Install docs:
+# Install docs:
( mkdir -p $PKG/usr/doc/glibc-$VERSION
- cd ..
cp -a \
BUGS CONFORMANCE COPYING* FAQ INSTALL LICENSES NAMESPACE \
NEWS NOTES PROJECTS README* \
@@ -338,6 +340,13 @@ cat nscd/nscd.conf > $PKG/etc/nscd.conf.new
chmod 644 $PKG/usr/doc/glibc-$VERSION/glibc-multilib.SlackBuild
)
+# Trim the NEWS file to omit ancient history:
+if [ -r NEWS ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/glibc-$VERSION)
+ cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+ touch -r NEWS $DOCSDIR/NEWS
+fi
+
# OK, there are some very old Linux standards that say that any binaries in a /bin or
# /sbin directory (and the directories themselves) should be group bin rather than
# group root, unless a specific group is really needed for some reason.