[gentoo-commits] gentoo-x86 commit in net-misc/sks/files: sks.confd sks-recon.initd sks-db.initd sks-1.1.4-ECC_OID_fix_x86.patch sks-db.service sks-recon.service

[gentoo-commits] gentoo-x86 commit in net-misc/sks/files: sks.confd sks-recon.initd sks-db.initd sks-1.1.4-ECC_OID_fix_x86.patch sks-db.service sks-recon.service

[Manuel Rueger (mrueg)]

mrueg       13/11/22 02:35:45

  Added:                sks.confd sks-recon.initd sks-db.initd
                        sks-1.1.4-ECC_OID_fix_x86.patch sks-db.service
                        sks-recon.service
  Log:
  Version bump. Add initd scripts and systemd unit files by Emery Hemingway. Fixes bug #427030. Add Kristian Fiskerstrand as maintainer and proxy-maintainers as herd.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.1                  net-misc/sks/files/sks.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks.confd?rev=1.1&content-type=text/plain

Index: sks.confd
===================================================================
SKS_DIR="/var/lib/sks"

# Set common options for sks db and sks recon here.
SKS_ARGS=""


1.1                  net-misc/sks/files/sks-recon.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.initd?rev=1.1&content-type=text/plain

Index: sks-recon.initd
===================================================================
#!/sbin/runscript
source /etc/conf.d/sks

command=/usr/bin/sks
command_args="recon ${SKS_ARGS}"
command_background=1
description="Reconnoiters SKS peers for keys"
name="SKS recon"
pidfile="/var/run/sks-recon.pid"
required_files="${SKS_DIR}/sksconf ${SKS_DIR}/membership"
start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"


depend()
{
    after sks-db
    use net
}

start_pre()
{
    checkpath --owner sks:sks --directory \
        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
    checkpath --owner sks:sks --file \
        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
}



1.1                  net-misc/sks/files/sks-db.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.initd?rev=1.1&content-type=text/plain

Index: sks-db.initd
===================================================================
#!/sbin/runscript
source /etc/conf.d/sks

command=/usr/bin/sks
command_args="db ${SKS_ARGS}"
command_background=1
description="SKS database thread"
name="SKS db"
pidfile="/var/run/sks-db.pid"
required_files="${SKS_DIR}/sksconf"
start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"


depend()
{
	use net
}

start_pre()
{
    checkpath --owner sks:sks --directory \
        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
    checkpath --owner sks:sks --file \
        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
}



1.1                  net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch?rev=1.1&content-type=text/plain

Index: sks-1.1.4-ECC_OID_fix_x86.patch
===================================================================
diff -r a4fab18949f0 -r 0374b3dbc4ae dbserver.ml
--- a/dbserver.ml	Fri Jan 25 18:16:13 2013 -0600
+++ b/dbserver.ml	Tue Apr 16 15:36:36 2013 -0500
@@ -293,8 +293,8 @@
           let keys = lookup_keys request.search in
           let count = List.length keys in
           let keys = truncate request.limit keys in
+          let keys = clean_keys request keys in
           let hashes = List.map ~f:KeyHash.hash keys in
-          let keys = clean_keys request keys in
           if request.machine_readable then
             ("text/plain",
              count,
diff -r a4fab18949f0 -r 0374b3dbc4ae parsePGP.ml
--- a/parsePGP.ml	Fri Jan 25 18:16:13 2013 -0600
+++ b/parsePGP.ml	Tue Apr 16 15:36:36 2013 -0500
@@ -153,7 +153,7 @@
 
 let parse_ecdh_pubkey cin =
    let length = cin#read_int_size 1 in
-   let oid = sprintf "%x" (cin#read_int_size length) in
+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
    let mpi = read_mpi cin in
    let kdf_length = cin#read_int_size 1 in
    let kdf_res = cin#read_int_size 1 in
@@ -166,7 +166,7 @@
 
  let parse_ecdsa_pubkey cin =
    let length = cin#read_int_size 1 in
-   let oid = sprintf "%x" (cin#read_int_size length) in
+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
    let psize = oid_to_psize oid
    in
    psize



1.1                  net-misc/sks/files/sks-db.service

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.service?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.service?rev=1.1&content-type=text/plain

Index: sks-db.service
===================================================================
[Unit]
Description=SKS database thread
After=network.target

[Service]
ExecStart=/usr/bin/sks db
User=sks
WorkingDirectory=/var/lib/sks

[Install]
WantedBy=multi-user.target



1.1                  net-misc/sks/files/sks-recon.service

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.service?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.service?rev=1.1&content-type=text/plain

Index: sks-recon.service
===================================================================
[Unit]
Description=SKS key reconnaissance thread
After=network.target

[Service]
ExecStart=/usr/bin/sks recon
User=sks
WorkingDirectory=/var/lib/sks

[Install]
WantedBy=multi-user.target