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 90d3ef2727..f53c607b41 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
 
 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
 ---
- contrib/systemd/syslog-ng.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ contrib/systemd/syslog-ng.service | 5 ++---
+ 1 file changed, 2 insertion(+), 3 deletions(-)
 
 diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service
 index fc16f8d..8e09deb 100644
@@ -20,11 +20,12 @@ index fc16f8d..8e09deb 100644
  
  [Service]
 -Type=notify
- Sockets=syslog.socket
 -ExecStart=/usr/sbin/syslog-ng -F
-+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
- ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
+-ExecReload=/bin/kill -HUP $MAINPID
++ExecStart=@SBINDIR@/syslog-ng -F -p @LOCALSTATEDIR@/run/syslogd.pid
++ExecReload=@BASEBINDIR@/kill -HUP $MAINPID
+ StandardOutput=journal
+ StandardError=journal
  Restart=on-failure
 -- 
 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 54f6920f5b..ed41f01994 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e0e8658d9be248f01b7933df24dc1408"
 
 # util-linux added to get libuuid
-DEPENDS = "flex eventlog glib-2.0 util-linux"
+DEPENDS = "libpcre flex eventlog glib-2.0 util-linux"
 
 SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${BPN}_${PV}.tar.gz \
            file://syslog-ng.conf \
@@ -70,6 +70,9 @@ do_install_append() {
     install -d ${D}/${localstatedir}/lib/${BPN}
     # Remove /var/run as it is created on startup
     rm -rf ${D}${localstatedir}/run
+    sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service
+    sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service
+    sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service
 }
 
 FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"
@@ -80,6 +83,7 @@ PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg"
 FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*"
 FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la"
 FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug"
+FILES_${PN}-staticdev = "${libdir}/${BPN}/libtest/*.a"
 INSANE_SKIP_${PN}-libs = "dev-so"
 RDEPENDS_${PN} += "${PN}-libs"
 
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 e8940c0abb..0000000000
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require syslog-ng.inc
-
-SRC_URI += " \
-    file://afsql-afsql_dd_insert_db-refactor.patch \
-    file://deinit-the-new-config-when-reverting-to-the.patch \
-    file://fix-a-memory-leak-in-log_driver_free.patch \
-    file://fix-config-libnet.patch \
-    file://fix-invalid-ownership.patch \
-    file://Fix-the-memory-leak-problem-for-mutex.patch \
-    file://Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch \
-    file://free-global-LogTemplateOptions.patch \
-    file://still-free-the-unconsumed-item.patch \
-    file://syslog-ng-verify-the-list-before-del.patch \
-    file://configure.patch \
-    file://dbifix.patch \
-    file://rewrite-expr-grammar.ym-Free-up-token.patch \
-    file://logwriter-dont-allocate-a-new-buffer.patch \
-    file://syslog-ng.service-the-syslog-ng-service.patch \
-"
-
-SRC_URI[md5sum] = "ff3bf223ebafbaa92b69a2d5b729f368"
-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 0000000000..73609af108
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.6.4.bb
@@ -0,0 +1,15 @@
+require syslog-ng.inc
+
+SRC_URI += " \
+    file://fix-a-memory-leak-in-log_driver_free.patch \
+    file://fix-config-libnet.patch \
+    file://fix-invalid-ownership.patch \
+    file://Fix-the-memory-leak-problem-for-mutex.patch \
+    file://Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch \
+    file://configure.patch \
+    file://dbifix.patch \
+    file://syslog-ng.service-the-syslog-ng-service.patch \
+"
+
+SRC_URI[md5sum] = "e9f401615e92e5eb27396c995c1446ba"
+SRC_URI[sha256sum] = "7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7"