From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-libs/ming/Manifest | 6 +- .../ming/files/ming-0.4.8-CVE-2017-8782.patch | 28 ------ .../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 62 ------------- media-libs/ming/ming-0.20181112.ebuild | 2 +- media-libs/ming/ming-0.4.8-r1.ebuild | 100 --------------------- 5 files changed, 2 insertions(+), 196 deletions(-) delete mode 100644 media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch delete mode 100644 media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch delete mode 100644 media-libs/ming/ming-0.4.8-r1.ebuild (limited to 'media-libs/ming') diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest index 97e75797269d..f743c45f24db 100644 --- a/media-libs/ming/Manifest +++ b/media-libs/ming/Manifest @@ -1,7 +1,3 @@ -AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408aae3ca0de8e31160a9d449599ce94139438e55638808bb667042f0c0e3dcf3f6b5de9959314f17bed3e3f11e090f871 SHA512 69a445d41856e4a567c253d5a0a1f63128ad8f71d8c418da855d62e2f1ff13e2a19a6887a22cfdaa8682811695b79b3bc736b569756f88e8472d294d89561005 -AUX ming-0.4.8-freetype_pkgconfig.patch 2146 BLAKE2B df8c56a04cfe5d0a264402ce5636853ea53c4376999077405355ad112503e82d1b346d7219eafad3689e93a2ac66f89f9ca5f9ad03c564c76571a1919c00e9d2 SHA512 f40ccdc5b97b847ff4bffbdc6a691db8627bbf85f97089e55214f19b34f098ddf0b7eb1a65d1fdc220cb9fb90f89f7fdfa78e44b5d10de872706451be89647ed DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3 -DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0 -EBUILD ming-0.20181112.ebuild 2244 BLAKE2B c704a902bdd09c15713465357bd220a61dc0f94df895c305c7c7be321a71721dd22026182cc547bbff32dd22dcd24c8811f8df2a7e96c7607b61be060b983426 SHA512 b49cc6df6b6bcba3095215386241ee0818ab194e16fa7405a67a3065aca7a7c6053e94d2a6c56e3b3110dbb341e4eb33df64f3eb8c835a5e13d6c608210a8bda -EBUILD ming-0.4.8-r1.ebuild 2257 BLAKE2B c6134cd272270764346d8fe80ae1897ad9353a131ade67d820c4fa4f1a3dd525b4a12851c79a357daaa83c52a84b8fa82eace830836b9d10c061880708cdb90f SHA512 2c7a0af6e4792d9ffce756dac6416432543912fd86bb1c7552b3d67fedd7968a19c971a6db7ea24707d73e2970af43469678d76c0097c83e9c53c00ec1eff1aa +EBUILD ming-0.20181112.ebuild 2235 BLAKE2B dd03b461949a5a080c55228e87a4eddef83ff0cf163c5a662aedf47f3005573ed8bd4fe2c622dbdb57619b2ec91bb0730bceea2721217a5102c0b87871b894b1 SHA512 ee714e3fd1aff9c0e453b06f7f219b440e8c6c5464777e0adf7eb0da405478eaf28a99df8fd9db22d2b65b123afaac21d350853b7c6f476269384144cfee57da MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0 diff --git a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch b/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch deleted file mode 100644 index 223d363ae0b0..000000000000 --- a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/libming/libming/commit/6eca133ee9985c298186cbe05f888082c30bf2d9 - ---- a/util/read.c -+++ b/util/read.c -@@ -247,6 +247,11 @@ char *readString(FILE *f) - if(len >= buflen-2) - { - buf = (char *)realloc(buf, sizeof(char)*(buflen+256)); -+ if ( ! buf ) -+ { -+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256); -+ exit(-1); -+ } - buflen += 256; - p = buf+len; - } -@@ -350,6 +355,11 @@ char *readSizedString(FILE *f,int size) - if(len >= buflen-2) - { - buf = (char *)realloc(buf, sizeof(char)*(buflen+256)); -+ if ( ! buf ) -+ { -+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256); -+ exit(-1); -+ } - buflen += 256; - p = buf+len; - } diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch deleted file mode 100644 index 5bddf0521224..000000000000 --- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 4 May 2018 17:40:04 +0200 -Subject: [PATCH] Use pkg-config to find freetype - -As of freetype-2.9.1 the freetype-config script has been deprecated and -is no longer shipped by default. ---- - configure.in | 30 +++++++----------------------- - 1 file changed, 7 insertions(+), 23 deletions(-) - -diff --git a/configure.in b/configure.in -index 361db86c..cb9423f5 100644 ---- a/configure.in -+++ b/configure.in -@@ -257,26 +257,10 @@ freetype_support=yes) - - if test "$freetype_support" = "yes"; then - dnl Check for the freetype library -- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) -- if test "$freetype_config" = "yes"; then -- AC_PATH_PROG(ft_config,freetype-config,no) -- if test "$ft_config" = "no"; then -- echo "To compile ming please install freetype:" -- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev" -- echo "" -- echo "or disable the freetype configuration option:" -- echo " --disable-freetype" -- AC_MSG_ERROR([Could not detect freetype-config!]) -- fi -- else -- ft_config="$freetype_config" -- fi -- -- FREETYPE_CFLAGS="`$ft_config --cflags`" -- FREETYPE_LIBS="`$ft_config --libs`" -- -- AC_SUBST(FREETYPE_LIBS) -- AC_SUBST(FREETYPE_CFLAGS) -+ PKG_PROG_PKG_CONFIG -+ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true, -+ AC_MSG_ERROR([Could not find freetype]) -+ ) - fi - - dnl Check for the ungif or gif (new or old) libraries -@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then - AC_DEFINE([USE_ZLIB], [1], [Use zlib]) - fi - --AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x) --if test -n "${ft_config}"; then -- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) -+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x) -+if test x${HAS_FREETYPE} = xtrue ; then -+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) - fi - - AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes) --- -2.17.0 - diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild index 7babd84b0d7c..b185a867bd79 100644 --- a/media-libs/ming/ming-0.20181112.ebuild +++ b/media-libs/ming/ming-0.20181112.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="+perl php +python static-libs" RDEPEND="perl? ( dev-lang/perl:= ) diff --git a/media-libs/ming/ming-0.4.8-r1.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild deleted file mode 100644 index eba066b84485..000000000000 --- a/media-libs/ming/ming-0.4.8-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PHP_EXT_NAME=ming -PHP_EXT_OPTIONAL_USE=php -AUTOTOOLS_AUTORECONF=yes -GENTOO_DEPEND_ON_PERL=no -inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot - -DESCRIPTION="An Open Source library for Flash movie generation" -HOMEPAGE="http://ming.sourceforge.net/" -SRC_URI="https://github.com/libming/libming/archive/${P//./_}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="+perl php +python static-libs" - -RDEPEND="perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - media-libs/freetype:= - media-libs/libpng:0= - media-libs/giflib:= - sys-libs/zlib:= - !media-libs/libswf" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/pkgconfig - virtual/yacc" -PDEPEND="php? ( dev-php/ming-php )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -S=${WORKDIR}/${P//./_} - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch - "${FILESDIR}"/${PN}-0.4.8-freetype_pkgconfig.patch -) - -# Tests only work when the package is tested on a system -# which does not presently have any version of ming installed. -RESTRICT="test" - -src_prepare() { - default - - # Let's get rid of the TEXTRELS, link dynamic. Use gif. - sed -i \ - -e 's/libming.a/libming.so/' \ - -e 's/lungif/lgif/' \ - perl_ext/Makefile.PL - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die - - eautoreconf -} - -src_configure() { - # build is sensitive to -O3 (bug #297437) - replace-flags -O3 -O2 - - # build python via distutils calls, disable here - # php is done in dev-php/ming-php - local myconf=( - --disable-python - --disable-php - $(use_enable static-libs static) - $(use_enable perl) - ) - econf "${myconf[@]}" -} - -run_distutils() { - if use python; then - pushd py_ext > /dev/null || die - distutils-r1_"${@}" - popd > /dev/null || die - fi -} - -src_compile() { - # some parallel make issues on flex/bison - emake -C src/actioncompiler -j1 - emake - - run_distutils ${FUNCNAME} -} - -src_install() { - run_distutils ${FUNCNAME} - - emake DESTDIR="${D}" INSTALLDIRS="vendor" install - einstalldocs - - perl_delete_localpod - find "${ED}"usr/lib* -name '*.la' -delete -} -- cgit v1.2.3