From 574f508c2c02d6ed8c03d06996765c868d73b472 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 29 Nov 2020 08:43:40 +0100 Subject: 20201129.1 global branch merge. Signed-off-by: Matteo Bernardini --- system/man-db/README | 14 --- system/man-db/README.Slackware | 49 -------- system/man-db/doinst.sh | 48 -------- system/man-db/dont_write_in_usr.diff | 50 -------- system/man-db/man-db.SlackBuild | 224 ----------------------------------- system/man-db/man-db.cron | 30 ----- system/man-db/man-db.csh | 12 -- system/man-db/man-db.info | 12 -- system/man-db/man-db.sh | 16 --- system/man-db/man_db.conf.new.gz | Bin 2404 -> 0 bytes system/man-db/slack-desc | 19 --- 11 files changed, 474 deletions(-) delete mode 100644 system/man-db/README delete mode 100644 system/man-db/README.Slackware delete mode 100644 system/man-db/doinst.sh delete mode 100644 system/man-db/dont_write_in_usr.diff delete mode 100644 system/man-db/man-db.SlackBuild delete mode 100644 system/man-db/man-db.cron delete mode 100644 system/man-db/man-db.csh delete mode 100644 system/man-db/man-db.info delete mode 100644 system/man-db/man-db.sh delete mode 100644 system/man-db/man_db.conf.new.gz delete mode 100644 system/man-db/slack-desc (limited to 'system/man-db') diff --git a/system/man-db/README b/system/man-db/README deleted file mode 100644 index 8ac7c0c470..0000000000 --- a/system/man-db/README +++ /dev/null @@ -1,14 +0,0 @@ -man-db (database-driven manual pager suite) - -This package provides the man command and related utilities -for examining on-line help files (manual pages). It can act as a -replacement for Slackware's man package. It has several enhancements -over man, including an indexed database for searches with -k or -apropos, the ability to easily view man pages in a browser, better -i18n support, and a much more efficient implementation of the -K (full -text search) option. - -This build includes a complete install of libpipeline. - -By default, man-db doesn't conflict with Slackware's man package. See -README.Slackware for details. diff --git a/system/man-db/README.Slackware b/system/man-db/README.Slackware deleted file mode 100644 index 165e9dfa4c..0000000000 --- a/system/man-db/README.Slackware +++ /dev/null @@ -1,49 +0,0 @@ -By default, man-db can be installed alongside Slackware's man package -without conflict, as it installs its binaries and man pages into -/opt/man-db. After installation, either log out and back in, or source -/etc/profile.d/man-db.sh in your shell (this adjusts $PATH so the man -command from /opt/man-db will be found first). - -Alternately, man-db can be built as a replacement for Slackware's -man package. To do this, set USR=yes in the script's environment, -and "removepkg man" before installing man-db. No profile scripts are -installed in this case. - -When installing man-db, the doinst.sh script may take several minutes to -run. This is because it's indexing all the man pages on the system. Also, -a cron job is installed in /etc/cron.daily, which adds newly-installed -man pages to the database. The index speeds up searching via "man -k" -or "apropos". The disadvantage is that newly-installed man pages won't -be found in these searches until the database has been updated, so any -time you install new man pages, you'll want to run "mandb" as root, or -wait for cron to do it for you (if you don't do this, the new pages can -still be displayed, they just won't be searchable). The indexing runs -quickly once the initial database has been created, so the cron job or -manual update shouldn't bring your system to its knees. - -The database is located in /var/cache/man, and on a full Slackware install -will be approximately 5MB in size. During index creation, approximately -10MB in /var is used. If you decide to removepkg man-db, you'll probably -also want to get rid of its database with "rm -rf /var/cache/man". If -the database gets corrupted somehow, it can be regenerated from scratch -by running "mandb -c" or just reinstalling the man-db package. - -Although man-db supports caching formatted pages ("cat" pages), it's -disabled in this build, to make man-db behave more like Slackware's man -(which supports caching, but it's disabled). On modern (and even 10+ -year old) systems, the small amount of extra time it takes to format -a man page every time it's viewed is probably not worth the headaches -caused by stale cat pages. - -Unlike some distro packages of man-db, this build doesn't install man or -mandb setuid. This prevents caching cat pages from working (see above), -and prevents man from automatically adding new man pages to the database -the first time a user views them (they will be indexed by the cron job, -or by root manually running "mandb", if you're impatient). - -A word about i18n support: the whole reason I packaged man-db is because -Slackware's man can't handle Japanese man pages, and I couldn't come -up with a way to make them work after several hours of research and -man.conf editing. With man-db, they Just Work, with LANG=ja_JP.UTF-8 -(now all I have to do is learn to read Japanese). In general, UTF-8 -locales are preferred for man-db, although non-UTF-8 is also supported. diff --git a/system/man-db/doinst.sh b/system/man-db/doinst.sh deleted file mode 100644 index cb474322c8..0000000000 --- a/system/man-db/doinst.sh +++ /dev/null @@ -1,48 +0,0 @@ - -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/man_db.conf.new - -# In English, the if/find below means "only run the database creation if -# it was last done over an hour ago". This is needed because upgradepkg -# runs doinst.sh twice, but I don't want the 10+ minute long database -# creation to happen twice on upgrade (or at all, when I'm repeatedly -# reinstalling man-db for testing purposes). - -if \ - [ ! -e /var/cache/man/man-db ] || \ - [ -n "$( find var/cache/man/ -type d -a -name man-db -a -mmin +60 )" ] -then -# Generate the initial man database (or rebuild it if it exists). -# We want to skip this step if installing somewhere besides / (e.g. with -# the -root option or ROOT env variable set for installpkg), hence the -# readlink silliness. - -# The -c option means it blows away any existing db. I thought about -# leaving it off (it will still create the db if it doesn't exist), -# but decided it's better to build it fresh if the package gets -# reinstalled (in case the db format has changed, or in case the -# db is corrupted and the user is trying to fix it by reinstalling -# this package). - -# the 2>/dev/null was added for 2.7.6 because it complains about -# missing CACHEDIR.TAG files... which don't matter, because we've -# got NOCACHE in the config file. - ( \ - [ -x /bin/readlink ] && \ - [ "$( /bin/readlink -f $( pwd ) )" = "/" ] && \ - ( [ -x /opt/man-db/bin/mandb ] && /opt/man-db/bin/mandb -c -q ) || \ - ( [ -x /usr/bin/mandb ] && /usr/bin/mandb -c -q ) \ - ) 2>/dev/null -fi diff --git a/system/man-db/dont_write_in_usr.diff b/system/man-db/dont_write_in_usr.diff deleted file mode 100644 index 8f71585981..0000000000 --- a/system/man-db/dont_write_in_usr.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure ---- man-db-2.7.6.1/configure 2016-12-12 07:43:48.000000000 -0500 -+++ man-db-2.7.6.1.patched/configure 2017-03-04 16:49:57.389893574 -0500 -@@ -25809,46 +25809,8 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 --$as_echo_n "checking for long file names... " >&6; } --if ${ac_cv_sys_long_file_names+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_sys_long_file_names=yes --# Test for long file names in all the places we know might matter: --# . the current directory, where building will happen --# $prefix/lib where we will be installing things --# $exec_prefix/lib likewise --# $TMPDIR if set, where it might want to write temporary files --# /tmp where it might want to write temporary files --# /var/tmp likewise --# /usr/tmp likewise --for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do -- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib -- # in the usual case where exec_prefix is '${prefix}'. -- case $ac_dir in #( -- . | /* | ?:[\\/]*) ;; #( -- *) continue;; -- esac -- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. -- ac_xdir=$ac_dir/cf$$ -- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue -- ac_tf1=$ac_xdir/conftest9012345 -- ac_tf2=$ac_xdir/conftest9012346 -- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || -- ac_cv_sys_long_file_names=no -- rm -f -r "$ac_xdir" 2>/dev/null -- test $ac_cv_sys_long_file_names = no && break --done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5 --$as_echo "$ac_cv_sys_long_file_names" >&6; } --if test $ac_cv_sys_long_file_names = yes; then -- - $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h - --fi -- - - - diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild deleted file mode 100644 index 7e8260ddd1..0000000000 --- a/system/man-db/man-db.SlackBuild +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/sh - -# Slackware build script for man-db - -# Written by B. Watson (yalhcru@gmail.com) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20201024 bkw: update for v2.9.3 (matches -current) -# 20200316 bkw: update for v2.9.1 (resync with -current) -# 20191201 bkw: update for v2.9.0 (to match -current again). -# Also got rid of the systemd-specific stuff properly (via configure opts). - -# 20180801 bkw: update for v2.8.4. -# 20180611 bkw: update for v2.8.3, to match what Pat has in -current. - -# 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0. -# This may be the last SBo update, since Pat has imported man-db -# into Slackware-current. Depends on how long it is from now until -# the next release: I'll maintain this until SBo stops accepting -# submissions for 14.2. - -# 20170305 bkw: -# - BUILD=2 -# - get rid of systemd-specific /usr/lib/tmpfiles.d from package. -# - patch configure so it doesn't write to /usr/lib. - -# 20170215 bkw: -# - update for 2.7.6.1 (whoops, last update wasn't for the latest version -# - only update the cache in doinst.sh if it's over an hour old. this -# takes several minutes, and happens twice (uselessly) if the package -# is upgraded (since upgradepkg runs doinst.sh twice). waiting an hour -# also makes my life easier when I'm testing this script. -# - fix man-db.cron so it works even if USR=yes (whoops), and stop trying -# to chown the cache to the nonexistent 'man' user. - -# 20170125 bkw: -# - update for 2.7.6. -# - add --disable-cache-owner. TODO: revisit this at some -# point. Maybe create a dedicated 'man' user, or use one of the existing -# users like 'bin' or 'operator'. - -# 20160726 bkw: -# - update for 2.7.5. - -# 20150507 bkw: -# - update for 2.7.1. -# - fix homepage in .info file. -# - had to update libpipeline to 1.4.0. - -# 20140924 bkw: -# - update for 2.7.0.1, which fixes the clash between man-db's zsoelim -# and groff's zsoelim. -# - update README and README.Slackware slightly. - -PRGNAM=man-db -VERSION=${VERSION:-2.9.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -# By default, install binaries to /opt, so as not to stomp on Slackware's -# man pkg. We will have to include a /etc/profile.d script to set PATH, -# MANPATH, etc. Note that only binaries and the man pages for man-db itself -# go to /opt. Everything else (libpipeline, man-db's shared libs, localized -# messages, etc) goes to /usr as usual. - -# If you want a proper replacement for Slack's man pkg, build with -# USR="yes", which puts the binaries in the usual places. If your name is -# Patrick V. and you're finally replacing man with man-db in Slackware, -# feel free to uncomment the next line: -#USR="yes" - -BINDIR=/opt/$PRGNAM/bin -[ "${USR:-no}" = "yes" ] && BINDIR=/usr/bin -MANDIR="${BINDIR/bin/man}" - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT - -# libpipeline is a pretty niche-market library. It used to be bundled -# in the man-db source, and as far as I can tell, nothing else uses it. -# Instead of making it a separate build and external dep, we'll just -# bundle it here. -LIBNAM=libpipeline -LIBVER=1.5.3 - -cd $TMP -rm -rf $LIBNAM-$LIBVER -tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz -cd $LIBNAM-$LIBVER -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER -cp -a COPYING ChangeLog* NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER - -# now build man-db itself, using the libpipeline installed in $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -# The 'checking for long filenames' test in the configure script writes to -# /usr/lib, which is bad behaviour for a configure script. Not to mention -# wrong (it assumes configure is always being run as root). We already -# know we have long filename support, because we live in the 21st century -# now, so this patch gets rid of the test and force-enables it. -patch -p1 < $CWD/dont_write_in_usr.diff - -# The circumlocutions below are needed because doing it the sane way: -# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline" -# gets broken by libtool (it *insists* on replacing -lpipeline with -# /usr/lib64/libpipeline.so, which will fail if it's an older version). -LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \ -LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \ -libpipeline_CFLAGS="-I$PKG/usr/include" \ -libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --with-systemdtmpfilesdir=no \ - --with-systemdsystemunitdir=no \ - --disable-setuid \ - --disable-cache-owner \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=$MANDIR \ - --bindir=$BINDIR \ - --sbindir=${BINDIR/bin/sbin} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# There will always be man pages here, regardless of USR=yes or no. -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 - -if [ "${USR:-no}" != "yes" ]; then - # separate dir full of man pages and symlinks in /opt - find $PKG/$MANDIR -type f -exec gzip -9 {} \; - for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - - # only need the profile.d stuff if installing to /opt - mkdir -p $PKG/etc/profile.d - install -m0755 -oroot -groot $CWD/$PRGNAM.sh $CWD/$PRGNAM.csh $PKG/etc/profile.d -fi - -# no special ownership or perms needed here since we --disable-setuid -mkdir -p $PKG/var/cache/man - -# only ship a daily cronjob, don't need a weekly one like Debian has. -mkdir -p $PKG/etc/cron.daily -install -m0755 -oroot -groot $CWD/$PRGNAM.cron $PKG/etc/cron.daily/$PRGNAM - -# modified default config, customized for Slackware. See the conf file for -# list of changes. -zcat $CWD/man_db.conf.new.gz \ - | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \ - > $PKG/etc/man_db.conf.new -rm -rf $PKG/etc/man_db.conf - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS Change* FAQ NEWS README docs/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -sed "s,@BINDIR@,$BINDIR," < $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -# N.B. the -p option is actually needed here (for libpipeline.so). -cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/man-db/man-db.cron b/system/man-db/man-db.cron deleted file mode 100644 index 93c3a00ff2..0000000000 --- a/system/man-db/man-db.cron +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# man-db daily cronjob, part of the slackbuilds.org man-db package. -# Author: B. Watson. -# Adapted from Debian's man-db package, so I guess the license is GPL. - -set -e - -if ! [ -d /var/cache/man ]; then - # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chown root:root /var/cache/man || true - chmod 2755 /var/cache/man -fi - -# expunge old catman pages which have not been read in a week -# commented out, as we've got cat pages disabled in this build. Left -# here for reference in case someone really wants to enable cat pages -# some day. -#find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | xargs -r0 rm -f &> /dev/null - -# regenerate man database. /opt/man-db/bin probably isn't in cron's $PATH, -# so check for it specially, otherwise use $PATH. -if [ -x /opt/man-db/bin/mandb ]; then - MANDB=/opt/man-db/bin/mandb -else - MANDB=mandb -fi - -$MANDB --no-purge --quiet diff --git a/system/man-db/man-db.csh b/system/man-db/man-db.csh deleted file mode 100644 index 6cf39ce0ba..0000000000 --- a/system/man-db/man-db.csh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/csh - -# Set up environment for man-db. This file is part of the slackbuilds.org -# man-db build. - -# Author: B. Watson. License: WTFPL - -setenv MANPATH /opt/man-db/man:$MANPATH -set path = ( /opt/man-db/bin $path ) -if ("`id -u`" == "0") then - set path = ( /opt/man-db/sbin $path ) -endif diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info deleted file mode 100644 index a0c86e1b19..0000000000 --- a/system/man-db/man-db.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="man-db" -VERSION="2.9.3" -HOMEPAGE="http://www.nongnu.org/man-db/" -DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.3.tar.xz \ - http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz" -MD5SUM="4c8721faa54a4c950c640e5e5c713fb0 \ - dad443d0911cf9f0f1bd90a334bc9004" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/system/man-db/man-db.sh b/system/man-db/man-db.sh deleted file mode 100644 index 54c9b34ae0..0000000000 --- a/system/man-db/man-db.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# Set up environment for man-db. This file is part of the slackbuilds.org -# man-db build. - -# Author: B. Watson. License: WTFPL - -MANPATH="/opt/man-db/man:$MANPATH" -PATH="/opt/man-db/bin:$PATH" - -if [ "$( id -u )" = "0" ]; then - PATH="/opt/man-db/sbin:$PATH" -fi - -export MANPATH -export PATH diff --git a/system/man-db/man_db.conf.new.gz b/system/man-db/man_db.conf.new.gz deleted file mode 100644 index 1d128438c4..0000000000 Binary files a/system/man-db/man_db.conf.new.gz and /dev/null differ diff --git a/system/man-db/slack-desc b/system/man-db/slack-desc deleted file mode 100644 index 5abdea8fb6..0000000000 --- a/system/man-db/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -man-db: man-db (database-driven manual pager suite) -man-db: -man-db: This package provides the man command and related utilities -man-db: for examining on-line help files (manual pages). It can act as a -man-db: replacement for Slackware's man package. It has several enhancements -man-db: over man, including an indexed database for searches with -k or -man-db: apropos, the ability to easily view man pages in a browser, better -man-db: i18n support, and a much more efficient implementation of the -K -man-db: (full text search) option. -man-db: -man-db: -- cgit v1.2.3