diff options
author | Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-01-12 18:23:16 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-27 12:43:56 +0100 |
commit | 72210ea4769d9f58477931d78c4e506ef6ad776b (patch) | |
tree | 7f57280e0fdd2bb5303018c02362089ae9ec42a5 | |
parent | 19a3f18e1e4f40a2c52108765c1f91e89691ba0e (diff) | |
download | meta-openembedded-72210ea4769d9f58477931d78c4e506ef6ad776b.tar.gz |
syslog-ng: 3.5.4.1 -> 3.6.4
Upgrade syslog-ng from 3.5.4.1 to 3.6.4.
1) Modify the syslog-ng.service-the-syslog-ng-service.patch,since the datas has been changed.
2) Delete these patches,since they are not needed any more.
afsql-afsql_dd_insert_db-refactor.patch
deinit-the-new-config-when-reverting-to-the.patch
free-global-LogTemplateOptions.patch
still-free-the-unconsumed-item.patch
syslog-ng-verify-the-list-before-del.patch
rewrite-expr-grammar.ym-Free-up-token.patch
logwriter-dont-allocate-a-new-buffer.patch
3) Fix WARNING:
QA Issue: syslog-ng-libs rdepends on libpcre, but it isn't a build dependency? [build-deps]
QA Issue: syslog-ng rdepends on libpcre, but it isn't a build dependency? [build-deps]
4) Fix ERROR: QA Issue: non -staticdev package contains static .a library:
work/i586-poky-linux/syslog-ng/3.6.4-r0/packages-split/syslog-ng/usr/lib/syslog-ng/libtest/libsyslog-ng-test.a' [staticdev]
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
4 files changed, 27 insertions, 29 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 90d3ef272..f53c607b4 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch | |||
@@ -8,8 +8,8 @@ Upstream-Status: pending | |||
8 | 8 | ||
9 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | 9 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
10 | --- | 10 | --- |
11 | contrib/systemd/syslog-ng.service | 3 +-- | 11 | contrib/systemd/syslog-ng.service | 5 ++--- |
12 | 1 file changed, 1 insertion(+), 2 deletions(-) | 12 | 1 file changed, 2 insertion(+), 3 deletions(-) |
13 | 13 | ||
14 | diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service | 14 | diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service |
15 | index fc16f8d..8e09deb 100644 | 15 | index fc16f8d..8e09deb 100644 |
@@ -20,11 +20,12 @@ index fc16f8d..8e09deb 100644 | |||
20 | 20 | ||
21 | [Service] | 21 | [Service] |
22 | -Type=notify | 22 | -Type=notify |
23 | Sockets=syslog.socket | ||
24 | -ExecStart=/usr/sbin/syslog-ng -F | 23 | -ExecStart=/usr/sbin/syslog-ng -F |
25 | +ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid | 24 | -ExecReload=/bin/kill -HUP $MAINPID |
26 | ExecReload=/bin/kill -HUP $MAINPID | 25 | +ExecStart=@SBINDIR@/syslog-ng -F -p @LOCALSTATEDIR@/run/syslogd.pid |
27 | StandardOutput=null | 26 | +ExecReload=@BASEBINDIR@/kill -HUP $MAINPID |
27 | StandardOutput=journal | ||
28 | StandardError=journal | ||
28 | Restart=on-failure | 29 | Restart=on-failure |
29 | -- | 30 | -- |
30 | 1.8.4.2 | 31 | 1.8.4.2 |
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 54f6920f5..ed41f0199 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -13,7 +13,7 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=e0e8658d9be248f01b7933df24dc1408" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=e0e8658d9be248f01b7933df24dc1408" |
14 | 14 | ||
15 | # util-linux added to get libuuid | 15 | # util-linux added to get libuuid |
16 | DEPENDS = "flex eventlog glib-2.0 util-linux" | 16 | DEPENDS = "libpcre flex eventlog glib-2.0 util-linux" |
17 | 17 | ||
18 | SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${BPN}_${PV}.tar.gz \ | 18 | SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${BPN}_${PV}.tar.gz \ |
19 | file://syslog-ng.conf \ | 19 | file://syslog-ng.conf \ |
@@ -70,6 +70,9 @@ do_install_append() { | |||
70 | install -d ${D}/${localstatedir}/lib/${BPN} | 70 | install -d ${D}/${localstatedir}/lib/${BPN} |
71 | # Remove /var/run as it is created on startup | 71 | # Remove /var/run as it is created on startup |
72 | rm -rf ${D}${localstatedir}/run | 72 | rm -rf ${D}${localstatedir}/run |
73 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service | ||
74 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service | ||
75 | sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service | ||
73 | } | 76 | } |
74 | 77 | ||
75 | FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" | 78 | FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" |
@@ -80,6 +83,7 @@ PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" | |||
80 | FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" | 83 | FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" |
81 | FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" | 84 | FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" |
82 | FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" | 85 | FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" |
86 | FILES_${PN}-staticdev = "${libdir}/${BPN}/libtest/*.a" | ||
83 | INSANE_SKIP_${PN}-libs = "dev-so" | 87 | INSANE_SKIP_${PN}-libs = "dev-so" |
84 | RDEPENDS_${PN} += "${PN}-libs" | 88 | RDEPENDS_${PN} += "${PN}-libs" |
85 | 89 | ||
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb deleted file mode 100644 index e8940c0ab..000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | require syslog-ng.inc | ||
2 | |||
3 | SRC_URI += " \ | ||
4 | file://afsql-afsql_dd_insert_db-refactor.patch \ | ||
5 | file://deinit-the-new-config-when-reverting-to-the.patch \ | ||
6 | file://fix-a-memory-leak-in-log_driver_free.patch \ | ||
7 | file://fix-config-libnet.patch \ | ||
8 | file://fix-invalid-ownership.patch \ | ||
9 | file://Fix-the-memory-leak-problem-for-mutex.patch \ | ||
10 | file://Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch \ | ||
11 | file://free-global-LogTemplateOptions.patch \ | ||
12 | file://still-free-the-unconsumed-item.patch \ | ||
13 | file://syslog-ng-verify-the-list-before-del.patch \ | ||
14 | file://configure.patch \ | ||
15 | file://dbifix.patch \ | ||
16 | file://rewrite-expr-grammar.ym-Free-up-token.patch \ | ||
17 | file://logwriter-dont-allocate-a-new-buffer.patch \ | ||
18 | file://syslog-ng.service-the-syslog-ng-service.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "ff3bf223ebafbaa92b69a2d5b729f368" | ||
22 | SRC_URI[sha256sum] = "92c6969e4172b4fd32390f80043b4de7b116f29989d8c2e5a8a687ee6dcd6f66" | ||
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb new file mode 100644 index 000000000..73609af10 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require syslog-ng.inc | ||
2 | |||
3 | SRC_URI += " \ | ||
4 | file://fix-a-memory-leak-in-log_driver_free.patch \ | ||
5 | file://fix-config-libnet.patch \ | ||
6 | file://fix-invalid-ownership.patch \ | ||
7 | file://Fix-the-memory-leak-problem-for-mutex.patch \ | ||
8 | file://Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch \ | ||
9 | file://configure.patch \ | ||
10 | file://dbifix.patch \ | ||
11 | file://syslog-ng.service-the-syslog-ng-service.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "e9f401615e92e5eb27396c995c1446ba" | ||
15 | SRC_URI[sha256sum] = "7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7" | ||