diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-28 18:01:21 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-28 18:01:21 -0400 |
| commit | d080f8c802e0ca929577abe70118fa765d473dc6 (patch) | |
| tree | 8df52d30342b40b710e32d7b40142b4821847e3f | |
| parent | 2c6da8e68e326d52e0a472bddfca50649a45602f (diff) | |
make sure that the /etc/monkeysphere/gpg-*.conf are placed during package installation.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | packaging/freebsd/Makefile | 6 |
3 files changed, 14 insertions, 1 deletions
@@ -46,6 +46,8 @@ install: all installman install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere + install -m 0644 etc/gnupg-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-host.conf$(ETCSUFFIX) + install -m 0644 etc/gnupg-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-authentication.conf$(ETCSUFFIX) install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX) install -m 0644 etc/monkeysphere-server.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-server.conf$(ETCSUFFIX) diff --git a/debian/changelog b/debian/changelog index 3131902..05383d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ monkeysphere (0.18-1) UNRELEASED; urgency=low + [ Jameson Graef Rollins ] * Fix bugs in authorized_{user_ids,keys} file permission checking. + + [ Daniel Kahn Gillmor ] + * update install to ensure placement of + /etc/monkeysphere/gnupg-{host,authentication}.conf - -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Tue, 28 Oct 2008 14:36:16 -0400 + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 28 Oct 2008 17:58:25 -0400 monkeysphere (0.17-1) experimental; urgency=low diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile index 78ad0d3..f4bf0fe 100644 --- a/packaging/freebsd/Makefile +++ b/packaging/freebsd/Makefile @@ -34,6 +34,12 @@ post-patch: find . -iname '*.orig' -delete post-install: + @if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-host.conf ]; then \ + ${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-host.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-host.conf ; \ + fi + @if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ]; then \ + ${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ; \ + fi @if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \ ${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere.conf ; \ fi |