Changeset 30f002a for npl/overig/file/file.SlackBuild.orig

Timestamp:

11/19/20 22:59:34 (4 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master

Children:

6e9c61f

Parents:

3c9eb90

Message:

new file command, fixes a issue with certain jpegs. this causes trouble in amavis when scanning mails

File:

• npl/overig/file/file.SlackBuild.orig (modified) (9 diffs)

npl/overig/file/file.SlackBuild.orig

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2005-2008, 2009, 2010, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2008, 2009, 2010, 2013, 2015, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -21 +21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=file
 VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Automatically determine the architecture we're building on:
@@ -34 +37 @@
        *) 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
 
@@ -50 +61 @@
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-file
@@ -63 +73 @@
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 
 # Make the default data directory /etc/file like it has always been:
 zcat $CWD/file.etc.file.diff.gz | patch -p1 --verbose || exit 1
 # This is needed after the patch above:
-autoreconf || exit 1
+autoreconf -vif || exit 1
 
 # Since we're going to include the compiled magic database now (otherwise
@@ -82 +92 @@
 # versions of file to avoid breaking existing scripts:
 zcat $CWD/file.short.diff.gz | patch -p1 -E --verbose || exit 1
+
+# Output on ELF objects should be "dynamically linked" for PT_DYNAMIC too, not
+# just for PT_INTERP:
+zcat $CWD/file.PT_DYNAMIC.is.dynamically.linked.diff.gz | patch -p1 -E --verbose || exit 1
 
 # Add zisofs and crda regulatory bin detection
@@ -107 +121 @@
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Ignore for now - still labeled as experimental
 # Actually, let's ignore it until something needs it  :)  <volkerdi>
@@ -122 +139 @@
 mkdir -p $PKG/etc/file/magic
 cp -a magic/Magdir/* $PKG/etc/file/magic
+chmod 644 $PKG/etc/file/magic/*
 
 # Add a script to recompile the flat files in the obvious location.
@@ -137 +155 @@
 
 # Strip everything for good measure:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+#find $PKG | xargs file | grep -e "executable" -e "shared object" \
+ # | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 ( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
+  find . -type f -exec gzip -9 {} \+
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )