[gentoo-commits] repo/gentoo:master commit in: app-text/aspell/files/, app-text/aspell/
commit: e3d5e772ce43d1895f25dd861fd072514a0660fe Author: Conrad Kostecki gentoo org> AuthorDate: Sun Mar 3 23:05:39 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Mar 3 23:15:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d5e772 app-text/aspell: drop 0.60.8-r4 Signed-off-by: Conrad Kostecki gentoo.org> app-text/aspell/Manifest | 1 - app-text/aspell/aspell-0.60.8-r4.ebuild| 113 - .../files/aspell-0.60.8-cve-2019-25051.patch | 96 - 3 files changed, 210 deletions(-) diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest index 3afb8f37a033..73345d5c60c1 100644 --- a/app-text/aspell/Manifest +++ b/app-text/aspell/Manifest @@ -1,2 +1 @@ DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7 -DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 diff --git a/app-text/aspell/aspell-0.60.8-r4.ebuild b/app-text/aspell/aspell-0.60.8-r4.ebuild deleted file mode 100644 index 157c31ef3058.. --- a/app-text/aspell/aspell-0.60.8-r4.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic libtool - -MY_P="${P/_/-}" - -DESCRIPTION="Free and Open Source spell checker designed to replace Ispell" -HOMEPAGE="http://aspell.net/; -SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="nls unicode" - -# All available language app-dicts/aspell-* packages. -LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa - fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku - ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR - qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu -) - -for LANG in ${LANGUAGES[@]}; do - IUSE+=" l10n_${LANG}" - - case ${LANG} in - de-1901) - DICT="de-alt" - ;; - pt-BR) - DICT="pt-br" - ;; - pt-PT) - DICT="pt" - ;; - *) - DICT="${LANG}" - ;; - esac - - PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )" -done -unset DICT LANG LANGUAGES - -RDEPEND=" - sys-libs/ncurses:=[unicode(+)?] - nls? ( virtual/libintl ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -HTML_DOCS=( manual/aspell{,-dev}.html ) - -PATCHES=( - "${FILESDIR}/${PN}-0.60.5-nls.patch" - "${FILESDIR}/${PN}-0.60.5-solaris.patch" - "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" - "${FILESDIR}/${PN}-0.60.6.1-clang.patch" - "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" - "${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch" -) - -src_prepare() { - default - - rm m4/lt* m4/libtool.m4 || die - eautoreconf - elibtoolize --reverse-deps - - # Parallel install of libtool libraries doesn't always work. - # https://lists.gnu.org/archive/html/libtool/2011-03/msg3.html - # This has to be after automake has run so that we don't clobber - # the default target that automake creates for us. - echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die - - # The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more. - [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1 -} - -src_configure() { - local myeconfargs=( - --disable-static - $(use_enable nls) - $(use_enable unicode) - --sysconfdir="${EPREFIX}"/etc/aspell - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto examples - dodoc "${S}"/examples/*.c - - # Install Aspell/Ispell compatibility scripts. - newbin scripts/ispell ispell-aspell - newbin scripts/spell spell-aspell - - # As static build has been disabled, - # all .la files
[gentoo-commits] repo/gentoo:master commit in: app-text/aspell/files/, app-text/aspell/
commit: 0e8adb6ed480c4538fc561c348f5bab3d4410baa Author: Conrad Kostecki gentoo org> AuthorDate: Tue Jul 20 23:26:08 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jul 20 23:26:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8adb6e app-text/aspell: fix CVE-2019-25051 Debian also applied this upstream patch to their aspell package. Bug: https://bugs.gentoo.org/803113 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> app-text/aspell/aspell-0.60.8-r3.ebuild| 113 + .../files/aspell-0.60.8-cve-2019-25051.patch | 96 + 2 files changed, 209 insertions(+) diff --git a/app-text/aspell/aspell-0.60.8-r3.ebuild b/app-text/aspell/aspell-0.60.8-r3.ebuild new file mode 100644 index 000..499e003d437 --- /dev/null +++ b/app-text/aspell/aspell-0.60.8-r3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic libtool toolchain-funcs + +MY_P="${P/_/-}" + +DESCRIPTION="Free and Open Source spell checker designed to replace Ispell" +HOMEPAGE="http://aspell.net/; +SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +IUSE="nls unicode" + +# All available language app-dicts/aspell-* packages. +LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa + fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku + ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR + qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu +) + +for LANG in ${LANGUAGES[@]}; do + IUSE+=" l10n_${LANG}" + + case ${LANG} in + de-1901) + DICT="de-alt" + ;; + pt-BR) + DICT="pt-br" + ;; + pt-PT) + DICT="pt" + ;; + *) + DICT="${LANG}" + ;; + esac + + PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )" +done +unset DICT LANG LANGUAGES + +RDEPEND=" + sys-libs/ncurses:=[unicode(+)?] + nls? ( virtual/libintl ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +HTML_DOCS=( manual/aspell{,-dev}.html ) + +PATCHES=( + "${FILESDIR}/${PN}-0.60.5-nls.patch" + "${FILESDIR}/${PN}-0.60.5-solaris.patch" + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" + "${FILESDIR}/${PN}-0.60.6.1-clang.patch" + "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" + "${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch" +) + +src_prepare() { + default + + rm m4/lt* m4/libtool.m4 || die + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg3.html + # This has to be after automake has run so that we don't clobber + # the default target that automake creates for us. + echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die + + # The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more. + [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1 +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable nls) + $(use_enable unicode) + --sysconfdir="${EPREFIX}"/etc/aspell + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto examples + dodoc "${S}"/examples/*.c + + # Install Aspell/Ispell compatibility scripts. + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + # As static build has been disabled, + # all .la files can be deleted unconditionally. + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch new file mode 100644 index 000..2f15d380ec0 --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch @@ -0,0 +1,96 @@ +From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson +Date: Sat, 21 Dec 2019 20:32:47 + +Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk + to prevent a buffer overflow + +Bug found using OSS-Fuze. +--- + common/objstack.hpp | 18