commit: 8aa72efe8b1a1194e5b0c55acf206f86210bc0e3
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 16:53:57 2015 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 16:54:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa72efe
app-misc/tdfsb: bump to EAPI4, add missing dependencies (bug #514836), fix
format-security warnings
Package-Manager: portage-2.2.23
.../tdfsb/files/tdfsb-0.0.10-format-security.patch | 26 ++++++++++++++++++++++
...{tdfsb-0.0.10.ebuild => tdfsb-0.0.10-r1.ebuild} | 18 ++++++++++-----
app-misc/tdfsb/tdfsb-0.0.10.ebuild | 9 ++++++--
3 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
new file mode 100644
index 0000000..55fcc1b
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
@@ -0,0 +1,26 @@
+diff --git a/tdfsb.c b/tdfsb.c
+index 5f6b233..a1af5a1 100644
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2436,7 +2436,7 @@ int speckey(int key)
+ if(TDFSB_CSE_FLAG)
+
snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING,fullpath);
+ else
+-
snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING);
++ snprintf(TDFSB_CES_TEMP,4096,"%s",
TDFSB_CUSTOM_EXECUTE_STRING);
+ }
+ system(TDFSB_CES_TEMP);
+ printf("EXECUTE COMMAND: %s\n",TDFSB_CES_TEMP);
+@@ -2732,9 +2732,9 @@ int keyboard (unsigned char key)
+
+ else if (key==TDFSB_KC_HELP)
+ { TDFSB_SHOW_HELP = 1-TDFSB_SHOW_HELP;
+- if (TDFSB_SHOW_HELP) {
printf("\n=======================================\n");
+-
printf(help_str);
+-
printf("=======================================\n\n");
++ if (TDFSB_SHOW_HELP) { printf("%s",
"\n=======================================\n");
++ printf("%s",
help_str);
++ printf("%s",
"=======================================\n\n");
+ }
+ }
+
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
similarity index 67%
copy from app-misc/tdfsb/tdfsb-0.0.10.ebuild
copy to app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index 4b6c765..c91db45 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit eutils toolchain-funcs
@@ -12,17 +12,23 @@
SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz";
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc -sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
IUSE=""
-DEPEND="media-libs/smpeg
+DEPEND="media-libs/freeglut
media-libs/sdl-image
- media-libs/freeglut"
+ media-libs/smpeg
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-asneeded.patch \
- "${FILESDIR}"/${P}-debugging.patch
+ "${FILESDIR}"/${P}-debugging.patch \
+ "${FILESDIR}"/${P}-format-security.patch
sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
index 4b6c765..5131747 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,12 @@ IUSE=""
DEPEND="media-libs/smpeg
media-libs/sdl-image
- media-libs/freeglut"
+ media-libs/freeglut
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu"
RDEPEND="${DEPEND}"
src_prepare() {
