aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-08-04 10:05:16 +0300
committerTimo Teras <timo.teras@iki.fi>2009-08-04 10:05:16 +0300
commitc47e236bc441bc6e479a211e7f93402627ab1351 (patch)
treea6fb31a0ed61b9546b030238e17d64e98ab2b3c0
parentf4fcd00de91020243328f71d7c37b952c5808f1d (diff)
downloadaports-c47e236bc441bc6e479a211e7f93402627ab1351.tar.bz2
aports-c47e236bc441bc6e479a211e7f93402627ab1351.tar.xz
main/sysklogd: fix the package to be usable (fixes #98)
fix a klogd crash if module symbols cannot be loaded. and add a default configuration file (based on ubuntu one).
-rw-r--r--main/sysklogd/APKBUILD7
-rw-r--r--main/sysklogd/ksym-fclose-fix.diff12
-rw-r--r--main/sysklogd/syslog.conf48
3 files changed, 66 insertions, 1 deletions
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index e3fe8badc5..43ce5aa54e 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sysklogd
pkgver=1.5
-pkgrel=0
+pkgrel=1
pkgdesc="System and kernel log daemons"
url="http://www.infodrom.org/projects/sysklogd/"
license="GPL BSD"
@@ -16,6 +16,8 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
sysklogd-1.4.2-caen-owl-syslogd-bind.diff
sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
sysklogd-1.5-build.patch
+ ksym-fclose-fix.diff
+ syslog.conf
LICENSE"
build ()
@@ -37,6 +39,7 @@ build ()
"$pkgdir"/etc/logrotate.d/sysklogd
install -D -m755 ../sysklogd.initd "$pkgdir"/etc/init.d/sysklogd
install -D -m644 ../sysklogd.confd "$pkgdir"/etc/conf.d/sysklogd
+ install -D -m644 ../syslog.conf "$pkgdir"/etc/syslog.conf
install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz
@@ -47,4 +50,6 @@ e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd
4715e1dd2deb7a9ac137e004210e3154 sysklogd-1.4.2-caen-owl-syslogd-bind.diff
6c0a416e40a678cf99c454b0e98185c9 sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
c71826d1a4f3f7e8ffa57adbfc24f1ce sysklogd-1.5-build.patch
+8e70cdf98cce9defae0c28a3d2db4410 ksym-fclose-fix.diff
+49ba209742f1651f4bda6c5e92cbb3eb syslog.conf
7930f7ff5038e1318511624e348581cc LICENSE"
diff --git a/main/sysklogd/ksym-fclose-fix.diff b/main/sysklogd/ksym-fclose-fix.diff
new file mode 100644
index 0000000000..a1b3401e22
--- /dev/null
+++ b/main/sysklogd/ksym-fclose-fix.diff
@@ -0,0 +1,12 @@
+Index: sysklogd-1.5/ksym_mod.c
+===================================================================
+--- sysklogd-1.5.orig/ksym_mod.c 2009-08-04 09:47:53.000000000 +0300
++++ sysklogd-1.5/ksym_mod.c 2009-08-04 09:48:05.000000000 +0300
+@@ -189,7 +189,6 @@
+ else
+ Syslog(LOG_ERR, "Error loading kernel symbols " \
+ "- %s\n", strerror(errno));
+- fclose(ksyms);
+ return(0);
+ }
+
diff --git a/main/sysklogd/syslog.conf b/main/sysklogd/syslog.conf
new file mode 100644
index 0000000000..855ee6e3e8
--- /dev/null
+++ b/main/sysklogd/syslog.conf
@@ -0,0 +1,48 @@
+# /etc/syslog.conf Configuration file for syslogd.
+#
+# For more information see syslog.conf(5)
+# manpage.
+
+# First some standard logfiles. Log by facility.
+#
+
+auth,authpriv.* /var/log/auth.log
+*.*;auth,authpriv.none -/var/log/syslog
+cron.* /var/log/cron.log
+daemon.* -/var/log/daemon.log
+kern.* -/var/log/kern.log
+lpr.* -/var/log/lpr.log
+mail.* -/var/log/mail.log
+user.* -/var/log/user.log
+
+# Logging for the mail system. Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info -/var/log/mail.info
+mail.warning -/var/log/mail.warn
+mail.err /var/log/mail.err
+
+# Some `catch-all' logfiles.
+#
+*.=debug;\
+ auth,authpriv.none;\
+ news.none;mail.none -/var/log/debug
+*.=info;*.=notice;*.=warning;\
+ auth,authpriv.none;\
+ cron,daemon.none;\
+ mail,news.none -/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg *
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+# news.=crit;news.=err;news.=notice;\
+# *.=debug;*.=info;\
+# *.=notice;*.=warning /dev/tty8
+