Date: Friday, November 12, 2010 @ 15:14:02 Author: ibiru Revision: 98697
upgpkg: hddtemp 0.3.beta15.46-1 update to patch 46 version Added: hddtemp/trunk/hddtemp-0.3-beta15-reg-eip.patch Modified: hddtemp/trunk/PKGBUILD Deleted: hddtemp/trunk/ChangeLog ----------------------------------+ ChangeLog | 14 -------------- PKGBUILD | 26 ++++++++++++++------------ hddtemp-0.3-beta15-reg-eip.patch | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 26 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2010-11-12 20:01:05 UTC (rev 98696) +++ ChangeLog 2010-11-12 20:14:02 UTC (rev 98697) @@ -1,14 +0,0 @@ -2009-03-05 Andreas Radke <andy...@archlinux.org> -* pkg moved to extra from AUR - -2008-01-23 Roman Kyrylych <ro...@archlinux.org> -* Updated to v38 of Debian's patchset - -2007-11-30 Roman Kyrylych <ro...@archlinux.org> -* Backup /etc/conf.d/hddtemp - -2007-11-09 Roman Kyrylych <ro...@archlinux.org> -* Updated to v37 of Debian's patchset - -2007-06-26 tardo <ta...@nagi-fanboi.net> -* Built for x86_64 Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-12 20:01:05 UTC (rev 98696) +++ PKGBUILD 2010-11-12 20:14:02 UTC (rev 98697) @@ -4,10 +4,10 @@ # Contributor: Damir Perisa <da...@archlinux.org> pkgname=hddtemp -pkgver=0.3.beta15.45 +pkgver=0.3.beta15.46 _origver=0.3-beta15 -_patchver=45 -pkgrel=2 +_patchver=46 +pkgrel=1 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" arch=('i686' 'x86_64') url="http://www.guzu.net/linux/hddtemp.php" @@ -16,24 +16,26 @@ backup=('etc/conf.d/hddtemp') source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2 http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz - 'hddtemp' 'hddtemp.confd') + 'hddtemp' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch') md5sums=('8b829339e1ae9df701684ec239021bb8' - 'a809a3a28d29ee719b2855af9b4eb1a8' + '040437845e28771c560b4bb40e41f933' 'b7ebb86dfeef3bc4577ed1040307e36b' - 'fdca5c43900406f0be76534ef2a5a697') + 'fdca5c43900406f0be76534ef2a5a697' + '526ef28549dd0da7e38d32cfc8523592') options=('!libtool') build() { cd "$srcdir/$pkgname-${_origver}" - patch -Np1 -i "$srcdir/${pkgname}_${_origver}-${_patchver}.diff" || return 1 + patch -Np1 -i "$srcdir/${pkgname}_${_origver}-${_patchver}.diff" + patch -Np1 -i "$srcdir/hddtemp-0.3-beta15-reg-eip.patch" ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + make + make DESTDIR=$srcdir/pkg install install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \ - "$pkgdir/usr/share/${pkgname}/hddtemp.db" || return 1 - install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp" || return 1 - install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp" || return 1 + "$pkgdir/usr/share/${pkgname}/hddtemp.db" + install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp" + install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp" } Added: hddtemp-0.3-beta15-reg-eip.patch =================================================================== --- hddtemp-0.3-beta15-reg-eip.patch (rev 0) +++ hddtemp-0.3-beta15-reg-eip.patch 2010-11-12 20:14:02 UTC (rev 98697) @@ -0,0 +1,22 @@ +__USE_GNU needs to be in effect when including sys/ucontext.h, +and signal.h pulls it in in some setups. + +diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c +--- hddtemp-0.3-beta15/src/backtrace.c~ 2006-04-19 05:38:14.000000000 +0300 ++++ hddtemp-0.3-beta15/src/backtrace.c 2010-02-14 21:59:47.000000000 +0200 +@@ -27,13 +27,12 @@ + #include <stdlib.h> + #include <unistd.h> + #include <linux/ptrace.h> ++#define __USE_GNU ++#include <ucontext.h> + #include <signal.h> + #include <bits/sigcontext.h> + #include <sys/param.h> + +-#define __USE_GNU +-#include <ucontext.h> +- + #define MAX_BTSIZE 64 + + void backtrace_handler(int n, siginfo_t *ist, void *extra) {