summaryrefslogtreecommitdiff
path: root/x11-misc/bbacpi
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-misc/bbacpi
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/bbacpi')
-rw-r--r--x11-misc/bbacpi/Manifest7
-rw-r--r--x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild41
-rw-r--r--x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff13
-rw-r--r--x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff105
-rw-r--r--x11-misc/bbacpi/metadata.xml14
5 files changed, 180 insertions, 0 deletions
diff --git a/x11-misc/bbacpi/Manifest b/x11-misc/bbacpi/Manifest
new file mode 100644
index 000000000000..7b53a2dc0c05
--- /dev/null
+++ b/x11-misc/bbacpi/Manifest
@@ -0,0 +1,7 @@
+AUX bbacpi-0.1.5-noextraquals.diff 236 SHA256 21d7a3cd345296d88cea4da3d99ccacf5722272a33ab8754527d9e588220ed2e SHA512 69aefc740a94067471b30dff016d27328567a1d472aba40f108c4647ca71c243d43368604c23881aa749c6cf2cd933af2bc6f5c7c29d16ab91c2041cf8cc2600 WHIRLPOOL f302fc47490425778a8e06210bdc59a49c5adbe0144c738379b487edea04f56456ca1f9e7812dcc35fe354af54ed4e0e5de27750cea519457453e1dc3334fef0
+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-r3.ebuild 754 SHA256 1674b76ca9c80adf81c4d832925056cfd0bf7a57b322cc49e7bd37983359fe45 SHA512 0f83c66ea1139d52b489043ac0b803cba0560a58ee0fe71bbbae70f7e23132bd04012604d299a862de04e1c4781535ea8925352c212d2782a92760ece0b63018 WHIRLPOOL 25d2d336dcfb3e212daae6d70d7761e941366cb75e4d55d01c5506a45ae5d6a41ee4d91cefd743118ff0974ef6091c9213d5ed43257149247341fb700017bd9c
+MISC ChangeLog 2563 SHA256 73753a6c9d46c10ede7a5dd8a50cbd5cbe6be844e97cc9965b640e40f4618c43 SHA512 0743082da0fbe1664f9687229fedd4ffc6d7f78a2ec0e25ec2ab10ade7346cebcaf2e9ed29cdb94236e2a8cde4bcf6237f4d2e50222a24fda535cbff716e24ff WHIRLPOOL 5e06a320fbbbce3420a520622243c535bb6df5aa40d3229070c056df90d1c1d8679a2f6eaa7be8867b6e1bae5900f01c5b70b8512d0dc80dd735a261cbc973bf
+MISC ChangeLog-2015 2264 SHA256 1220d49dff9bfafce09224846a7488b20d8a5b0111f03429172928f8f471ae93 SHA512 ce92c6378311a68e40228bd819e5e9213c626ac01bcc1afdb9f6e0a57daa30ae53c23ce578346717f8ac2e3b7e8dc776d34948c27bcb9aea500eba75196eafe8 WHIRLPOOL a29ed6cb8c8e564ec41418d5bd9230bfd9f4d6e27796b6b54f3abc5d6069a9842c859672a9ae0b8357bcc010bdf1d0173e11a9bf57abf88628244b22ed850164
+MISC metadata.xml 438 SHA256 f978783eb25b5ad023000ea5c2d482577ae420e6f9a87b45eab6487c137ae7d9 SHA512 b88162948bb8b4cb5b05ac45d8c72b80f11d05165a033137a1e99f5fc37dfad189d6619321959a540d01943efa1112fa5173bd267bbcab2529a52b497363eff5 WHIRLPOOL 661740d1177cff4affce3e7ac27f9f3bd1ca0338968708699791e2b00c2b6198aff4e77026032a226239e32e233fdae9e683b6bb4a3407273fde06cc375b6f7b
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild
new file mode 100644
index 000000000000..e3fb13c155f1
--- /dev/null
+++ b/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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"
+
+DEPEND="
+ media-libs/imlib
+ sys-power/acpi
+ sys-power/acpid
+ x11-libs/libX11
+ x11-misc/xdialog"
+RDEPEND="
+ ${DEPEND}
+ media-fonts/font-adobe-100dpi"
+
+DOCS=( AUTHORS ChangeLog NEWS README data/README.bbacpi )
+PATCHES=(
+ "${FILESDIR}"/${P}-noextraquals.diff
+ "${FILESDIR}"/${P}-overflows.diff
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ rm "${ED%/}"/usr/share/bbtools/README.bbacpi || die
+}
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 000000000000..7da903cbd4ca
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
@@ -0,0 +1,13 @@
+--- a/resource.hh
++++ b/resource.hh
+@@ -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.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])
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
new file mode 100644
index 000000000000..5c53ec9ef9bf
--- /dev/null
+++ b/x11-misc/bbacpi/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <longdescription lang="en">
+Utility for viewing ACPI data via X11
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">bbacpi</remote-id>
+ </upstream>
+</pkgmetadata>