Updates agent transfer to 0.41

1 files changed, 15 insertions, 34 deletions

diff --git a/agent-transfer.patch b/agent-transfer.patch
index da0cff8bdc15..708fed129c9a 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.