[patch] complete patch RC1

syslog-ng-setuser.patch (text/plain), 1.83 KB, created by wbrana on 2013-01-27 11:48:58 UTC

--- syslog-ng-3.3.5-r2.ebuild.orig	2012-06-08 20:50:14.000000000 +0200
+++ syslog-ng-3.3.5-r2.ebuild	2013-01-27 12:20:23.053830432 +0100
@@ -41,6 +41,11 @@
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+pkg_setup() {
+    enewgroup syslog
+    enewuser syslog -1 -1 /nonexistent syslog
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-compile.patch \
@@ -68,8 +73,8 @@
 		--disable-systemd \
 		--with-ivykis=internal \
 		--sysconfdir=/etc/syslog-ng \
-		--localstatedir=/var/lib/misc \
-		--with-pidfile-dir=/var/run \
+		--localstatedir=/var/lib/misc/syslog \
+		--with-pidfile-dir=/var/run/syslog \
 		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
 		$(use_enable caps linux-caps) \
 		$(use_enable ipv6) \
--- files/syslog-ng.rc6.3.3.orig	2011-10-19 08:19:38.000000000 +0200
+++ files/syslog-ng.rc6.3.3	2013-01-27 12:32:32.695886562 +0100
@@ -13,8 +13,8 @@
 SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}
 
 SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/${SVCNAME}.pid}
-SYSLOG_NG_OPTS="--cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/syslog/${SVCNAME}.pid}
+SYSLOG_NG_OPTS="-u syslog -g syslog --cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
 
 depend() {
 	# Make networking dependency conditional on configuration
@@ -50,6 +50,10 @@
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
 	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
+	mkdir /var/run/syslog 2> /dev/null
+	chown syslog /var/run/syslog
+	mkdir /var/lib/misc/syslog 2> /dev/null
+	chown syslog /var/lib/misc/syslog
 	start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
 	eend $? "Failed to start ${SVCNAME}"
 }