x11-misc/bbacpi: Fixes bug 338936. Not working at all... Something wrong with X libs?

7 files changed, 234 insertions, 0 deletions

diff --git a/x11-misc/bbacpi/ChangeLog b/x11-misc/bbacpi/ChangeLog
new file mode 100644
index 0000000..0059333
--- /dev/null
+++ b/x11-misc/bbacpi/ChangeLog
@@ -0,0 +1,48 @@
+# ChangeLog for x11-misc/bbacpi
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.10 2010/07/08 08:30:58 ssuominen Exp $
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  bbacpi-0.1.5-r1.ebuild:
+  x86 stable
+
+*bbacpi-0.1.5-r1 (03 Mar 2010)
+
+  03 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
+  +bbacpi-0.1.5-r1.ebuild:
+  Fix documentation installation. Adjust correct dependencies. EAPI2fy it. 
+  Add amd64 keyword.
+  Thanks to Christophe LEFEBVRE <chtof62@gmail.com> for the ebuild. Fixes
+  bug #298868
+
+  26 Dec 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove smithj from metadata (#95385)
+
+  05 Nov 2006; <dirtyepic@gentoo.org> +files/bbacpi-0.1.5-noextraquals.diff,
+  bbacpi-0.1.5.ebuild:
+  Fix gcc 4.1 build error.  Thanks to William Keaney in bug #141032.
+
+  10 Apr 2006; <smithj@gentoo.org> -bbacpi-0.1.3.ebuild,
+  bbacpi-0.1.5.ebuild:
+  x86 stable and removed stale versions
+
+*bbacpi-0.1.5 (11 Feb 2006)
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> +bbacpi-0.1.5.ebuild:
+  Version bump, see bug #119338.
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> bbacpi-0.1.3.ebuild:
+  Fixed DEPEND for modular X.
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> bbacpi-0.1.3.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+  16 Jul 2005; Jonathan Smith <smithj@gentoo.org> bbacpi-0.1.3.ebuild:
+  stable x86
+
+*bbacpi-0.1.3 (14 Jun 2005)
+
+  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
new file mode 100644
index 0000000..dec9343
--- /dev/null
+++ b/x11-misc/bbacpi/Manifest
@@ -0,0 +1,7 @@
+AUX bbacpi-0.1.5-asneeded.patch 1189 RMD160 750d49463a6f9b81d2d3309e56e6ec64adf0011b SHA1 08228b18e2d31ff6957313d899141e37cf667197 SHA256 a3886b4e269306f122c0a2875f833eeaa513cab4c9660a6c279414f35b1eac31
+AUX bbacpi-0.1.5-noextraquals.diff 468 RMD160 df1cc2e62df538c7b2300a64050ef1aa0ebafae6 SHA1 1009088a190514c776185a7433d6b609dd7276b9 SHA256 81959935f97c54244efa62dc3fea54a7e7a02abb0df3f21117986a1a60c5475a
+AUX bbacpi-0.1.5-overflows.patch 2888 RMD160 a78bf19f0f07ee88c9c95998c4f0725bb05cdd36 SHA1 805f97d978e07c0801832fc1bc2266a0593232a8 SHA256 604ccf4a190f065ed94140bc3306c7ebbf1e8d278f182a918527dc20f66f3f66
+DIST bbacpi-0.1.5.tar.gz 241565 RMD160 f0fd1d85ea891ca0cdbfaba29398ebc6a7649525 SHA1 10b86f6c27c9c5891656fa20e728c36c096d3742 SHA256 e3845b961f424461cd956b24b22613171b65f8fa1e302ad1ef713d22c9273e51
+EBUILD bbacpi-0.1.5-r2.ebuild 855 RMD160 5fef1275f75b9274fab829511d85f37f066304bd SHA1 adc1c173d843a562ecb7a4d0cb2c9da14de0438c SHA256 77a32054626ab2abc466ff16bfee413e7b760920f32ee6dcefb883dc2cff5ad2
+MISC ChangeLog 1598 RMD160 8d4747dfa2986467e202b2b94891afa48c97d359 SHA1 3c180c108d6eeef34f7430d42c05b1cdf9665111 SHA256 7bca8d111d486a79b3cc2b88c917415f330d2184fd9bb11bacaa53ecf3aae1d7
+MISC metadata.xml 251 RMD160 322015e5929c1c9775e15a3d4e243518833cbe27 SHA1 2ca9ea7742a6da0ef55e4fa983b8036c61bee11c SHA256 1902f28729511f9b16959b8a70183e2753c6f913a8bac719661a1dd6c4dad763
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 0000000..921473f
--- /dev/null
+++ b/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 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.2 2010/07/08 08:30:58 ssuominen Exp $
+
+EAPI=2
+
+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="virtual/blackbox
+	media-libs/imlib
+	x11-libs/libX11
+	x11-misc/xdialog
+	sys-power/acpi
+	sys-power/acpid"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-noextraquals.diff \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-overflows.patch
+	rm -f configure missing || die
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README || die
+}
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-asneeded.patch b/x11-misc/bbacpi/files/bbacpi-0.1.5-asneeded.patch
new file mode 100644
index 0000000..5b8160a
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-asneeded.patch
@@ -0,0 +1,40 @@
+Fix configure check that appended -lX11 to $LDFLAGS instead of allowing the
+default handling that appended it to $LIBS.
+
+https://bugs.gentoo.org/show_bug.cgi?id=338936
+
+Patch written by Kevin Pyle
+--- configure.in
++++ configure.in
+@@ -89,13 +89,10 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $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"
+-
+ dnl Check for Imlib
+ AC_MSG_CHECKING([for Imlib])
+ AC_ARG_WITH(imlib,[  --with-imlib[=path]	Use Imlib for images [path to imlib-config]],
+--- Makefile.am
++++ 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\"
+@@ -18,7 +18,7 @@
+ 		  Basemenu.cc Basemenu.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbacpi_LDADD = @X_LIBS@
++bbacpi_LDADD = @X_PRE_LIBS@ @X_LIBS@
+ 
+ if USE_IMLIB
+ AM_CPPFLAGS += @IMAGE_CFLAGS@ -D__IMLIB
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
new file mode 100644
index 0000000..abf409b
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
@@ -0,0 +1,14 @@
+diff -urN bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh
+--- bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh	2004-05-15 08:10:52.000000000 -0400
++++ bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh	2006-07-19 09:29:28.000000000 -0400
+@@ -126,8 +126,8 @@
+ {
+   
+ public:
+-  Resource::Resource(ToolWindow *);
+-  Resource::~Resource(void);
++  Resource(ToolWindow *);
++  ~Resource(void);
+   
+   struct FRAME frame;
+   struct LABEL label;
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.patch b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.patch
new file mode 100644
index 0000000..23a0ce6
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.patch
@@ -0,0 +1,79 @@
+Fix buffer overflows
+
+https://bugs.gentoo.org/show_bug.cgi?id=338936
+
+Patch written by Kevin Pyle
+--- bbacpi.cc
++++ bbacpi.cc
+@@ -167,7 +167,7 @@
+   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 @@
+     {
+       /* 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 @@
+       {
+ 	/* 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 @@
+   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 @@
+ 	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 @@
+ 	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 @@
+   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 @@
+   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);
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
new file mode 100644
index 0000000..82230a5
--- /dev/null
+++ b/x11-misc/bbacpi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<longdescription lang="en">
+Utility for viewing ACPI data via X11
+</longdescription>
+</pkgmetadata>
+