package/sysklogd: bump to version 1.6
PATCH v2 1/1 package/sysklogd: bump to version 1.6
- Switch site to github
- Drop all patches (already in version or not needed anymore)
- Switch to autotools infrastructure
- Add hash for license file
Signed-off-by Fabrice Fontaine <[email protected]>
---
Changes v1 -> v2:
- Fix title (7/7 -> 1/1)
...place-deprecated-union-wait-with-int.patch | 28 ------- .../0002-Fix-improper-header-includes.patch | 78 ------------------- .../0003-Remove-include-of-linux-time.h.patch | 50 ------------ ...d-written-klogctl-syscall-implementa.patch | 38 --------- ...5-Add-missing-headers-for-open-flags.patch | 46 ----------- ...yslogd.c-rename-dprintf-to-mydprintf.patch | 39 ---------- package/sysklogd/Config.in | 2 +- package/sysklogd/sysklogd.hash | 5 +- package/sysklogd/sysklogd.mk | 20 ++--- 9 files changed, 12 insertions(+), 294 deletions(-) delete mode 100644 package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch delete mode 100644 package/sysklogd/0002-Fix-improper-header-includes.patch delete mode 100644 package/sysklogd/0003-Remove-include-of-linux-time.h.patch delete mode 100644 package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch delete mode 100644 package/sysklogd/0005-Add-missing-headers-for-open-flags.patch delete mode 100644 package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch
package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 76685540a7882926c54bc0d1a8945b7a6abffe40 Mon Sep 17 00:00:00 2001 -From: Ryan Coe <[email protected]> -Date: Fri, 7 Oct 2016 19:42:40 -0700 -Subject: [PATCH] Replace deprecated union wait with int - -This is needed for compatibility with glibc >= 2.24. - -Signed-off-by: Ryan Coe <[email protected]> ---- - syslogd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syslogd.c b/syslogd.c -index ea73ea5..ace96c8 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -2094,7 +2094,7 @@ void reapchild() - (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ - wait ((int *)0); - #else -- union wait status; -+ int status; - - while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) - ; --- -2.7.4 -
package/sysklogd/0002-Fix-improper-header-includes.patch deleted +0 -78
78 lines not on this page · raw message
package/sysklogd/0003-Remove-include-of-linux-time.h.patch deleted +0 -50
50 lines not on this page · raw message
package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From fe92a7a8197241f7d6b28ea3c8214bb6d2c7fda4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 28 Nov 2016 23:10:55 +0100 -Subject: [PATCH] Remove bogus hand-written klogctl() syscall implementation - -The way the hand-written klogctl() syscall is written cannot compile, as -_syscall3() is just a function provided by the C library, so calling it -outside of a function doesn't build. - -Since the musl C library provides a klogctl() function, we don't need -this hand-written system call anyway. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - klogd.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/klogd.c b/klogd.c -index 6505d96..9219671 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -274,13 +274,8 @@ - - #define __LIBRARY__ - #include <linux/unistd.h> --#if !defined(__GLIBC__) --# define __NR_ksyslog __NR_syslog --_syscall3(int,ksyslog,int, type, char *, buf, int, len); --#else - #include <sys/klog.h> - #define ksyslog klogctl --#endif - - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 --- -2.7.4 -
package/sysklogd/0005-Add-missing-headers-for-open-flags.patch deleted +0 -46
46 lines not on this page · raw message
package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 68213f6902d291d2ba1626fd950fd7d4a1329d33 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 28 Nov 2016 23:13:08 +0100 -Subject: [PATCH] syslogd.c: rename dprintf() to mydprintf() - -There is an existing kludge in syslogd.c to rename all dprintf() -function calls and its definition to mydprintf(). This kludge is only -applied when the glibc C library is used (i.e when GLIBC is defined), -because glibc also provides a dprintf() function, with a different -signature and behavior. - -However, the musl C library also provides the dprintf() function (with -the same signature as the one in glibc, obviously), but does not define -the GLIBC macro, causing a conflicting definition of dprintf. - -This commit fixes that by having the rename kludge used unconditionally. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - syslogd.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/syslogd.c b/syslogd.c -index b5e8054..22a9ed5 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -818,9 +818,7 @@ void doexit(int sig); - void init(); - void cfline(char *line, register struct filed *f); - int decode(char *name, struct code *codetab); --#if defined(__GLIBC__) - #define dprintf mydprintf --#endif /* __GLIBC__ */ - static void dprintf(char *, ...); - static void allocate_log(void); - void sighup_handler(); --- -2.7.4 -
package/sysklogd/Config.in +1 -1
@@ -5,4 +5,4 @@ config BR2_PACKAGE_SYSKLOGD help System log daemons syslogd and klogd. - http://www.infodrom.org/projects/sysklogd/ + https://github.com/troglobit/sysklogd/
package/sysklogd/sysklogd.hash +3 -2
@@ -1,2 +1,3 @@ -# Locally calculated from download (no sig, hash) -sha256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 sysklogd-1.5.1.tar.gz +# Locally calculated +sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
package/sysklogd/sysklogd.mk +8 -12
@@ -4,24 +4,20 @@ # ################################################################################ -SYSKLOGD_VERSION = 1.5.1 -SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download +SYSKLOGD_VERSION = 1.6 +SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) SYSKLOGD_LICENSE = GPL-2.0+ SYSKLOGD_LICENSE_FILES = COPYING +#?From git +SYSKLOGD_AUTORECONF = YES -# Override SKFLAGS which is used as CFLAGS. -define SYSKLOGD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \ - -C $(@D) -endef - -define SYSKLOGD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/sbin/syslogd - $(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/sbin/klogd +define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf endef +SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG + define SYSKLOGD_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/sysklogd/S01syslogd \ $(TARGET_DIR)/etc/init.d/S01syslogd
@@ -41,4 +37,4 @@ define SYSKLOGD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/etc/systemd/system/syslog.service endef -$(eval $(generic-package)) +$(eval $(autotools-package))
Signature · 1 line
2.20.1
PATCH v2 1/1 package/sysklogd: bump to version 1.6
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Switch site to github
- Drop all patches (already in version or not needed anymore)
- Switch to autotools infrastructure
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2:
- Fix title (7/7 -> 1/1)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard