diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-27 12:15:40 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-27 12:15:40 +0000 |
| commit | 52b48e0d1ca4d2c30b6cb9ef06cfd9fe29be92aa (patch) | |
| tree | dec614bda17fd85f1c5a531c82ae62bf9f5e90f3 /games-util/deutex | |
| parent | Initial import (diff) | |
| download | historical-52b48e0d1ca4d2c30b6cb9ef06cfd9fe29be92aa.tar.gz historical-52b48e0d1ca4d2c30b6cb9ef06cfd9fe29be92aa.tar.bz2 historical-52b48e0d1ca4d2c30b6cb9ef06cfd9fe29be92aa.zip | |
Fix overflow. Bug #340829
Package-Manager: portage-2.1.9.22/cvs/Linux i686
Diffstat (limited to 'games-util/deutex')
| -rw-r--r-- | games-util/deutex/ChangeLog | 6 | ||||
| -rw-r--r-- | games-util/deutex/Manifest | 5 | ||||
| -rw-r--r-- | games-util/deutex/deutex-4.4.0.ebuild | 6 | ||||
| -rw-r--r-- | games-util/deutex/files/deutex-4.4.0-ovflfix.patch | 11 |
4 files changed, 23 insertions, 5 deletions
diff --git a/games-util/deutex/ChangeLog b/games-util/deutex/ChangeLog index e185af86a4fb..54c642cb2014 100644 --- a/games-util/deutex/ChangeLog +++ b/games-util/deutex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/deutex # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/ChangeLog,v 1.6 2010/10/15 12:37:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/ChangeLog,v 1.7 2010/10/27 12:15:40 tupone Exp $ + + 27 Oct 2010; Tupone Alfredo <tupone@gentoo.org> deutex-4.4.0.ebuild, + +files/deutex-4.4.0-ovflfix.patch: + Fix overflow. Bug #340829 by flameeyes@gentoo.org 15 Oct 2010; Brent Baude <ranger@gentoo.org> deutex-4.4.0.ebuild: stable ppc, bug 315049 diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest index be8f43ea1fe9..4ce77d7b4dfe 100644 --- a/games-util/deutex/Manifest +++ b/games-util/deutex/Manifest @@ -1,6 +1,7 @@ AUX deutex-4.4.0-64bit.patch 524 RMD160 76219672fad543b28b5c33ac273950a4d8b1bed5 SHA1 f0c79dd2ad81d93454dac7e7e3e96d3a9e3eeefb SHA256 5bf04877f1fa12695b260d535bc5dc4a318be9e74e13b52787eeec4a6abe687f AUX deutex-4.4.0-makefile.patch 621 RMD160 688ad379a228b56f3dcff483b40a3f196a54093d SHA1 d768711ca66201a7f0b34e0916695dba940fcb4d SHA256 23051fb9f4d32c6b4961e6622a99c9ebb973cf9b14aa49493d7f2fd3c5343e6d +AUX deutex-4.4.0-ovflfix.patch 695 RMD160 e86486f894291aa86c4a9ec2258f9b0131dbc609 SHA1 2b98f921cc7283f1efcc600f986e14a6d1b16a3e SHA256 35908168be73896dd1bee1e21fcac96a61d24732cd96e79a1bd26b83e6949c37 DIST deutex-4.4.0.tar.gz 215945 RMD160 a811e14a387e30d525ab2095ccb99bc0aeac9152 SHA1 f3d9cd68a03cf36aad3096ded6609be4b6f7c82b SHA256 e87ff2984c6555f30408ee7aa4e6461aac6f1d3d0a1e21b4e12a797a057ba3b7 -EBUILD deutex-4.4.0.ebuild 667 RMD160 c11530085cec8241c4a977f621a03c29d1cfc6a6 SHA1 db84e1ffda3fcc0ac72443a1e3c8449d3bf343a1 SHA256 21129089def90ec18c745886c1d7d1fd33a57e938e8c249780c4ed5c6ee715a5 -MISC ChangeLog 1019 RMD160 ba356c434b957a23e0858ddfc2ece79187ceaa1f SHA1 43baed6866bcb783860a7b79a04bfc11d82519ef SHA256 9698691a3e8e1a983ce822c9097562bd9fa70a1aac22e77133ccd9da8f494ada +EBUILD deutex-4.4.0.ebuild 712 RMD160 8a6b83e0a80cdf6e039fcb8d796582862e48e02c SHA1 2a2410fc45a1313b2942faf5f8ce362e01a79a24 SHA256 28d3f17cd45bfb7c45406283e55d8bf16e712dd33a0544520b082171e0662746 +MISC ChangeLog 1180 RMD160 b8e84cb467e4a1516b4604a1a83c200cebac85f3 SHA1 68cd2eea34e2fe38000da35e8b605c4faa8da2c9 SHA256 69d24cc9dc27eb8b673a155992164fbd3ac3b41d7d7f5a389d4da7deaf7d777d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild index 8c34b45ebd6e..49b1766d5e89 100644 --- a/games-util/deutex/deutex-4.4.0.ebuild +++ b/games-util/deutex/deutex-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/deutex-4.4.0.ebuild,v 1.6 2010/10/15 12:37:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/deutex-4.4.0.ebuild,v 1.7 2010/10/27 12:15:40 tupone Exp $ EAPI=2 inherit games @@ -14,9 +14,11 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" +RDEPEND="" DEPEND="" -PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-64bit.patch ) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-64bit.patch + "${FILESDIR}"/${P}-ovflfix.patch ) src_install() { dobin deusf deutex || die diff --git a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch new file mode 100644 index 000000000000..32a7dce0d97c --- /dev/null +++ b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch @@ -0,0 +1,11 @@ +--- src/sound.c.old 2010-10-27 12:32:28.000000000 +0200 ++++ src/sound.c 2010-10-27 12:32:52.000000000 +0200 +@@ -309,7 +309,7 @@ + if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header"); + if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header"); + if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header"); +- if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block"); ++ if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block"); + if(blockv.type!=1) ProgError("VOC: first block is not sound"); + datasize= ((blockv.sizeU)<<16)&0xFF0000L; + datasize+=((blockv.sizeM)<<8)&0xFF00L; |