From a6c9b799bb0d9625507975904c15e540174328f4 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 4 Sep 2008 23:10:18 -0400 Subject: adding make install target --- Makefile | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f8cd92..7ab188d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,9 @@ -MONKEYSPHERE_VERSION=`head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` +MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` + +# these defaults are for debian. porters should probably adjust them +# before calling make install +ETCPREFIX ?= +PREFIX ?= /usr all: keytrans @@ -24,4 +29,19 @@ clean: # clean up old monkeysphere packages lying around as well. rm -f monkeysphere_* -.PHONY: all clean tarball debian-package +# this target is to be called from the tarball, not from the git +# working dir! +install: all + mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/sbin $(DESTDIR)/$(PREFIX)/share/monkeysphere + mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1 $(DESTDIR)/$(PREFIX)/share/man/man7 $(DESTDIR)/$(PREFIX)/share/man/man8 + mkdir -p $(DESTDIR)/$(ETCPREFIX)/etc + mkdir -p $(DESTDIR)/$(PREFIX)/var/lib/monkeysphere/authorized_keys + install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)/$(PREFIX)/bin + install src/monkeysphere-server $(DESTDIR)/$(PREFIX)/sbin + install src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere + install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1 + install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7 + install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8 + install etc/* $(DESTDIR)$(ETCPREFIX)/etc + +.PHONY: all clean tarball debian-package install -- cgit v1.2.3 From c627816ba6e249e2203bbe2cdb7a6ffcb9636135 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 4 Sep 2008 23:15:35 -0400 Subject: tuning up the make install target. --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7ab188d..691447a 100644 --- a/Makefile +++ b/Makefile @@ -32,16 +32,15 @@ clean: # this target is to be called from the tarball, not from the git # working dir! install: all - mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/sbin $(DESTDIR)/$(PREFIX)/share/monkeysphere - mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1 $(DESTDIR)/$(PREFIX)/share/man/man7 $(DESTDIR)/$(PREFIX)/share/man/man8 - mkdir -p $(DESTDIR)/$(ETCPREFIX)/etc - mkdir -p $(DESTDIR)/$(PREFIX)/var/lib/monkeysphere/authorized_keys + mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8 + mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)/$(PREFIX)/bin install src/monkeysphere-server $(DESTDIR)/$(PREFIX)/sbin install src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1 install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7 install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8 - install etc/* $(DESTDIR)$(ETCPREFIX)/etc + install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere .PHONY: all clean tarball debian-package install -- cgit v1.2.3 From 93a51ab8ec443b64d36bfe2cab5cd0f2f962ae5f Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 4 Sep 2008 23:43:49 -0400 Subject: packaging simplification, TODO cleanup. --- Makefile | 4 +++- debian/monkeysphere.docs | 3 --- debian/monkeysphere.install | 7 ------- debian/monkeysphere.manpages | 5 ----- doc/TODO | 21 --------------------- 5 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 debian/monkeysphere.docs delete mode 100644 debian/monkeysphere.install delete mode 100644 debian/monkeysphere.manpages (limited to 'Makefile') diff --git a/Makefile b/Makefile index 691447a..765c3e9 100644 --- a/Makefile +++ b/Makefile @@ -34,10 +34,12 @@ clean: install: all mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8 + mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)/$(PREFIX)/bin install src/monkeysphere-server $(DESTDIR)/$(PREFIX)/sbin - install src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere + install -m 0644 src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere + install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1 install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7 install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8 diff --git a/debian/monkeysphere.docs b/debian/monkeysphere.docs deleted file mode 100644 index 398bc5a..0000000 --- a/debian/monkeysphere.docs +++ /dev/null @@ -1,3 +0,0 @@ -doc/getting-started-user.mdwn -doc/getting-started-admin.mdwn -doc/MonkeySpec diff --git a/debian/monkeysphere.install b/debian/monkeysphere.install deleted file mode 100644 index 6dd3dda..0000000 --- a/debian/monkeysphere.install +++ /dev/null @@ -1,7 +0,0 @@ -src/keytrans/openpgp2ssh usr/bin -src/monkeysphere usr/bin -src/monkeysphere-server usr/sbin -src/monkeysphere-ssh-proxycommand usr/bin -src/common usr/share/monkeysphere -etc/monkeysphere.conf etc/monkeysphere -etc/monkeysphere-server.conf etc/monkeysphere diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages deleted file mode 100644 index 1490566..0000000 --- a/debian/monkeysphere.manpages +++ /dev/null @@ -1,5 +0,0 @@ -man/man1/monkeysphere.1 -man/man1/openpgp2ssh.1 -man/man1/monkeysphere-ssh-proxycommand.1 -man/man7/monkeysphere.7 -man/man8/monkeysphere-server.8 diff --git a/doc/TODO b/doc/TODO index b41d2be..6cc086a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -14,35 +14,14 @@ Work out the details (and describe a full use case) for assigning a do we export it so it's available when a second-party revocation is needed? -Ensure that authorized_user_ids are under as tight control as ssh - expects from authorized_keys: we don't want monkeysphere to be a - weak link in the filesystem. - -Consider the default permissions for - /var/lib/monkeysphere/authorized_keys/* (and indeed the whole - directory path leading up to that) - -Make sure alternate ports are handled for known_hosts. - -Script to import private key into ssh agent. - Provide a friendly interactive UI for marginal or failing client-side hostkey verifications. Handle the common cases smoothly, and provide good debugging info for the unusual cases. -Make sure onak properly escapes user IDs with colons in them. - -Indicate on web site how to report trouble or concerns, and how to - join the project. - -Clean up the style for the web site (pages, icons, etc). - Create ssh2openpgp or convert to full-fledged keytrans. Resolve the bugs listed in openpgp2ssh(1):BUGS. -Document alternate trustdb models. - Understand and document the output of gpg --check-trustdb: gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model gpg: depth: 0 valid: 2 signed: 20 trust: 0-, 0q, 0n, 0m, 0f, 2u -- cgit v1.2.3