make sure that the FreeBSD package is using GNU-style getopt calls.

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 2bdb28345777730a78d3080cf3964e5827d2329f..e5e36940e65677536a592dd5822e759938a361fc 100644 (file)
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=  gnutls.26:${PORTSDIR}/security/gnutls
 RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
                gpg:${PORTSDIR}/security/gnupg \
                lockfile:${PORTSDIR}/mail/procmail \
+               getopt:${PORTSDIR}/misc/getopt \
                bash:${PORTSDIR}/shells/bash
 
 MAN1=          monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1

diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index 84fa981543edfe7f259120d996836ec493c1072b..1a3b6c592d0e10e6351fbb02a318520350d50d79 100644 (file)
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 7ec79824cf814c618b39e9bf33ff65b1
+SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = bce97a2b2f90bc85b81af374cc0d32dfb23c6b2c1f1b2145f8a4d4a5bb00645b
+SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58595

diff --git a/src/monkeysphere b/src/monkeysphere
index 36b44dd4a457f78a6f39ea901150776c005ae2df..089c06e6e8e59ac2e72e7df9e6613b4a0e53490e 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -63,7 +63,7 @@ gen_subkey(){
     keyExpire=
 
     # get options
-    TEMP=$(getopt -o l:e: -l length:,expire: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o l:e: -l length:,expire: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
        exit 1

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index f4bdd1b83b7de3c3c701c7da0d8c6d70972c7a41..111f77723ff1797c543d35d547968125b842b16a 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -267,7 +267,7 @@ gen_key() {
     revoker=
 
     # get options
-    TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
        exit 1
@@ -699,7 +699,7 @@ add_certifier() {
     depth=1
 
     # get options
-    TEMP=$(getopt -o n:t:d: -l domain:,trust:,depth: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o n:t:d: -l domain:,trust:,depth: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
        exit 1