commit ad281eae641fb45c47a672bf0161df753ad79425 Author: Jay Larson Date: Mon Oct 24 07:13:32 2016 -0500 First check in diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..47b5286 --- /dev/null +++ b/Makefile @@ -0,0 +1,77 @@ +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation here: +# (http://www.gnu.org/licenses/gpl-2.0.html) +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +DEPENDS = glibc +ARCH = x86_64 +URL = http://www.infodrom.org/projects/sysklogd/ +DESC = This package implements two system log daemons. The syslogd daemon \ +is an enhanced version of the standard Berkeley utility program. The klogd \ +daemon listens to kernel message sources and is responsible for prioritizing \ +and processing operating system messages. +SNAPVER = sr0 + +ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) +TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') +SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') +PATCHDIR := $(PWD)/SRC/patches +VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) + +MAKE = make +MAKEINST = BINDIR=/sbin make install +SNAPHACKS = + +include /usr/share/snap/Makefile.snaplinux + +$(SRCDIR)/Makefile: $(ARCHIVE) + @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ + tar -jxf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ + tar -zxf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-tar' ]; then \ + tar -xf $(ARCHIVE); \ + elif [ '$(TYPE)' == 'application/x-xz' ]; then \ + tar -xf $(ARCHIVE); \ + else \ + echo 'Unable to determine archive type'; \ + exit 1; \ + fi + @touch $(SRCDIR)/Makefile + +$(SRCDIR)/syslogd: $(SRCDIR)/Makefile + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ + patch --verbose -Np1 -i $$patch; \ + done + @cd $(SRCDIR); \ + $(MAKE) + +$(ROOT): $(SRCDIR)/syslogd + @if [ -d $(ROOT) ]; then \ + touch $(ROOT); \ + else \ + mkdir -v $(ROOT); \ + fi + + @cd $(SRCDIR); \ + $(MAKEINST) DESTDIR=$(ROOT) + + @$(SNAPHACKS) + +test: $(ROOT) + @cd $(SRCDIR); \ + make test + +clean: + @rm -rvf $(ROOT) \ + $(SNAPINFO) \ + $(MANIFEST) \ + $(FILES) \ + $(SRCDIR) + diff --git a/SNAP/README b/SNAP/README new file mode 100644 index 0000000..19a3ff1 --- /dev/null +++ b/SNAP/README @@ -0,0 +1,3 @@ +This is the directory where the manifest, snapinfo, and files.tar.gz +files will be created. It is also where the usher file should be +placed if it is required by the package. diff --git a/SNAP/usher b/SNAP/usher new file mode 100755 index 0000000..2637cc6 --- /dev/null +++ b/SNAP/usher @@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +CONF="auth,authpriv.* -/var/log/auth.log +*.*;auth,authpriv.none -/var/log/sys.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log +#*.emerg * +*.emerg -/var/log/kern.log" + +case $1 in + preinst) + exit 0 + ;; + postinst) + if [ ! -f ${TARGET}/etc/syslog.conf ]; then + echo "${CONF}" > ${TARGET}/etc/syslog.conf + fi + ;; + prerm) + exit 0 + ;; + postrm) + exit 0 + ;; +esac diff --git a/SRC/patches/01_destdir-and-ksym_mod.patch b/SRC/patches/01_destdir-and-ksym_mod.patch new file mode 100644 index 0000000..4b24f6a --- /dev/null +++ b/SRC/patches/01_destdir-and-ksym_mod.patch @@ -0,0 +1,37 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2007-05-30 15:28:48.000000000 +0000 ++++ b/Makefile 2015-10-04 20:49:35.354387956 +0000 +@@ -127,14 +127,16 @@ + 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 ++ mkdir -p $(DESTDIR)/${BINDIR} ++ ${INSTALL} -m 500 -s syslogd $(DESTDIR)/${BINDIR}/syslogd ++ ${INSTALL} -m 500 -s klogd $(DESTDIR)/${BINDIR}/klogd + + install_man: +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8 ++ mkdir -p $(DESTDIR)/${MANDIR}/man{5,8} ++ ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 $(DESTDIR)/${MANDIR}/man8/sysklogd.8 ++ ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 $(DESTDIR)/${MANDIR}/man8/syslogd.8 ++ ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 $(DESTDIR)/${MANDIR}/man5/syslog.conf.5 ++ ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 $(DESTDIR)/${MANDIR}/man8/klogd.8 + + obj-m += oops.o + +diff -Naur a/ksym_mod.c b/ksym_mod.c +--- a/ksym_mod.c 2007-06-18 07:50:55.000000000 +0000 ++++ b/ksym_mod.c 2015-10-04 20:45:09.274671054 +0000 +@@ -189,7 +189,6 @@ + else + Syslog(LOG_ERR, "Error loading kernel symbols " \ + "- %s\n", strerror(errno)); +- fclose(ksyms); + return(0); + } + diff --git a/SRC/patches/README b/SRC/patches/README new file mode 100644 index 0000000..253cdcd --- /dev/null +++ b/SRC/patches/README @@ -0,0 +1,2 @@ +Place any patch files here and preface each with a number indicating +the order of execution. Patch files are expected to use a .patch extension. diff --git a/SRC/sysklogd-1.5.tar.gz b/SRC/sysklogd-1.5.tar.gz new file mode 100644 index 0000000..e77c3f4 Binary files /dev/null and b/SRC/sysklogd-1.5.tar.gz differ diff --git a/SRC/sysklogd-1.5.tar.gz.asc b/SRC/sysklogd-1.5.tar.gz.asc new file mode 100644 index 0000000..91dedbf --- /dev/null +++ b/SRC/sysklogd-1.5.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iD8DBQBLYD9EW5ql+IAeqTIRAt/CAKCmUXFaCbsQlB9avupq74397V+/WQCfZeLR ++/VdFD2kYRuEkkyNs0hQl2o= +=iafM +-----END PGP SIGNATURE-----