summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-02-28 16:54:05 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-04 12:38:53 +0100
commitf5ad70187901bf5464dbff350990c741760ddba3 (patch)
tree62aea327e7fc1d62b4d4c1f391f0aa86979b32ef /meta-oe/recipes-support/syslog-ng/syslog-ng.inc
parenta4835a616b33a2bfe6943dff37327f6858e0fbe8 (diff)
downloadmeta-openembedded-f5ad70187901bf5464dbff350990c741760ddba3.tar.gz
syslog-ng: Update to 3.8.1
* The upstream has changed to github.com. * Remove patches that are no longer needed: - Fix-the-memory-leak-problem-for-mutex.patch - configure.patch - dbifix.patch - fix-a-memory-leak-in-log_driver_free.patch * Update syslog-ng.service-the-syslog-ng-service.patch * openssl is no longer optional, so remove its PACKAGECONFIG. * Add (disabled) PACKAGECONFIGs for the new http and native modules. * Disable the new python and java modules. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/syslog-ng.inc')
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc17
1 files changed, 10 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index a5e1bfe489..e13c57be99 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -10,12 +10,12 @@ ideal for firewalled environments. \
10HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" 10HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system"
11 11
12LICENSE = "GPLv2 & LGPLv2.1" 12LICENSE = "GPLv2 & LGPLv2.1"
13LIC_FILES_CHKSUM = "file://COPYING;md5=e0e8658d9be248f01b7933df24dc1408" 13LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240"
14 14
15# util-linux added to get libuuid 15# util-linux added to get libuuid
16DEPENDS = "libpcre flex eventlog glib-2.0 util-linux" 16DEPENDS = "libpcre flex eventlog glib-2.0 openssl util-linux"
17 17
18SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${BPN}_${PV}.tar.gz \ 18SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
19 file://syslog-ng.conf \ 19 file://syslog-ng.conf \
20 file://initscript \ 20 file://initscript \
21 file://volatiles.03_syslog-ng \ 21 file://volatiles.03_syslog-ng \
@@ -32,28 +32,31 @@ EXTRA_OECONF = " \
32 --sysconfdir=${sysconfdir}/${BPN} \ 32 --sysconfdir=${sysconfdir}/${BPN} \
33 --with-module-dir=${libdir}/${BPN} \ 33 --with-module-dir=${libdir}/${BPN} \
34 --with-sysroot=${STAGING_DIR_HOST} \ 34 --with-sysroot=${STAGING_DIR_HOST} \
35 --with-libmongo-client=no --disable-mongodb \ 35 --without-mongoc --disable-mongodb \
36 --with-librabbitmq-client=no \ 36 --with-librabbitmq-client=no \
37 --disable-python \
38 --disable-java --disable-java-modules \
37 ${CONFIG_TLS} \ 39 ${CONFIG_TLS} \
38" 40"
39 41
40CONFIG_TLS = "--enable-thread-tls" 42CONFIG_TLS = "--enable-thread-tls"
41CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" 43CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
42 44
43PACKAGECONFIG ??= "openssl \ 45PACKAGECONFIG ??= " \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 46 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 47 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
46" 48"
47PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl,"
48PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," 49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,,"
49PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," 50PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd,"
50PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," 51PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap,"
51PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," 52PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi,"
52PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet," 53PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet,"
54PACKAGECONFIG[http] = "--enable-http,--disable-http,curl,"
53PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," 55PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp,"
54PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," 56PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c,"
55PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," 57PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers,"
56PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," 58PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip,"
59PACKAGECONFIG[native] = "--enable-native,--disable-native,,"
57 60
58do_configure_prepend() { 61do_configure_prepend() {
59 olddir=$(pwd) 62 olddir=$(pwd)
@@ -90,7 +93,7 @@ PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg"
90FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" 93FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*"
91FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" 94FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la"
92FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" 95FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug"
93FILES_${PN}-staticdev = "${libdir}/${BPN}/libtest/*.a" 96FILES_${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a"
94INSANE_SKIP_${PN}-libs = "dev-so" 97INSANE_SKIP_${PN}-libs = "dev-so"
95RDEPENDS_${PN} += "${PN}-libs" 98RDEPENDS_${PN} += "${PN}-libs"
96 99