diff options
| author | Micah Anderson <micah@riseup.net> | 2009-01-31 16:39:40 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-01-31 16:39:40 -0500 |
| commit | a693e9be61d02196e2583e9096cb049982a26668 (patch) | |
| tree | 48a558a3d112106005f88314a184c57336ef4bb7 /packaging | |
| parent | b024a2d3cacfe2fdb410daa830e04b2d9dfbcf4e (diff) | |
| parent | 3ebaf05d01b7d4639980608feefeef7287000634 (diff) | |
Merge commit 'jrollins/master'
Conflicts:
website/sidebar.mdwn
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/debian/changelog | 7 | ||||
| -rw-r--r-- | packaging/freebsd/security/monkeysphere/Makefile | 2 | ||||
| -rw-r--r-- | packaging/freebsd/security/monkeysphere/distinfo | 6 | ||||
| -rw-r--r-- | packaging/freebsd/security/monkeysphere/files/patch-sharelocation | 11 |
4 files changed, 21 insertions, 5 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 2aaa9ca..a282c58 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -3,8 +3,13 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low * New upstream release: - added better checks for the existence of a host private key for functions that require it to be there. + - add checks for root users, for functions where it is required. + - get rid of getopts. + - added version output option + - check that existing authentication keys are valid in gen_key + function. - -- Jameson Graef Rollins <jrollins@finestructure.net> Sun, 30 Nov 2008 17:14:50 -0500 + -- Jameson Graef Rollins <jrollins@finestructure.net> Tue, 30 Dec 2008 20:21:16 -0500 monkeysphere (0.22-1) unstable; urgency=low diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile index 976f543..24f9b2b 100644 --- a/packaging/freebsd/security/monkeysphere/Makefile +++ b/packaging/freebsd/security/monkeysphere/Makefile @@ -6,7 +6,7 @@ # PORTNAME= monkeysphere -PORTVERSION= 0.22~pre +PORTVERSION= 0.22 CATEGORIES= security MASTER_SITES= http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ # hack for debian orig tarballs diff --git a/packaging/freebsd/security/monkeysphere/distinfo b/packaging/freebsd/security/monkeysphere/distinfo index 51edfbe..d6c6e5e 100644 --- a/packaging/freebsd/security/monkeysphere/distinfo +++ b/packaging/freebsd/security/monkeysphere/distinfo @@ -1,3 +1,3 @@ -MD5 (monkeysphere_0.22~pre.orig.tar.gz) = fd19f09ed9a720f673d74c9cb58e9d6d -SHA256 (monkeysphere_0.22~pre.orig.tar.gz) = 337c7fdb93b697fba5a9e35cdff2b5faf0e4914fd8beab7994b456d58d19abb6 -SIZE (monkeysphere_0.22~pre.orig.tar.gz) = 69345 +MD5 (monkeysphere_0.22.orig.tar.gz) = 2bb00c86323409b98aff53f94d9ce0a6 +SHA256 (monkeysphere_0.22.orig.tar.gz) = 2566facda807a67a4d2d6de3833cccfa0b78b454909e8d25f47a235a9e621b24 +SIZE (monkeysphere_0.22.orig.tar.gz) = 70245 diff --git a/packaging/freebsd/security/monkeysphere/files/patch-sharelocation b/packaging/freebsd/security/monkeysphere/files/patch-sharelocation index 99c9604..e41c479 100644 --- a/packaging/freebsd/security/monkeysphere/files/patch-sharelocation +++ b/packaging/freebsd/security/monkeysphere/files/patch-sharelocation @@ -20,3 +20,14 @@ export SYSSHAREDIR . "${SYSSHAREDIR}/common" || exit 1 +--- src/monkeysphere-ssh-proxycommand.orig ++++ src/monkeysphere-ssh-proxycommand +@@ -16,7 +16,7 @@ + ######################################################################## + PGRM=$(basename $0) + +-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"} ++SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"} + export SYSSHAREDIR + . "${SYSSHAREDIR}/common" || exit 1 + |