diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 18:20:28 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 18:20:28 -0400 |
| commit | 6a68ed330a5133d4d4d3aa7ae0c9c26bb7a7e59b (patch) | |
| tree | 0d25559c30267cc5e9cf22f500ebdd66c2bfeb5d | |
| parent | 1343ffb414e74917b4e6f9eed05df035d25be4aa (diff) | |
make calls to hostname portable; more tweaks to FreeBSD packaging.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | packaging/freebsd/distinfo | 6 | ||||
| -rwxr-xr-x | packaging/freebsd/pkg-deinstall | 2 | ||||
| -rwxr-xr-x | packaging/freebsd/pkg-install | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 2 |
6 files changed, 10 insertions, 6 deletions
@@ -26,6 +26,9 @@ debian-package: tarball (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us) rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) +freebsd-distinfo: tarball + ./utils/build-freebsd-distinfo + clean: $(MAKE) -C src/keytrans clean # clean up old monkeysphere packages lying around as well. diff --git a/debian/changelog b/debian/changelog index fb0788e..bf7c219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ monkeysphere (0.16~pre-1) UNRELEASED; urgency=low * replaced "#!/bin/bash" with "#!/usr/bin/env bash" for better portability. * fixed busted lockfile arrangement, where empty file was being locked + * portability fixes for date, mktemp, hostname -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 11 Sep 2008 23:16:31 -0400 diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo index e962627..84fa981 100644 --- a/packaging/freebsd/distinfo +++ b/packaging/freebsd/distinfo @@ -1,3 +1,3 @@ -MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 0dc82d6e81bf469326b6801147d93bbb -SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = e8147afaae0bef44dd659f0cfc47b12a90b23776b750a58756ca32c2c5605332 -SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58204 +MD5 (monkeysphere_0.16~pre.orig.tar.gz) = e495b71d28afc36d65217e1935c43535 +SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = c2c3c4203ac28d025e63a2e0683dfbb5ec558e4f061f3c3b1c2b736af2b38ba9 +SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58501 diff --git a/packaging/freebsd/pkg-deinstall b/packaging/freebsd/pkg-deinstall index 966f252..3000878 100755 --- a/packaging/freebsd/pkg-deinstall +++ b/packaging/freebsd/pkg-deinstall @@ -19,7 +19,7 @@ POST-DEINSTALL) # (note: FreeBSD does not seem to want the package-specific user to be # purged at package removal) - if pw user show "${USER}" 2>/dev/null; then + if pw user show "${USER}" 2>/dev/null >/dev/null; then echo "Warning: If you will *NOT* use this package anymore, please remove the monkeysphere user manually." fi if [ -d "$VARLIB" ] ; then diff --git a/packaging/freebsd/pkg-install b/packaging/freebsd/pkg-install index 5601bb5..b832190 100755 --- a/packaging/freebsd/pkg-install +++ b/packaging/freebsd/pkg-install @@ -38,7 +38,7 @@ POST-INSTALL) echo "You already have a user \"${USER}\", so I will use it." else if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "$VARLIB" -s /sbin/sh -c "monkeysphere authentication user,,," + -d "$VARLIB" -s /bin/sh -c "monkeysphere authentication user,,," then echo "Added user \"${USER}\"." else diff --git a/src/monkeysphere-server b/src/monkeysphere-server index b96a659..f4bdd1b 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -299,7 +299,7 @@ gen_key() { esac done - hostName=${1:-$(hostname --fqdn)} + hostName=${1:-$(hostname -f)} userID="ssh://${hostName}" # check for presense of key with user ID |