Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 544766
Collapse All | Expand All

(-)a/app-admin/syslog-ng/files/3.6/syslog-ng.rc6 (-10 / +11 lines)
Lines 1-19 Link Here
1
#!/sbin/runscript
1
#!/sbin/runscript
2
# Copyright 1999-2014 Gentoo Foundation
2
# Copyright 1999-2015 Gentoo Foundation
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.2 2014/12/18 19:51:36 mr_bones_ Exp $
4
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.2 2014/12/18 19:51:36 mr_bones_ Exp $
5
5
6
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
6
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
7
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
7
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/${RC_SVCNAME}}
8
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
8
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
9
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
9
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run/${RC_SVCNAME}}
10
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
10
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
11
SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_CONTROLFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
11
12
12
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
13
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-${RC_SVCNAME}}
13
SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
14
SYSLOG_NG_USER=${SYSLOG_NG_USER:-${RC_SVCNAME}}
14
15
15
command="/usr/sbin/syslog-ng"
16
command="/usr/sbin/syslog-ng"
16
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
17
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
17
extra_commands="checkconfig"
18
extra_commands="checkconfig"
18
extra_started_commands="reload"
19
extra_started_commands="reload"
19
pidfile="${SYSLOG_NG_PIDFILE}"
20
pidfile="${SYSLOG_NG_PIDFILE}"
Lines 22-28 description="Syslog-ng is a syslog replacement with advanced filtering features. Link Here
22
description_checkconfig="Check the configuration file that will be used by \"start\""
23
description_checkconfig="Check the configuration file that will be used by \"start\""
23
description_reload="Reload the configuration without exiting"
24
description_reload="Reload the configuration without exiting"
24
required_files="${SYSLOG_NG_CONFIGFILE}"
25
required_files="${SYSLOG_NG_CONFIGFILE}"
25
required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
26
26
27
depend() {
27
depend() {
28
	use clock
28
	use clock
Lines 42-49 start_pre() { Link Here
42
	checkpath \
42
	checkpath \
43
		-d \
43
		-d \
44
		--mode 0700 \
44
		--mode 0700 \
45
		--owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
45
		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
46
		"${SYSLOG_NG_STATEFILE_DIR}"
46
		"${SYSLOG_NG_STATEFILE_DIR}" \
47
		"${SYSLOG_NG_PIDFILE_DIR}"
47
}
48
}
48
49
49
stop_pre() {
50
stop_pre() {
(-)a/app-admin/syslog-ng/metadata.xml (+1 lines)
Lines 8-13 Link Here
8
<use>
8
<use>
9
	<flag name='amqp'>Enable support for AMQP destinations</flag>
9
	<flag name='amqp'>Enable support for AMQP destinations</flag>
10
	<flag name='smtp'>Enable support for SMTP destinations</flag>
10
	<flag name='smtp'>Enable support for SMTP destinations</flag>
11
	<flag name='extra-caps'>Permit more Linux capabilities</flag>
11
	<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
12
	<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
12
	<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
13
	<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
13
	<flag name='mongodb'>Enable support for mongodb destinations</flag>
14
	<flag name='mongodb'>Enable support for mongodb destinations</flag>
(-)a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild (-2 / +32 lines)
Lines 3-9 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.7 2015/03/25 14:01:18 ago Exp $
3
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.7 2015/03/25 14:01:18 ago Exp $
4
4
5
EAPI=5
5
EAPI=5
6
inherit eutils multilib systemd versionator
6
inherit eutils fcaps user multilib systemd versionator
7
7
8
MY_PV=${PV/_/}
8
MY_PV=${PV/_/}
9
MY_PV_MM=$(get_version_component_range 1-2)
9
MY_PV_MM=$(get_version_component_range 1-2)
Lines 14-20 SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc Link Here
14
LICENSE="GPL-2+ LGPL-2.1+"
14
LICENSE="GPL-2+ LGPL-2.1+"
15
SLOT="0"
15
SLOT="0"
16
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
16
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
17
IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
17
IUSE="amqp caps dbi extra-caps geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
18
REQUIRED_USE="extra-caps? ( filecaps )"
18
RESTRICT="test"
19
RESTRICT="test"
19
20
20
RDEPEND="
21
RDEPEND="
Lines 37-42 DEPEND="${RDEPEND} Link Here
37
38
38
S=${WORKDIR}/${PN}-${MY_PV}
39
S=${WORKDIR}/${PN}-${MY_PV}
39
40
41
pkg_setup() {
42
	if use caps; then
43
		ewarn "\"caps\" USE flag is only useful for limiting privileges when running syslog-ng as root."
44
		ewarn "It is suggested to use \"filecaps\" instead and run as syslog-ng user."
45
	fi
46
}
47
40
src_prepare() {
48
src_prepare() {
41
	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
49
	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
42
	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
50
	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
Lines 110-115 src_install() { Link Here
110
}
118
}
111
119
112
pkg_postinst() {
120
pkg_postinst() {
121
	enewuser syslog-ng
122
123
	# Capabilities, see 'man capabilities 7' for more info:
124
	#
125
	# 'cap_syslog' is required to read /proc/kmsg, if disabled syslog-ng fails with these errors:
126
	# 	Error opening file for reading; filename='/proc/kmsg', error='Operation not permitted (1)'
127
	# 	Error initializing message pipeline;
128
	#
129
	# 'cap_dac_override' is required to read /dev/log, if disabled syslog-ng fails with these errors:
130
	# 	Error binding socket; addr='AF_UNIX(/dev/log)', error='Address already in use (98)'
131
	# 	Error initializing message pipeline;
132
	#
133
	# 'cap_chown' is required to change owners of logs
134
135
	# enable minimal required for standalone logger capabilities
136
	logger_caps='cap_chown,cap_dac_override,cap_syslog'
137
	# enable all capabilities from syslog-ng/main.c BASE_CAPS
138
	use extra-caps && logger_caps+=',cap_chown,cap_dac_read_search,cap_net_bind_service,cap_net_broadcast,cap_net_raw'
139
140
	chown root:syslog-ng "${EROOT}"/usr/sbin/syslog-ng || die
141
	fcaps -o root -g syslog-ng -m 4710 -M 0710 "${logger_caps}+ep" /usr/sbin/syslog-ng
142
113
	elog "For detailed documentation please see the upstream website:"
143
	elog "For detailed documentation please see the upstream website:"
114
	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
144
	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
115
145

Return to bug 544766