whoops. fixing some paths

4 files changed, 19 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbd56f589ffc..c692052cd9dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Mar  9 06:22:16 UTC 2018
+# Sun Apr 15 11:51:15 UTC 2018
 pkgbase = sks-local
 	pkgdesc = A modified version of AUR/sks that can be used in tandem to perform localized keydumps
 	pkgver = 1.1.6
-	pkgrel = 7
+	pkgrel = 8
 	url = https://bitbucket.org/skskeyserver/sks-keyserver/
 	install = sks-local.install
 	arch = i686
@@ -32,7 +32,7 @@ pkgbase = sks-local
 	source = cryptokit-1.7-sks-uint32.patch.sig
 	source = debian_eventloopfix.patch.sig
 	sha512sums = f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
-	sha512sums = 0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc
+	sha512sums = f8230b99ced630b75d035be81923e6d4ace607e247f770cdbcc2f4a0313dd4fe88e7e36e3c10472817ce56ad0476702c6782d0a27e8a41d0cfd624ba096026df
 	sha512sums = 41560dd89cb19c482af4352ee5e1c661428e61521e2cdfd307be23af6f3729a4c1a8db266391fba643a7ec0fb6f2ae936b56b889f02c7faf294e40b1ee54d73c
 	sha512sums = 175de67d82060a55f2ce6444c072c40bd0dce5e8d59d7b47adca588a5b1d7a0e79ba84044fa2953a77dec9dd56b63457bba104c6d99c6dc0cd1ce3fd6f179c88
 	sha512sums = 6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171
diff --git a/500_debian_fhs.patch b/500_debian_fhs.patch
index 23ad44480570..54233161c347 100644
--- a/500_debian_fhs.patch
+++ b/500_debian_fhs.patch
@@ -6,7 +6,7 @@ diff -ru sks-1.1.4/common.ml sks-1.1.4.new/common.ml
  let set_logfile extension =
    if !Settings.filelog then
 -    let fname = (Filename.concat !Settings.basedir extension) ^ ".log" in
-+    let fname = (Filename.concat !Settings.basedir "/var/log/sks/") ^ extension ^ ".log" in
++    let fname = (Filename.concat !Settings.basedir "/var/log/sks-local/") ^ extension ^ ".log" in
      stored_logfile_name := Some fname;
      logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ]
        0o600 fname;
@@ -16,8 +16,8 @@ diff -ru sks-1.1.4/common.ml sks-1.1.4.new/common.ml
  let http_address = !Settings.hkp_address
 -let db_command_name = Filename.concat !Settings.basedir "db_com_sock"
 -let recon_command_name = Filename.concat !Settings.basedir "recon_com_sock"
-+let db_command_name = Filename.concat !Settings.basedir "/var/run/sks/db_com_sock"
-+let recon_command_name = Filename.concat !Settings.basedir "/var/run/sks/recon_com_sock"
++let db_command_name = Filename.concat !Settings.basedir "/var/run/sks-local/db_com_sock"
++let recon_command_name = Filename.concat !Settings.basedir "/var/run/sks-local/recon_com_sock"
  
  let db_command_addr = Unix.ADDR_UNIX db_command_name
  let recon_command_addr = Unix.ADDR_UNIX recon_command_name
@@ -29,7 +29,7 @@ diff -ru sks-1.1.4/dbserver.ml sks-1.1.4.new/dbserver.ml
    let convert_web_fname fname =
      if verify_web_fname fname then
 -      Filename.concat !Settings.basedir (Filename.concat "web" fname)
-+      Filename.concat !Settings.basedir (Filename.concat "/var/lib/sks/www" fname)
++      Filename.concat !Settings.basedir (Filename.concat "/var/lib/sks-local/www" fname)
      else raise (Wserver.Misc_error "Malformed requst")
  
    let supported_extensions =
@@ -41,7 +41,7 @@ diff -ru sks-1.1.4/getfileopts.ml sks-1.1.4.new/getfileopts.ml
  (**************************************************************)
  
 -let config_fname = "sksconf"
-+let config_fname = "/etc/sks/sksconf"
++let config_fname = "/etc/sks-local/sksconf"
  
  let parse args =
    Arg.current := 0;
@@ -53,7 +53,7 @@ diff -ru sks-1.1.4/reconserver.ml sks-1.1.4.new/reconserver.ml
          let hashes = hashconvert elements in
          print_hashes (sockaddr_to_string http_addr) hashes;
 -        log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
-+        log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
++        log_diffs (sprintf "/var/spool/sks-local/diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
          if List.length elements > 0
          then
            begin
@@ -62,7 +62,7 @@ diff -ru sks-1.1.4/reconserver.ml sks-1.1.4.new/reconserver.ml
          let hashes = hashconvert results in
          print_hashes (sockaddr_to_string http_addr) hashes;
 -        log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
-+        log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
++        log_diffs (sprintf "/var/spool/sks-local/diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
          match results with
              [] -> []
            | _ ->
@@ -92,13 +92,13 @@ diff -ru sks-1.1.4/settings.ml sks-1.1.4.new/settings.ml
 -let base_dumpdir = "dump"
 -let base_msgdir = "messages"
 -let base_failed_msgdir = "failed_messages"
-+let base_dbdir = "/var/lib/sks/DB"
-+let base_ptree_dbdir = "/var/lib/sks/PTree"
-+let base_membership_file = "/etc/sks/membership"
-+let base_mailsync_file = "/etc/sks/mailsync"
-+let base_dumpdir = "/var/lib/sks/dump"
-+let base_msgdir = "/var/spool/sks/messages"
-+let base_failed_msgdir = "/var/spool/sks/failed_messages"
++let base_dbdir = "/var/lib/sks-local/DB"
++let base_ptree_dbdir = "/var/lib/sks-local/PTree"
++let base_membership_file = "/etc/sks-local/membership"
++let base_mailsync_file = "/etc/sks-local/mailsync"
++let base_dumpdir = "/var/lib/sks-local/dump"
++let base_msgdir = "/var/spool/sks-local/messages"
++let base_failed_msgdir = "/var/spool/sks-local/failed_messages"
  
  let dbdir = lazy (Filename.concat !basedir base_dbdir)
  let ptree_dbdir = lazy (Filename.concat !basedir base_ptree_dbdir)
diff --git a/500_debian_fhs.patch.sig b/500_debian_fhs.patch.sig
index e093e9859d0c..7c973682cc1f 100644
--- a/500_debian_fhs.patch.sig
+++ b/500_debian_fhs.patch.sig
diff --git a/PKGBUILD b/PKGBUILD
index 210e90f2351c..988546ebf9e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # https://bitbucket.org/skskeyserver/sks-keyserver/issues/55/unbound-module-nat-in-cryptokit-on-ocaml
 pkgname=sks-local
 pkgver=1.1.6
-pkgrel=7
+pkgrel=8
 pkgdesc="A modified version of AUR/sks that can be used in tandem to perform localized keydumps"
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/skskeyserver/sks-keyserver/"
@@ -39,7 +39,7 @@ source=("https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${_pkgname}-
 	"cryptokit-1.7-sks-uint32.patch.sig"
 	"debian_eventloopfix.patch.sig")
 sha512sums=('f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099'
-	    '0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc'
+	    'f8230b99ced630b75d035be81923e6d4ace607e247f770cdbcc2f4a0313dd4fe88e7e36e3c10472817ce56ad0476702c6782d0a27e8a41d0cfd624ba096026df'
 	    '41560dd89cb19c482af4352ee5e1c661428e61521e2cdfd307be23af6f3729a4c1a8db266391fba643a7ec0fb6f2ae936b56b889f02c7faf294e40b1ee54d73c'
 	    '175de67d82060a55f2ce6444c072c40bd0dce5e8d59d7b47adca588a5b1d7a0e79ba84044fa2953a77dec9dd56b63457bba104c6d99c6dc0cd1ce3fd6f179c88'
 	    '6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171'