jhogarth pushed to sslh (el6). "fix up the sysvinit file for the right pid and run as a sslh user"

[notifications at fedoraproject.org]

>From de3abdd9a79526f3abbcd003ed41e47645cbb702 Mon Sep 17 00:00:00 2001
From: James Hogarth <james.hogarth at gmail.com>
Date: Sat, 18 Apr 2015 00:41:25 +0100
Subject: fix up the sysvinit file for the right pid and run as a sslh user


diff --git a/patch-el6.patch b/patch-el6.patch
index 77f5641..6d112c7 100644
--- a/patch-el6.patch
+++ b/patch-el6.patch
@@ -1,8 +1,35 @@
+diff --git a/basic.cfg b/basic.cfg
+index 526ffbf..4234a5d 100644
+--- a/basic.cfg
++++ b/basic.cfg
+@@ -7,7 +7,7 @@ inetd: false;
+ numeric: false;
+ transparent: false;
+ timeout: "2";
+-user: "nobody";
++user: "sslh";
+ pidfile: "/var/run/sslh.pid";
+ 
+ 
 diff --git a/scripts/etc.rc.d.init.d.sslh.centos b/scripts/etc.rc.d.init.d.sslh.centos
-index 6549545..934e32d 100755
+index 6549545..7911277 100755
 --- a/scripts/etc.rc.d.init.d.sslh.centos
 +++ b/scripts/etc.rc.d.init.d.sslh.centos
-@@ -23,7 +23,7 @@ if [ -f /etc/sysconfig/sslh ]; then
+@@ -9,11 +9,12 @@
+ # processname: sslh
+ # config: /etc/sslh.cfg
+ # config: /etc/sysconfig/sslh
+-# pidfile: /var/run/sslh/sslh.pid
++# pidfile: /var/run/sslh.pid
+ #
+ # Authors:
+ # Andre Krajnik akrajnik at gmail.com - 2010-03-20
+ # Julien Thomas julthomas at free.fr - 2013-08-25
++# James Hogarth james.hogarth at gmail.com - 2015-04-18
+ 
+ # Source function library.
+ . /etc/init.d/functions
+@@ -23,10 +24,10 @@ if [ -f /etc/sysconfig/sslh ]; then
  fi
  
  PROGNAME=sslh
@@ -10,7 +37,11 @@ index 6549545..934e32d 100755
 +SSLH=${SSLH:-/usr/sbin/sslh}
  SSLH_LANG=${SSLH_LANG:-C}
  CONFIG=${CONFIG:-/etc/sslh.cfg}
- PIDFILE=${PIDFILE:-/var/run/sslh/sslh.pid}
+-PIDFILE=${PIDFILE:-/var/run/sslh/sslh.pid}
++PIDFILE=${PIDFILE:-/var/run/sslh.pid}
+ LOCKFILE=${LOCKFILE:-/var/lock/subsys/sslh}
+ STOP_TIMEOUT=${STOP_TIMEOUT:-10}
+ RETVAL=0
 diff --git a/sslh-main.c b/sslh-main.c
 index 9cc8a06..607b44f 100644
 --- a/sslh-main.c
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/sslh.git/commit/?h=el6&id=de3abdd9a79526f3abbcd003ed41e47645cbb702