initial import from aur3

7 files changed, 182 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..1245c01be4f7
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = socklog
+	pkgdesc = Small and secure syslogd replacement for use with Runit
+	pkgver = 2.1.0
+	pkgrel = 2
+	url = http://smarden.org/socklog/
+	arch = i686
+	arch = x86_64
+	license = BSD
+	makedepends = make
+	depends = glibc
+	depends = runit
+	provides = socklog
+	source = http://smarden.org/socklog/socklog-2.1.0.tar.gz
+	source = headers.patch
+	source = klog.sv.run
+	source = socklog.sv.check
+	source = socklog.sv.log
+	source = socklog.sv.run
+	sha256sums = aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455
+	sha256sums = 6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3
+	sha256sums = ae9864e8dc86fb9d0de74bc988bb0f896c4811d12d52a649374903bd3257246a
+	sha256sums = f84241c1dff3b67499ecec7be9385c6c190b3b43c839956df8458fb2c0b58f2b
+	sha256sums = 72a094547454b44dfda5cd50a5992ac2f0829450b99033900e68eb301130637f
+	sha256sums = f62fd60c54e735f95153d1f0018cadb556c56833235f24653855445dc91e152f
+
+pkgname = socklog
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..8c266119e141
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,79 @@
+# Maintainer: Andy Weidenbaum <archbaum@gmail.com>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+
+pkgname=socklog
+pkgver=2.1.0
+pkgrel=2
+pkgdesc="Small and secure syslogd replacement for use with Runit"
+arch=('i686' 'x86_64')
+depends=('glibc' 'runit')
+makedepends=('make')
+url="http://smarden.org/socklog/"
+license=('BSD')
+source=(http://smarden.org/socklog/$pkgname-$pkgver.tar.gz
+        headers.patch
+        klog.sv.run
+        socklog.sv.check
+        socklog.sv.log
+        socklog.sv.run)
+sha256sums=('aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455'
+            '6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3'
+            'ae9864e8dc86fb9d0de74bc988bb0f896c4811d12d52a649374903bd3257246a'
+            'f84241c1dff3b67499ecec7be9385c6c190b3b43c839956df8458fb2c0b58f2b'
+            '72a094547454b44dfda5cd50a5992ac2f0829450b99033900e68eb301130637f'
+            'f62fd60c54e735f95153d1f0018cadb556c56833235f24653855445dc91e152f')
+provides=('socklog')
+
+prepare() {
+  cd "$srcdir/admin/$pkgname-$pkgver/src"
+
+  msg 'Patching headers...'
+  patch -p1 < "$srcdir/headers.patch"
+
+  msg 'Setting default kernel message path to /proc/kmsg...'
+  sed -i -e 's:^#define _PATH_KLOG "\/dev\/klog"$:#define _PATH_KLOG "\/proc\/kmsg":' socklog-conf.c
+}
+
+build() {
+  cd "$srcdir/admin/$pkgname-$pkgver/src"
+
+  msg 'Building...'
+  echo "${CC:-gcc} ${CFLAGS:-O2 -Wall}" > conf-cc
+  echo "${LD:-gcc -s}" > conf-ld
+  make
+}
+
+check() {
+  cd "$srcdir/admin/$pkgname-$pkgver/src"
+
+  msg 'Testing...'
+  make check
+}
+
+package() {
+  cd "$srcdir/admin/$pkgname-$pkgver/src"
+  
+  msg 'Installing license...'
+  install -D -m644 "$srcdir/admin/$pkgname-$pkgver/package/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  msg 'Installing documentation...'
+  install -d "$pkgdir/usr/share/doc/socklog"
+  install -D -m644 "$srcdir/admin/$pkgname-$pkgver/doc"/*.html "$pkgdir/usr/share/doc/socklog"
+
+  msg 'Installing man pages...'
+  install -d "$pkgdir/usr/share/man/man8"
+  install -D -m644 "$srcdir/admin/$pkgname-$pkgver/man"/* "$pkgdir/usr/share/man/man8"
+
+  msg 'Installing executables...'
+  install -d "$pkgdir/usr/bin"
+  for i in `cat $srcdir/admin/$pkgname-$pkgver/package/commands`; do
+    install -s -D -m755 "$srcdir/admin/$pkgname-$pkgver/src/$i" "$pkgdir/usr/bin"
+  done
+
+  msg 'Installing Runit service files...'
+  mkdir -p "$pkgdir/etc/sv"/{klog,socklog/log}
+  install -D -m755 "$srcdir/klog.sv.run" "$pkgdir/etc/sv/klog/run"
+  install -D -m755 "$srcdir/socklog.sv.check" "$pkgdir/etc/sv/socklog/check"
+  install -D -m755 "$srcdir/socklog.sv.log" "$pkgdir/etc/sv/socklog/log/run"
+  install -D -m755 "$srcdir/socklog.sv.run" "$pkgdir/etc/sv/socklog/run"
+}
diff --git a/headers.patch b/headers.patch
new file mode 100644
index 000000000000..b7c10e3da606
--- /dev/null
+++ b/headers.patch
@@ -0,0 +1,54 @@
+add missing headers for misc funcs and types
+
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,10 +1,11 @@
+ /* Public domain. */
+ 
+ #include <unistd.h>
++#include <grp.h>
+ 
+ int main()
+ {
+-  short x[4];
++  gid_t x[4];
+ 
+   x[0] = x[1] = 0;
+   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+--- a/pathexec_run.c
++++ b/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+--- a/prot.c
++++ b/prot.c
+@@ -1,12 +1,15 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
++#include <grp.h>
++
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+ int prot_gid(int gid)
+ {
+ #ifdef HASSHORTSETGROUPS
+-  short x[2];
++  gid_t x[2];
+   x[0] = gid; x[1] = 73; /* catch errors */
+   if (setgroups(1,x) == -1) return -1;
+ #else
+--- a/seek_set.c
++++ b/seek_set.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include "seek.h"
+ 
diff --git a/klog.sv.run b/klog.sv.run
new file mode 100644
index 000000000000..22398aee4fdc
--- /dev/null
+++ b/klog.sv.run
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+svname=kernel
+
+if [ ! -d /var/log/$svname ]
+then
+    mkdir /var/log/$svname
+    chown root:root /var/log/$svname
+    chmod 700 /var/log/$svname
+fi
+
+exec < /proc/kmsg svlogd -tt /var/log/$svname
diff --git a/socklog.sv.check b/socklog.sv.check
new file mode 100644
index 000000000000..4c61abd9ac00
--- /dev/null
+++ b/socklog.sv.check
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>/dev/null
+exec socklog-check unix /dev/log
diff --git a/socklog.sv.log b/socklog.sv.log
new file mode 100644
index 000000000000..bdd27450e429
--- /dev/null
+++ b/socklog.sv.log
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec chpst -uroot svlogd /var/log/socklog \
+  /main/main /main/auth /main/cron /main/daemon /main/debug /main/ftp \
+  /main/kern /main/local /main/mail /main/news /main/syslog /main/user
diff --git a/socklog.sv.run b/socklog.sv.run
new file mode 100644
index 000000000000..b2a709616182
--- /dev/null
+++ b/socklog.sv.run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -Uroot socklog unix /dev/log