Commit 9903399c authored by abveritas's avatar abveritas
Browse files

kernel update to 3.4.6, systemd corrections for syslog-ng & vhba-modules

parent 048b1361
......@@ -9,7 +9,7 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.4
pkgver=${_basekernel}.3
pkgver=${_basekernel}.6
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
......@@ -35,7 +35,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz"
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch')
md5sums=('967f72983655e2479f951195953e8480'
'3b6cf4f6337346ee78904eb70e2d4e08'
'14443e53d3ab88e6eac45d954d891e00'
'9bcefced1f4be50ef2720944f656e5d7'
'eccab7a50869a58ec476ab5b4fc087e8'
'a0aac33ce142f819220d77751585dd2f'
......
......@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
KERNEL_VERSION=3.4.3-1-CHAKRA
KERNEL_VERSION=3.4.6-1-CHAKRA
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
......
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=syslog-ng
pkgver=3.3.4
pkgver=3.3.5
pkgrel=1
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
arch=('i686' 'x86_64')
......@@ -19,15 +18,17 @@ optdepends=('logrotate: for rotating log files')
provides=('logger')
options=('!libtool')
backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng' 'etc/logrotate.d/syslog-ng')
source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
syslog-ng.conf
syslog-ng.logrotate
syslog-ng.rc)
sha1sums=('3437a50af027f281747087ab47a45aa5fbabbf14'
'syslog-ng.conf'
'syslog-ng.conf.d'
'syslog-ng.logrotate'
'syslog-ng.rc')
sha1sums=('0c8b85079b60c68c4279bcd4124b1e3c6358407b'
'98074e0facfc6ef036202662cc86d04b38a2c142'
'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
'949128fe3d7f77a7aab99048061f885bc758000c'
'a6ad26912b5bcbe1b47b003309945d733613b98f')
'94af81a84e3add6653755122cdd5080694de059d')
build() {
cd "$pkgname-$pkgver"
......@@ -37,10 +38,11 @@ build() {
--sysconfdir=/etc/syslog-ng \
--libexecdir=/usr/lib \
--localstatedir=/var/lib/syslog-ng \
--datadir=/usr/share/syslog-ng \
--with-pidfile-dir=/run \
--disable-spoof-source \
--enable-systemd \
--with-systemdsystemunitdir=/lib/systemd/system
--with-systemdsystemunitdir=/usr/lib/systemd/system
make
}
......@@ -52,8 +54,11 @@ package() {
install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
# compat with pre-systemd 38
# XXX: remove this once the journal is in extra
sed -i '/^ExecStartPre/s/=/=-/' "$pkgdir/lib/systemd/system/syslog-ng.service"
# location of systemctl
sed -e 's@/bin/systemctl@/usr&@' \
-e '$aAlias=syslog.service' \
-e '/^ExecStartPre/d' \
-i "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
}
#
# /etc/conf.d/syslog-ng
#
# passed to syslog-ng on config check
SYSLOG_NG_CHECKOPTS=()
# passed to syslog-ng at startup
SYSLOG_NG_OPTS=()
......@@ -2,9 +2,10 @@
. /etc/rc.conf
. /etc/rc.d/functions
. /etc/conf.d/syslog-ng
checkconfig() {
if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then
if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
stat_fail
exit 1
fi
......@@ -24,7 +25,7 @@ case $1 in
start)
stat_busy "Starting Syslog-NG"
checkconfig
if [[ -z $PID ]] && /usr/sbin/syslog-ng; then
if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
add_daemon syslog-ng
stat_done
else
......@@ -64,4 +65,3 @@ case $1 in
*)
echo "usage: $0 {start|stop|restart|reload}"
esac
exit 0
KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
ACTION=="remove", GOTO="vhba_end"
KERNEL!="vhba_ctl", GOTO="vhba_end"
NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
TAG+="udev-acl"
GOTO="vhba_end"
LABEL="vhba_uaccess"
TAG+="uaccess"
LABEL="vhba_end"
......@@ -8,7 +8,7 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=vhba-module
pkgver=20120422
pkgrel=2
pkgrel=3
pkgdesc="Kernel module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
......@@ -16,10 +16,10 @@ license=('GPL2')
depends=('linux>=3.4' 'linux<3.5')
makedepends=('linux-headers')
install=vhba-module.install
source=(http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2
60-vhba.rules)
source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2"
'60-vhba.rules')
md5sums=('d97372da1d270d1605742b2995fb6678'
'549bd2d9696bd1884c8eed7193c00e21')
'071cd160f50ef6b062b6e3262d5b1e76')
build() {
cd "$srcdir/$pkgname-$pkgver"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment