diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2006-04-09 14:43:41 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2006-04-09 14:43:41 +0000 |
| commit | f496e10b6537139983e37f7cc6e96459c62fa3d9 (patch) | |
| tree | e6c6e96f8175278a893d16c454cdd2d06c4f5a2a /app-admin/hddtemp | |
| parent | Add newer patch to improve ebuilds filter, thanks to Pat Double in bug #129298. (diff) | |
| download | gentoo-2-f496e10b6537139983e37f7cc6e96459c62fa3d9.tar.gz gentoo-2-f496e10b6537139983e37f7cc6e96459c62fa3d9.tar.bz2 gentoo-2-f496e10b6537139983e37f7cc6e96459c62fa3d9.zip | |
Fixed segfaulting when running hddtemp for 2 or more drives which are not in its database (bug #126775).
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'app-admin/hddtemp')
| -rw-r--r-- | app-admin/hddtemp/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/hddtemp/files/hddtemp-0.3_beta14-sizeofdsk.patch | 12 | ||||
| -rw-r--r-- | app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild | 8 |
3 files changed, 25 insertions, 2 deletions
diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog index 460ffd771476..250ba9fe0a63 100644 --- a/app-admin/hddtemp/ChangeLog +++ b/app-admin/hddtemp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/hddtemp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.32 2006/02/19 15:46:59 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.33 2006/04/09 14:43:41 spock Exp $ + + 09 Apr 2006; Michał Januszewski <spock@gentoo.org> + +files/hddtemp-0.3_beta14-sizeofdsk.patch, hddtemp-0.3_beta14-r1.ebuild: + Fixed segfaulting when running hddtemp for 2 or more drives which are not in + its database (bug #126775). *hddtemp-0.3_beta14-r1 (19 Feb 2006) diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta14-sizeofdsk.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta14-sizeofdsk.patch new file mode 100644 index 000000000000..a64a0382814e --- /dev/null +++ b/app-admin/hddtemp/files/hddtemp-0.3_beta14-sizeofdsk.patch @@ -0,0 +1,12 @@ +diff -Naurp hddtemp-0.3-beta14-orig/src/hddtemp.c hddtemp-0.3-beta14/src/hddtemp.c +--- hddtemp-0.3-beta14-orig/src/hddtemp.c 2006-04-09 16:35:14.000000000 +0200 ++++ hddtemp-0.3-beta14/src/hddtemp.c 2006-04-09 16:36:32.000000000 +0200 +@@ -400,7 +400,7 @@ int main(int argc, char* argv[]) { + + assert(dsk); + +- memset(dsk, 0, sizeof(dsk)); ++ memset(dsk, 0, sizeof(struct disk)); + + p = strchr(argv[i], ':'); + if(p == NULL) diff --git a/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild index 7e999bd97355..33a58f31b6e6 100644 --- a/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild +++ b/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild,v 1.1 2006/02/19 15:46:59 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta14-r1.ebuild,v 1.2 2006/04/09 14:43:41 spock Exp $ inherit eutils @@ -19,6 +19,12 @@ DEPEND="" S=${WORKDIR}/${MY_P} +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-sizeofdsk.patch +} + src_compile() { local myconf |