Attachment #337002 for bug #453024

View | Details | Raw Unified | Return to bug 453024
Collapse All | Expand All

Lines 41-46 Link Here

(-)syslog-ng-3.3.5-r2.ebuild.orig (-2 / +7 lines)
41		41
42	S=${WORKDIR}/${PN}-${MY_PV}	42	S=${WORKDIR}/${PN}-${MY_PV}
43		43
		44	pkg_setup() {
		45	enewgroup syslog
		46	enewuser syslog -1 -1 /nonexistent syslog
		47	}
		48
44	src_prepare() {	49	src_prepare() {
45	epatch \	50	epatch \
46	"${FILESDIR}"/${P}-compile.patch \	51	"${FILESDIR}"/${P}-compile.patch \
Lines 68-75 Link Here
68	--disable-systemd \	73	--disable-systemd \
69	--with-ivykis=internal \	74	--with-ivykis=internal \
70	--sysconfdir=/etc/syslog-ng \	75	--sysconfdir=/etc/syslog-ng \
71	--localstatedir=/var/lib/misc \	76	--localstatedir=/var/lib/misc/syslog \
72	--with-pidfile-dir=/var/run \	77	--with-pidfile-dir=/var/run/syslog \
73	--with-module-dir=/usr/$(get_libdir)/syslog-ng \	78	--with-module-dir=/usr/$(get_libdir)/syslog-ng \
74	$(use_enable caps linux-caps) \	79	$(use_enable caps linux-caps) \
75	$(use_enable ipv6) \	80	$(use_enable ipv6) \

Lines 13-20 Link Here

(-)files/syslog-ng.rc6.3.3.orig (-2 / +6 lines)
13	SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}	13	SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}
14		14
15	SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}	15	SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}
16	SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/${SVCNAME}.pid}	16	SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/syslog/${SVCNAME}.pid}
17	SYSLOG_NG_OPTS="--cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"	17	SYSLOG_NG_OPTS="-u syslog -g syslog --cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
18		18
19	depend() {	19	depend() {
20	# Make networking dependency conditional on configuration	20	# Make networking dependency conditional on configuration
Lines 50-55 Link Here
50	checkconfig \|\| return 1	50	checkconfig \|\| return 1
51	ebegin "Starting ${SVCNAME}"	51	ebegin "Starting ${SVCNAME}"
52	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"	52	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
		53	mkdir /var/run/syslog 2> /dev/null
		54	chown syslog /var/run/syslog
		55	mkdir /var/lib/misc/syslog 2> /dev/null
		56	chown syslog /var/lib/misc/syslog
53	start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}	57	start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
54	eend $? "Failed to start ${SVCNAME}"	58	eend $? "Failed to start ${SVCNAME}"
55	}	59	}

Return to bug 453024