Add debian_eventloopfix and some improvements in service files.

6 files changed, 169 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47f37810bcec..e6c16f382d7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sks
 	pkgdesc = Synchronizing OpenPGP Key Server
 	pkgver = 1.1.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://bitbucket.org/skskeyserver/sks-keyserver/
 	install = sks.install
 	arch = i686
@@ -22,13 +22,15 @@ pkgbase = sks
 	source = sks-db.service
 	source = sks-recon.service
 	source = cryptokit-1.7-sks-uint32.patch
+	source = debian_eventloopfix.patch
 	validpgpkeys = C90EF1430B3AC0DFD00E6EA541259773973A612A
 	sha512sums = f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
 	sha512sums = SKIP
 	sha512sums = 0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc
-	sha512sums = 5628e6a0065ec9bab4df84e77bed0af51379e70021543dfee4d4181f55b2779735fcea7848b51e2ab555f9f988da5aff8f0f15e522b801d7330e4bb2e53701fc
-	sha512sums = 41352e9862996170c70ed8e546ad89e26c94bf3c4ef7e91b64f330273b94c2666cf3f11f13a54e66b1a29b3ef46b75c8c6dfbe49fe12e2b11451e8311faf68a9
+	sha512sums = cc10998ac8a072bdd35d22438aa1a4bfb5eda2271887c3f1bb1dc0ee6029228201dd903f36580df43552ad6c8227012f039ed5353147a00d61a05bd5c4333695
+	sha512sums = 615ac9237359e89332bbaeabe7f36ba1e33877d1b06f8c302fd3af8faa0eee0d785714405a26b92859b9d3fddb4cd708ca0c343db8e4b8c5ffe16323338323bb
 	sha512sums = 6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171
+	sha512sums = 9463538f5668cdd41b25c43e31a2621e1c0953430b8dde84e54be4a45aa3f9ffbfcd270c83583df2a5462163eaf014fee3c3ed49f436faf71db7e87db88626b4
 
 pkgname = sks
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..53a16593d3fe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg
+src
+*.pkg.tar.xz
+sks-*.tgz
+sks-*.tgz.asc
diff --git a/PKGBUILD b/PKGBUILD
index fca0d5b63769..461fff39b93b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=sks
 pkgver=1.1.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc='Synchronizing OpenPGP Key Server'
@@ -18,14 +18,16 @@ source=(
   '500_debian_fhs.patch'
   'sks-db.service'
   'sks-recon.service'
-  'cryptokit-1.7-sks-uint32.patch')
+  'cryptokit-1.7-sks-uint32.patch'
+  'debian_eventloopfix.patch'
+  )
 sha512sums=(
-  'f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099'
-  SKIP
+  'f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099' SKIP
   '0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc'
-  '5628e6a0065ec9bab4df84e77bed0af51379e70021543dfee4d4181f55b2779735fcea7848b51e2ab555f9f988da5aff8f0f15e522b801d7330e4bb2e53701fc'
-  '41352e9862996170c70ed8e546ad89e26c94bf3c4ef7e91b64f330273b94c2666cf3f11f13a54e66b1a29b3ef46b75c8c6dfbe49fe12e2b11451e8311faf68a9'
+  'cc10998ac8a072bdd35d22438aa1a4bfb5eda2271887c3f1bb1dc0ee6029228201dd903f36580df43552ad6c8227012f039ed5353147a00d61a05bd5c4333695'
+  '615ac9237359e89332bbaeabe7f36ba1e33877d1b06f8c302fd3af8faa0eee0d785714405a26b92859b9d3fddb4cd708ca0c343db8e4b8c5ffe16323338323bb'
   '6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171'
+  '9463538f5668cdd41b25c43e31a2621e1c0953430b8dde84e54be4a45aa3f9ffbfcd270c83583df2a5462163eaf014fee3c3ed49f436faf71db7e87db88626b4'
 )
 validpgpkeys=(C90EF1430B3AC0DFD00E6EA541259773973A612A) # SKS Keyserver Signing Key
 
@@ -35,6 +37,7 @@ prepare() {
 
   # patch path
   patch -Np1 -i "$srcdir/500_debian_fhs.patch"
+  patch -Np1 -i "$srcdir/debian_eventloopfix.patch"
 
   cp Makefile.local.unused Makefile.local
 
diff --git a/debian_eventloopfix.patch b/debian_eventloopfix.patch
new file mode 100644
index 000000000000..e8dbca5296b8
--- /dev/null
+++ b/debian_eventloopfix.patch
@@ -0,0 +1,144 @@
+Description: Fix FTBFS with OCaml 4.05.0
+Author: Stephane Glondu <glondu@debian.org>
+Bug-Debian: https://bugs.debian.org/870150
+Last-Update: 2017-08-01
+
+--- sks-1.1.6.orig/eventloop.ml
++++ sks-1.1.6/eventloop.ml
+@@ -26,6 +26,7 @@ open MoreLabels
+ open Printf
+ open Common
+ open Packet
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ open Unix
+ 
+@@ -129,7 +130,7 @@ let create_sock addr =
+     let domain =
+       Unix.domain_of_sockaddr addr in
+     let sock =
+-      socket ~domain ~kind:SOCK_STREAM ~protocol:0 in
++      unix_socket domain SOCK_STREAM 0 in
+     setsockopt sock SO_REUSEADDR true;
+     if domain = PF_INET6 then
+       setsockopt sock IPV6_ONLY true;
+--- sks-1.1.6.orig/reconComm.ml
++++ sks-1.1.6/reconComm.ml
+@@ -26,6 +26,7 @@ open Printf
+ open Common
+ open Packet
+ 
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ module Map = PMap.Map
+ 
+@@ -37,10 +38,10 @@ open DbMessages
+ 
+ (** send DbMessages message and wait for response *)
+ let send_dbmsg msg =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr db_command_addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr db_command_addr)
++            Unix.SOCK_STREAM
++            0 in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cin = Channel.sys_in_from_fd s in
+@@ -54,10 +55,10 @@ let send_dbmsg msg =
+ 
+ (** send DbMessages message, don't wait for response *)
+ let send_dbmsg_noreply msg =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr db_command_addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr db_command_addr)
++            Unix.SOCK_STREAM
++            0 in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cout = Channel.sys_out_from_fd s in
+@@ -75,10 +76,10 @@ let is_content_type line =
+ let http_status_ok_regexp = Str.regexp "^HTTP/[0-9]+\\.[0-9]+ 2"
+ 
+ let get_keystrings_via_http addr hashes =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0  in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr addr)
++            Unix.SOCK_STREAM
++            0  in
+   protect ~f:(fun () ->
+                 Unix.bind s ~addr:(match_client_recon_addr addr);
+                 Unix.connect s ~addr;
+--- sks-1.1.6.orig/sks_do.ml
++++ sks-1.1.6/sks_do.ml
+@@ -27,6 +27,7 @@ open Printf
+ open Common
+ open Packet
+ open DbMessages
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ module PTree = PrefixTree
+ module Map = PMap.Map
+@@ -37,10 +38,10 @@ let fail reason =
+   exit (-1)
+ 
+ let send_dbmsg msg =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr db_command_addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr db_command_addr)
++            Unix.SOCK_STREAM
++            0 in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:db_command_addr;
+                 let cin = Channel.sys_in_from_fd s in
+--- sks-1.1.6.orig/tester.ml
++++ sks-1.1.6/tester.ml
+@@ -26,6 +26,7 @@ open Printf
+ open Common
+ open Packet
+ open DbMessages
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ 
+ let settings = {
+@@ -46,10 +47,10 @@ module Keydb = Keydb.Safe
+ 
+ 
+ let send_msg addr msg =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr addr)
++            Unix.SOCK_STREAM
++            0 in
+   protect ~f:( fun () ->
+                  Unix.connect s ~addr:addr;
+                  let cin = Channel.sys_in_from_fd s
+@@ -62,10 +63,10 @@ let send_msg addr msg =
+     ~finally:(fun () -> Unix.close s)
+ 
+ let send_msg_noreply addr msg =
+-  let s = Unix.socket
+-            ~domain:(Unix.domain_of_sockaddr addr)
+-            ~kind:Unix.SOCK_STREAM
+-            ~protocol:0 in
++  let s = unix_socket
++            (Unix.domain_of_sockaddr addr)
++            Unix.SOCK_STREAM
++            0 in
+   protect ~f:(fun () ->
+                 Unix.connect s ~addr:addr;
+                 let cout = Channel.sys_out_from_fd s in
diff --git a/sks-db.service b/sks-db.service
index a09aaaebd891..049d372720c3 100644
--- a/sks-db.service
+++ b/sks-db.service
@@ -5,8 +5,11 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=simple
 User=sks
+Group=sks
 PIDFile=/var/run/sks/sksdb.pid
 ExecStart=/usr/bin/sks db
+RuntimeDirectory=sks
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sks-recon.service b/sks-recon.service
index d4411de4b51c..a179ba47e397 100644
--- a/sks-recon.service
+++ b/sks-recon.service
@@ -5,8 +5,11 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=simple
 User=sks
+Group=sks
 PIDFile=/var/run/sks/sksrecon.pid
 ExecStart=/usr/bin/sks recon
+RuntimeDirectory=sks
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target