summaryrefslogtreecommitdiffstats
path: root/source/xap/imagemagick
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/xap/imagemagick
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap/imagemagick')
-rw-r--r--source/xap/imagemagick/doinst.sh17
-rwxr-xr-xsource/xap/imagemagick/imagemagick.SlackBuild203
-rw-r--r--source/xap/imagemagick/policy.xml.diff33
-rw-r--r--source/xap/imagemagick/slack-desc19
4 files changed, 0 insertions, 272 deletions
diff --git a/source/xap/imagemagick/doinst.sh b/source/xap/imagemagick/doinst.sh
deleted file mode 100644
index a78c00608..000000000
--- a/source/xap/imagemagick/doinst.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-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...
-}
-
-# Process all .new config files:
-for file in etc/ImageMagick*/*.new ; do
- config $file
-done
diff --git a/source/xap/imagemagick/imagemagick.SlackBuild b/source/xap/imagemagick/imagemagick.SlackBuild
deleted file mode 100755
index 49797da04..000000000
--- a/source/xap/imagemagick/imagemagick.SlackBuild
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Patrick J. 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.
-
-BUILD=${BUILD:-1}
-
-# NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4,
-# which occur fairly often (but not always). If these numbers are all the same,
-# then this is not one of those versions.
-
-# This is a bit messy, so we'll explain it well. :-)
-
-# This is the version number used in the source tarball filename
-FILEVER=6.9.4-9
-
-# This is the base version number, which is needed to cd into the source tree.
-# Normally this is the same as $FILEVER, but allow setting it here if needed.
-BASEVER=$FILEVER
-
-# This is the version number used in the package, where a version number cannot
-# contain a '-'. We'll try to autogenerate this one.
-PKGVER=$(echo $FILEVER | tr - _)
-
-# 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
-
-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
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-imagemagick
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-# --with-x or not --with-x, that is the question. It seems many other
-# distributions don't compile with X support, but it's been traditional
-# here. I am moving the prefix to /usr (instead of /usr/X11R6) though,
-# because many X-linked things are put into /usr now (like GNOME), and
-# I've heard a few reports of compile failures when this isn't in /usr.
-# Everyone else does it -- time to follow the path of least resistance.
-
-cd $TMP
-rm -rf ImageMagick-$BASEVER
-tar xvf $CWD/ImageMagick-$FILEVER.tar.xz || exit 1
-cd ImageMagick-$BASEVER || exit 1
-
-# Harden the default settings in policy.xml to prevent security issues:
-zcat $CWD/policy.xml.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# --without-modules seems to avoid a segfault when identifying
-# or converting ps or eps files...
-
-# --disable-openmp seems to keep the perl Image::Magick from
-# eating up all RAM, and may help other script bindings.
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --sysconfdir=/etc \
- --program-prefix= \
- --with-x \
- --with-frozenpaths=no \
- --without-modules \
- --disable-openmp \
- --enable-static=no \
- --enable-shared \
- --with-gcc-arch=$ARCH \
- --with-perl \
- --with-rsvg \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1
-# First, spam the running development system, as ImageMagick is unable to
-# properly link the utilities against a new shared library major version
-# otherwise which has led to several broken packages over the years:
-make install INSTALLDIRS=vendor || exit 1
-/sbin/ldconfig
-
-# Now build again against the new libraries and headers:
-make clean
-make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1
-make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1
-
-# This should certainly not be included.
-# It stomps on the libtool package.
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libltdl.*
-
-# .la files in /usr/lib${LIBDIRSUFFIX}/ should be removed.
-# Other .la files should be left alone, as ImageMagick uses them internally
-# to locate modules.
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-( cd $PKG
- # Nothing but a perl upgrade should replace this (and maybe not even that)
- find . -name perllocal.pod | xargs rm -f
-)
-
-# DESTDIR is still broken about this, but works well enough otherwise:
-chmod 644 $PKG/usr/share/man/man3/*
-mv $PKG/usr/share/man/man3 $PKG/usr/man
-rmdir $PKG/usr/share/man
-
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/perl5
- # Ditch empty dirs:
- rmdir */* 2> /dev/null
- rmdir * 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
-
-# Compress and link manpages, if any:
-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 | grep -v '\.gz$') ; do
- ln -s $( readlink $eachpage ).gz $eachpage.gz
- rm $eachpage
- done
- gzip -9 *.?
- )
- done
- )
-fi
-
-# Move config files to .new:
-( cd $PKG/etc/ImageMagick*
- for file in * ; do
- mv ${file} ${file}.new
- done
-)
-
-mkdir -p $PKG/usr
-mv $PKG/usr/share/doc $PKG/usr
-cp -a \
- AUTHORS LICENSE NEWS NOTICE Platforms.txt QuickStart.txt README.txt \
- $PKG/usr/doc/Imag*
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
- DOCSDIR=$(echo $PKG/usr/doc/ImageMagick-*)
- cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
- touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/imagemagick-$PKGVER-$ARCH-$BUILD.txz
-
diff --git a/source/xap/imagemagick/policy.xml.diff b/source/xap/imagemagick/policy.xml.diff
deleted file mode 100644
index dc033c1cb..000000000
--- a/source/xap/imagemagick/policy.xml.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./config/policy.xml.orig 2016-06-10 07:19:41.000000000 -0500
-+++ ./config/policy.xml 2016-06-17 17:30:47.311584022 -0500
-@@ -49,6 +49,21 @@
- exceeds policy maximum so memory limit is 1GB).
- -->
- <policymap>
-+ <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
-+ <!-- SECURITY: disable potentially insecure coders: -->
-+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
-+ <policy domain="coder" rights="none" pattern="HTTPS" />
-+ <policy domain="coder" rights="none" pattern="MVG" />
-+ <policy domain="coder" rights="none" pattern="MSL" />
-+ <policy domain="coder" rights="none" pattern="TEXT" />
-+ <policy domain="coder" rights="none" pattern="SHOW" />
-+ <policy domain="coder" rights="none" pattern="WIN" />
-+ <policy domain="coder" rights="none" pattern="PLT" />
-+ <!-- SECURITY: prevent indirect reads: -->
-+ <policy domain="path" rights="none" pattern="@*" />
-+ <!-- SECURITY: prevent pipe to shell: -->
-+ <policy domain="path" rights="none" pattern="|*" />
-+ <!-- Some examples: -->
- <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
- <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
- <!-- <policy domain="resource" name="map" value="4GiB"/> -->
-@@ -61,8 +76,4 @@
- <!-- <policy domain="resource" name="throttle" value="0"/> -->
- <!-- <policy domain="resource" name="time" value="3600"/> -->
- <!-- <policy domain="system" name="precision" value="6"/> -->
-- <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
-- <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
-- <!-- <policy domain="path" rights="none" pattern="@*"/> -->
-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
- </policymap>
diff --git a/source/xap/imagemagick/slack-desc b/source/xap/imagemagick/slack-desc
deleted file mode 100644
index 80ac9a678..000000000
--- a/source/xap/imagemagick/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 ':'.
-
- |-----handy-ruler------------------------------------------------------|
-imagemagick: imagemagick (a robust collection of image processing tools)
-imagemagick:
-imagemagick: ImageMagick is a collection of tools for manipulating and displaying
-imagemagick: digital images. It can merge images, transform image dimensions,
-imagemagick: do screen captures, create animation sequences, and convert between
-imagemagick: many different image formats.
-imagemagick:
-imagemagick: ImageMagick was written by John Cristy of ImageMagick Studio.
-imagemagick:
-imagemagick: Home page: http://www.imagemagick.org/
-imagemagick: