Skip to contentSkip to conversation

sysklogd: update to 2.0.3

PATCH New Alexander Kanavin 1 participant 2 messages Dec 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sysklogd: update to 2.0.3

Drop all patches as they are no longer necessary with autotools,
fix problems that are addressed upstream, or (in case of no-vectorization.patch) don't apply to the old version either, which means no one is using that hw target anymore.

Remove custom systemd configs (provided by upstream), and custom syslog config (also provided by upstream but not installed by default).

Adjust parselogs to not error out on not being able to find System.map file during boot (that is packaged into kernel-dev and is not normally installed).

License-Update: various tweaks; the license terms are the same.

---
 meta/lib/oeqa/runtime/cases/parselogs.py      |   3 +-
 .../files/0001-Fix-build-with-musl.patch      | 132 ------------------
 ...t-causes-a-segmentation-fault-under-.patch |  28 ----
 ...or-respecting-flags-from-environment.patch |  35 -----
 .../sysklogd/files/klogd.service              |  13 --
 .../sysklogd/files/no-strip-install.patch     |  17 ---
 .../sysklogd/files/no-vectorization.patch     |  20 ---
 meta/recipes-extended/sysklogd/files/sysklogd |   4 +-
 .../sysklogd/files/syslog.conf                |  71 ----------
 .../sysklogd/files/syslogd.service            |  14 --
 .../sysklogd/files/tmpfiles.sysklogd.conf     |   1 -
 meta/recipes-extended/sysklogd/sysklogd.inc   |  46 ++----
 .../sysklogd/sysklogd_1.5.1.bb                |   3 -
 .../sysklogd/sysklogd_2.0.3.bb                |   3 +
 14 files changed, 19 insertions(+), 371 deletions(-)
 delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/klogd.service
 delete mode 100644 meta/recipes-extended/sysklogd/files/no-strip-install.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/no-vectorization.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/syslog.conf
 delete mode 100644 meta/recipes-extended/sysklogd/files/syslogd.service
 delete mode 100644 meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
 delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
 create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb
meta/lib/oeqa/runtime/cases/parselogs.py +2 -1
index 15343d7abbe..b7c7b30adf5 100644
@@ -55,7 +55,8 @@ common_errors = [
     "Failed to read /var/lib/nfs/statd/state: Success",
     "error retry time-out =",
     "logind: cannot setup systemd-logind helper (-61), using legacy fallback",
-    "Error changing net interface name 'eth0' to "
+    "Error changing net interface name 'eth0' to ",
+    "Cannot find a map file"
     ]
 
 video_related = [
meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch deleted +0 -132

132 lines not on this page · raw message

meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch deleted +0 -28
deleted file mode 100644
index 56431af8456..00000000000
@@ -1,28 +0,0 @@
-From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 30 Jun 2017 18:20:06 -0700
-Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some
- conditions
-
-Upstream-Status: Inappropriate [ no upstream ]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- ksym_mod.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ksym_mod.c b/ksym_mod.c
-index 6e26da1..a3daa7d 100644
---- a/ksym_mod.c
-+++ b/ksym_mod.c
-@@ -186,7 +186,6 @@ extern int InitMsyms()
- 		else
- 			Syslog(LOG_ERR, "Error loading kernel symbols " \
- 			       "- %s\n", strerror(errno));
--		fclose(ksyms);
- 		return(0);
- 	}
- 
--- 
-2.13.2
-
meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch deleted +0 -35
deleted file mode 100644
index ebbdef303bc..00000000000
@@ -1,35 +0,0 @@
-From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 1 Jul 2017 00:01:50 -0700
-Subject: [PATCH 2/2] Make way for respecting flags from environment
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5af1689..af699d2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,14 +17,12 @@
- #   along with this program; if not, write to the Free Software
- #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--CC= gcc
- #SKFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # $(shell getconf LFS_SKFLAGS)
--LDFLAGS= -s
- 
- # Look where your install program is.
- INSTALL = /usr/bin/install
--- 
-2.13.2
-
meta/recipes-extended/sysklogd/files/klogd.service deleted +0 -13
deleted file mode 100644
index 0c888c497dd..00000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Kernel Logging Service
-After=syslogd.service
-
-[Service]
-Type=forking
-ExecStart=/sbin/klogd
-PIDFile=/var/run/klogd.pid
-StandardOutput=null
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-extended/sysklogd/files/no-strip-install.patch deleted +0 -17
deleted file mode 100644
index d426c83bf25..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: sysklogd-1.5.1/Makefile
-===================================================================
---- sysklogd-1.5.1.orig/Makefile
-+++ sysklogd-1.5.1/Makefile
-@@ -127,8 +127,8 @@ clobber: clean
- 	rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
- 
- install_exec: syslogd klogd
--	${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
--	${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
-+	${INSTALL} -m 500 syslogd ${BINDIR}/syslogd
-+	${INSTALL} -m 500 klogd ${BINDIR}/klogd
- 
- install_man:
- 	${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
meta/recipes-extended/sysklogd/files/no-vectorization.patch deleted +0 -20
deleted file mode 100644
index c1cc042c9cf..00000000000
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate
-
-The compiler should not be generating vectorized instructions on this target.
-This is a work around until I can determine why this is occuring on this
-particular recipe
-
-Index: sysklogd-1.5/Makefile
-===================================================================
---- sysklogd-1.5.orig/Makefile
-+++ sysklogd-1.5/Makefile
-@@ -20,7 +20,8 @@
- CC= gcc
- #SKFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce \
-+	-fno-tree-vectorize
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # $(shell getconf LFS_SKFLAGS)
meta/recipes-extended/sysklogd/files/sysklogd +2 -2
index 73424840ba3..4a4ca8a78ed 100755
@@ -19,8 +19,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 pidfile_syslogd=/var/run/syslogd.pid
 pidfile_klogd=/var/run/klogd.pid
-binpath_syslogd=/sbin/syslogd
-binpath_klogd=/sbin/klogd
+binpath_syslogd=/usr/sbin/syslogd
+binpath_klogd=/usr/sbin/klogd
 
 test -x $binpath || exit 0
 
meta/recipes-extended/sysklogd/files/syslog.conf deleted +0 -71

71 lines not on this page · raw message

meta/recipes-extended/sysklogd/files/syslogd.service deleted +0 -14
deleted file mode 100644
index eeaff3d38d6..00000000000
@@ -1,14 +0,0 @@
-[Unit]
-Description=System Logging Service
-Requires=syslog.socket
-
-[Service]
-Type=forking
-ExecStart=/sbin/syslogd
-PIDFile=/var/run/syslogd.pid
-StandardOutput=null
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=syslog.service
meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf deleted +0 -1
deleted file mode 100644
index f4aecd385b6..00000000000
@@ -1 +0,0 @@
-p /dev/xconsole 0640 root adm
meta/recipes-extended/sysklogd/sysklogd.inc +12 -34

66 lines not on this page · raw message

meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb deleted +0 -3
deleted file mode 100644
index 88bcfd9e4a0..00000000000
@@ -1,3 +0,0 @@
-require sysklogd.inc
-
-SRCREV = "930a2b1c0d15b14309a49f14e3f30e905456af4d"
meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb new file +3 -0
new file mode 100644
index 00000000000..21f750fa60f
@@ -0,0 +1,3 @@
+require sysklogd.inc
+
+SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 libtasn1: update to 4.15.0

Drop backports.

---
 .../gnutls/libtasn1/fix-gtkdoc.patch          | 38 -------------------
 .../gnutls/libtasn1/fix-ldflags.patch         | 31 ---------------
 .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb}  | 11 ++++--
 3 files changed, 7 insertions(+), 73 deletions(-)
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch
 rename meta/recipes-support/gnutls/{libtasn1_4.14.bb => libtasn1_4.15.0.bb} (72%)
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0 -38
deleted file mode 100644
index bfc9b9fca7e..00000000000
@@ -1,38 +0,0 @@
-Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49]
-Signed-off-by: Ross Burton <[email protected]>
-
-From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Mon, 9 Sep 2019 13:11:39 +0100
-Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter
-
-The object hierarchy section is empty because there are no GObjects in the
-libtasn1 API.  With gtk-doc 1.30 onwards if there are no objects then the object
-hierarchy file won't exist, resulting in a failure when building the
-documentation:
-
-| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found
-
-Signed-off-by: Ross Burton <[email protected]>
----
- doc/reference/libtasn1-docs.xml | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml
-index accdb85..f88b888 100644
---- a/doc/reference/libtasn1-docs.xml
-+++ b/doc/reference/libtasn1-docs.xml
-@@ -34,10 +34,6 @@
-         <xi:include href="xml/libtasn1.xml"/>
- 
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--    <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
--- 
-2.20.1
-
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0 -31
deleted file mode 100644
index f18f3c62679..00000000000
@@ -1,31 +0,0 @@
-From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]>
-Date: Tue, 23 Jul 2019 20:44:01 +0200
-Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Tim Rühsen <[email protected]>
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <[email protected]>
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5bf3622..4459767 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
-  -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS)
- 
- LDADD = ../lib/libtasn1.la
--LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
-+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
- 
- bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding
- 
--- 
-2.21.0
-
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +7 -4
similarity index 72%
rename from meta/recipes-support/gnutls/libtasn1_4.14.bb
rename to meta/recipes-support/gnutls/libtasn1_4.15.0.bb
index ef2c1956a24..398faa29a86 100644
@@ -10,15 +10,18 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
-           file://fix-ldflags.patch \
-           file://fix-gtkdoc.patch \
            "
 
 DEPENDS = "bison-native"
 
-SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205"
-SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08"
+SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8"
+SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e"
 
 inherit autotools texinfo lib_package gtk-doc
 
+do_install_append () {
+    # this utility has a bogus RPATH
+    chrpath -d ${D}/${bindir}/corpus2array
+}
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1