From c54ffbc86d562b12ffef86f2af11628ec0647899 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 29 Oct 2020 21:55:56 +0000 Subject: Thu Oct 29 21:55:56 UTC 2020 a/aaa_elflibs-15.0-x86_64-26.txz: Rebuilt. Upgraded: liblber-2.4.so.2.11.3, libldap-2.4.so.2.11.3, libmpc.so.3.2.1. Added temporarily to allow for third-party packages to be recompiled: libHalf.so.12.0.0, libIex-2_2.so.12.0.0, libIexMath-2_2.so.12.0.0, libIlmImf-2_2.so.22.0.0, libIlmImfUtil-2_2.so.22.0.0, libIlmThread-2_2.so.12.0.0, libImath-2_2.so.12.0.0, libpoppler-qt4.so.4.11.0, libpoppler.so.79.0.0. a/kernel-generic-5.4.73-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.73-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.73-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.73-x86-1.txz: Upgraded. k/kernel-source-5.4.73-noarch-1.txz: Upgraded. l/LibRaw-0.20.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/exiv2-0.27.3-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/gegl-0.4.26-x86_64-2.txz: Rebuilt. Recompiled against openexr-2.5.3. l/gexiv2-0.12.1-x86_64-1.txz: Upgraded. Compiled against exiv2-0.27.3. l/graphene-1.10.2-x86_64-1.txz: Added. l/gst-plugins-base-1.18.1-x86_64-2.txz: Rebuilt. Recompiled against system libgraphene. l/ilmbase-2.2.0-x86_64-2.txz: Removed. These libraries are now part of openexr. l/imagemagick-7.0.10_34-x86_64-2.txz: Rebuilt. Recompiled against LibRaw-0.20.2 and openexr-2.5.3. l/openexr-2.5.3-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/poppler-20.10.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Qt4 support dropped. n/samba-4.13.1-x86_64-1.txz: Upgraded. This update fixes security issues: Missing handle permissions check in SMB1/2/3 ChangeNotify. Denial-of-service vulnerabilities. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14318 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14323 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14383 (* Security fix *) xap/geeqie-1.5.1-x86_64-2.txz: Rebuilt. Recompiled against exiv2-0.27.3. xap/gimp-2.10.22-x86_64-2.txz: Rebuilt. Recompiled against openexr-2.5.3. xap/xlockmore-5.66-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/l/exiv2/exiv2.SlackBuild | 78 +++++++++++++++++++++-------------------- source/l/exiv2/exiv2.url | 1 - source/l/exiv2/paredown.sh | 39 +++++++++------------ source/l/exiv2/slack-desc | 2 +- 4 files changed, 57 insertions(+), 63 deletions(-) delete mode 100644 source/l/exiv2/exiv2.url (limited to 'source/l/exiv2') diff --git a/source/l/exiv2/exiv2.SlackBuild b/source/l/exiv2/exiv2.SlackBuild index c317a709..6d49c690 100755 --- a/source/l/exiv2/exiv2.SlackBuild +++ b/source/l/exiv2/exiv2.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2007 Frank Caraballo -# Copyright 2008, 2009, 2011, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2015, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,9 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=exiv2 -#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -VERSION=${VERSION:-$(echo $PKGNAM-*-trunk.tar.xz | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -49,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -PKG=$TMP/package-exiv2 +PKG=$TMP/package-$PKGNAM NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then @@ -69,12 +68,10 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf exiv2-$VERSION exiv2-trunk +rm -rf $PKGNAM-$VERSION-Source -#tar xvf $CWD/exiv2-$VERSION.tar.?z* || exit 1 -#cd exiv2-$VERSION || exit 1 -tar xvf $CWD/$PKGNAM-$VERSION-trunk.tar.xz || exit 1 -cd exiv2-trunk || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION-Source.tar.?z || exit 1 +cd $PKGNAM-$VERSION-Source || exit 1 chown -R root:root . find . \ @@ -83,26 +80,26 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --enable-shared=yes \ - --enable-static=no \ - --enable-xmp \ - --enable-video \ - --enable-webready \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Configure, build, and install: +mkdir cmake-build +cd cmake-build + cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ + -DMAN_INSTALL_DIR=/usr/man \ + -DBUILD_SHARED_LIBS=ON \ + -DEXIV2_ENABLE_CURL=ON \ + -DEXIV2_ENABLE_VIDEO=ON \ + -DEXIV2_ENABLE_WEBREADY==ON \ + -DEXIV2_ENABLE_XMP=ON \ + -DEXIV2_BUILD_SAMPLES=OFF \ + -DEXIV2_ENABLE_NLS=ON \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. # Make sure shared libraries are executable: chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.* @@ -110,16 +107,21 @@ chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.* 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 - find . -type f -exec gzip -9 {} \+ - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Move manpage directory: +mv $PKG/usr/share/man $PKG/usr -mkdir -p $PKG/usr/doc/exiv2-$VERSION +# Compress manual pages: +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 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - COPYING* README* \ + AUTHORS* CODING_GUIDELINES* CONTRIBUTING* COPYING* README* \ doc/{COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \ - $PKG/usr/doc/exiv2-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # 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: @@ -133,5 +135,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/exiv2-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/exiv2/exiv2.url b/source/l/exiv2/exiv2.url deleted file mode 100644 index 61e8fe54..00000000 --- a/source/l/exiv2/exiv2.url +++ /dev/null @@ -1 +0,0 @@ -http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz diff --git a/source/l/exiv2/paredown.sh b/source/l/exiv2/paredown.sh index cebe54f5..a40aa335 100755 --- a/source/l/exiv2/paredown.sh +++ b/source/l/exiv2/paredown.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,32 +20,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Convert github release in vX.XX.tar.gz format to exiv2-X.XX.tar.xz format -# and remove useless cruft. +PKGNAM=exiv2 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} - -GITHUB_RELEASE=$(echo v*.tar.gz) -if [ ! -r $GITHUB_RELEASE ]; then - echo "$GITHUB_RELEASE is not a libwebp tarball. Exiting." +if [ ! -r $PKGNAM-${VERSION}-Source.tar.gz ]; then + echo "$PKGNAM-${VERSION}-Source.tar.gz does not exist. Exiting." exit 1 fi -SRCDIR=$(tar tf v*.tar.gz | head -n 1 | cut -f 1 -d /) - -# Untar github sources: -rm -rf $SRCDIR -tar xvf $GITHUB_RELEASE - -# HERE'S WHERE WE WOULD REMOVE STUFF FROM $SRCDIR, BUT WE AREN'T ACTUALLY -# USING THIS SCRIPT YET UNTIL WE SWITCH TO DOWNLOADING FROM GITHUB'S RELEASES -# Package it back up as a .tar.xz: -rm -f $SRCDIR.tar $SRCDIR.tar.xz -tar cf $SRCDIR.tar $SRCDIR -xz -9 $SRCDIR.tar -touch -d "$(tar tvf $GITHUB_RELEASE | head -n 1 | cut -f 2- -d 0 | cut -f 2,3 -d ' ')" $SRCDIR.tar.xz +touch -r $PKGNAM-${VERSION}-Source.tar.gz tmp-timestamp || exit 1 -# Cleanup: -rm -rf $SRCDIR +rm -rf $PKGNAM-${VERSION}-Source +tar xf $PKGNAM-${VERSION}-Source.tar.gz || exit 1 +rm -rf $PKGNAM-${VERSION}-Source/test/data/* +rm -rf $PKGNAM-${VERSION}-Source/tests/bugfixes/* +rm -f $PKGNAM-${VERSION}-Source.tar.lz +tar cf $PKGNAM-${VERSION}-Source.tar $PKGNAM-${VERSION}-Source +touch -r tmp-timestamp $PKGNAM-${VERSION}-Source.tar +plzip -9 -v $PKGNAM-${VERSION}-Source.tar +rm -rf $PKGNAM-${VERSION}-Source tmp-timestamp -echo "Repacking of $SRCDIR.tar.xz complete." +echo "Repacking of $PKGNAM-${VERSION}-Source.tar.lz complete." diff --git a/source/l/exiv2/slack-desc b/source/l/exiv2/slack-desc index c67aac6c..b2b31456 100644 --- a/source/l/exiv2/slack-desc +++ b/source/l/exiv2/slack-desc @@ -11,7 +11,7 @@ exiv2: exiv2: Exiv2 is a C++ library and a command line utility to read and write exiv2: Exif and IPTC image metadata. exiv2: -exiv2: Homepage: http://www.exiv2.org/ +exiv2: Homepage: https://www.exiv2.org/ exiv2: exiv2: exiv2: -- cgit v1.2.3