diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch | 33 | ||||
-rw-r--r-- | testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch | 61 | ||||
-rw-r--r-- | testing/dhcpcd/PKGBUILD | 55 | ||||
-rw-r--r-- | testing/dhcpcd/dhcpcd.conf.d | 6 | ||||
-rw-r--r-- | testing/dhcpcd/dhcpcd.service | 13 | ||||
-rw-r--r-- | testing/dhcpcd/remove_ifconfig.patch | 20 | ||||
-rw-r--r-- | testing/e2fsprogs/PKGBUILD | 6 | ||||
-rw-r--r-- | testing/iptables/PKGBUILD | 15 | ||||
-rw-r--r-- | testing/krb5/MITKRB5-SA-2012-001.patch | 61 | ||||
-rw-r--r-- | testing/krb5/PKGBUILD | 13 | ||||
-rw-r--r-- | testing/krb5/krb5-kpropd@.service | 8 | ||||
-rw-r--r-- | testing/lm_sensors/PKGBUILD | 20 | ||||
-rw-r--r-- | testing/lm_sensors/healthd | 9 | ||||
-rw-r--r-- | testing/lm_sensors/healthd.rc | 18 | ||||
-rw-r--r-- | testing/lm_sensors/healthd.service | 9 | ||||
-rw-r--r-- | testing/lm_sensors/sensord.service | 9 |
16 files changed, 313 insertions, 43 deletions
diff --git a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch new file mode 100644 index 000000000..4420d0b63 --- /dev/null +++ b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Sun, 19 Jun 2011 16:04:25 -0500 +Subject: [PATCH] Set hostname via /proc if file is available + +On Linux, the hostname can be set via this file if available, precluding +the need for a `hostname` binary. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + dhcpcd-hooks/30-hostname | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname +index 65d1a13..af94262 100644 +--- a/dhcpcd-hooks/30-hostname ++++ b/dhcpcd-hooks/30-hostname +@@ -21,7 +21,11 @@ need_hostname() + try_hostname() + { + if valid_domainname "$1"; then +- hostname "$1" ++ if [ -w /proc/sys/kernel/hostname ]; then ++ echo "$1" > /proc/sys/kernel/hostname ++ else ++ hostname "$1" ++ fi + else + syslog err "Invalid hostname: $1" + fi +-- +1.7.5.4 + diff --git a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch new file mode 100644 index 000000000..7e78ecd0d --- /dev/null +++ b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Tue, 21 Jun 2011 09:32:47 -0400 +Subject: [PATCH] set MTU via sysfs if file is available + +On Linux, a network interface's MTU can be set by writing to +/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. + +Signed-off-by: Dave Reisner <d@falconindy.com> +--- + dhcpcd-hooks/10-mtu | 4 ++-- + dhcpcd-run-hooks.in | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu +index 639697c..8763930 100644 +--- a/dhcpcd-hooks/10-mtu ++++ b/dhcpcd-hooks/10-mtu +@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if set_mtu "$interface" "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ set_mtu "$interface" "$mtu" + rm "$mtu_dir/$interface" + fi + fi +diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in +index 0e60338..843f3ca 100644 +--- a/dhcpcd-run-hooks.in ++++ b/dhcpcd-run-hooks.in +@@ -215,6 +215,17 @@ service_condcommand() + service_exists $1 && service_status $1 && service_cmd $1 $2 + } + ++# Set MTU for an interface ++set_mtu() { ++ local interface=$1 mtu=$2 ++ ++ if [ -e /sys/class/net/$interface/mtu ]; then ++ echo "$mtu" > /sys/class/net/$interface/mtu ++ else ++ ifconfig "$interface" mtu "$mtu" ++ fi ++} ++ + # We source each script into this one so that scripts run earlier can + # remove variables from the environment so later scripts don't see them. + # Thus, the user can create their dhcpcd.enter/exit-hook script to configure +-- +1.7.5.4 + diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD new file mode 100644 index 000000000..4b96ec8f3 --- /dev/null +++ b/testing/dhcpcd/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 164380 2012-07-31 20:34:32Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Killian <tom.archlinux.org> +# Contributor: Judd Vinet <jvinet.zeroflux.org> + +pkgname=dhcpcd +pkgver=5.6.0 +pkgrel=1 +pkgdesc="RFC2131 compliant DHCP client daemon" +url="http://roy.marples.name/projects/dhcpcd/" +arch=('i686' 'x86_64') +license=('BSD') +groups=('base') +depends=('glibc' 'sh') +backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') +options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ + 'dhcpcd.conf.d' 'dhcpcd.service') +sha1sums=('28ad6931393420a72da307ee173466a9e00cd952' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + '3d0542eab1b89a88d56ca427128228ac72c40d1f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # configure variables + ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ + --rundir=/run + + # Build + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # Create Binary Symlink + install -d ${pkgdir}/usr/sbin + ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd + + # Install Configuration File used in /etc/rc.d/network + install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname + + # Install License + install -d $pkgdir/usr/share/licenses/$pkgname + awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ + >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + # Set Options in /etc/dhcpcd.conf + echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + + # install systemd files + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service +} diff --git a/testing/dhcpcd/dhcpcd.conf.d b/testing/dhcpcd/dhcpcd.conf.d new file mode 100644 index 000000000..83c6f14ad --- /dev/null +++ b/testing/dhcpcd/dhcpcd.conf.d @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP client daemon +# + +DHCPCD_ARGS="-q" + diff --git a/testing/dhcpcd/dhcpcd.service b/testing/dhcpcd/dhcpcd.service new file mode 100644 index 000000000..25a1923ac --- /dev/null +++ b/testing/dhcpcd/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/sbin/dhcpcd -A -q -w %I +ExecStop=/sbin/dhcpcd -k %I + +[Install] +Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/testing/dhcpcd/remove_ifconfig.patch b/testing/dhcpcd/remove_ifconfig.patch new file mode 100644 index 000000000..5bcc4a68f --- /dev/null +++ b/testing/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD index 6f1085a0c..b9eafd672 100644 --- a/testing/e2fsprogs/PKGBUILD +++ b/testing/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162001 2012-06-18 08:47:34Z ronald $ +# $Id: PKGBUILD 164382 2012-07-31 20:39:10Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.4 +pkgver=1.42.5 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' +sha1sums=('41bc6d247238eac65864193e6de941956da493cb' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD index 779edbdba..f6d2c8e13 100644 --- a/testing/iptables/PKGBUILD +++ b/testing/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164053 2012-07-25 06:40:02Z foutrelis $ +# $Id: PKGBUILD 164378 2012-07-31 20:17:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.14 -pkgrel=3 +pkgver=1.4.15 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules 0503-extension_cppflags.patch - iptables-1.4.12-fixresore.patch iptables.service ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' +sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -41,7 +40,6 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - # Fix scope issue exposed by gcc 4.7 (patch by fryasu) - # http://bugzilla.netfilter.org/show_bug.cgi?id=774 - # (This will most likely be fixed in iptables 1.4.15) - patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/testing/krb5/MITKRB5-SA-2012-001.patch b/testing/krb5/MITKRB5-SA-2012-001.patch new file mode 100644 index 000000000..938b56570 --- /dev/null +++ b/testing/krb5/MITKRB5-SA-2012-001.patch @@ -0,0 +1,61 @@ +diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c +index 23623fe..8ada9d0 100644 +--- a/src/kdc/do_as_req.c ++++ b/src/kdc/do_as_req.c +@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, + krb5_enctype useenctype; + struct as_req_state *state; + +- state = malloc(sizeof(*state)); ++ state = calloc(sizeof(*state), 1); + if (!state) { + (*respond)(arg, ENOMEM, NULL); + return; +@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, + state->authtime = 0; + state->c_flags = 0; + state->req_pkt = req_pkt; ++ state->inner_body = NULL; + state->rstate = NULL; + state->sname = 0; + state->cname = 0; +diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c +index 9d8cb34..d4ece3f 100644 +--- a/src/kdc/kdc_preauth.c ++++ b/src/kdc/kdc_preauth.c +@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request, + continue; + + } +- if (request_contains_enctype(context, request, db_etype)) { ++ if (krb5_is_permitted_enctype(context, db_etype) && ++ request_contains_enctype(context, request, db_etype)) { + retval = _make_etype_info_entry(context, client->princ, + client_key, db_etype, + &entry[i], etype_info2); +diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c +index a43b291..94dad3a 100644 +--- a/src/kdc/kdc_util.c ++++ b/src/kdc/kdc_util.c +@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request, + return 0; + pa.magic = KV5M_PA_DATA; + pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP; ++ memset(&checksum, 0, sizeof(checksum)); + retval = krb5_c_make_checksum(kdc_context,0, reply_key, + KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum); + if (retval != 0) +diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c +index c4bf92e..367c894 100644 +--- a/src/lib/kdb/kdb_default.c ++++ b/src/lib/kdb/kdb_default.c +@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap) + krb5_boolean saw_non_permitted = FALSE; + + ret = 0; ++ if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype)) ++ return KRB5_KDB_NO_PERMITTED_KEY; ++ + if (kvno == -1 && stype == -1 && ktype == -1) + kvno = 0; + diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD index c8c15c16f..57575bbda 100644 --- a/testing/krb5/PKGBUILD +++ b/testing/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161930 2012-06-16 17:15:04Z dreisner $ +# $Id: PKGBUILD 164358 2012-07-31 18:56:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -20,7 +20,8 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-si krb5-kpropd krb5-kpropd.service krb5-kpropd@.service - krb5-kpropd.socket) + krb5-kpropd.socket + MITKRB5-SA-2012-001.patch) sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '78b759d566b1fdefd9bbcd06df14f07f12effe96' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' @@ -30,7 +31,8 @@ sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '7f402078fa65bb9ff1beb6cbbbb017450df78560' '614401dd4ac18e310153240bb26eb32ff1e8cf5b' '023a8164f8ee7066ac814486a68bc605e79f6101' - 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') + 'f3677d30dbbd7106c581379c2c6ebb1bf7738912' + '7b32dd24e68dc801efb8be280083e4d8067e392a') options=('!emptydirs') build() { @@ -46,6 +48,9 @@ build() { # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + # Fix KDC heap corruption and crash vulnerabilities + patch -Np2 -i ../../MITKRB5-SA-2012-001.patch + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ diff --git a/testing/krb5/krb5-kpropd@.service b/testing/krb5/krb5-kpropd@.service new file mode 100644 index 000000000..46f7e3639 --- /dev/null +++ b/testing/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/testing/lm_sensors/PKGBUILD b/testing/lm_sensors/PKGBUILD index 85f29edca..d72fea0c9 100644 --- a/testing/lm_sensors/PKGBUILD +++ b/testing/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161931 2012-06-16 17:15:28Z dreisner $ +# $Id: PKGBUILD 164348 2012-07-31 04:47:30Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -11,21 +11,24 @@ license=('GPL' 'LGPL') depends=('perl' 'sysfsutils') makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') +backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc fancontrol.service daemonarg.patch linux_3.0.patch) + sensord.rc fancontrol.service sensord.service healthd.service \ + daemonarg.patch linux_3.0.patch) sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' 'a486d9fb6c5b0aff4520f6312106c67f5163f1cf' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' - '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' + 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' + 'de5a46afc39a77ae8721246a0223baf21a2d4c9c' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' + 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' + '9cc453eb0e9f9057227459cb07e74815383544bf' '34241388c4001bfb6e49b7e10da1217e29a258d6' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') @@ -34,6 +37,7 @@ build() { sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect + sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service patch -p1 < ../daemonarg.patch patch -p0 < ../linux_3.0.patch make PREFIX=/usr @@ -48,8 +52,10 @@ package() { install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" - install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" + install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" + install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service" } diff --git a/testing/lm_sensors/healthd b/testing/lm_sensors/healthd index 0315dd788..5ffed5681 100644 --- a/testing/lm_sensors/healthd +++ b/testing/lm_sensors/healthd @@ -4,7 +4,7 @@ # /usr/sbin/healthd # -. /etc/conf.d/healthd +. /etc/healthd.conf cmd="${ALARM_CMD}" addr="${ADMIN_EMAIL}" @@ -21,6 +21,13 @@ while [ $# -gt 0 ] ; do esac done +case "${ALARM_RESET}" in + yes) /usr/bin/sensors > /dev/null + ;; + no) true + ;; +esac + [ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ [ -n "${addr}" ] || exit 1 diff --git a/testing/lm_sensors/healthd.rc b/testing/lm_sensors/healthd.rc index 7bb79519f..f50f4a6f8 100644 --- a/testing/lm_sensors/healthd.rc +++ b/testing/lm_sensors/healthd.rc @@ -1,29 +1,13 @@ #!/bin/bash -# -# /etc/rc.d/healthd -# - . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/healthd - -maybe_alarm_reset() { - case "${ALARM_RESET}" in - yes) /usr/bin/sensors > /dev/null - ;; - no) true - ;; - *) false - esac - return $? -} PID=$(pidof -x -o %PPID /usr/sbin/healthd) case "${1}" in start) stat_busy "Starting Health Daemon" - [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null + [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/testing/lm_sensors/healthd.service b/testing/lm_sensors/healthd.service new file mode 100644 index 000000000..b894fbb1f --- /dev/null +++ b/testing/lm_sensors/healthd.service @@ -0,0 +1,9 @@ +[Unit] +Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm + +[Service] +PIDFile=/var/run/healthd.pid +ExecStart=/usr/sbin/healthd + +[Install] +WantedBy=multi-user.target diff --git a/testing/lm_sensors/sensord.service b/testing/lm_sensors/sensord.service new file mode 100644 index 000000000..6d272f1ef --- /dev/null +++ b/testing/lm_sensors/sensord.service @@ -0,0 +1,9 @@ +[Unit] +Description=Sensor information logging daemon + +[Service] +PIDFile=/var/run/sensord.pid +ExecStart=/usr/sbin/sensord + +[Install] +WantedBy=multi-user.target |