summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-23 21:08:50 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-23 21:08:50 -0500
commitadaa3e13243bc808cc4a0d91980ba6fa0a5b4aa8 (patch)
tree41a4ea3f72a01135bfedb58a4a2856cf1881e05a
parent4d991936c0489b5a4e12e5a06de56a68a0e37b97 (diff)
downloadpackages-adaa3e13243bc808cc4a0d91980ba6fa0a5b4aa8.tar.gz
packages-adaa3e13243bc808cc4a0d91980ba6fa0a5b4aa8.tar.bz2
packages-adaa3e13243bc808cc4a0d91980ba6fa0a5b4aa8.tar.xz
packages-adaa3e13243bc808cc4a0d91980ba6fa0a5b4aa8.zip
system/sysklogd: [PD] no maintainer, fix for utmpx
-rw-r--r--system/sysklogd/APKBUILD14
-rw-r--r--system/sysklogd/utmpx.patch78
2 files changed, 86 insertions, 6 deletions
diff --git a/system/sysklogd/APKBUILD b/system/sysklogd/APKBUILD
index 3e15a8444..fb9885595 100644
--- a/system/sysklogd/APKBUILD
+++ b/system/sysklogd/APKBUILD
@@ -1,15 +1,16 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer:
pkgname=sysklogd
pkgver=1.5.1
pkgrel=1
pkgdesc="System and kernel log daemons"
url="http://www.infodrom.org/projects/sysklogd/"
arch="all"
-license="GPL BSD"
-subpackages="$pkgname-doc"
+options="!check" # requires kernel sources to build oops.ko
+license="GPL-2.0+ AND BSD-4-Clause-UC"
+subpackages="$pkgname-doc $pkgname-openrc"
depends=""
makedepends="linux-headers"
-options="!check" # requires kernel sources to build oops.ko
source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.gz
sysklogd.logrotate
sysklogd.daily
@@ -21,13 +22,13 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
sysklogd-1.5-build.patch
ksym-fclose-fix.patch
fix-includes.patch
+ utmpx.patch
syslog.conf
LICENSE"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$builddir"
- make CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+ make CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" LIBS="-lutmps -lskarnet"
}
package() {
@@ -56,5 +57,6 @@ eb4c2c411d75315e113efe40c8445dd2eb7aa88e3318ce3d7624916005ec82325a877c83f5816231
ab979b36f091c62ada916246723cd75a71319a6c3687c034167b9caafc53807e6d224e0d6c836bc4b81b61c1d02ec21a1cb19477396a416c62f097d4b9ccc678 sysklogd-1.5-build.patch
ceb1f7cb70f526dd285fc8bad5511cdef603fc1296f69cc0e7ec4901f11685fae083d028687765b233ca074dfbe0cdafa921de6c80a5cbced94de1059d9761ee ksym-fclose-fix.patch
0208662a0158ecb6b0a387bd1bf467c866105dac02767209aeaaaeb02762d6c2b814a2707315f8f6cd40f46c4b7744b74653e30973c31354998c27cd7c966dbd fix-includes.patch
+ea5aef3f4515595a14a66ec8df0614644e3b30a8d42e3a8d98e79d5f817f3572647bf5352d1ebfc7becb37d79a3fa923d5cbe18597ef52eca265acedd2a3507c utmpx.patch
49f73b8a16b92d0cda56db9cfc16d5322e797590dfc998282a62560d54205042af953837f5f94b45a3de403fdf5f63efe65d72e9908c7185a2cd5941275abf33 syslog.conf
7b3de1d38b50df14ceaada900f2e8f23b0d5035278c9eacb06d2578ccdcf64ffc44bbb76ed6a10d80f4b883bf36a3ecd2bf60897321e4eae7aed7d8a5a36d86c LICENSE"
diff --git a/system/sysklogd/utmpx.patch b/system/sysklogd/utmpx.patch
new file mode 100644
index 000000000..5f6d75151
--- /dev/null
+++ b/system/sysklogd/utmpx.patch
@@ -0,0 +1,78 @@
+--- sysklogd-1.5.1/syslogd.c.old 2018-06-23 20:53:59.451604474 -0500
++++ sysklogd-1.5.1/syslogd.c 2018-06-23 20:58:06.251360126 -0500
+@@ -494,6 +494,9 @@
+ * Wed Jul 4 21:02:22 CEST 2007: Martin Schulze <joey@infodrom.org>
+ * Open a pipe with O_NOCTTY to avoid them becoming the controlling
+ * tty and normal files with O_NONBLOCK to avoid blocking.
++ *
++ * Sat Jun 23 20:54:48 CDT 2018: A. Wilcox <awilfox@adelielinux.org>
++ * Use POSIX <utmpx.h> instead of non-standard <utmp.h>.
+ */
+
+
+@@ -511,7 +514,7 @@
+ #ifdef SYSV
+ #include <sys/types.h>
+ #endif
+-#include <utmp.h>
++#include <utmpx.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <setjmp.h>
+@@ -557,18 +560,6 @@
+ #include <paths.h>
+ #endif
+
+-#ifndef UTMP_FILE
+-#ifdef UTMP_FILENAME
+-#define UTMP_FILE UTMP_FILENAME
+-#else
+-#ifdef _PATH_UTMP
+-#define UTMP_FILE _PATH_UTMP
+-#else
+-#define UTMP_FILE "/etc/utmp"
+-#endif
+-#endif
+-#endif
+-
+ #ifndef _PATH_LOGCONF
+ #define _PATH_LOGCONF "/etc/syslog.conf"
+ #endif
+@@ -2036,8 +2027,8 @@
+ register int i;
+ int ttyf, len;
+ static int reenter = 0;
+- struct utmp ut;
+- struct utmp *uptr;
++ struct utmpx ut;
++ struct utmpx *uptr;
+ char greetings[200];
+
+ (void) &len;
+@@ -2046,7 +2037,7 @@
+ return;
+
+ /* open the user login file */
+- setutent();
++ setutxent();
+
+
+ /*
+@@ -2066,7 +2057,7 @@
+ len = strlen(greetings);
+
+ /* scan the user login file */
+- while ((uptr = getutent())) {
++ while ((uptr = getutxent())) {
+ memcpy(&ut, uptr, sizeof(ut));
+ /* is this slot used? */
+ if (ut.ut_name[0] == '\0')
+@@ -2120,7 +2111,7 @@
+ exit(0);
+ }
+ /* close the user login file */
+- endutent();
++ endutxent();
+ reenter = 0;
+ }
+