projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37c5b03
)
fixing symlinks created in packaging; updated FreeBSD port to handle centrally-linked...
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 29 Oct 2008 06:46:44 +0000
(
02:46
-0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 29 Oct 2008 06:46:44 +0000
(
02:46
-0400)
debian/monkeysphere.postinst
patch
|
blob
|
history
packaging/freebsd/Makefile
patch
|
blob
|
history
packaging/freebsd/distinfo
patch
|
blob
|
history
packaging/freebsd/pkg-install
patch
|
blob
|
history
diff --git
a/debian/monkeysphere.postinst
b/debian/monkeysphere.postinst
index 27a50e00017f70bb94407f78f6b54b8ae4686d56..02d63046ff66db0cfc2ffbd457f30cfba4b8131c 100755
(executable)
--- a/
debian/monkeysphere.postinst
+++ b/
debian/monkeysphere.postinst
@@
-20,9
+20,9
@@
fi
# install host gnupg home directory
install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host
# link in the gpg.conf
# install host gnupg home directory
install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host
# link in the gpg.conf
-ln -sTf "$ETC"/gpg-host.conf "$VARLIB"/gnupg-host/gpg.conf
+ln -sTf "$ETC"/g
nu
pg-host.conf "$VARLIB"/gnupg-host/gpg.conf
# install authentication gnupg home directory
install --owner monkeysphere --group monkeysphere --mode 700 -d "$VARLIB"/gnupg-authentication
# link in the gpg.conf
# install authentication gnupg home directory
install --owner monkeysphere --group monkeysphere --mode 700 -d "$VARLIB"/gnupg-authentication
# link in the gpg.conf
-ln -sTf "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf
+ln -sTf "$ETC"/g
nu
pg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf
diff --git
a/packaging/freebsd/Makefile
b/packaging/freebsd/Makefile
index f4bf0fe2d54a220086704f71627f66380e775cf0..e484997106386262755b9edbb1856bdd60e12992 100644
(file)
--- a/
packaging/freebsd/Makefile
+++ b/
packaging/freebsd/Makefile
@@
-6,7
+6,7
@@
#
PORTNAME= monkeysphere
#
PORTNAME= monkeysphere
-PORTVERSION= 0.1
6
+PORTVERSION= 0.1
8
CATEGORIES= security
MASTER_SITES= http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
# hack for debian orig tarballs
CATEGORIES= security
MASTER_SITES= http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
# hack for debian orig tarballs
@@
-17,7
+17,7
@@
COMMENT= use the OpenPGP web of trust to verify ssh connections
LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls
RUN_DEPENDS= base64:${PORTSDIR}/converters/base64 \
LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls
RUN_DEPENDS= base64:${PORTSDIR}/converters/base64 \
- gpg:${PORTSDIR}/security/gnupg \
+ gpg:${PORTSDIR}/security/gnupg
1
\
lockfile:${PORTSDIR}/mail/procmail \
/usr/local/bin/getopt:${PORTSDIR}/misc/getopt \
bash:${PORTSDIR}/shells/bash
lockfile:${PORTSDIR}/mail/procmail \
/usr/local/bin/getopt:${PORTSDIR}/misc/getopt \
bash:${PORTSDIR}/shells/bash
diff --git
a/packaging/freebsd/distinfo
b/packaging/freebsd/distinfo
index 16e88de4fb5044524ccbbd677203f9e13ab96c9c..f449c5abceb90f9a14ad6345b68154e180134e14 100644
(file)
--- a/
packaging/freebsd/distinfo
+++ b/
packaging/freebsd/distinfo
@@
-1,3
+1,3
@@
-MD5 (monkeysphere_0.1
6.orig.tar.gz) = 4bc223e8004e0e374bd54f0315585c49
-SHA256 (monkeysphere_0.1
6.orig.tar.gz) = f2dbd031315f99c82099a4a902f2240cca97536b035ef75872e72a65f324c9d7
-SIZE (monkeysphere_0.1
6.orig.tar.gz) = 66062
+MD5 (monkeysphere_0.1
8.orig.tar.gz) = 4cae9db5bd112a3a2d1077d1816384de
+SHA256 (monkeysphere_0.1
8.orig.tar.gz) = 68cb88676cad5788d2a75d95b1ccf8e884a0f7f47512c5292f402b630f63ace8
+SIZE (monkeysphere_0.1
8.orig.tar.gz) = 68219
diff --git
a/packaging/freebsd/pkg-install
b/packaging/freebsd/pkg-install
index 5e520cdfd20ad8a19f5b8f7c8e0dd1df39b0fb80..d7e4dbec95acffd9ab5c7387975f29906f1b4760 100755
(executable)
--- a/
packaging/freebsd/pkg-install
+++ b/
packaging/freebsd/pkg-install
@@
-15,6
+15,7
@@
# MySQL puts its data in /var/db/mysql
VARLIB="/var/monkeysphere"
# MySQL puts its data in /var/db/mysql
VARLIB="/var/monkeysphere"
+ETCDIR="/usr/local/etc/monkeysphere"
case $2 in
POST-INSTALL)
case $2 in
POST-INSTALL)
@@
-56,20
+57,14
@@
POST-INSTALL)
fi
fi
fi
fi
- ## set up the cache directories:
+ ## set up the cache directories
, and link them to the config files
:
install -d -o root -g monkeysphere -m 750 "$VARLIB"/gnupg-host
install -d -o root -g monkeysphere -m 750 "$VARLIB"/gnupg-host
- cat <<EOF > "$VARLIB"/gnupg-host/gpg.conf
-list-options show-uid-validity
-EOF
+ ln -sf "$ETCDIR"/gnupg-host.conf "$VARLIB"/gnupg-host/gpg.conf
install -d -o monkeysphere -g monkeysphere -m 700 "$VARLIB"/gnupg-authentication
install -d -o monkeysphere -g monkeysphere -m 700 "$VARLIB"/gnupg-authentication
-# install authentication gpg.conf
- cat <<EOF > "$VARLIB"/gnupg-authentication/gpg.conf
-list-options show-uid-validity
-primary-keyring $VARLIB/gnupg-authentication/pubring.gpg
-keyring $VARLIB/gnupg-host/pubring.gpg
-EOF
+ ln -sf "$ETCDIR"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf
+
chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
monkeysphere-server diagnostics
chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
monkeysphere-server diagnostics