diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-11 15:58:48 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-11 15:59:15 +0300 |
commit | 2f9739240bcb1cfd0675bbe77c02b5f7c32219b1 (patch) | |
tree | 1055886a67869b77ae1c7c2f3722934153574ea6 /meta-openembedded/meta-oe/recipes-support/syslog-ng | |
parent | bf18570e7823c708c807889633686f17f4632e4a (diff) | |
download | openbmc-2f9739240bcb1cfd0675bbe77c02b5f7c32219b1.tar.xz |
meta-openembedded: subtree update:e0daf6f8e0..3a9262866d
Adrian Bunk (1):
xfce-polkit: Upgrade 0.2 -> 0.3
Alex Kiernan (2):
ostree: Add support for ptest
ostree: Upgrade 2019.4 -> 2019.5
Alistair Francis (1):
openocd: Update to latest git version
Anders Roxell (1):
s-suite: install missing create_config.sh
Andreas Müller (6):
mm-common: upgrade 0.9.12 -> 1.0.0 / meson build / add SUMMARY
mm-common: do really build with meson
libpeas: upgrade 1.22.0 -> 1.24.1
xfce4-screenshooter: upgrade 1.9.6 -> 1.9.7
xfce4-time-out-plugin: upgrade 1.0.3 -> 1.1.0
xfce4-whiskermenu-plugin: upgrade 2.3.3 -> 2.3.4
Andreas Oberritter (4):
haveged: Fix missing initscript when both systemd and sysvinit are enabled
samba: fix installation for minimal build
autofs: set some paths for configure script
autofs: install sysvinit script manually if systemd is enabled
André Draszik (8):
jansson: allow to build a -native package
cunit: allow to build a -native package
libev: allow to build a -native package
nghttp2: fix UPSTREAM_CHECK_URI
nghttp2: update to 1.39.2
nghttp2: build more of this & fix packaging
nghttp2: allow to build a -native package
nodejs: allow use of system nghttp2
Hongxu Jia (10):
python-pluggy: add python-importlib-metadata to RDEPENDS
python-more-itertools.inc: fix python2 package not incorrectly generated
python-more-itertools: downgrade 7.2.0 -> 5.0.0
python-importlib-metadata: add missing runtime depends
python-pathlib2: add python-scandir and python-misc to runtime depends
python-scandir: add version 1.10.0
python-contextlib2/python3-contextlib2: add version 0.6.0
python3-importlib-metadata: add python3-misc to runtime depends
python-importlib-metadata: add python-compression to runtime depends
python-configparser: add python-pkgutil to runtime depends
Kai Kang (4):
xfce4-genmon-plugin: 4.0.1 -> 4.0.2
xfce-panel-plugin.bbclass: correct SRC_URI with xfce_verdir
xfce4-weather-plugin: 0.9.1 -> 0.10.0
xfce4-screensaver: 0.1.5 -> 0.1.8
Khem Raj (8):
iwd: Fix installed-vs-shipped QA errors on systemd units
iwd: Fix build race during documentation build
ifplugd: Include stdint.h for uintXX_t
netkit-rwho: Include stdint.h for int32_t
libowfat: Fix parallel build
grpc: Add dep on libnsl
gtkwave: Upgrade to 3.3.102
syslog-ng: Do not install non-existing systemd file
Ming Liu (2):
python-jsonschema: RDEPENDS on python-importlib-metadata
ostree: fix some invalid condition checking
Oleksandr Kravchuk (1):
iwd: update to 1.0
Stefan Agner (2):
zstd: Upgrade 1.4.3 -> 1.4.4
zstd: move recipe to oe-core
Yi Zhao (2):
libldb: upgrade 1.5.5 -> 1.5.6
samba: upgrade 4.10.8 -> 4.10.10
Zang Ruochen (20):
python-pyjks: upgrade 17.1.1 -> 19.0.0
python-pyjwt: upgrade 1.6.4 -> 1.7.1
python-pymisp: upgrade 2.4.93 -> 2.4.117.2
xorriso: upgrade 1.5.0 -> 1.5.3
python-cython: upgrade 0.29.13 -> 0.29.14
python-decorator: upgrade 4.4.0 -> 4.4.1
python-dominate: upgrade 2.3.1 -> 2.4.0
python-flask-babel: upgrade 0.11.2 -> 0.12.2
python-flask-migrate: upgrade 2.2.1 -> 2.5.2
python-flask-restful: upgrade 0.3.6 -> 0.3.7
python-flask-socketio: upgrade 3.3.2 -> 4.2.1
python-flask-sqlalchemy: upgrade 2.3.2 -> 2.4.1
python-paho-mqtt: upgrade 1.4.0 -> 1.5.0
python-pyroute2: upgrade 0.5.2 -> 0.5.7
python-pyrsistent: upgrade 0.15.4 -> 0.15.5
python-pysmi: upgrade 0.2.2 -> 0.3.4
python-pytest: upgrade 5.2.1 -> 5.2.2
python-serpent: upgrade 1.25 -> 1.28
python-smbus: upgrade 4.0 -> 4.1
python-snimpy: upgrade 0.8.12 -> 0.8.13
Zheng Ruoqin (19):
mdns: upgrade 878.200.35 -> 878.260.1
ledmon: Modify the Upstream-Status to Submitted.
byacc: upgrade 20190617 -> 20191103
ccid: upgrade 1.4.30 -> 1.4.31
dialog: upgrade 1.3-20190728 -> 1.3-20190808
cryptsetup: upgrade 2.2.1 -> 2.2.2
lvm2/libdevmapper: 2.03.05 -> 2.03.06
libssh2: upgrade 1.8.2 -> 1.9.0
mariadb: upgrade 10.3.16 -> 10.3.18
mcelog: upgrade 164 -> 165
mce-test: Update to latest git version
postgresql: upgrade 11.5 -> 12.0
protobuf: upgrade 3.10.0 -> 3.10.1
sshfs-fuse: upgrade 3.5.2 -> 3.6.0
syslog-ng: upgrade 3.19.1 -> 3.24.1
tslib: upgrade 1.16 -> 1.21
xkbprint: upgrade 1.0.4 -> 1.0.5
xterm: upgrade 349 -> 350
zabbix: upgrade 4.2.7 -> 4.2.8
Zhixiong Chi (1):
gtkwave: add the libtirpc dependence and config
Change-Id: I7dd3609b2d3166e5ba2f977e26026f2b675dc108
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/syslog-ng')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch | 44 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch | 24 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb) | 4 |
5 files changed, 50 insertions, 50 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch index 0fc40be4a..b5bfcd025 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch @@ -1,6 +1,3 @@ -From caeccb7bec45f65bc89efa8195b3853368328361 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 17 Sep 2018 12:49:36 +0800 Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 service start failed since segment fault on arch arm64, @@ -17,12 +14,15 @@ https://github.com/buytenh/ivykis/issues/15 Upstream-Status: Pending Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - lib/ivykis/src/pthr.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + lib/ivykis/src/pthr.h | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..72c5190 100644 +index 29e4be7..5d29096 100644 --- a/lib/ivykis/src/pthr.h +++ b/lib/ivykis/src/pthr.h @@ -24,6 +24,16 @@ @@ -47,12 +47,12 @@ index a41eaf3..72c5190 100644 #ifdef HAVE_PRAGMA_WEAK -/* -- * On Linux, pthread_atfork() is defined in libpthread_nonshared.a, -- * a static library, and we want to avoid "#pragma weak" for that -- * symbol because that causes it to be undefined even if you link -- * libpthread_nonshared.a in explicitly. +- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for +- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and +- * we want to avoid "#pragma weak" for that symbol because that causes +- * it to be undefined even if you link lib*_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED +-#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) -#pragma weak pthread_atfork -#endif - @@ -60,16 +60,15 @@ index a41eaf3..72c5190 100644 #pragma weak pthread_create #pragma weak pthread_detach #pragma weak pthread_getspecific -@@ -73,8 +74,7 @@ static inline int +@@ -73,7 +74,7 @@ static inline int pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { if (pthreads_available()) - return pthread_atfork(prepare, parent, child); -- + return __register_atfork(prepare, parent, child, __dso_handle); + return ENOSYS; } - -- 2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch index 553f4a517..4ad0afa95 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch @@ -6,25 +6,28 @@ This would avoid a implicit auto-detecting result. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.ac | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) + configure.ac | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) -Index: syslog-ng-3.8.1/configure.ac -=================================================================== ---- syslog-ng-3.8.1.orig/configure.ac -+++ syslog-ng-3.8.1/configure.ac -@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h) +diff --git a/configure.ac b/configure.ac +index 00eb566..e7d5ac1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments -+AC_ARG_ENABLE(libnet, ++AC_ARG_ENABLE(libnet, + [ --enable-libnet Enable libnet support.],, enable_libnet="no") + AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , -@@ -893,22 +896,26 @@ dnl ************************************ +@@ -1047,19 +1050,20 @@ dnl *************************************************************************** dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) @@ -39,7 +42,14 @@ Index: syslog-ng-3.8.1/configure.ac + else + LIBNET_CONFIG="$with_libnet/libnet-config" + fi -+ + +-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" +- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" +- AC_MSG_RESULT(yes) +-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build +-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till +- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then + LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" + LIBNET_LIBS="`$LIBNET_CONFIG --libs`" @@ -48,16 +58,8 @@ Index: syslog-ng-3.8.1/configure.ac + AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) + fi --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) else LIBNET_LIBS= - AC_MSG_RESULT(no) - fi - -- - if test "x$enable_spoof_source" = "xauto"; then - AC_MSG_CHECKING(whether to enable spoof source support) - if test "x$LIBNET_LIBS" != "x"; then +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 39c3f59ce..0e1d09492 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,16 +1,17 @@ -From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Wed, 17 Jun 2015 14:46:30 +0900 -Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. Upstream-Status: pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> + +Update for 3.24.1 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - contrib/systemd/syslog-ng.service | 5 ++--- - 1 file changed, 2 insertion(+), 3 deletions(-) + contrib/systemd/syslog-ng@.service | 4 ++-- + contrib/systemd/syslog-ng@default | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service index a28640e..93aec94 100644 @@ -28,19 +29,18 @@ index a28640e..93aec94 100644 StandardError=journal Restart=on-failure diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default -index 02da288..3a8215d 100644 +index 0ccc2b9..7f08c0e 100644 --- a/contrib/systemd/syslog-ng@default +++ b/contrib/systemd/syslog-ng@default @@ -1,5 +1,5 @@ --CONFIG_FILE=/etc/syslog-ng.conf + CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist --CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl +-CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid -+CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" - -- -1.8.4.2 +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 4c22d4b0f..3aba4473d 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -92,7 +92,6 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 0644 ${S}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb index 852343c23..01ed76765 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb @@ -10,5 +10,5 @@ SRC_URI += " \ file://syslog-ng-tmp.conf \ " -SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" -SRC_URI[sha256sum] = "5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178" +SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" +SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" |