diff options
author | 2021-01-24 13:48:39 +0000 | |
---|---|---|
committer | 2021-01-24 13:49:58 +0000 | |
commit | 00fe6ef1f87a081ee5c826093440d60a9eab2c83 (patch) | |
tree | 06c5728f633d19fc352cf15d16e7ccece696de39 /app-text | |
parent | app-i18n/enca: cleanup old (diff) | |
download | gentoo-00fe6ef1f87a081ee5c826093440d60a9eab2c83.tar.gz gentoo-00fe6ef1f87a081ee5c826093440d60a9eab2c83.tar.bz2 gentoo-00fe6ef1f87a081ee5c826093440d60a9eab2c83.zip |
app-text/recode: security cleanup
Bug: https://bugs.gentoo.org/717054
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/recode/Manifest | 2 | ||||
-rw-r--r-- | app-text/recode/files/recode-3.6-as-if.patch | 19 | ||||
-rw-r--r-- | app-text/recode/files/recode-3.6-gettextfix.diff | 23 | ||||
-rw-r--r-- | app-text/recode/files/recode-3.6-recode.texi.patch | 11 | ||||
-rw-r--r-- | app-text/recode/recode-3.6_p20-r1.ebuild | 65 |
5 files changed, 0 insertions, 120 deletions
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest index 08c7ab3c800c..7aa40eb5c34a 100644 --- a/app-text/recode/Manifest +++ b/app-text/recode/Manifest @@ -1,4 +1,2 @@ -DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70 -DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch deleted file mode 100644 index c7bcc27c8750..000000000000 --- a/app-text/recode/files/recode-3.6-as-if.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://bugs.gentoo.org/283029 - ---- a/m4/flex.m4 -+++ b/m4/flex.m4 -@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX - dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT - AC_DEFUN(ad_AC_PROG_FLEX, - [AC_CHECK_PROGS(LEX, flex, missing) --if test "$LEX" = missing; then -+AS_IF([test "$LEX" = missing], [dnl - LEX="\$(top_srcdir)/$ac_aux_dir/missing flex" - LEX_OUTPUT_ROOT=lex.yy - AC_SUBST(LEX_OUTPUT_ROOT)dnl --else -+], [: - AC_PROG_LEX - AC_DECL_YYTEXT --fi]) -+])]) diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff deleted file mode 100644 index 3b7eb8ba20e6..000000000000 --- a/app-text/recode/files/recode-3.6-gettextfix.diff +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/239372 - -patch by Dmitry Karasik - ---- recode-3.6/m4/gettext.m4 -+++ recode-3.6/m4/gettext.m4 -@@ -109,12 +109,12 @@ - else - ac_items="$LINGUAS" - for ac_item in $ac_items; do -- case "$ALL_LINGUAS" in -- *$ac_item*) -+ for supported_item in $ALL_LINGUAS; do -+ if test "$ac_item" = "$supported_item"; then - ac_print="$ac_print $ac_item" - MOFILES="$MOFILES $ac_item.mo" -- ;; -- esac -+ fi -+ done - done - fi - AC_SUBST(MOFILES) diff --git a/app-text/recode/files/recode-3.6-recode.texi.patch b/app-text/recode/files/recode-3.6-recode.texi.patch deleted file mode 100644 index bb5b1bcc274d..000000000000 --- a/app-text/recode/files/recode-3.6-recode.texi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/doc/recode.texi 2020-06-23 07:43:20.959074594 -0000 -+++ a/doc/recode.texi 2020-06-23 07:43:32.262338563 -0000 -@@ -3713,7 +3713,7 @@ - between HTML and various other charsets. - - Here is a list of those HTML variants which @code{recode} supports. --Some notes have been provided by François Yergeau @email{yergeau@@alis.com}. -+Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}. - - @table @code - @item XML-standalone diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild deleted file mode 100644 index d68206176512..000000000000 --- a/app-text/recode/recode-3.6_p20-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WANT_AUTOMAKE="1.11" # bug 419455 - -inherit autotools eutils flag-o-matic libtool toolchain-funcs multilib-minimal - -MY_P=${P%_*} -MY_PV=${PV%_*} -DEB_PATCH=${PV#*p} - -DESCRIPTION="Convert files between various character sets" -HOMEPAGE="https://github.com/rrthomas/recode" -SRC_URI=" - mirror://gnu/${PN}/${MY_P}.tar.gz - mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="nls static-libs" - -DEPEND=" - sys-devel/flex - nls? ( sys-devel/gettext )" -RDEPEND="" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # fix #571106 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - - rm "${WORKDIR}"/debian/patches/series || die - epatch \ - "${FILESDIR}/${MY_P}-recode.texi.patch" \ - "${FILESDIR}/${MY_P}-gettextfix.diff" \ - "${FILESDIR}/${MY_P}-as-if.patch" \ - "${WORKDIR}"/debian/patches/* - sed -i '1i#include <stdlib.h>' src/argmatch.c || die - - # Remove old libtool macros - rm "${S}"/acinclude.m4 || die - - eautoreconf - elibtoolize -} - -multilib_src_configure() { - # on solaris -lintl is needed to compile - [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl" - # --without-included-gettext means we always use system headers - # and library - ECONF_SOURCE="${S}" econf \ - --without-included-gettext \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -exec rm -v {} + || die -} |