* [gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/, app-text/hunspell/files/
@ 2016-11-26 23:05 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-11-26 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 6638e8b67a68459451d478a5f3810d7fcb8bf324
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 22:49:08 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 23:04:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6638e8b6
app-text/hunspell: Bump to version 1.5.0
Package-Manager: portage-2.3.2
app-text/hunspell/Manifest | 1 +
.../hunspell/files/hunspell-1.5.0-renameexes.patch | 124 +++++++++++++++++++++
app-text/hunspell/hunspell-1.5.0.ebuild | 84 ++++++++++++++
3 files changed, 209 insertions(+)
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 80c8229..07f23ad 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,3 +2,4 @@ DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b
DIST hunspell-1.3.4.tar.gz 1004935 SHA256 55918522cb0041748507dd4f5aa92d043cef337aa589b9367c2221da084281ac SHA512 092818570f5eb152b2bf8d0964068510185304f41e1eb0946bf7589c640d21bff67d2b79b49f770e8c0baa9031ab449eefb9e3b0bce8a28e2fc4809007fefa99 WHIRLPOOL 0e7c1941d31824e3a8f93200b6b228f56b0e35f14498a138425b177bc5a47274d422cd7b1d4836ebdb74b449bf777129381382e7b66211f5e8d1507cc3becdf7
DIST hunspell-1.4.1.tar.gz 1000647 SHA256 c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb SHA512 6edc1120a08d46f1c3a590f9964486240eee46ef7f1c2d072c228d26dd1cb3bee1f283d007fcda994cdf0482c065cd5375c9706570a7c5be9aff423e19c03b6b WHIRLPOOL 7f250ba58369ca12282bf23d85396e66385197d3d1d268e3bae39d197029438543ba9377abe224a9b2dea860fe816c627e10adf27f1d2198793a18ded95534cf
DIST hunspell-1.4.2.tar.gz 1000676 SHA256 b6a0b23d083e0130f8c561cca8c980814ba65740ccfa52f47159f9141089946d SHA512 b4528e9cc926456809b6a0c0c95ed95b297ca564c219bb229f8daefcc7aa4d50e77c99778f8eba867106d284a6ed6320e6966a7b304c7af873908cf55118f8f3 WHIRLPOOL 0343c7e507c6eae0d9df38a3c9bcf1ec847c3afc5497ac9dd729df1418cb0a398d25ee47da8fe498230ef7589d6735abb6a5eee6f2d5125e418437eaa9500ddc
+DIST hunspell-1.5.0.tar.gz 1110566 SHA256 651ef922c1638644cf4e7fb1180f9b1345b3a26322dc2a22af9df083da9b9dae SHA512 a9b24fe9d1813879bcd00ee833d1c36656d2e97e3bff68dc47da6da014d52d8af64b8169ec8ca026688b4dcd12553c9c2a1fc08fdd9c22851983d574e4f6ebe0 WHIRLPOOL a2ea200f6ec8a2d935e418aceae503998055a512364d3cb66d26fd4382baaa62e6ede05a6da9b348503dbc45745c5368698770144dbe3fa79e93f2c8ecf1be57
diff --git a/app-text/hunspell/files/hunspell-1.5.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.5.0-renameexes.patch
new file mode 100644
index 00000000..f2a555e
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.5.0-renameexes.patch
@@ -0,0 +1,124 @@
+--- hunspell-1.5.0/src/tools/chmorph.cxx
++++ hunspell-1.5.0/src/tools/chmorph.cxx
+@@ -58,11 +58,11 @@
+ if (!argv[i]) {
+ fprintf(
+ stderr,
+- "chmorph - change affixes by morphological analysis and generation\n"
+- "correct syntax is:\nchmorph affix_file "
++ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
++ "correct syntax is:\nhunspell-chmorph affix_file "
+ "dictionary_file file_to_convert STRING1 STRING2\n"
+ "STRINGS may be arbitrary parts of the morphological descriptions\n"
+- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
++ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+ " (convert informal Hungarian second person texts to formal third "
+ "person texts)\n");
+ exit(1);
+--- hunspell-1.5.0/src/tools/example.cxx
++++ hunspell-1.5.0/src/tools/example.cxx
+@@ -53,9 +53,9 @@
+ /* first parse the command line options */
+
+ if (argc < 4) {
+- fprintf(stderr, "example (now it works with more dictionary files):\n");
++ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
+ fprintf(stderr,
+- "example affix_file dictionary_file(s) file_of_words_to_check\n");
++ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+ exit(1);
+ }
+
+--- hunspell-1.5.0/src/tools/Makefile.am
++++ hunspell-1.5.0/src/tools/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+
+ INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+
+@@ -6,8 +6,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.5.la
+
+-munch_SOURCES=munch.cxx munch.h
+-unmunch_SOURCES=unmunch.cxx unmunch.h
++hunspell_munch_SOURCES=munch.cxx munch.h
++hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
+
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.5.la
+@@ -16,11 +16,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ ../hunspell/libhunspell-1.5.la @CURSESLIB@ @READLINELIB@
+
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.5.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.5.la
+
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.5.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.5.la
+
+ noinst_PROGRAMS=example
+
+--- hunspell-1.5.0/src/tools/munch.cxx
++++ hunspell-1.5.0/src/tools/munch.cxx
+@@ -81,14 +81,14 @@
+ wf = mystrdup(argv[1]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "munch word_list_file affix_file\n");
++ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ exit(1);
+ }
+ if (argv[2]) {
+ af = mystrdup(argv[2]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "munch word_list_file affix_file\n");
++ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ exit(1);
+ }
+
+--- hunspell-1.5.0/src/tools/unmunch.cxx
++++ hunspell-1.5.0/src/tools/unmunch.cxx
+@@ -76,14 +76,14 @@
+ wf = mystrdup(argv[1]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "unmunch dic_file affix_file\n");
++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ exit(1);
+ }
+ if (argv[2]) {
+ af = mystrdup(argv[2]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "unmunch dic_file affix_file\n");
++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ exit(1);
+ }
+
+--- hunspell-1.5.0/tests/test.sh
++++ hunspell-1.5.0/tests/test.sh
+@@ -74,7 +74,7 @@
+ shopt -s expand_aliases
+
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
+-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
++alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
+
+ if [ "$VALGRIND" != "" ]; then
+ rm -f $TEMPDIR/test.pid*
+@@ -83,7 +83,7 @@
+ fi
+
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
+- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
++ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
+ fi
+
+ # Tests good words
diff --git a/app-text/hunspell/hunspell-1.5.0.ebuild b/app-text/hunspell/hunspell-1.5.0.ebuild
new file mode 100644
index 00000000..f81062c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.5.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib autotools flag-o-matic versionator
+
+MY_P=${PN}-${PV/_beta/b}
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0/$(get_version_component_range 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ ncurses? ( sys-libs/ncurses:0= )
+ readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
+
+PDEPEND="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+ case ${lang} in
+ de-1901) dict="de_1901" ;;
+ pt-BR) dict="pt-br" ;;
+ *) dict="${lang}" ;;
+ esac
+ PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+ AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+ AUTHORS.myspell README.myspell license.myspell
+)
+
+PATCHES=(
+ # Upstream package creates some executables which names are too generic
+ # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+ # It modifies a Makefile.am file, hence eautoreconf.
+ "${FILESDIR}/${PN}-1.5.0-renameexes.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # missing somehow, and I am too lazy to fix it properly
+ [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+ # I wanted to put the include files in /usr/include/hunspell.
+ # You can do that, libreoffice can find them anywhere, just
+ # ping me when you do so ; -- scarabeus
+ econf \
+ $(use_enable nls) \
+ $(use_with ncurses ui) \
+ $(use_with readline readline) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ prune_libtool_files --all
+
+ #342449
+ pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+ ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/, app-text/hunspell/files/
@ 2018-12-07 15:29 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-12-07 15:29 UTC (permalink / raw
To: gentoo-commits
commit: b773092e65a86bd3f964a137d38bc20e67aba04d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 7 15:29:05 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 7 15:29:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b773092e
app-text/hunspell: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-text/hunspell/Manifest | 1 -
.../hunspell/files/hunspell-1.6.0-renameexes.patch | 124 ---------------------
app-text/hunspell/hunspell-1.6.1-r1.ebuild | 84 --------------
3 files changed, 209 deletions(-)
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index e82c9c07968..f27735636f4 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,3 +1,2 @@
-DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458
DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
deleted file mode 100644
index 6a75ce3fb8c..00000000000
--- a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- hunspell-1.6.0/src/tools/chmorph.cxx
-+++ hunspell-1.6.0/src/tools/chmorph.cxx
-@@ -58,11 +58,11 @@
- if (!argv[i]) {
- fprintf(
- stderr,
-- "chmorph - change affixes by morphological analysis and generation\n"
-- "correct syntax is:\nchmorph affix_file "
-+ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+ "correct syntax is:\nhunspell-chmorph affix_file "
- "dictionary_file file_to_convert STRING1 STRING2\n"
- "STRINGS may be arbitrary parts of the morphological descriptions\n"
-- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
- " (convert informal Hungarian second person texts to formal third "
- "person texts)\n");
- exit(1);
---- hunspell-1.6.0/src/tools/example.cxx
-+++ hunspell-1.6.0/src/tools/example.cxx
-@@ -53,9 +53,9 @@
- /* first parse the command line options */
-
- if (argc < 4) {
-- fprintf(stderr, "example (now it works with more dictionary files):\n");
-+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
- fprintf(stderr,
-- "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
- exit(1);
- }
-
---- hunspell-1.6.0/src/tools/Makefile.am
-+++ hunspell-1.6.0/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
-
- INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
-
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.6.la
-
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
-
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.6.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- ../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
-
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.6.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
-
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-
- noinst_PROGRAMS=example
-
---- hunspell-1.6.0/src/tools/munch.cxx
-+++ hunspell-1.6.0/src/tools/munch.cxx
-@@ -81,14 +81,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
-
---- hunspell-1.6.0/src/tools/unmunch.cxx
-+++ hunspell-1.6.0/src/tools/unmunch.cxx
-@@ -76,14 +76,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
-
---- hunspell-1.6.0/tests/test.sh
-+++ hunspell-1.6.0/tests/test.sh
-@@ -74,7 +74,7 @@
- shopt -s expand_aliases
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
--alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
-+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
-
- if [ "$VALGRIND" != "" ]; then
- rm -f $TEMPDIR/test.pid*
-@@ -83,7 +83,7 @@
- fi
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
-- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
-+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
- fi
-
- # Tests good words
diff --git a/app-text/hunspell/hunspell-1.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
deleted file mode 100644
index 2788a1246fa..00000000000
--- a/app-text/hunspell/hunspell-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de_1901" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
- AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
- AUTHORS.myspell README.myspell license.myspell README.md
-)
-
-PATCHES=(
- # Upstream package creates some executables which names are too generic
- # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
- # It modifies a Makefile.am file, hence eautoreconf.
- "${FILESDIR}/${PN}-1.6.0-renameexes.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # missing somehow, and I am too lazy to fix it properly
- [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
- # I wanted to put the include files in /usr/include/hunspell.
- # You can do that, libreoffice can find them anywhere, just
- # ping me when you do so ; -- scarabeus
- econf \
- $(use_enable nls) \
- $(use_with ncurses ui) \
- $(use_with readline readline) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- einstalldocs
-
- prune_libtool_files --all
-
- #342449
- pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
- ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
- popd >/dev/null
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/, app-text/hunspell/files/
@ 2020-06-28 22:17 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2020-06-28 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 4e89ec853a42dd375ccc12057c9376e6786d44ba
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Fri Jun 19 03:50:19 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 22:16:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e89ec85
app-text/hunspell: Patch CVE-2019-16707
Bug: https://bugs.gentoo.org/717968
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16320
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/hunspell-1.7.0-CVE-2019-16707.patch | 22 ++++++
app-text/hunspell/hunspell-1.7.0-r2.ebuild | 89 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
new file mode 100644
index 00000000000..649eef5b293
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
@@ -0,0 +1,22 @@
+From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Tue, 12 Nov 2019 20:03:15 +0000
+Subject: [PATCH] invalid read memory access #624
+
+---
+ src/hunspell/suggestmgr.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx
+index dba084e9..c23f165a 100644
+--- a/src/hunspell/suggestmgr.cxx
++++ b/src/hunspell/suggestmgr.cxx
+@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring(
+ int l2 = su2.size();
+ // decapitalize dictionary word
+ if (complexprefixes) {
+- if (su1[l1 - 1] == su2[l2 - 1])
++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1])
+ return 1;
+ } else {
+ unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l;
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
new file mode 100644
index 00000000000..209dab4e6da
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ ncurses? ( sys-libs/ncurses:0= )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+ case ${lang} in
+ de-1901) dict="de_1901" ;;
+ pt-BR) dict="pt-br" ;;
+ *) dict="${lang}" ;;
+ esac
+ PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+ AUTHORS ChangeLog NEWS THANKS license.hunspell
+ license.myspell README.md
+)
+
+PATCHES=(
+ # Upstream package creates some executables which names are too generic
+ # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+ # It modifies a Makefile.am file, hence eautoreconf.
+ "${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+
+ "${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+ "${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # missing somehow, and I am too lazy to fix it properly
+ [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+ # I wanted to put the include files in /usr/include/hunspell.
+ # You can do that, libreoffice can find them anywhere, just
+ # ping me when you do so ; -- scarabeus
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with ncurses ui)
+ $(use_with readline readline)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ #342449
+ pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+ ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/, app-text/hunspell/files/
@ 2023-01-03 10:52 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-03 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 65514e34b3955abc59013b1ca04f97fd7a101b55
Author: Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Sun Jan 1 01:01:45 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 10:52:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65514e34
app-text/hunspell: drop 1.7.0-r2
Bug: https://bugs.gentoo.org/866093
Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/28908
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/hunspell/Manifest | 1 -
.../files/hunspell-1.7.0-CVE-2019-16707.patch | 22 ------
app-text/hunspell/hunspell-1.7.0-r2.ebuild | 80 ----------------------
3 files changed, 103 deletions(-)
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index d6c9e02a50b8..1abaa146cd13 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,3 +1,2 @@
-DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac
diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
deleted file mode 100644
index 649eef5b293d..000000000000
--- a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Tue, 12 Nov 2019 20:03:15 +0000
-Subject: [PATCH] invalid read memory access #624
-
----
- src/hunspell/suggestmgr.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx
-index dba084e9..c23f165a 100644
---- a/src/hunspell/suggestmgr.cxx
-+++ b/src/hunspell/suggestmgr.cxx
-@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring(
- int l2 = su2.size();
- // decapitalize dictionary word
- if (complexprefixes) {
-- if (su1[l1 - 1] == su2[l2 - 1])
-+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1])
- return 1;
- } else {
- unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l;
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
deleted file mode 100644
index 18d75871d37b..000000000000
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is
-it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
-inherit autotools flag-o-matic
-
-DESCRIPTION="Spell checker, morphological analyzer library and command-line tool"
-HOMEPAGE="https://hunspell.github.io/"
-SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PDEPEND=""
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de_1901" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README.md )
-
-PATCHES=(
- # Upstream package creates some executables which names are too generic
- # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
- # It modifies a Makefile.am file, hence eautoreconf.
- "${FILESDIR}/${PN}-1.7.0-renameexes.patch"
-
- "${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
- "${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # missing somehow, and I am too lazy to fix it properly
- [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
- # I wanted to put the include files in /usr/include/hunspell.
- # You can do that, libreoffice can find them anywhere, just
- # ping me when you do so ; -- scarabeus
- local myeconfargs=(
- $(use_enable nls)
- $(use_with ncurses ui)
- $(use_with readline readline)
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-
- #342449
- pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
- ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
- popd >/dev/null
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-03 10:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-07 15:29 [gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/, app-text/hunspell/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-01-03 10:52 Andreas Sturmlechner
2020-06-28 22:17 Aaron Bauman
2016-11-26 23:05 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox