diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2010-10-24 10:03:18 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-10-24 10:03:18 +0000 |
| commit | c3af1298d16edd0eadde26ce1f02aec4a94951d8 (patch) | |
| tree | f09c40753c57bac66bbb64fa8161abe1ebe01404 /media-radio/xlog | |
| parent | Remove media-libs/alsa-oss from deps wrt #342441 by Sven Müller. (diff) | |
| download | historical-c3af1298d16edd0eadde26ce1f02aec4a94951d8.tar.gz historical-c3af1298d16edd0eadde26ce1f02aec4a94951d8.tar.bz2 historical-c3af1298d16edd0eadde26ce1f02aec4a94951d8.zip | |
Fix buffer overflow for big cty.dat files
Package-Manager: portage-2.1.9.22/cvs/Linux x86_64
Diffstat (limited to 'media-radio/xlog')
| -rw-r--r-- | media-radio/xlog/ChangeLog | 6 | ||||
| -rw-r--r-- | media-radio/xlog/Manifest | 5 | ||||
| -rw-r--r-- | media-radio/xlog/files/xlog-2.0.3-dxcc.patch | 30 | ||||
| -rw-r--r-- | media-radio/xlog/xlog-2.0.3.ebuild | 4 |
4 files changed, 41 insertions, 4 deletions
diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog index 0c6dddcfbcdf..dfd8466428a5 100644 --- a/media-radio/xlog/ChangeLog +++ b/media-radio/xlog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/xlog # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.14 2010/10/04 15:19:36 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.15 2010/10/24 10:03:18 tomjbe Exp $ + + 24 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.3.ebuild, + +files/xlog-2.0.3-dxcc.patch: + Fix buffer overflow for big cty.dat files 04 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.3.ebuild, +files/xlog-2.0.3-memmove.patch: diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest index e1351c27c453..2c5969e20923 100644 --- a/media-radio/xlog/Manifest +++ b/media-radio/xlog/Manifest @@ -1,8 +1,9 @@ AUX xlog-1.9-desktop-update.patch 1393 RMD160 045463b085cb4587b571c9ecbf70aafadaf5b716 SHA1 d4143c9f581ab1859f7ea38584248f61358e0b05 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a AUX xlog-2.0.1-adif.patch 364 RMD160 5747c9bfd9a5e6e68d03b3e850736081af27805e SHA1 9077661c53401c44191c653d99250e0e4c9d63ea SHA256 b2ae523994271baa65f5847b5ee3528cc4d0e3924bdeacb9bb46098b21452986 AUX xlog-2.0.2-qsl.patch 809 RMD160 e1e124b746c0f08febf4f7e1bc33c66735181d18 SHA1 eab5c1cd9a3ba051abcce4ab3c843390410731c9 SHA256 e6cf4baa72b46f4e705fc9d6084f0ff538874fe6774c796dab8c4126799d8997 +AUX xlog-2.0.3-dxcc.patch 793 RMD160 b59a93280e07d064d110a460dc90f8b608900cef SHA1 6f82d9a98e1a3fa1d80fcd0f070fb7ed5f172090 SHA256 935a8313552b5291bb07a7d8a9179cb5670852d713aae6712c7c28c144fe732d AUX xlog-2.0.3-memmove.patch 1873 RMD160 23deb0ae3eec9e5f7cd8f799368bd44d3b90b35a SHA1 000b00cf73ac915e47d92a57554a5a9053706d17 SHA256 b13e49ed3b305463a4e9fc38afb1806f8b53348b55fd48dd21c39b29ca1f4f12 DIST xlog-2.0.3.tar.gz 11141993 RMD160 b4882d0916ebb80306e497367dacf065b687009b SHA1 cc073fb3844b240ecaeed3119fc9b430e4116faf SHA256 ca12a468d2b10b11adbff365d0731853bfc54d915a342b2e3b712629d092f245 -EBUILD xlog-2.0.3.ebuild 1399 RMD160 98a58b9d6423271ff0b1b8ed68195a1ee4a412f6 SHA1 5508027aba38863ebf6e023d900829c747db0c56 SHA256 aef0afcb2f76ffad230ee6ae8f8272bc9dac6d6cc893e1af30c99bf69e99204d -MISC ChangeLog 815 RMD160 38c21784f3dc6ca72f85d1f70d650ca9c0cb07d1 SHA1 4db7b201a06391576dbd17d9a1fdfcaa3d188c3f SHA256 62744cb73cd4edcf8e763c71b4059e1fa63277eeacc310db73242125545f63e4 +EBUILD xlog-2.0.3.ebuild 1478 RMD160 34127dc21581366d2f87eb999f3ce83f3c7ad852 SHA1 1b8b1ca81eeadfda5218378e9a2dea0598dc5bac SHA256 2c557b3f16f78e82acaaff89c596b36b8289d61382bc6ad15e8e43ec3caee5fc +MISC ChangeLog 963 RMD160 2c04467bda7d370cc5c02a87792c932e789d6d63 SHA1 dbb4602178605e3fe7b270525b63e961e59f736e SHA256 d5a04c292d790bd93f55a7d02b86e6f86e9891bacd2fa56fca4b9941c8f8cc9d MISC metadata.xml 252 RMD160 97b7e7d78993c6123ed2d99298be3bade7e52197 SHA1 d747c2ba9a0158afb075712518f6442af74a6fbb SHA256 e9ecb799a64ff215ac2412db6e6c133d8d325c330d07b087b23d21ad0b56c7a6 diff --git a/media-radio/xlog/files/xlog-2.0.3-dxcc.patch b/media-radio/xlog/files/xlog-2.0.3-dxcc.patch new file mode 100644 index 000000000000..dff52d42108c --- /dev/null +++ b/media-radio/xlog/files/xlog-2.0.3-dxcc.patch @@ -0,0 +1,30 @@ +# prevent buffer overflow for big cty.dat files +--- src/dxcc.c.orig 2010-10-24 11:47:15.000000000 +0200 ++++ src/dxcc.c 2010-10-24 11:47:59.000000000 +0200 +@@ -364,7 +364,7 @@ + gint + readctyversion (void) + { +- gchar buf[65536], *ver, *ch, *cty_location; ++ gchar buf[131072], *ver, *ch, *cty_location; + FILE *fp; + + #ifdef G_OS_WIN32 +@@ -378,7 +378,7 @@ + return (1); + } + g_free (cty_location); +- gint n = fread (buf, 1, 65536, fp); ++ gint n = fread (buf, 1, 131072, fp); + buf[n] = '\0'; + ver = strstr (buf, "VER2"); + if (ver) +@@ -400,7 +400,7 @@ + readctydata (void) + { + +- gchar buf[8192], *cty_location, *pfx, **split, **pfxsplit; ++ gchar buf[65536], *cty_location, *pfx, **split, **pfxsplit; + gint ichar = 0, dxccitem = 0, ipfx = 0, ch = 0; + gboolean firstcolon = FALSE; + FILE *fp; diff --git a/media-radio/xlog/xlog-2.0.3.ebuild b/media-radio/xlog/xlog-2.0.3.ebuild index 4eabf9e6944e..3e2e1d8e7cb5 100644 --- a/media-radio/xlog/xlog-2.0.3.ebuild +++ b/media-radio/xlog/xlog-2.0.3.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/media-radio/xlog/xlog-2.0.3.ebuild,v 1.4 2010/10/04 15:19:36 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.5 2010/10/24 10:03:18 tomjbe Exp $ EAPI=2 @@ -28,6 +28,8 @@ src_prepare() { # and patch wrong ADIF export epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \ "${FILESDIR}/${PN}-2.0.2-qsl.patch" + # patch buffer overflow for new cty.dat + epatch "${FILESDIR}"/${P}-dxcc.patch # fix buffer overflow (bug 339652) epatch "${FILESDIR}/${P}-memmove.patch" eautoreconf |