From 807a83d0eae14d5ffd4a7dd35235f57184667b3e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 May 2020 03:00:33 -0700 Subject: [PATCH] New package: pacman-5.2.1 --- srcpkgs/pacman/patches/gpg2gpg2.patch | 37 +++++++++++++++++++++++++++ srcpkgs/pacman/template | 22 ++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 srcpkgs/pacman/patches/gpg2gpg2.patch create mode 100644 srcpkgs/pacman/template diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch new file mode 100644 index 00000000000..3a2a769b9ff --- /dev/null +++ b/srcpkgs/pacman/patches/gpg2gpg2.patch @@ -0,0 +1,37 @@ +gpg to gpg2: +Arch's "gnupg" package is this distro's "gnupg2" +This patches all references to the gpg command to use +gpg2 instead. + +diff -Naur pacman-5.2.1/scripts/pacman-key.sh.in pacman-5.2.1.orig/scripts/pacman-key.sh.in +--- scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700 ++++ scripts/pacman-key.sh.in 2020-05-24 02:30:26.838797182 -0700 +@@ -51,6 +51,7 @@ + UPDATEDB=0 + USE_COLOR='y' + VERIFY=0 ++GPG_COMMAND='gpg2' + + usage() { + printf "pacman-key (pacman) %s\n" ${myver} +@@ -591,8 +592,8 @@ + unset ALL_OFF BOLD BLUE GREEN RED YELLOW + fi + +-if ! type -p gpg >/dev/null; then +- error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key" ++if ! type -p ${GPG_COMMAND} >/dev/null; then ++ error "$(gettext "Cannot find the %s binary required for all %s operations.")" "${GPG_COMMAND}" "pacman-key" + exit 1 + fi + +@@ -611,7 +612,7 @@ + # file, falling back on a hard default + PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(pacman-conf --config="$CONFIG" gpgdir)} + +-GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) ++GPG_PACMAN=(${GPG_COMMAND} --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) + if [[ -n ${KEYSERVER} ]]; then + GPG_PACMAN+=(--keyserver "${KEYSERVER}") + fi + diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template new file mode 100644 index 00000000000..c4f13411264 --- /dev/null +++ b/srcpkgs/pacman/template @@ -0,0 +1,22 @@ +# Template file for 'pacman' +pkgname=pacman +version=5.2.1 +revision=1 +wrksrc="pacman-${version}" +make_dirs="/var/lib/pacman 0755 root root + /usr/var/cache/pacman/pkg 0755 root root + /usr/share/libalpm/hooks 0755 root root + /usr/share/pacman/keyrings 0755 root root" +conf_files="/etc/pacman.conf" +build_style=gnu-configure +configure_args="--prefix=/usr --sysconfdir=/etc + --localstatedir=/var" +hostmakedepends="autoconf automake libtool gettext-devel pkg-config" +makedepends="libarchive-devel gpgme-devel libcurl-devel" +depends="gnupg2" +short_desc="Arch Linux's library-based package manager" +maintainer="oreo639 " +license="GPL-2.0-or-later" +homepage="https://www.archlinux.org/pacman/" +distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz" +checksum=1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312