From 150008da442a4a95672356c2148884223dea68d7 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Wed, 29 Oct 2008 14:22:32 -0400 Subject: fix small bug in the packaging about man7 directory installation. --- debian/monkeysphere.dirs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/monkeysphere.dirs b/debian/monkeysphere.dirs index cfafe15..1f9e66b 100644 --- a/debian/monkeysphere.dirs +++ b/debian/monkeysphere.dirs @@ -7,6 +7,6 @@ usr/share usr/share/monkeysphere usr/share/man usr/share/man/man1 -usr/share/man/man5 +usr/share/man/man7 usr/share/man/man8 etc/monkeysphere -- cgit v1.2.3 From 56ba9a2e10b757bf7a31ba190b14ee38ed511461 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Wed, 29 Oct 2008 23:48:16 -0400 Subject: fix my email address in debian/control. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index efd734b..ccc3ad2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: monkeysphere Section: net Priority: extra Maintainer: Daniel Kahn Gillmor -Uploaders: Jameson Graef Rollins +Uploaders: Jameson Graef Rollins Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0) Standards-Version: 3.8.0.1 Homepage: http://web.monkeysphere.info/ -- cgit v1.2.3 From e3030c0ed18988ff646fd8dc004797de09b39360 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 30 Oct 2008 15:04:24 -0400 Subject: updating debian/changelog as we start work on version 0.20. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a7514a3..fa905d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +monkeysphere (0.20-1) UNRELEASED; urgency=low + + [ Jameson Graef Rollins ] + * clean up Makefile to generate more elegant source tarballs. + + -- Daniel Kahn Gillmor Thu, 30 Oct 2008 15:03:23 -0400 + monkeysphere (0.19-1) experimental; urgency=low [ Daniel Kahn Gillmor ] -- cgit v1.2.3 From 992e7de99fdacfe913338bc995efba36854ee6a2 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 30 Oct 2008 15:54:03 -0400 Subject: do more testing to make sure that mktemp calls do not fail. --- debian/changelog | 4 ++++ src/monkeysphere-server | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fa905d3..300175d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ monkeysphere (0.20-1) UNRELEASED; urgency=low [ Jameson Graef Rollins ] * clean up Makefile to generate more elegant source tarballs. + + [ Daniel Kahn Gillmor ] + * ensure that tempdirs are properly created, bail out otherwise instead + of stumbling ahead. -- Daniel Kahn Gillmor Thu, 30 Oct 2008 15:03:23 -0400 diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 5f0cb73..e78903b 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -134,7 +134,7 @@ show_server_key() { # dumping to a file named ' ' so that the ssh-keygen output # doesn't claim any potentially bogus hostname(s): - tmpkey=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) + tmpkey=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!" gpg_authentication "--export $fingerprint" | openpgp2ssh "$fingerprint" 2>/dev/null > "$tmpkey/ " echo -n "ssh fingerprint: " (cd "$tmpkey" && ssh-keygen -l -f ' ' | awk '{ print $2 }') @@ -180,7 +180,7 @@ update_users() { log verbose "----- user: $uname -----" # make temporary directory - TMPLOC=$(mktemp -d ${MSTMPDIR}/tmp.XXXXXXXXXX) + TMPLOC=$(mktemp -d ${MSTMPDIR}/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!" # trap to delete temporary directory on exit trap "rm -rf $TMPLOC" EXIT -- cgit v1.2.3