* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/files/, media-libs/allegro/
@ 2018-07-16 22:26 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-07-16 22:26 UTC (permalink / raw
To: gentoo-commits
commit: cc402fa4548fc878e06c5fa778c519feeee27334
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 18:08:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 22:25:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc402fa4
media-libs/allegro: 4.4.2-r1 EAPI-6 bump
Package-Manager: Portage-2.3.43, Repoman-2.3.10
media-libs/allegro/allegro-4.4.2-r1.ebuild | 60 +++++++++++-----------
.../allegro/files/allegro-4.4.2-gentoo.patch | 4 +-
media-libs/allegro/files/allegro-4.4.2-rpath.patch | 4 +-
.../allegro/files/allegro-4.4.2-shared.patch | 4 +-
.../allegro/files/allegro-4.4.2-underlink.patch | 4 +-
5 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 0cb5aac9bf3..c70499bbb40 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils
+inherit cmake-utils desktop
DESCRIPTION="cross-platform multimedia library"
HOMEPAGE="http://alleg.sourceforge.net/"
@@ -14,7 +15,8 @@ SLOT="0"
KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
png? ( media-libs/libpng:0= )
@@ -55,44 +57,40 @@ src_prepare() {
src_configure() {
# WANT_LINUX_CONSOLE is by default OFF
# WANT_EXAMPLES doesn't install anything
-
- mycmakeargs=(
- "-DDOCDIR=share/doc"
- "-DINFODIR=share/info"
- "-DMANDIR=share/man"
- $(cmake-utils_use_want alsa)
- "-DWANT_EXAMPLES=OFF"
- $(cmake-utils_use_want jack)
- $(cmake-utils_use_want jpeg JPGALLEG)
- "-DWANT_LINUX_CONSOLE=OFF"
- $(cmake-utils_use_want fbcon LINUX_FBCON)
- $(cmake-utils_use_want svga LINUX_SVGALIB)
- $(cmake-utils_use_want vga LINUX_VGA)
- $(cmake-utils_use_want png LOADPNG)
- $(cmake-utils_use_want vorbis LOGG)
- $(cmake-utils_use_want oss)
- $(cmake-utils_use_want test TESTS)
- $(cmake-utils_use_want X TOOLS)
- $(cmake-utils_use_want X X11)
- )
+ local mycmakeargs=(
+ -DDOCDIR=share/doc
+ -DINFODIR=share/info
+ -DMANDIR=share/man
+ -DWANT_ALSA=$(usex alsa)
+ -DWANT_EXAMPLES=OFF
+ -DWANT_JACK=$(usex jack)
+ -DWANT_JPGALLEG=$(usex jpeg)
+ -DWANT_LINUX_CONSOLE=OFF
+ -DWANT_LINUX_FBCON=$(usex fbcon)
+ -DWANT_LINUX_SVGALIB=$(usex svga)
+ -DWANT_LINUX_VGA=$(usex vga)
+ -DWANT_LOADPNG=$(usex png)
+ -DWANT_LOGG=$(usex vorbis)
+ -DWANT_OSS=$(usex oss)
+ -DWANT_TESTS=$(usex test)
+ -DWANT_TOOLS=$(usex X)
+ -DWANT_X11=$(usex X)
+ )
if use X; then
- mycmakeargs+=(
- $(cmake-utils_use_want opengl ALLEGROGL)
- )
+ mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
else
- mycmakeargs+=(
- "-DWANT_ALLEGROGL=OFF"
- )
+ mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
fi
cmake-utils_src_configure
}
src_install() {
- cmake-utils_src_install
+ rm -r docs/html/{build,tmpfile.txt} || die
+ local HTML_DOCS=( docs/html/. )
- dohtml docs/html/*.html
+ cmake-utils_src_install
#176020 (init_dialog.3), #409305 (key.3)
pushd docs/man >/dev/null
diff --git a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
index 119d9c78950..660a48437e6 100644
--- a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
@@ -1,5 +1,5 @@
---- docs/CMakeLists.txt.old 2012-03-04 20:20:05.566881387 +0100
-+++ docs/CMakeLists.txt 2012-03-04 20:20:50.659714153 +0100
+--- a/docs/CMakeLists.txt 2012-03-04 20:20:05.566881387 +0100
++++ b/docs/CMakeLists.txt 2012-03-04 20:20:50.659714153 +0100
@@ -71,11 +71,12 @@
string(REGEX MATCH "[^/]*._tx" basename ${page})
string(REPLACE "._tx" "" basename ${basename})
diff --git a/media-libs/allegro/files/allegro-4.4.2-rpath.patch b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
index 57bdb6bf8d0..ab646e485d9 100644
--- a/media-libs/allegro/files/allegro-4.4.2-rpath.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
@@ -1,5 +1,5 @@
---- setup/CMakeLists.txt
-+++ setup/CMakeLists.txt
+--- a/setup/CMakeLists.txt
++++ b/setup/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+
diff --git a/media-libs/allegro/files/allegro-4.4.2-shared.patch b/media-libs/allegro/files/allegro-4.4.2-shared.patch
index 665c03e3120..7b4417d35c1 100644
--- a/media-libs/allegro/files/allegro-4.4.2-shared.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-shared.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -830,7 +830,7 @@
option(WANT_LOGG "Enable logg" on)
option(WANT_JPGALLEG "Enable JPGAlleg" on)
diff --git a/media-libs/allegro/files/allegro-4.4.2-underlink.patch b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
index 33dc9d260b2..7e6ea9398c3 100644
--- a/media-libs/allegro/files/allegro-4.4.2-underlink.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2011-06-06 23:46:06.057320691 +0200
-+++ CMakeLists.txt 2011-06-06 23:46:21.900313261 +0200
+--- a/CMakeLists.txt 2011-06-06 23:46:06.057320691 +0200
++++ b/CMakeLists.txt 2011-06-06 23:46:21.900313261 +0200
@@ -392,7 +392,7 @@
message(FATAL_ERROR "Unix port requires pthreads support.")
endif()
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/files/, media-libs/allegro/
@ 2018-08-21 14:57 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 56bbd26eb8317298c6dd431d3ac9f6e1cff458ce
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu May 24 22:41:10 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 14:57:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bbd26e
media-libs/allegro: fix format-security error
Combined patch taken from Fedora Project
(https://src.fedoraproject.org/rpms/allegro/tree/master)
Fixes #540470
Closes: https://bugs.gentoo.org/540470
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/allegro/allegro-4.4.2-r1.ebuild | 1 +
.../allegro-4.4.2-Werror-format-security.patch | 107 +++++++++++++++++++++
2 files changed, 108 insertions(+)
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index fff77ed7e25..06ed3de8d26 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${P}-underlink.patch
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-rpath.patch
+ "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
)
src_prepare() {
diff --git a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
new file mode 100644
index 00000000000..b3b0bc30b34
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
@@ -0,0 +1,107 @@
+diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c
+--- allegro-4.4.2/src/unix/umodules.c~ 2011-05-13 10:11:33.000000000 +0200
++++ allegro-4.4.2/src/unix/umodules.c 2017-03-15 14:42:39.822612368 +0100
+@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive
+ continue;
+
+ if (!fullpath_slash) {
+- snprintf(fullpath, sizeof fullpath, filename);
++ snprintf(fullpath, sizeof fullpath, "%s", filename);
+ fullpath[(sizeof fullpath) - 1] = 0;
+ }
+ else {
+- snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename);
++ snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename);
+ fullpath[(sizeof fullpath) - 1] = 0;
+ }
+
+diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c
+--- allegro-4.4.2/src/linux/ljoy.c~ 2010-02-20 06:18:16.000000000 +0100
++++ allegro-4.4.2/src/linux/ljoy.c 2017-03-15 14:52:28.474215615 +0100
+@@ -93,7 +93,7 @@ static int joy_init(void)
+
+ if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) {
+ /* NOTE: IOCTL fails if the joystick API is version 0.x */
+- uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
++ uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
+ return -1;
+ }
+
+diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c
+--- allegro-4.4.2/examples/extrans2.c~ 2008-01-30 11:56:50.000000000 +0100
++++ allegro-4.4.2/examples/extrans2.c 2017-03-15 15:43:03.494831521 +0100
+@@ -211,7 +211,7 @@ int main(int argc, char **argv)
+ } else {
+ msg = "no flipping";
+ }
+- textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg);
++ textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg);
+
+ /* finally blit the back buffer on the screen */
+ blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h);
+diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c
+--- allegro-4.4.2/setup/setup.c~ 2010-05-23 18:05:33.000000000 +0200
++++ allegro-4.4.2/setup/setup.c 2017-03-15 16:13:42.243136380 +0100
+@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP *
+ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp),
+ joystick_driver->name, i+1, num_joysticks);
+ else
+- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name);
++ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name);
+ c++;
+ }
+
+@@ -2879,7 +2879,7 @@ int main(void)
+ alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0);
+ #else
+ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
+- allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
++ allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
+ #endif
+ return 1;
+ }
+diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c
+--- allegro-4.4.2/examples/exkeys.c~ 2008-01-10 20:46:00.000000000 +0100
++++ allegro-4.4.2/examples/exkeys.c 2017-03-15 16:17:30.268545467 +0100
+@@ -193,7 +193,7 @@ int main(void)
+ if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num");
+ if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl");
+ scroll();
+- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
++ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
+ } while (k != 27);
+
+ /* various scan codes are defined in allegro.h as KEY_* constants */
+@@ -234,7 +234,7 @@ int main(void)
+ if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' ';
+ if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' ';
+ buf[10] = 0;
+- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
++ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
+ rest(1);
+ } while (!keypressed() || (readkey() >> 8) != KEY_ESC);
+
+diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c
+--- allegro-4.4.2/tests/play.c~ 2005-03-19 12:15:07.000000000 +0100
++++ allegro-4.4.2/tests/play.c 2017-03-15 16:35:18.628156496 +0100
+@@ -74,7 +74,7 @@ void usage(void)
+
+ strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n");
+
+- allegro_message(msg);
++ allegro_message("%s", msg);
+ free(msg);
+ }
+
+diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c
+--- allegro-4.2.3/tools/pack.c~ 2006-05-20 16:49:58.000000000 +0200
++++ allegro-4.2.3/tools/pack.c 2010-12-30 11:20:42.425231307 +0100
+@@ -42,7 +42,7 @@ static void err(char *s1, char *s2)
+ printf(": %s", s1);
+
+ if (s2)
+- printf(s2);
++ printf("%s", s2);
+
+ printf("\n");
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-21 14:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-21 14:57 [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/files/, media-libs/allegro/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-07-16 22:26 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox