diff options
| author | Ladislav Hagara | 2011-05-13 17:32:40 +0200 |
|---|---|---|
| committer | Ladislav Hagara | 2011-05-13 17:32:40 +0200 |
| commit | c76dc46cc8d66c72b10d57ff5bbaee26ce4101bc (patch) | |
| tree | 636153677ea7027554e3ccb4048753bc5b46cd87 | |
| parent | 0bce6d1ed363b2a03edca766e29aa9738c9685c2 (diff) | |
hddtemp: Debian and Arch patches added
| -rwxr-xr-x | utils/hddtemp/DETAILS | 4 | ||||
| -rw-r--r-- | utils/hddtemp/HISTORY | 5 | ||||
| -rwxr-xr-x | utils/hddtemp/PRE_BUILD | 3 | ||||
| -rw-r--r-- | utils/hddtemp/hddtemp-0.3-beta15-reg-eip.patch | 22 |
4 files changed, 34 insertions, 0 deletions
diff --git a/utils/hddtemp/DETAILS b/utils/hddtemp/DETAILS index ec5ea28a5b..d747e13e0f 100755 --- a/utils/hddtemp/DETAILS +++ b/utils/hddtemp/DETAILS @@ -1,14 +1,18 @@ SPELL=hddtemp VERSION=0.3-beta15 + PATCHLEVEL=1 SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE2=${SPELL}.db + SOURCE3=hddtemp_0.3-beta15-46.diff.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/hddtemp/$SOURCE SOURCE2_URL[0]=http://download.savannah.nongnu.org/releases/hddtemp/$SOURCE2 + SOURCE3_URL[0]=http://ftp.debian.org/debian/pool/main/h/hddtemp/$SOURCE3 WEB_SITE=http://www.guzu.net/linux/hddtemp.php ENTERED=20020721 SOURCE_HASH=sha512:7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d SOURCE2_IGNORE=volatile + SOURCE3_HASH=sha512:2a8dda152de012280a6fcb2ac5c90724c39a06f183208c46d90efc95e06d6f72421e8667448767ea981828c861ba17deaf89681cfae2796588df29553c643009 LICENSE[0]=GPL LICENSE[1]=GPL FORCE_DOWNLOAD[2]="yes" diff --git a/utils/hddtemp/HISTORY b/utils/hddtemp/HISTORY index 6da18068ea..668ab246d0 100644 --- a/utils/hddtemp/HISTORY +++ b/utils/hddtemp/HISTORY @@ -1,3 +1,8 @@ +2011-05-13 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: PATCHLEVEL=1, SOURCE3 added, Debian patch + * hddtemp-0.3-beta15-reg-eip.patch: added, Arch patch + * PRE_BUILD: updated + 2008-08-22 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: changed SOURCE2_URL to match SOURCE_URL * init.d/hddtemp, init.d/hddtemp.conf: added an init script to start diff --git a/utils/hddtemp/PRE_BUILD b/utils/hddtemp/PRE_BUILD index 965bba3898..d7dc04e34f 100755 --- a/utils/hddtemp/PRE_BUILD +++ b/utils/hddtemp/PRE_BUILD @@ -1,4 +1,7 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && unpack_file 2 && +unpack_file 3 && +zcat ${SOURCE_CACHE}/$SOURCE3 | patch -p1 && +patch -p1 < $SPELL_DIRECTORY/hddtemp-0.3-beta15-reg-eip.patch && cp ${SOURCE_CACHE}/${SOURCE2} . diff --git a/utils/hddtemp/hddtemp-0.3-beta15-reg-eip.patch b/utils/hddtemp/hddtemp-0.3-beta15-reg-eip.patch new file mode 100644 index 0000000000..504a0366e3 --- /dev/null +++ b/utils/hddtemp/hddtemp-0.3-beta15-reg-eip.patch @@ -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) { |