summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsValo2016-12-09 17:22:55 +0100
committersValo2016-12-09 17:30:13 +0100
commit0105a67e5d61c52842cb7ad64e9eae1e136f6805 (patch)
tree1a77a63d746cd36ea12da2cfc077e473337e2edd
parent28be833818a0786c10ae38201fe32495ca89b234 (diff)
downloadaur-0105a67e5d61c52842cb7ad64e9eae1e136f6805.tar.gz
Updates agent transfer to 0.41
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--agent-transfer.patch49
3 files changed, 23 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c619942e29e..40ca3ee5930 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Sep 2 20:22:25 UTC 2016
+# Fri Dec 9 16:28:27 UTC 2016
pkgbase = agent-transfer
pkgdesc = Copy a secret key from GnuPG's gpg-agent to OpenSSH's ssh-agent
- pkgver = 0.39
+ pkgver = 0.41
pkgrel = 1
url = http://web.monkeysphere.info/
arch = i686
@@ -10,10 +10,10 @@ pkgbase = agent-transfer
license = GPL3
depends = libassuan>=2.0.1
depends = libgcrypt>=1.7.0
- source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
+ source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
source = agent-transfer.patch
- sha256sums = 73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f
- sha256sums = 2679c03daf13c494d3672091b2f351429618ad96f505571784fe3485727d93e3
+ sha256sums = 911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b
+ sha256sums = 7209c99d3f11bfdd6484012e989c296d3f484b6f1f7e37ae65bd54b4c3873673
pkgname = agent-transfer
diff --git a/PKGBUILD b/PKGBUILD
index 5257cc5447c..1bbf41c2133 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: svalo <valo@eigenlab.org>
pkgname=agent-transfer
_pkgsrcname=monkeysphere
-pkgver=0.39
+pkgver=0.41
pkgrel=1
pkgdesc="Copy a secret key from GnuPG's gpg-agent to OpenSSH's ssh-agent"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ source=(http://archive.monkeysphere.info/debian/pool/${_pkgsrcname}/m/${_pkgsrcn
agent-transfer.patch
)
-sha256sums=('73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f'
- '2679c03daf13c494d3672091b2f351429618ad96f505571784fe3485727d93e3')
+sha256sums=('911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b'
+ '7209c99d3f11bfdd6484012e989c296d3f484b6f1f7e37ae65bd54b4c3873673')
prepare() {
cd "${srcdir}/${_pkgsrcname}-${pkgver}"
diff --git a/agent-transfer.patch b/agent-transfer.patch
index da0cff8bdc1..708fed129c9 100644
--- a/agent-transfer.patch
+++ b/agent-transfer.patch
@@ -1,6 +1,6 @@
---- Makefile.orig 2016-06-21 14:30:08.405491497 +0200
-+++ Makefile 2016-06-21 14:31:23.393041346 +0200
-@@ -43,63 +43,13 @@
+--- Makefile.orig 2016-12-03 10:43:04.759768941 +0100
++++ Makefile 2016-12-03 10:57:02.677366447 +0100
+@@ -62,43 +62,14 @@
# this target is to be called from the tarball, not from the git
# working dir!
install: all installman
@@ -9,17 +9,12 @@
- 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 replaced/src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+- install replaced/src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+- install replaced/src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
- 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
-- sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
-- sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
+- install -m 0644 replaced/src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
- install -m 0755 src/share/checkperms $(DESTDIR)$(PREFIX)/share/monkeysphere
- install -m 0755 src/share/keytrans $(DESTDIR)$(PREFIX)/share/monkeysphere
- ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/pem2openpgp
@@ -28,9 +23,7 @@
- ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
install -m 0755 src/agent-transfer/agent-transfer $(DESTDIR)$(PREFIX)/bin
-- install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
-- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
-- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
+- 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
- install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
@@ -42,29 +35,17 @@
- install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)
- install -m 0644 etc/monkeysphere-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-authentication.conf$(ETCSUFFIX)
- installman:
+ installman: $(REPLACED_COMPRESSED_MANPAGES)
- mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8
-- gzip -n man/*/*
-- install man/man1/* $(DESTDIR)$(MANPREFIX)/man1
-- install man/man7/* $(DESTDIR)$(MANPREFIX)/man7
-- install man/man8/* $(DESTDIR)$(MANPREFIX)/man8
-- ln -s openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2pem.1.gz
-- ln -s openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2spki.1.gz
-- gzip -d man/*/*
-- gzip -d $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1.gz
-- sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1
-- gzip -n $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1
-- gzip -d $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8.gz
-- sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
-- sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
-- gzip -n $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
-- gzip -d $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8.gz
-- sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
-- sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
-- gzip -n $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
+- install replaced/man/man1/* $(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
+- ln -sf openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2spki.1.gz
+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+ gzip -n man/man1/agent-transfer.1
+ install man/man1/agent-transfer.1.gz $(DESTDIR)$(MANPREFIX)/man1
++
# this target depends on you having the monkeysphere-docs
# repo checked out as a peer of your monkeysphere repo.