diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2012-11-25 10:15:13 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-11-25 10:15:13 +0000 |
commit | 47c612fed26961f3f0519e877e237a579063baed (patch) | |
tree | 117e49341118274cbf26eaa3244f615321827528 /x11-misc | |
parent | Set proper license information, wrt bug #444628. Thanks to Ulrich Müller for... (diff) | |
download | historical-47c612fed26961f3f0519e877e237a579063baed.tar.gz historical-47c612fed26961f3f0519e877e237a579063baed.tar.bz2 historical-47c612fed26961f3f0519e877e237a579063baed.zip |
Fix buffer overflows wrt #338936 by Diego Elio Pettenò <flameeyes@gentoo.org>. Thanks to Kevin Pyle for patch. Add missing dependency on helvetica font. Thanks to James Cloos <cloos@jhcloos.com> for providing solution
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/bbacpi/ChangeLog | 13 | ||||
-rw-r--r-- | x11-misc/bbacpi/Manifest | 32 | ||||
-rw-r--r-- | x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild | 7 | ||||
-rw-r--r-- | x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild | 32 | ||||
-rw-r--r-- | x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff | 105 |
5 files changed, 174 insertions, 15 deletions
diff --git a/x11-misc/bbacpi/ChangeLog b/x11-misc/bbacpi/ChangeLog index 5f1c3eb59f8f..d233792c476c 100644 --- a/x11-misc/bbacpi/ChangeLog +++ b/x11-misc/bbacpi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-misc/bbacpi -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.11 2011/04/16 17:21:32 ulm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.12 2012/11/25 10:15:03 xarthisius Exp $ + +*bbacpi-0.1.5-r2 (25 Nov 2012) + + 25 Nov 2012; Kacper Kowalik <xarthisius@gentoo.org> +bbacpi-0.1.5-r2.ebuild, + +files/bbacpi-0.1.5-overflows.diff, bbacpi-0.1.5-r1.ebuild: + Fix buffer overflows wrt #338936 by Diego Elio Pettenò <flameeyes@gentoo.org>. + Thanks to Kevin Pyle for patch. Add missing dependency on helvetica font. + Thanks to James Cloos <cloos@jhcloos.com> for providing solution 16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> bbacpi-0.1.5-r1.ebuild: Remove bogus dependency on virtual/blackbox, bug 358825. @@ -48,4 +56,3 @@ 14 Jun 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml, +bbacpi-0.1.3.ebuild: initial commit to fix #75980 - diff --git a/x11-misc/bbacpi/Manifest b/x11-misc/bbacpi/Manifest index 6e7988699de5..23ca13a00175 100644 --- a/x11-misc/bbacpi/Manifest +++ b/x11-misc/bbacpi/Manifest @@ -1,15 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX bbacpi-0.1.5-noextraquals.diff 468 RMD160 df1cc2e62df538c7b2300a64050ef1aa0ebafae6 SHA1 1009088a190514c776185a7433d6b609dd7276b9 SHA256 81959935f97c54244efa62dc3fea54a7e7a02abb0df3f21117986a1a60c5475a -DIST bbacpi-0.1.5.tar.gz 241565 RMD160 f0fd1d85ea891ca0cdbfaba29398ebc6a7649525 SHA1 10b86f6c27c9c5891656fa20e728c36c096d3742 SHA256 e3845b961f424461cd956b24b22613171b65f8fa1e302ad1ef713d22c9273e51 -EBUILD bbacpi-0.1.5-r1.ebuild 657 RMD160 9c0add75c97ba88b51e271e29f8dcaac2ab07c0e SHA1 cbcd634df8ada543863f39250a3b6b6535661ad5 SHA256 c75848dc6ff378d279414b8b86e5cddb44d87ed27187c8a29e5a581a9857dd65 -MISC ChangeLog 1723 RMD160 8bca0a50b104b4a59c4a0a2a4f7d0c0687e0c0c3 SHA1 e34b25441ff213b01dd578356f2c886aa9a41b2e SHA256 54682025fb821d53d6568bd5159290884d487fb434c03e49caec28073fbcb321 -MISC metadata.xml 251 RMD160 322015e5929c1c9775e15a3d4e243518833cbe27 SHA1 2ca9ea7742a6da0ef55e4fa983b8036c61bee11c SHA256 1902f28729511f9b16959b8a70183e2753c6f913a8bac719661a1dd6c4dad763 +AUX bbacpi-0.1.5-noextraquals.diff 468 SHA256 81959935f97c54244efa62dc3fea54a7e7a02abb0df3f21117986a1a60c5475a SHA512 4afb7557deff8cc1dcc5e63a9fba0437c8ad22727ff54c35d219544e1fd9c8ccc3aea45605a467dcd1756dab03ad2ec276a418ffd12870ff4405726b2d60f6e2 WHIRLPOOL 193b91569cfdb4f8a2fe13d1185b334f4dbf04c2f272573f8a0933e2722e99015ecd9a9209342e5fc68989b8ed2bd1ffea90cfc1b53e93a1cb4c9192e4b50a53 +AUX bbacpi-0.1.5-overflows.diff 4015 SHA256 1bce6ab98e6d34f6e49e25c1a656da923c5dbf88bbac22c7e3e336a0d7d35eee SHA512 62679f7be9c702f6fe61fbcc448951761f5a62a05ff93a99e94e6fa79389b059ab4f95b588c0cd4c561d3a22e00257dd89c45c2aa3fabad8570333cfa36ebb7e WHIRLPOOL c7aba684b8322b4d71ba1cf46993e0b07970396957b9485cb9824ff7e97755ee76998b400879b88114965023dfaf0b6aa31fbbe9c1f3654c11923b0871db5a8a +DIST bbacpi-0.1.5.tar.gz 241565 SHA256 e3845b961f424461cd956b24b22613171b65f8fa1e302ad1ef713d22c9273e51 SHA512 4491bf0352a376ada9006f3306c377d5c8b6fafcad8d214f64f8a3cd52e1e8b8d02b084888d58d8a1389a624631f6fc3b6f98aa33cd89b06e1ccd0802b5a540a WHIRLPOOL 54207dd972e88e12a84179fc334cad721965821ee228cb3afe8af1ac17b72c13d1e4e6ecc1f559d8d5c6c5f0e8e98854c4ce5409cb7791e67d4aecfac92cd57f +EBUILD bbacpi-0.1.5-r1.ebuild 716 SHA256 1fcb4c3a0e987c3071f4f1275438828fd745322a087408b52c074448e233ad00 SHA512 f8afe1c5abfdfd4650d8964965f0f777f4324dc96b63d9dc193e32e24f79c339bc3c82d22475677dfb14c06fdbcbd6d6e2e0cabe3f41633d19777f15febd5af0 WHIRLPOOL d64a80e17f20868b56e665370527b17b7f979dff656ed02b33b5be9020480c325d1b048bc7e4422bf9fb2ae1b0131fce2338bffc1ec05c5ecf70ac499ff8362c +EBUILD bbacpi-0.1.5-r2.ebuild 738 SHA256 3ff932471212c71d6b50c72cde72833472c4f87c6fa5b6607bbdc6a4c0a7ea3c SHA512 6ff8262868369911a210342a9c5c468236f3c8ca92520049bded55866a551df026e53b2ab66da58ca05f848747e6057c9ef7b7bd7a0e3150a245d7a5094a9b94 WHIRLPOOL ace6354d845eb14a164a9f8e54e2e6cee93750a6cf7bc60a4c5139f66c30358c42dc531a78f8ffa439aca9dbad80d97e2cfbfbdf1070cc86a05785b584fb029a +MISC ChangeLog 2128 SHA256 3f5d1cf39cba5e5603a6d7cabb11c7eb1e33d924669c688575f7bd46566f5cd3 SHA512 1be122a1f7dd0dde3f661021e656fd5c8a85fdf8a95eb8b1f59305983be1a7e632babbd2ad8094e72fc49cc5aae349aa6bdea0a20be12bd1d5c0468dd19fbe4d WHIRLPOOL 85d406c086ca98ebfcd3a3a788d32ca3fa0fbcdb9af1156485e992fa1c7e4fc5b623c7f17f60227cab71faad40fa5087cc0cd7e1b02732cc80de74834621567a +MISC metadata.xml 251 SHA256 1902f28729511f9b16959b8a70183e2753c6f913a8bac719661a1dd6c4dad763 SHA512 050d9ba397c41694706c939f05aa3e31a1e8edaaa5c5c5752db17cdbb30fdc2194b33ce8be93efc88b588f6d94225f4f9f7a955bf3291d31380ebb5614a6c8d2 WHIRLPOOL 8d66504fa63d2e0e815aaecff6f4c8cb717f7310133b79e406b25cb8ea4fa185be1a7ef7da6bbba8f19f72102fa7127408fa1b093c6117dc75a5e779cde8974f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk2p0HIACgkQOeoy/oIi7ux+OgCffuXd7Qdjhm2h/LyFJAMml51X -x6cAn1D8Rr+h4v1D27pspPUoziNgrB7B -=pD/9 +iQIcBAEBCAAGBQJQse+uAAoJEF0huFKJUZL5eoYP+wf+VmefiSOr/MxY4J5nDM5p +4iWmZWDq/Ol5UEzt77nCJulhCC1ucaCFJr4cnJdxelemfdLcUtrio9dj+hi0Ltg2 +vJuF2sSzCbLf0cmgnjHUSRkuI1aMJ5G42CR8z7igPKfTQskmh3vREhCb0exQldQn +LHZlhQ+aL49IfzfhH9K8Bws+lSBio+GAqehfVv+Pot30+w3PTUPLt13+Y6d8+ee9 +sBOzT9opAwc0PTFxzaoRUya+Q8DLwsYcsExbMWNhjgI9uR/84hVLjGL3APZvOS8+ +/AV+nxhbfRAstZHHzJtpDE+6fhzLdmnPWkjVByC7CWQURdXwZPi9LepnsZYyIgwm +axSXn1kRj3zLlIj7wBF53yNhAVN3SG2bLSoE56NBeWO7U82B3OifI7uVJcAd6+Uc +/k3/5tLfxeNsb7IXHZUl4IVv8rpRpAJUMplhL1QdxacHttMX1Y6uU4xLp8RE7VXW +ypr5aOsIOCk2Vw806vAjBiIxsUCO+MMHiirvKICptIlXeZCQQqExgi2R3tJ0jDfh +ojNTRoIDYoUlIAcAckH0yow7DQ5TEAgSm3wERWHnznhGfLA6Q2a+0ALC03uJPd9E +geEQlI5Ej9RsY0jfXgS/q8arge6vnEKrXsNBWRWl0Wpk6hcLM8goS7sdBNwzSCQR +zGETd1g5EgW0Qrw7/yAK +=xfWP -----END PGP SIGNATURE----- diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild index ea897f491d3f..8594514bd81e 100644 --- a/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild +++ b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild,v 1.3 2011/04/16 17:21:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild,v 1.4 2012/11/25 10:15:03 xarthisius Exp $ EAPI=2 + inherit eutils DESCRIPTION="ACPI monitor for X11" @@ -19,6 +20,8 @@ DEPEND="x11-libs/gtk+:2 x11-misc/xdialog sys-power/acpi sys-power/acpid" +RDEPEND="${DEPEND} + media-fonts/font-adobe-100dpi" src_prepare() { epatch "${FILESDIR}"/${P}-noextraquals.diff diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild new file mode 100644 index 000000000000..ebdc008abb29 --- /dev/null +++ b/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild,v 1.1 2012/11/25 10:15:03 xarthisius Exp $ + +EAPI=4 + +inherit autotools eutils + +DESCRIPTION="ACPI monitor for X11" +HOMEPAGE="http://bbacpi.sourceforge.net" +SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-libs/libX11 + media-libs/imlib + x11-misc/xdialog + sys-power/acpi + sys-power/acpid" +RDEPEND="${DEPEND} + media-fonts/font-adobe-100dpi" + +DOCS=( AUTHORS ChangeLog README ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-noextraquals.diff \ + "${FILESDIR}"/${P}-overflows.diff + eautoreconf +} diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff new file mode 100644 index 000000000000..df961e607e4f --- /dev/null +++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff @@ -0,0 +1,105 @@ +Fixes buffer overflows and --as-needed issues + +https://bugs.gentoo.org/show_bug.cgi?id=338936 + +Patch written by Kevin Pyle <gentoo.8eaf7cd8e5128d8191fe@spamgourmet.com> +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = @CPPFLAGS@ @INTERLACE@ \ ++AM_CPPFLAGS = @INTERLACE@ \ + -DGLOBAL_BB=\"$(datadir)/bbtools/bbacpi.bb\" \ + -DGLOBAL_NOBB=\"$(datadir)/bbtools/bbacpi.nobb\" \ + -DGLOBAL_DATA=\"$(datadir)/bbtools\" +--- a/bbacpi.cc ++++ b/bbacpi.cc +@@ -167,7 +167,7 @@ bool CheckLoad::checkbatteryfile (char* name, char* device) + if (ret = (fp = fopen(name, "r"))) { + char buffer[100]; + char present[20]; +- fgets(buffer,128,fp); ++ fgets(buffer, sizeof(buffer),fp); + sscanf(buffer,"present: %s", present); + if (strncmp(present, "yes", 3) != 0) { + fprintf(stderr, "Device %s not present.\n", device); +@@ -195,7 +195,7 @@ void CheckLoad::ReadStaticInfo() + { + /* Read data in any order */ + found = 0; +- while (found < 11 && (fgets(buffer, 63, fp) != NULL)) { ++ while (found < 11 && (fgets(buffer, sizeof(buffer), fp) != NULL)) { + /* Present */ + if (strncmp(buffer, "present:", 7) == 0 + || strncmp(buffer, "Present:", 7) == 0) { +@@ -277,7 +277,7 @@ void CheckLoad::ReadStaticInfo() + { + /* Read data in any order */ + found = 0; +- while (found < 11 && (fgets(buffer, 63, fp) != NULL)) { ++ while (found < 11 && (fgets(buffer, sizeof(buffer), fp) != NULL)) { + /* Present */ + if (strncmp(buffer, "present:", 7) == 0 + || strncmp(buffer, "Present:", 7) == 0) { +@@ -361,7 +361,7 @@ void CheckLoad::ReadStaticInfo() + if ((fp = fopen(names.temptrip, "r"))) + { + found = 0; +- while (found < 2 && (fgets(buffer,128,fp) != NULL)) { ++ while (found < 2 && (fgets(buffer, sizeof(buffer),fp) != NULL)) { + /* Critical */ + if (strncmp(buffer, "critical", 8) == 0 + || strncmp(buffer, "Critical", 8) == 0) { +@@ -425,7 +425,7 @@ void CheckLoad::Reconfigure() + if (file_status.st_mtime != last_mtime) + { + found = 0; +- while (found < 4 && (fgets(buffer, 63, fp) != NULL)) { ++ while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) { + /* Charging state */ + if (strncmp(buffer, "charging state:", 15) == 0 + || strncmp(buffer, "Charging State:", 15) == 0) { +@@ -463,7 +463,7 @@ void CheckLoad::Reconfigure() + if (file_status.st_mtime != last_mtime) + { + found = 0; +- while (found < 4 && (fgets(buffer, 63, fp) != NULL)) { ++ while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) { + /* Charging state */ + if (strncmp(buffer, "charging state:", 15) == 0 + || strncmp(buffer, "Charging State:", 15) == 0) { +@@ -497,7 +497,7 @@ void CheckLoad::Reconfigure() + if ((fp = fopen(names.adapter, "r"))) + { + found = 0; +- while (found < 1 && (fgets(buffer, 63,fp) != NULL)) { ++ while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) { + if (strncmp(buffer, "state:", 6) == 0 + || strncmp(buffer, "State:", 6) == 0) { + sscanf(buffer+offset,"%s", adapter.state); +@@ -511,7 +511,7 @@ void CheckLoad::Reconfigure() + if ((fp = fopen(names.temperature, "r"))) + { + found = 0; +- while (found < 1 && (fgets(buffer, 63,fp) != NULL)) { ++ while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) { + if (strncmp(buffer, "temperature:", 12) == 0 + || strncmp(buffer, "Temperature:", 12) == 0) { + sscanf(buffer+offset,"%u", &temperature.celcius); +--- a/configure.in ++++ b/configure.in +@@ -89,12 +89,12 @@ AC_PATH_XTRA + + CFLAGS="$CFLAGS $X_CFLAGS" + CXXFLAGS="$CXXFLAGS $X_CFLAGS" +-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" ++LIBS="$LIBS $X_LIBS $X_PRE_LIBS" + dnl Checks for X libraries. +-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", ++AC_CHECK_LIB(X11, XOpenDisplay,, + AC_MSG_ERROR(XOpenDisplay not found in -lX11)) + +-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" ++LIBS="$LIBS $X_EXTRA_LIBS" + + dnl Check for Imlib + AC_MSG_CHECKING([for Imlib]) |