From 4edf6f3743dadcc14a09102d8a3d17f9e06c5197 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 22 Jan 2018 19:09:47 +0100 Subject: pcr/monkeysphere: updated to 0.41 --- pcr/monkeysphere/PKGBUILD | 60 ++++++++++++++++------------------- pcr/monkeysphere/binmerge.patch | 23 ++++++-------- pcr/monkeysphere/exclude-agent.patch | 21 ++++++++++++ pcr/monkeysphere/monkeysphere.install | 28 ++++++++-------- pcr/monkeysphere/ms.patch | 11 ------- pcr/monkeysphere/msauth.patch | 20 ------------ pcr/monkeysphere/mshost.patch | 11 ------- 7 files changed, 71 insertions(+), 103 deletions(-) create mode 100644 pcr/monkeysphere/exclude-agent.patch delete mode 100644 pcr/monkeysphere/ms.patch delete mode 100644 pcr/monkeysphere/msauth.patch delete mode 100644 pcr/monkeysphere/mshost.patch (limited to 'pcr/monkeysphere') diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index 67a6e5a09..8b5157b67 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -1,50 +1,46 @@ -# Maintainer: svalo -# Contributor: David Costa -# Contributor: fauno +# Maintainer (AUR): svalo +# Contributor (AUR): David Costa +# Contributor (AUR): fauno # Based on monkeysphere-git from -# Contributor: Olivier Mehani +# Contributor (AUR): Olivier Mehani + +# parabola changes and rationale: +# no changes. + pkgname=monkeysphere -pkgver=0.37 -pkgrel=2 +pkgver=0.41 +pkgrel=1 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('any') url="http://web.monkeysphere.info/" license=('GPL3') -depends=('gnupg1' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') -checkdepends=('socat' 'openssh' 'cpio' 'gnupg') +depends=('agent-transfer' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1' 'gnupg>=2.1.13') +checkdepends=('socat' 'openssh' 'cpio' 'gnupg>=2.1.13') source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz - binmerge.patch - ms.patch - mshost.patch - msauth.patch) + binmerge.patch + exclude-agent.patch + ) -sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59' - 'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7' - 'ce490eebfbf92b9a9abaf77d43489b0cdd7ebab427262e9eb7fbefdb67cdf289' - '4ddad85f6a9998f8f8869cef4f2f6d7bf9f04171fb3b5ae6c6621bfc8dc2bcbe' - 'bcad168603c2afd4db6b54edd61c8c9cdd1e08bcea7de3b936a3269f271e3de6') +sha256sums=('911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b' + 'e0cdadd4f01deab281cb66543eef19216bd762cb41774d3b498bd2e7c17816e4' + '90c3fcc64cbd2329489225af39afa52dc8ebeb6ad0877532c2842ccf616df4ea') install=monkeysphere.install prepare() { - cd "$srcdir/$pkgname-$pkgver" - + cd "${srcdir}/${pkgname}-${pkgver}" patch -Ni "${srcdir}/binmerge.patch" - patch -p1 -Ni "${srcdir}/ms.patch" - patch -p1 -Ni "${srcdir}/msauth.patch" - patch -p1 -Ni "${srcdir}/mshost.patch" + patch -Ni "${srcdir}/exclude-agent.patch" } -# Checks fail -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# -# make test -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make test || true # tests fail in the chroot +} package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - mkdir -p "$pkgdir/var/lib/monkeysphere" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + mkdir -p "${pkgdir}/var/lib/monkeysphere" + chown root:root "${pkgdir}/var/lib/monkeysphere" } diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch index 48d945511..c78f69765 100644 --- a/pcr/monkeysphere/binmerge.patch +++ b/pcr/monkeysphere/binmerge.patch @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-06-07 13:02:23.123944233 -0300 -+++ Makefile 2013-06-07 13:02:43.351065809 -0300 -@@ -36,17 +36,17 @@ +--- Makefile.orig 2016-12-03 12:01:26.072614797 +0100 ++++ Makefile 2016-12-03 12:04:36.739352722 +0100 +@@ -62,14 +62,14 @@ # this target is to be called from the tarball, not from the git # working dir! install: all installman @@ -10,16 +10,11 @@ mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION - install src/monkeysphere $(DESTDIR)$(PREFIX)/bin - sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere -- install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host -- install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication -+ install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host -+ install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication + install replaced/src/monkeysphere $(DESTDIR)$(PREFIX)/bin +- install replaced/src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin +- install replaced/src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin ++ install replaced/src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin ++ install replaced/src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere + install -m 0644 replaced/src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere diff --git a/pcr/monkeysphere/exclude-agent.patch b/pcr/monkeysphere/exclude-agent.patch new file mode 100644 index 000000000..cbe37cf5f --- /dev/null +++ b/pcr/monkeysphere/exclude-agent.patch @@ -0,0 +1,21 @@ +--- Makefile.old 2016-12-09 17:41:06.744056816 +0100 ++++ Makefile 2016-12-09 17:47:12.430739851 +0100 +@@ -79,7 +79,6 @@ + ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh + ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem + ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki +- install -m 0755 src/agent-transfer/agent-transfer $(DESTDIR)$(PREFIX)/bin + install -m 0744 replaced/src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions + install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions + install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m +@@ -94,7 +93,9 @@ + + installman: $(REPLACED_COMPRESSED_MANPAGES) + mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8 +- install replaced/man/man1/* $(DESTDIR)$(MANPREFIX)/man1 ++ install replaced/man/man1/monkeysphere.1.gz $(DESTDIR)$(MANPREFIX)/man1 ++ install replaced/man/man1/openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1 ++ install replaced/man/man1/pem2openpgp.1.gz $(DESTDIR)$(MANPREFIX)/man1 + install replaced/man/man7/* $(DESTDIR)$(MANPREFIX)/man7 + install replaced/man/man8/* $(DESTDIR)$(MANPREFIX)/man8 + ln -sf openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2pem.1.gz diff --git a/pcr/monkeysphere/monkeysphere.install b/pcr/monkeysphere/monkeysphere.install index df25cbda5..5ab081342 100644 --- a/pcr/monkeysphere/monkeysphere.install +++ b/pcr/monkeysphere/monkeysphere.install @@ -5,22 +5,20 @@ # arg 1: the new package version post_install() { echo ">>> Creating monkeysphere user and group and setting permissions..." - getent group monkeysphere >/dev/null || groupadd monkeysphere - getent passwd monkeysphere >/dev/null ||useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere + getent group monkeysphere >/dev/null || groupadd -r monkeysphere + getent passwd monkeysphere >/dev/null ||useradd -r -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere + echo ">>> Trying all available transitions..." + for trans in 0.23 0.28 ; do + /usr/share/monkeysphere/transitions/$trans || { \ + RET=$? + echo "Failed running transition script /usr/share/monkeysphere/transitions/$trans" >&2 + exit $RET + } + done -# Should be root:root for sshd to work - chown root:root /var/lib/monkeysphere } -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { -# Should be root:root for sshd to work - chown root:root /var/lib/monkeysphere -} - -# arg 1: the old package version pre_remove() { - userdel monkeysphere &>/dev/null - (getent group monkeysphere >/dev/null && groupdel monkeysphere &>/dev/null) || /bin/true -} + echo ">>> /var/lib/monkeysphere files and folder will be left in place, + remove any reference to them from openssh-server config file to avoid being locked outside" + } diff --git a/pcr/monkeysphere/ms.patch b/pcr/monkeysphere/ms.patch deleted file mode 100644 index 99af937cc..000000000 --- a/pcr/monkeysphere/ms.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/monkeysphere 2014-08-06 19:27:38.000000000 +0200 -+++ b/src/monkeysphere 2014-12-07 23:22:52.903467885 +0100 -@@ -62,7 +62,7 @@ - - # user gpg command to define common options - gpg_user() { -- LC_ALL=C gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@" -+ LC_ALL=C gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@" - } - - # output the ssh fingerprint of a gpg key diff --git a/pcr/monkeysphere/msauth.patch b/pcr/monkeysphere/msauth.patch deleted file mode 100644 index b426101b9..000000000 --- a/pcr/monkeysphere/msauth.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/monkeysphere-authentication 2014-08-06 19:27:38.000000000 +0200 -+++ b/src/monkeysphere-authentication 2014-12-07 23:23:37.770134940 +0100 -@@ -73,7 +73,7 @@ - GNUPGHOME="$GNUPGHOME_CORE" - export GNUPGHOME - -- gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@" -+ gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@" - } - - # function to interact with the gpg sphere keyring -@@ -81,7 +81,7 @@ - GNUPGHOME="$GNUPGHOME_SPHERE" - export GNUPGHOME - -- su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@" -+ su_monkeysphere_user gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@" - } - - check_openpgp2ssh_sanity() { diff --git a/pcr/monkeysphere/mshost.patch b/pcr/monkeysphere/mshost.patch deleted file mode 100644 index c8c6e2859..000000000 --- a/pcr/monkeysphere/mshost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/monkeysphere-host 2014-08-06 19:27:38.000000000 +0200 -+++ b/src/monkeysphere-host.new 2014-12-07 23:23:07.306801343 +0100 -@@ -71,7 +71,7 @@ - - # function to interact with the gpg keyring - gpg_host() { -- GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@" -+ GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg1 --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@" - } - - # list the info about the a key, in colon format, to stdout -- cgit v1.2.3