mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
7e5ee73de9
a/acl-2.2.53-x86_64-1.txz: Upgraded.
a/attr-2.4.48-x86_64-1.txz: Upgraded.
n/gnupg-1.4.23-x86_64-1.txz: Upgraded.
Sanitize the diagnostic output of the original file name in verbose mode.
By using a made up file name in the message it was possible to fake status
messages. Using this technique it was for example possible to fake the
verification status of a signed mail.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12020
(* Security fix *)
x/libXaw3d-1.6.3-x86_64-1.txz: Upgraded.
x/libinput-1.11.1-x86_64-1.txz: Upgraded.
x/xf86-input-mouse-1.9.3-x86_64-1.txz: Upgraded.
testing/packages/pkgtools-15.0-noarch-20.txz: Rebuilt.
This update is a bit scarier than usual, so we're going to test it here
first and then move it into the main tree in a couple of days if there
are no serious bug reports. It's well-tested here, and works with the
slackpkg that's in -current now, but I don't know about slackpkg+ so that's
another reason to let it cool down here first. The purpose of this update
is to migrate the package database and directories from /var/log to
/var/lib/pkgtools. /var/log was never a good place for this data, as it is
considered by many to be a directory that could be wiped to free up some
space. Originally the package database was in /var/adm, but the FSSTND
(later FHS) group decided that directory should be a symlink to /var/log,
and I went along with that since it was years ago and I was a n00b and didn't
know any better. /var/lib/pkgtools will be a better and safer location.
The removed_packages and removed_scripts directories are really just logs
that aren't actually used for anything - those will remain under /var/log,
but moved into /var/log/pkgtools. Everything under /var/log will be
considered potentially non-permanent by the pkgtools - if any directories or
symlinks disappear from there, the pkgtools will automatically recreate them
as needed. In fact, the migration process will create symlinks from all the
old directory locations to the new ones, so anything that expects the old
locations (including slackpkg, for now) should continue to work. Once this
moves into the main tree, the plan is to fix other packages to use the new
installer script directory (/var/lib/pkgtools/setup) and change the installer
and slackpkg to use the new native locations for everything. When slackpkg
is changed over to use the new native locations, I'll also make sure to float
that in testing/ for a few days before moving it to the main tree to avoid
more unintentional disruption to slackpkg+ users.
Be aware that the package database migration is a one-way operation, but even
so if you later downgrade to an older version of the pkgtools it will still
work through the compatibility symlinks.
191 lines
5.6 KiB
Bash
Executable file
191 lines
5.6 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018 Patrick Volkerding, Sebeka, MN, USA
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use of this script, with or without modification, is
|
|
# permitted provided that the following conditions are met:
|
|
#
|
|
# 1. Redistributions of this script must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
cd $(dirname $0) ; CWD=$(pwd)
|
|
|
|
PKGNAM=sane
|
|
VERSION=1.0.27
|
|
BACKVER=1.0.27
|
|
FRONTVER=1.0.14
|
|
BUILD=${BUILD:-3}
|
|
|
|
# Automatically determine the architecture we're building on:
|
|
if [ -z "$ARCH" ]; then
|
|
case "$( uname -m )" in
|
|
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
|
|
|
|
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
|
# the name of the created package would be, and then exit. This information
|
|
# could be useful to other scripts.
|
|
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
|
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
|
exit 0
|
|
fi
|
|
|
|
NUMJOBS=${NUMJOBS:-" -j7 "}
|
|
|
|
if [ "$ARCH" = "i586" ]; then
|
|
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
|
LIBDIRSUFFIX=""
|
|
elif [ "$ARCH" = "s390" ]; then
|
|
SLKCFLAGS="-O2"
|
|
LIBDIRSUFFIX=""
|
|
elif [ "$ARCH" = "x86_64" ]; then
|
|
SLKCFLAGS="-O2 -fPIC"
|
|
LIBDIRSUFFIX="64"
|
|
else
|
|
SLKCFLAGS="-O2"
|
|
LIBDIRSUFFIX=""
|
|
fi
|
|
|
|
TMP=${TMP:-/tmp}
|
|
PKG=$TMP/package-sane
|
|
|
|
rm -rf $PKG
|
|
mkdir -p $TMP $PKG
|
|
|
|
# First, we'll build the backends
|
|
cd $TMP
|
|
rm -rf sane-backends-$BACKVER
|
|
tar xvf $CWD/sane-backends-$BACKVER.tar.xz || exit 1
|
|
cd sane-backends-$BACKVER || exit 1
|
|
chown -R root:root .
|
|
|
|
# Put the SANE_CAP_ALWAYS_SETTABLE definition back until
|
|
# everything else catches up with the API change...
|
|
zcat $CWD/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz | patch -p1 || exit 1
|
|
|
|
CFLAGS="$SLKCFLAGS" \
|
|
./configure \
|
|
--prefix=/usr \
|
|
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
|
--sysconfdir=/etc \
|
|
--mandir=/usr/man \
|
|
--docdir=/usr/doc/sane-$VERSION \
|
|
--localstatedir=/var/lib \
|
|
--enable-locking \
|
|
--with-lockdir=/var/lock/sane \
|
|
--with-group=scanner \
|
|
--with-usb \
|
|
--without-api-spec \
|
|
--build=$ARCH-slackware-linux || exit 1
|
|
|
|
make $NUMJOBS || make || exit 1
|
|
make install || exit 1
|
|
make install DESTDIR=$PKG || exit 1
|
|
|
|
# Add the default udev rules. Use group "lp" rather than "scanner" to avoid
|
|
# breaking CUPS access for multifunction printer/scanner devices (possibly
|
|
# the most common type of scanner these days)
|
|
#
|
|
# Use ACTION!="add|change" to avoid skipping these rules if coming from an
|
|
# initrd where udev was started.
|
|
mkdir -p $PKG/lib/udev/rules.d
|
|
cat tools/udev/libsane.rules \
|
|
| sed -e "s/GROUP=\"scanner\"/GROUP=\"lp\"/g" \
|
|
| sed -e "s/MODE=\"0664\"/MODE=\"0660\"/g" \
|
|
| sed -e "s/ACTION!=\"add\"/ACTION!=\"add|change\"/g" \
|
|
> $PKG/lib/udev/rules.d/80-libsane.rules
|
|
|
|
## Add the hal fdi file:
|
|
#mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor/
|
|
#cat tools/hal/libsane.fdi \
|
|
# > $PKG/usr/share/hal/fdi/policy/10osvendor/10-libsane.fdi
|
|
|
|
# Install the pkgconfig file:
|
|
install -D -m644 tools/sane-backends.pc \
|
|
$PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
|
|
|
|
# Now let's build the frontends:
|
|
cd $TMP
|
|
rm -rf sane-frontends-$FRONTVER
|
|
tar xvf $CWD/sane-frontends-$FRONTVER.tar.xz || exit 1
|
|
cd sane-frontends-$FRONTVER || exit 1
|
|
chown -R root:root .
|
|
|
|
CFLAGS="$SLKCFLAGS" \
|
|
./configure \
|
|
--prefix=/usr \
|
|
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
|
--sysconfdir=/etc \
|
|
--mandir=/usr/man \
|
|
--with-docdir=/usr/doc/sane-$VERSION \
|
|
--build=$ARCH-slackware-linux || exit 1
|
|
|
|
make $NUMJOBS || make || exit 1
|
|
make install || exit 1
|
|
make install DESTDIR=$PKG || exit 1
|
|
|
|
# Fix stupid permissions:
|
|
chown -R root:root $PKG/var
|
|
chmod 755 $PKG/var
|
|
chmod 1777 $PKG/var/lock
|
|
chown root:scanner $PKG/var/lock/sane
|
|
chmod 775 $PKG/var/lock/sane
|
|
|
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
|
|
|
# Don't ship .la files:
|
|
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
|
rm -f /usr/lib${LIBDIRSUFFIX}/libsane.la
|
|
|
|
# List additional backends in /etc/sane.d/dll.conf.
|
|
# I don't think it will hurt anything to do this, even
|
|
# if these backends turn out not to be available:
|
|
zcat $CWD/dll.conf.additions.gz >> $PKG/etc/sane.d/dll.conf
|
|
|
|
# Move config files:
|
|
( cd $PKG/etc/sane.d
|
|
for file in *.conf ; do
|
|
mv $file ${file}.new
|
|
done
|
|
)
|
|
rm -f /etc/sane.d/*.conf
|
|
|
|
# Compress and if needed symlink the man pages:
|
|
if [ -d $PKG/usr/man ]; then
|
|
( cd $PKG/usr/man
|
|
for manpagedir in $(find . -type d -name "man*") ; do
|
|
( cd $manpagedir
|
|
for eachpage in $( find . -type l -maxdepth 1) ; do
|
|
ln -s $( readlink $eachpage ).gz $eachpage.gz
|
|
rm $eachpage
|
|
done
|
|
gzip -9 *.?
|
|
)
|
|
done
|
|
)
|
|
fi
|
|
|
|
mkdir -p $PKG/install
|
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
|
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
|
|
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/sane-$VERSION-$ARCH-$BUILD.txz
|
|
|