From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- media-libs/allegro/Manifest | 9 +- media-libs/allegro/allegro-4.4.2-r1.ebuild | 1 + media-libs/allegro/allegro-5.0.11.ebuild | 1 + media-libs/allegro/allegro-5.2.4.0.ebuild | 86 +++++++++++++++++ .../allegro-4.4.2-Werror-format-security.patch | 107 +++++++++++++++++++++ media-libs/allegro/metadata.xml | 1 + 6 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 media-libs/allegro/allegro-5.2.4.0.ebuild create mode 100644 media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch (limited to 'media-libs/allegro') diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest index c95867e9decb..0f2daa99e4e7 100644 --- a/media-libs/allegro/Manifest +++ b/media-libs/allegro/Manifest @@ -1,3 +1,4 @@ +AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5 @@ -6,6 +7,8 @@ AUX allegro-5.0.11-multilib.patch 340 BLAKE2B 61dd9c6308a1303ec07ec50b4d1ee0ede7 AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196252a5ff2e33e90fdd3bcf6b5a5f2efc443ef6634fea6d7dbdeea5a6c9843539993f475de3811a35b30bc38b3b01b00f SHA512 aaf982cf3e91bb6c5f300f3ac5f925a14e7dec7a2366ca80a734410926e382339ad1b0b0e8be9efedbd2126da899f3babba92d4458bdfb338b8fe609a764d8f5 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052 -EBUILD allegro-4.4.2-r1.ebuild 2465 BLAKE2B d5fb5a8eeabe45dc5b54d53ff3725741560c75269da58ce131a62362906a7b5a453d18a6e1b5d3c9295be1d0bdd17b7c9bb11fea8f0e6600e1ffc8b363d062f6 SHA512 fd80275b9d42851765e0af9703ce4472e2b233b4a78a7dd6d005c2e46af2c691ef927e3de238d0d8e61a502869c532c8984fb8f5e47c6f491957483538e843a0 -EBUILD allegro-5.0.11.ebuild 2374 BLAKE2B 04971e4b4750e37e7e4fa1d0a1ee5d8c21412502935b5e8cabb3c5772c96adc8791e5fd5e5df9bcf6b2466189003c9b89a2679daab30ed9e6a84e1bd8ceec04f SHA512 48493bd135f0ced07ad854aa2fe0f0c9393f0ba154a1f846bb06200abf020eaeb2de3024730d0c911650c55a5cb9a543a182efea63a5a67e1efeefd9890a2379 -MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994 +DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776 +EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47 +EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719 +EBUILD allegro-5.2.4.0.ebuild 2711 BLAKE2B 79c85013e97894e1b1adfd9bc0d6ba144d62b682022b74efecbbb56b9309ba824675bac662096b615774cac439f00f9d675b50306838c75a00e5e945eafbb907 SHA512 fe644140fd2a5cc2dc4fc401eb4858cad32abd3be427d35d9e0c7101e4308ce150c572a5e309bef925774d07852ed6f2c4f7927a030c143d168b489f19ce17c9 +MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild index fff77ed7e25f..06ed3de8d269 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/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild index 858be8f9f103..e5d44d7afb74 100644 --- a/media-libs/allegro/allegro-5.0.11.ebuild +++ b/media-libs/allegro/allegro-5.0.11.ebuild @@ -61,6 +61,7 @@ src_configure() { -DWANT_VORBIS=$(usex vorbis) -DWANT_NATIVE_DIALOG=$(usex gtk) -DWANT_OPENGL=$(usex X) + -DWANT_X11=$(usex X) -DWANT_X11_XINERAMA=$(usex xinerama) ) diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild new file mode 100644 index 000000000000..487d398bbadb --- /dev/null +++ b/media-libs/allegro/allegro-5.2.4.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-multilib + +DESCRIPTION="Cross-platform library aimed at video game and multimedia programming" +HOMEPAGE="https://liballeg.org/" +SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD ZLIB" +SLOT="5" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama" + +REQUIRED_USE="X? ( opengl ) xinerama? ( X )" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] ) + flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] ) + gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] ) + jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opengl? ( + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + ) + opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) + physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) + vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + ) + xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + x11-base/xorg-proto +" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h ) + +src_configure() { + local mycmakeargs=( + -DWANT_ALSA=$(usex alsa) + -DWANT_DEMO=OFF + -DWANT_EXAMPLES=OFF + -DWANT_FLAC=$(usex flac) + -DWANT_IMAGE_JPG=$(usex jpeg) + -DWANT_IMAGE_PNG=$(usex png) + -DWANT_MODAUDIO=$(usex dumb) + -DWANT_NATIVE_DIALOG=$(usex gtk) + -DWANT_OPENAL=$(usex openal) + -DWANT_OPENGL=$(usex opengl) + -DWANT_OPUS=$(usex opus) + -DWANT_OSS=$(usex oss) + -DWANT_PHYSFS=$(usex physfs) + -DWANT_PULSEAUDIO=$(usex pulseaudio) + -DWANT_TESTS=$(usex test) + -DWANT_TTF=$(usex truetype) + -DWANT_OGG_VIDEO=$(usex vorbis) + -DWANT_VORBIS=$(usex vorbis) + -DWANT_IMAGE_WEBP=$(usex webp) + -DWANT_X11=$(usex X) + -DWANT_X11_XINERAMA=$(usex xinerama) + ) + + cmake-multilib_src_configure +} + +src_install() { + local HTML_DOCS=( docs/html/refman/. ) + cmake-multilib_src_install + + dodoc CHANGES-5.0.txt + doman docs/man/*.3 +} 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 000000000000..b3b0bc30b344 --- /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"); + diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml index 1a6f9338ec6e..0c51c0b4e8ac 100644 --- a/media-libs/allegro/metadata.xml +++ b/media-libs/allegro/metadata.xml @@ -16,6 +16,7 @@ and a GUI. Enable media-libs/dumb module library support + Enable Opus codec support Enable physfs support Enables the VGA graphics driver -- cgit v1.2.3