From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 12 Sep 2008 07:08:52 +0000 (-0400)
Subject: patching the upstream sources for the unusual location of etc in FreeBSD.
X-Git-Tag: monkeysphere_0.16-1~65
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=99fbb1b6bf101451e6889aeaa6e34886789ee264

patching the upstream sources for the unusual location of etc in FreeBSD.
---

diff --git a/packaging/freebsd/files/patch-etclocation b/packaging/freebsd/files/patch-etclocation
new file mode 100644
index 0000000..ebf5c0e
--- /dev/null
+++ b/packaging/freebsd/files/patch-etclocation
@@ -0,0 +1,56 @@
+diff --git etc/monkeysphere-server.conf etc/monkeysphere-server.conf
+index c001f2d..d33fd36 100644
+--- etc/monkeysphere-server.conf
++++ etc/monkeysphere-server.conf
+@@ -17,7 +17,7 @@
+ # authorized_keys file.  '%h' will be replaced by the home directory
+ # of the user, and %u will be replaced by the username of the user.
+ # For purely admin-controlled authorized_user_ids, you might put them
+-# in /etc/monkeysphere/authorized_user_ids/%u
++# in /usr/local/etc/monkeysphere/authorized_user_ids/%u
+ #AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
+ 
+ # Whether to add user controlled authorized_keys file to
+diff --git man/man1/monkeysphere.1 man/man1/monkeysphere.1
+index 3ece735..09320d2 100644
+--- man/man1/monkeysphere.1
++++ man/man1/monkeysphere.1
+@@ -111,7 +111,7 @@ Path to ssh authorized_keys file (~/.ssh/authorized_keys).
+ ~/.monkeysphere/monkeysphere.conf
+ User monkeysphere config file.
+ .TP
+-/etc/monkeysphere/monkeysphere.conf
++/usr/local/etc/monkeysphere/monkeysphere.conf
+ System-wide monkeysphere config file.
+ .TP
+ ~/.monkeysphere/authorized_user_ids
+diff --git man/man8/monkeysphere-server.8 man/man8/monkeysphere-server.8
+index f207e2c..360408e 100644
+--- man/man8/monkeysphere-server.8
++++ man/man8/monkeysphere-server.8
+@@ -203,10 +203,10 @@ User to control authentication keychain (monkeysphere).
+ .SH FILES
+ 
+ .TP
+-/etc/monkeysphere/monkeysphere-server.conf
++/usr/local/etc/monkeysphere/monkeysphere-server.conf
+ System monkeysphere-server config file.
+ .TP
+-/etc/monkeysphere/monkeysphere.conf
++/usr/local/etc/monkeysphere/monkeysphere.conf
+ System-wide monkeysphere config file.
+ .TP
+ /var/lib/monkeysphere/authorized_keys/USER
+diff --git src/common src/common
+index c8a7db6..cb4f8e1 100644
+--- src/common
++++ src/common
+@@ -16,7 +16,7 @@
+ ### COMMON VARIABLES
+ 
+ # managed directories
+-ETC="/etc/monkeysphere"
++ETC="/usr/local/etc/monkeysphere"
+ export ETC
+ 
+ ########################################################################