diff options
Diffstat (limited to 'source/n/gnupg')
-rw-r--r-- | source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch | 27 | ||||
-rwxr-xr-x | source/n/gnupg/gnupg.SlackBuild | 41 |
2 files changed, 59 insertions, 9 deletions
diff --git a/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch b/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch new file mode 100644 index 000000000..6dc91811c --- /dev/null +++ b/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch @@ -0,0 +1,27 @@ +From 684cf85eeac78fd716f476a6b9678cc11336f8b6 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" <bcl@redhat.com> +Date: Wed, 5 Dec 2018 08:52:51 -0800 +Subject: [PATCH] Rename package to gnupg1 (#1656282) + +gnupg2 is going to start using /usr/bin/gpg so we need to rename the +gnupg v1.4.x version to avoid conflicts. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e5bf1bc1a..085ebd33e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ m4_define([mym4_betastring], + m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + +-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org]) ++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org]) + + + development_version=mym4_isgit +-- +2.19.2 + diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild index 572ffc120..965da043e 100755 --- a/source/n/gnupg/gnupg.SlackBuild +++ b/source/n/gnupg/gnupg.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018, 2021, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnupg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,6 +74,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +cat $CWD/0001-Rename-package-to-gnupg1-1656282.patch | patch -p1 --verbose || exit 1 +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -84,13 +87,33 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* - -gzip -9 $PKG/usr/man/*/* +# Rename the binaries: +for binary in gpg gpgv gpg-zip gpgsplit; do + mv $PKG/usr/bin/${binary} $PKG/usr/bin/${binary}1 +done + +# Rename the manpages: +for page in gpg gpgv gpg-zip ; do + mv $PKG/usr/man/man1/${page}.1 $PKG/usr/man/man1/${page}1.1 +done + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# 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 + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi mkdir -p $PKG/usr/doc/gnupg-$VERSION cp -a \ |