Update to apertium-3.7.2.

This commit is contained in:
bentley 2021-11-15 04:23:36 +00:00
parent df7beffe1b
commit a50cd54032
75 changed files with 649 additions and 702 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2019/11/11 08:49:10 bentley Exp $
# $OpenBSD: Makefile,v 1.13 2021/11/15 04:23:36 bentley Exp $
COMMENT = module for compiling and processing lexical rules
V = 0.2.1
V = 0.2.7
DISTNAME = apertium-lex-tools-$V
REVISION = 1
CATEGORIES = textproc
@ -19,18 +18,21 @@ PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += apertium3 c lttoolbox3 m pcre pthread ${COMPILER_LIBCXX} xml2 z
#WANTLIB += apertium3-3.7 c lttoolbox3-3.5 m pthread ${COMPILER_LIBCXX} xml2 z
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = https://github.com/apertium/apertium-lex-tools/releases/download/v$V/ \
${MASTER_SITE_SOURCEFORGE:=apertium/}
MASTER_SITES = https://github.com/apertium/apertium-lex-tools/releases/download/v$V/
LIB_DEPENDS = devel/pcre \
textproc/apertium \
EXTRACT_SUFX = .tar.bz2
LIB_DEPENDS = textproc/apertium \
textproc/libxml \
textproc/lttoolbox
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
CONFIGURE_STYLE = autoreconf
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (apertium-lex-tools-0.2.1.tar.gz) = 8AylYp58DDFipeK6X1cOR9gIc81HY0A6HdiLh688bpY=
SIZE (apertium-lex-tools-0.2.1.tar.gz) = 127241
SHA256 (apertium-lex-tools-0.2.7.tar.bz2) = 0R8qjIC6sICn/xHXyfDL08haCZUMMELUMMynfRkM9e4=
SIZE (apertium-lex-tools-0.2.7.tar.bz2) = 53969

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-multitrans_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: multitrans.cc
--- multitrans.cc.orig
+++ multitrans.cc
@@ -1,3 +1,4 @@
+#include <unistd.h>
#include "multi_translator.h"
bool trim = false;
@@ -55,6 +56,10 @@ void parseArguments(int argc, char **argv) {
int main(int argc, char** argv) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
parseArguments(argc, argv);

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-lrx_comp_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-src_lrx_comp_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: lrx_comp.cc
--- lrx_comp.cc.orig
+++ lrx_comp.cc
Index: src/lrx_comp.cc
--- src/lrx_comp.cc.orig
+++ src/lrx_comp.cc
@@ -16,6 +16,7 @@
*/
#include <lrx_compiler.h>
+#include <unistd.h>
#define PACKAGE_VERSION "0.2.0"
using namespace std;
@@ -33,6 +34,11 @@ void endProgram(char *name)
@@ -31,6 +32,11 @@ void endProgram(char *name)
int main (int argc, char **argv)
{

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lrx_proc_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-src_lrx_proc_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: lrx_proc.cc
--- lrx_proc.cc.orig
+++ lrx_proc.cc
Index: src/lrx_proc.cc
--- src/lrx_proc.cc.orig
+++ src/lrx_proc.cc
@@ -20,6 +20,7 @@
#include <getopt.h>
#include <iostream>
@ -11,7 +11,7 @@ Index: lrx_proc.cc
#ifdef _MSC_VER
#include <io.h>
@@ -49,6 +50,11 @@ void endProgram(char *name)
@@ -47,6 +48,11 @@ void endProgram(char *name)
int main(int argc, char *argv[])
{
@ -21,5 +21,5 @@ Index: lrx_proc.cc
+ }
+
LRXProcessor lrxp;
bool useMaxEnt = false;
#if HAVE_GETOPT_LONG

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_multitrans_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: src/multitrans.cc
--- src/multitrans.cc.orig
+++ src/multitrans.cc
@@ -1,3 +1,4 @@
+#include <unistd.h>
#include "multi_translator.h"
bool trim = false;
@@ -24,6 +25,11 @@ void printError(char *name) {
}
void parseArguments(int argc, char **argv) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(1);
+ }
+
if (argc < 3 || argc > 7) {
printError(argv[0]);
exit(1);

View File

@ -1,25 +1,25 @@
$OpenBSD: patch-yasmet_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-src_yasmet_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: yasmet.cc
--- yasmet.cc.orig
+++ yasmet.cc
@@ -9,6 +9,7 @@
#include <algorithm>
Index: src/yasmet.cc
--- src/yasmet.cc.orig
+++ src/yasmet.cc
@@ -10,6 +10,7 @@
#include <set>
#include <iterator>
#include <math.h>
+#include <unistd.h>
/* YASMET 1.0 toolkit Copyright (C) 2002 Franz Josef Och */
#include <fstream> /* This program is free software; you can redistribute */
@@ -81,6 +82,11 @@ struct event {
@@ -77,6 +78,11 @@ struct event {
int main(int argc, char **argv)
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ std::cerr << "pledge" << endl;
+ exit(1);
+ }
+
string s;
vector<pair<event, double> > E;
std::string s;
std::vector<std::pair<event, double> > E;
bool lN = 0;

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/01 11:51:49 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/11/15 04:23:36 bentley Exp $
@bin bin/lrx-comp
@bin bin/lrx-proc
@bin bin/multitrans
lib/pkgconfig/apertium-lex-tools.pc

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2019/11/11 08:49:10 bentley Exp $
# $OpenBSD: Makefile,v 1.5 2021/11/15 04:23:36 bentley Exp $
COMMENT = reorder separable/discontinuous multiwords
V = 0.3.2
V = 0.3.6
DISTNAME = apertium-separable-$V
REVISION = 0
CATEGORIES = textproc
@ -19,10 +18,12 @@ PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += ${COMPILER_LIBCXX} apertium3 c lttoolbox3 m pcre xml2 z
WANTLIB += ${COMPILER_LIBCXX} apertium3-3.7 c lttoolbox3-3.5 m xml2
MASTER_SITES = https://github.com/apertium/apertium-separable/releases/download/v$V/
EXTRACT_SUFX = .tar.bz2
# c++20
COMPILER = base-clang ports-gcc
@ -31,7 +32,10 @@ LIB_DEPENDS = textproc/apertium>=3.5.1 \
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
CONFIGURE_STYLE = autoreconf
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,2 +1,2 @@
SHA256 (apertium-separable-0.3.2.tar.gz) = xWhin0K87nzq72Zl1N2+2DdXgC5wH1t2lOuQ0LA3VO0=
SIZE (apertium-separable-0.3.2.tar.gz) = 114545
SHA256 (apertium-separable-0.3.6.tar.bz2) = JjriDfGPQ+GotcfDDndwT7kVUAEdFKeWgmKGgePMQUw=
SIZE (apertium-separable-0.3.6.tar.bz2) = 31998

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_lsx_comp_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-src_lsx_comp_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: src/lsx_comp.cc
--- src/lsx_comp.cc.orig
@ -20,6 +20,6 @@ Index: src/lsx_comp.cc
+ exit(EXIT_FAILURE);
+ }
+
if(argc != 4)
if(argc < 4)
{
endProgram(argv[0]);

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_lsx_processor_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-src_lsx_proc_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: src/lsx_processor.cc
--- src/lsx_processor.cc.orig
+++ src/lsx_processor.cc
@@ -6,8 +6,15 @@
#include <lttoolbox/fst_processor.h>
Index: src/lsx_proc.cc
--- src/lsx_proc.cc.orig
+++ src/lsx_proc.cc
@@ -1,9 +1,15 @@
#include <lttoolbox/lt_locale.h>
#include <iostream>
+#include <unistd.h>
+
#include "lsx_processor.h"
int main (int argc, char** argv)
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/11/19 09:55:47 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/11/15 04:23:36 bentley Exp $
@bin bin/lsx-comp
@bin bin/lsx-proc
lib/pkgconfig/apertium-separable.pc

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.15 2020/06/09 07:14:45 jasper Exp $
# $OpenBSD: Makefile,v 1.16 2021/11/15 04:23:36 bentley Exp $
COMMENT = rule-based machine translation platform
V = 3.5
VER = 3.5.2
V = 3.7
VER = 3.7.2
DISTNAME = apertium-${VER}
REVISION = 2
SHARED_LIBS += apertium3-$V 0.0 # 0.0
SHARED_LIBS += apertium3 0.0 # 0.0
SHARED_LIBS += apertium3-$V 1.0 # 0.0
SHARED_LIBS += apertium3 1.0 # 0.0
CATEGORIES = textproc
@ -25,25 +24,47 @@ PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += c iconv lttoolbox3-$V lzma m pcre pcrecpp pcreposix pthread
WANTLIB += c iconv lzma m pcre pcrecpp pcreposix pthread
WANTLIB += ${COMPILER_LIBCXX} xml2 z
WANTLIB += icudata icui18n icuuc lttoolbox3-3.5
MASTER_SITES = https://github.com/apertium/apertium/releases/download/v${VER}/
EXTRACT_SUFX = .tar.xz
# C++2a
COMPILER = base-clang ports-gcc
MODULES = lang/python
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = shells/bash \
textproc/libxslt
LIB_DEPENDS = converters/libiconv \
devel/pcre \
textproc/icu4c \
textproc/lttoolbox>=3.4.0
CONFIGURE_STYLE = gnu
MODPY_BUILDDEP = No
MODPY_ADJ_FILES = scripts/apertium-editdist \
scripts/apertium-genvdix \
scripts/apertium-genvldix \
scripts/apertium-genvrdix \
scripts/apertium-metalrx
AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
CONFIGURE_STYLE = autoreconf
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS = V
pre-configure:
${SUBST_CMD} \
${WRKSRC}/scripts/apertium-filter-dix.in \
${WRKSRC}/scripts/apertium-filter-rules.in \
${WRKSRC}/scripts/apertium-metalrx-to-lrx.in \
${WRKSRC}/scripts/apertium-translate-to-default-equivalent.in
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (apertium-3.5.2.tar.gz) = kNzJ52SJiTRtS9IuiQbOHrcCftyh9tFugH+KfiMqPVM=
SIZE (apertium-3.5.2.tar.gz) = 1152690
SHA256 (apertium-3.7.2.tar.xz) = QaO54cNQks4ZFiy/3GIWcdBd6o+GGTxCVxPz9GUM1R0=
SIZE (apertium-3.7.2.tar.xz) = 301032

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-apertium_Makefile_in,v 1.2 2018/10/17 06:58:07 bentley Exp $
Don't download assets during build.
Index: apertium/Makefile.in
--- apertium/Makefile.in.orig
+++ apertium/Makefile.in
@@ -797,7 +797,7 @@ GENERATEDSCRIPTS = apertium-gen-deformat apertium-gen-
lib_LTLIBRARIES = libapertium3.la
libapertium3_la_SOURCES = $(h_sources) $(cc_sources)
libapertium3_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-bin_SCRIPTS = $(GENERATEDSCRIPTS) apertium-get/apertium-get
+bin_SCRIPTS = $(GENERATEDSCRIPTS)
instdir = apertium
apertiumdir = $(prefix)/share/apertium
apertiuminclude = $(prefix)/include/apertium-$(GENERIC_API_VERSION)

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-apertium_adapt_docx_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/adapt_docx.cc
--- apertium/adapt_docx.cc.orig
+++ apertium/adapt_docx.cc
@@ -24,6 +24,7 @@
#include <libxml/tree.h>
#include <stack>
#include <vector>
+#include <unistd.h>
#ifdef _MSC_VER
#include <io.h>
@@ -427,6 +428,10 @@ void process(string fileName, bool outputsName, bool p
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
bool outputsName = false;
bool pretty = false;

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-apertium_apertium-multiple-translations_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium-multiple-translations.cc
--- apertium/apertium-multiple-translations.cc.orig
+++ apertium/apertium-multiple-translations.cc
@@ -43,6 +43,11 @@ void message(char *progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 5 || argc <3)

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_apertium-postlatex-raw_l,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium-postlatex-raw.l
--- apertium/apertium-postlatex-raw.l.orig
+++ apertium/apertium-postlatex-raw.l
@@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include <apertium/latex_accentsmap.h>
+#include <unistd.h>
extern "C" {
#if !defined(__STDC__)
@@ -257,6 +258,12 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_apertium-postlatex_l,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium-postlatex.l
--- apertium/apertium-postlatex.l.orig
+++ apertium/apertium-postlatex.l
@@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include <apertium/latex_accentsmap.h>
+#include <unistd.h>
extern "C" {
#if !defined(__STDC__)
@@ -315,6 +316,12 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_apertium-prelatex_l,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium-prelatex.l
--- apertium/apertium-prelatex.l.orig
+++ apertium/apertium-prelatex.l
@@ -11,6 +11,7 @@
#include <vector>
#include <apertium/latex_accentsmap.h>
#include <apertium/string_utils.h>
+#include <unistd.h>
extern "C" {
#if !defined(__STDC__)
@@ -428,6 +429,12 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-apertium_apertium_cleanstream_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_cleanstream.cc
--- apertium/apertium_cleanstream.cc.orig
+++ apertium/apertium_cleanstream.cc
@@ -22,6 +22,7 @@
#include <iostream>
#include <cstdio>
#include <list>
+#include <unistd.h>
#ifdef __MINGW32__
#include <windows.h>
@@ -98,6 +99,11 @@ readFullBlock(FILE *input, wchar_t const delim1, wchar
int
main (int argc, char** argv)
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
wstring buf = L"";
wstring blanktmp = L"";
bool keepblank = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_deshtml_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_deshtml.cc
--- apertium/apertium_deshtml.cc.orig
+++ apertium/apertium_deshtml.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -5415,6 +5416,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_deslatex_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_deslatex.cc
--- apertium/apertium_deslatex.cc.orig
+++ apertium/apertium_deslatex.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -67375,6 +67376,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_desmediawiki_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_desmediawiki.cc
--- apertium/apertium_desmediawiki.cc.orig
+++ apertium/apertium_desmediawiki.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -9813,6 +9814,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_desodt_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_desodt.cc
--- apertium/apertium_desodt.cc.orig
+++ apertium/apertium_desodt.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -3704,6 +3705,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_despptx_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_despptx.cc
--- apertium/apertium_despptx.cc.orig
+++ apertium/apertium_despptx.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -4062,6 +4063,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_desrtf_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_desrtf.cc
--- apertium/apertium_desrtf.cc.orig
+++ apertium/apertium_desrtf.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -11599,6 +11600,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_destxt_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_destxt.cc
--- apertium/apertium_destxt.cc.orig
+++ apertium/apertium_destxt.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -2068,6 +2069,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_deswxml_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_deswxml.cc
--- apertium/apertium_deswxml.cc.orig
+++ apertium/apertium_deswxml.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -6110,6 +6111,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_desxlsx_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
Index: apertium/apertium_desxlsx.cc
--- apertium/apertium_desxlsx.cc.orig
+++ apertium/apertium_desxlsx.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -3322,6 +3323,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_desxpresstag_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_desxpresstag.cc
--- apertium/apertium_desxpresstag.cc.orig
+++ apertium/apertium_desxpresstag.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -2197,6 +2198,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -1,21 +1,22 @@
$OpenBSD: patch-apertium_apertium_filter_ambiguity_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_filter_ambiguity_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_filter_ambiguity.cc
--- apertium/apertium_filter_ambiguity.cc.orig
+++ apertium/apertium_filter_ambiguity.cc
@@ -32,6 +32,7 @@
#include <io.h>
#include <fcntl.h>
#endif
@@ -21,6 +21,7 @@
#include <apertium/tagger_data_hmm.h>
#include <apertium/tagger_word.h>
#include <apertium/string_utils.h>
+#include <unistd.h>
using namespace Apertium;
using namespace std;
@@ -63,6 +64,11 @@ FILE * open_file(char const *filename, char const *mod
#include <cstdlib>
#include <iostream>
@@ -63,6 +64,12 @@ FILE * open_file(char const *filename, char const *mod
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ if(pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }

View File

@ -1,13 +1,14 @@
$OpenBSD: patch-apertium_apertium_interchunk_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_interchunk_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_interchunk.cc
--- apertium/apertium_interchunk.cc.orig
+++ apertium/apertium_interchunk.cc
@@ -86,6 +86,11 @@ FILE * open_output(string const &filename)
@@ -86,6 +86,12 @@ FILE * open_output(string const &filename)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-apertium_apertium_perceptron_trace_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_perceptron_trace.cc
--- apertium/apertium_perceptron_trace.cc.orig
+++ apertium/apertium_perceptron_trace.cc
@@ -1,5 +1,6 @@
#include <fstream>
#include <string>
+#include <unistd.h>
#include <apertium/mtx_reader.h>
#include <apertium/perceptron_tagger.h>
@@ -109,5 +110,11 @@ int perceptron_trace(int argc, char* argv[])
int main(int argc, char* argv[]) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ std::wcout << "pledge" << std::endl;
+ return 1;
+ }
+
return Apertium::perceptron_trace(argc, argv);
}

View File

@ -1,13 +1,14 @@
$OpenBSD: patch-apertium_apertium_postchunk_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_postchunk_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_postchunk.cc
--- apertium/apertium_postchunk.cc.orig
+++ apertium/apertium_postchunk.cc
@@ -85,6 +85,11 @@ FILE * open_output(string const &filename)
@@ -85,6 +85,12 @@ FILE * open_output(string const &filename)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_postlatex_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_postlatex.cc
--- apertium/apertium_postlatex.cc.orig
+++ apertium/apertium_postlatex.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -4601,6 +4602,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_postlatex_raw_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_postlatex_raw.cc
--- apertium/apertium_postlatex_raw.cc.orig
+++ apertium/apertium_postlatex_raw.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -4043,6 +4044,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_apertium_posttransfer_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_posttransfer.cc
--- apertium/apertium_posttransfer.cc.orig
+++ apertium/apertium_posttransfer.cc
@@ -20,6 +20,7 @@
#include <libgen.h>
#include <string>
#include "getopt_long.h"
+#include <unistd.h>
#ifdef _MSC_VER
#include <io.h>
@@ -63,6 +64,12 @@ void processStream(FILE *in, FILE *out, bool null_flus
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
bool null_flush = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_prelatex_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_prelatex.cc
--- apertium/apertium_prelatex.cc.orig
+++ apertium/apertium_prelatex.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -3732,6 +3733,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_apertium_pretransfer_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_pretransfer.cc
--- apertium/apertium_pretransfer.cc.orig
+++ apertium/apertium_pretransfer.cc
@@ -20,6 +20,7 @@
#include <libgen.h>
#include <string>
#include "getopt_long.h"
+#include <unistd.h>
#ifdef _MSC_VER
#include <io.h>
@@ -43,6 +44,12 @@ void usage(char *progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << L"pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
bool compound_sep = false;
bool null_flush = false;

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_reodt_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_reodt.cc
--- apertium/apertium_reodt.cc.orig
+++ apertium/apertium_reodt.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1855,6 +1856,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_repptx_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_repptx.cc
--- apertium/apertium_repptx.cc.orig
+++ apertium/apertium_repptx.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1855,6 +1856,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_rertf_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_rertf.cc
--- apertium/apertium_rertf.cc.orig
+++ apertium/apertium_rertf.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1926,6 +1927,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_rewxml_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_rewxml.cc
--- apertium/apertium_rewxml.cc.orig
+++ apertium/apertium_rewxml.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1855,6 +1856,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_rexlsx_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_rexlsx.cc
--- apertium/apertium_rexlsx.cc.orig
+++ apertium/apertium_rexlsx.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1855,6 +1856,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-apertium_apertium_rexpresstag_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
Index: apertium/apertium_rexpresstag.cc
--- apertium/apertium_rexpresstag.cc.orig
+++ apertium/apertium_rexpresstag.cc
@@ -21,6 +21,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
/* end standard C headers. */
@@ -1844,6 +1845,11 @@ void usage(string const &progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
if(argc > 3)

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-apertium_apertium_tagger_apply_new_rules_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_tagger_apply_new_rules_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_tagger_apply_new_rules.cc
--- apertium/apertium_tagger_apply_new_rules.cc.orig
+++ apertium/apertium_tagger_apply_new_rules.cc
@@ -57,6 +57,11 @@ void help(char *name) {
@@ -56,6 +56,11 @@ void help(char *name) {
}
int main(int argc, char* argv[]) {

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-apertium_apertium_tagger_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_tagger_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_tagger.cc
--- apertium/apertium_tagger.cc.orig
+++ apertium/apertium_tagger.cc
@@ -813,6 +813,11 @@ void apertium_tagger::t_FILE_Tagger(FILE_Tagger &FILE_
}
@@ -30,6 +30,11 @@
#include <unistd.h>
int main(int argc, char **argv) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ std::wcerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ std::wcerr << "pledge" << std::endl;
+ return 1;
+ }
+
try {
apertium_tagger(argc, argv);
} catch (const err_Exception &err_Exception_) {
Apertium::apertium_tagger(argc, argv);
} catch (const Apertium::Exception::apertium_tagger::err_Exception &err_Exception_) {

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-apertium_apertium_tagger_readwords_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_tagger_readwords_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_tagger_readwords.cc
--- apertium/apertium_tagger_readwords.cc.orig
+++ apertium/apertium_tagger_readwords.cc
@@ -31,6 +31,7 @@
#include <apertium/tagger_data_hmm.h>
#include <lttoolbox/lt_locale.h>
#include <iostream>
+#include <unistd.h>
@@ -26,6 +26,7 @@
#include <cstdlib>
#include <apertium/string_utils.h>
@@ -93,6 +94,11 @@ void help(char *name) {
+#include <unistd.h>
using namespace std;
@@ -85,6 +86,11 @@ void help(char *name) {
int main(int argc, char* argv[]) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-apertium_apertium_tmxbuild_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_tmxbuild_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_tmxbuild.cc
--- apertium/apertium_tmxbuild.cc.orig
@ -16,7 +16,7 @@ Index: apertium/apertium_tmxbuild.cc
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ wcerr << L"pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-apertium_apertium_transfer_cc,v 1.1 2019/03/05 05:19:32 bentley Exp $
$OpenBSD: patch-apertium_apertium_transfer_cc,v 1.2 2021/11/15 04:23:36 bentley Exp $
Index: apertium/apertium_transfer.cc
--- apertium/apertium_transfer.cc.orig

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apertium_deformat_xsl,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/deformat.xsl
--- apertium/deformat.xsl.orig
+++ apertium/deformat.xsl
@@ -155,6 +155,7 @@
#include &lt;map&gt;
#include &lt;string&gt;
#include &lt;vector&gt;
+#include &lt;unistd.h&gt;
extern "C" {
#if !defined(__STDC__)
@@ -689,6 +690,12 @@ void usage(string const &amp;progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr &lt;&lt; "pledge" &lt;&lt; endl;
+ exit(EXIT_SUCCESS);
+ }
+
LtLocale::tryToSetLocale();
size_t base = 0;
eosIncond = false;

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-apertium_gen_modes_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/gen_modes.cc
--- apertium/gen_modes.cc.orig
+++ apertium/gen_modes.cc
@@ -31,6 +31,7 @@
#include <map>
#include <string>
#include <set>
+#include <unistd.h>
using namespace Apertium;
using namespace std;
@@ -300,6 +301,11 @@ void gen_modes(map<string, pipeline>& modes, fs::path&
int main(int argc, char* argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
LtLocale::tryToSetLocale();
#if HAVE_GETOPT_LONG

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-apertium_reformat_xsl,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/reformat.xsl
--- apertium/reformat.xsl.orig
+++ apertium/reformat.xsl
@@ -178,6 +178,12 @@ void usage(string const &amp;progname)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr &lt;&lt; "pledge" &lt;&lt; endl;
+ exit(EXIT_SUCCESS);
+ }
+
LtLocale::tryToSetLocale();
if(argc &gt; 3)

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-apertium_transferpp_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/transferpp.cc
--- apertium/transferpp.cc.orig
+++ apertium/transferpp.cc
@@ -20,12 +20,19 @@
#include <iostream>
#include <apertium/string_utils.h>
#include <libgen.h>
+#include <unistd.h>
using namespace Apertium;
using namespace std;
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ {
+ wcerr << "pledge" << endl;
+ return EXIT_SUCCESS;
+ }
+
LtLocale::tryToSetLocale();
if(argc != 3)

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-apertium_wblank-attach_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/wblank-attach.cc
--- apertium/wblank-attach.cc.orig
+++ apertium/wblank-attach.cc
@@ -21,6 +21,7 @@
#include <vector>
#include <algorithm>
#include <array>
+#include <unistd.h>
void trim_wb(std::string& wb) {
while (!wb.empty() && (wb.back() == ';' || wb.back() == ' ')) {
@@ -33,6 +34,11 @@ void trim_wb(std::string& wb) {
}
int main(int argc, char* argv[]) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ std::cerr << "pledge" << std::endl;
+ return 1;
+ }
+
// Ignore -z, but anything else just show what this tool does
if (argc > 1 && argv[1][1] != 'z') {
std::cout << "Distributes word-bound blanks across all tokens they encompass, turning [[A]]^...$^...$[[/]] into [[A]]^...$[[A]]^...$\n";

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-apertium_wblank-detach_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/wblank-detach.cc
--- apertium/wblank-detach.cc.orig
+++ apertium/wblank-detach.cc
@@ -19,8 +19,14 @@
#include <iostream>
#include <string>
#include <array>
+#include <unistd.h>
int main(int argc, char* argv[]) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ std::cerr << "pledge" << std::endl;
+ return 1;
+ }
+
// Ignore -z, but anything else just show what this tool does
if (argc > 1 && argv[1][1] != 'z') {
std::cout << "Closes all word-bound blanks, turning [[...]]^...$ into [[...]]^...$[[/]]\n";

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-apertium_wblank-mode_cc,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: apertium/wblank-mode.cc
--- apertium/wblank-mode.cc.orig
+++ apertium/wblank-mode.cc
@@ -23,6 +23,7 @@
#include <regex>
#include <cctype>
#include "apertium_config.h"
+#include <unistd.h>
void trim(std::string& str) {
while (!str.empty() && isspace(str.back())) {
@@ -35,6 +36,11 @@ void trim(std::string& str) {
}
int main(int argc, char* argv[]) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ std::cerr << "pledge" << std::endl;
+ return 1;
+ }
+
bool add_z = false;
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'z' && argv[1][2] == 0) {

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-scripts_apertium-filter-dix_in,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: scripts/apertium-filter-dix.in
--- scripts/apertium-filter-dix.in.orig
+++ scripts/apertium-filter-dix.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
case $# in
3)
LANG=$1

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-scripts_apertium-filter-rules_in,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: scripts/apertium-filter-rules.in
--- scripts/apertium-filter-rules.in.orig
+++ scripts/apertium-filter-rules.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
case $# in
2)
LANG=$1

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-scripts_apertium-metalrx-to-lrx_in,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: scripts/apertium-metalrx-to-lrx.in
--- scripts/apertium-metalrx-to-lrx.in.orig
+++ scripts/apertium-metalrx-to-lrx.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
case $# in
2)
INFILE=$1

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-scripts_apertium-translate-to-default-equivalent_in,v 1.1 2021/11/15 04:23:36 bentley Exp $
Index: scripts/apertium-translate-to-default-equivalent.in
--- scripts/apertium-translate-to-default-equivalent.in.orig
+++ scripts/apertium-translate-to-default-equivalent.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
case $# in
2)
INFILE=$1

View File

@ -1,6 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2019/11/11 08:49:10 bentley Exp $
@comment $OpenBSD: PLIST,v 1.6 2021/11/15 04:23:36 bentley Exp $
bin/apertium
@bin bin/apertium-adapt-docx
@bin bin/apertium-cleanstream
@bin bin/apertium-deshtml
@bin bin/apertium-deshtml-alt
@bin bin/apertium-deshtml-noent
@bin bin/apertium-deslatex
@bin bin/apertium-desmediawiki
@bin bin/apertium-desodt
@ -10,20 +14,30 @@ bin/apertium
@bin bin/apertium-deswxml
@bin bin/apertium-desxlsx
@bin bin/apertium-desxpresstag
bin/apertium-editdist
@bin bin/apertium-filter-ambiguity
bin/apertium-filter-dix
bin/apertium-filter-rules
bin/apertium-gen-deformat
bin/apertium-gen-modes
@bin bin/apertium-gen-modes
bin/apertium-gen-reformat
bin/apertium-genvdix
bin/apertium-genvldix
bin/apertium-genvrdix
@bin bin/apertium-interchunk
bin/apertium-metalrx
bin/apertium-metalrx-to-lrx
@bin bin/apertium-multiple-translations
@bin bin/apertium-perceptron-trace
@bin bin/apertium-postchunk
@bin bin/apertium-postlatex
@bin bin/apertium-postlatex-raw
@bin bin/apertium-posttransfer
@bin bin/apertium-prelatex
@bin bin/apertium-preprocess-transfer
@bin bin/apertium-pretransfer
@bin bin/apertium-rehtml
@bin bin/apertium-rehtml-alt
@bin bin/apertium-rehtml-noent
@bin bin/apertium-relatex
@bin bin/apertium-remediawiki
@ -39,6 +53,7 @@ bin/apertium-gen-reformat
@bin bin/apertium-tagger-readwords
@bin bin/apertium-tmxbuild
@bin bin/apertium-transfer
bin/apertium-translate-to-default-equivalent
bin/apertium-unformat
bin/apertium-utils-fixlatex
bin/apertium-validate-acx
@ -48,26 +63,19 @@ bin/apertium-validate-modes
bin/apertium-validate-postchunk
bin/apertium-validate-tagger
bin/apertium-validate-transfer
@bin bin/apertium-wblank-attach
@bin bin/apertium-wblank-detach
@bin bin/apertium-wblank-mode
include/apertium-${V}/
include/apertium-${V}/apertium/
include/apertium-${V}/apertium/a.h
include/apertium-${V}/apertium/align.h
include/apertium-${V}/apertium/analysis.h
include/apertium-${V}/apertium/apertium_re.h
include/apertium-${V}/apertium/apertium_tagger.h
include/apertium-${V}/apertium/basic_5_3_1_tagger.h
include/apertium-${V}/apertium/basic_5_3_2_tagger.h
include/apertium-${V}/apertium/basic_5_3_3_tagger.h
include/apertium-${V}/apertium/basic_exception_type.h
include/apertium-${V}/apertium/basic_stream_tagger.h
include/apertium-${V}/apertium/basic_stream_tagger_trainer.h
include/apertium-${V}/apertium/basic_tagger.h
include/apertium-${V}/apertium/collection.h
include/apertium-${V}/apertium/constant_manager.h
include/apertium-${V}/apertium/constructor_eq_delete.h
include/apertium-${V}/apertium/deserialiser.h
include/apertium-${V}/apertium/endian_double_util.h
include/apertium-${V}/apertium/err_exception.h
include/apertium-${V}/apertium/exception.h
include/apertium-${V}/apertium/exception_type.h
include/apertium-${V}/apertium/feature_vec.h
@ -91,26 +99,22 @@ include/apertium-${V}/apertium/optional.h
include/apertium-${V}/apertium/perceptron_spec.h
include/apertium-${V}/apertium/perceptron_tagger.h
include/apertium-${V}/apertium/postchunk.h
include/apertium-${V}/apertium/pretransfer.h
include/apertium-${V}/apertium/sentence_stream.h
include/apertium-${V}/apertium/serialiser.h
include/apertium-${V}/apertium/shell_utils.h
include/apertium-${V}/apertium/stream.h
include/apertium-${V}/apertium/stream_5_3_1_tagger.h
include/apertium-${V}/apertium/stream_5_3_1_tagger_trainer.h
include/apertium-${V}/apertium/stream_5_3_2_tagger.h
include/apertium-${V}/apertium/stream_5_3_2_tagger_trainer.h
include/apertium-${V}/apertium/stream_5_3_3_tagger.h
include/apertium-${V}/apertium/stream_5_3_3_tagger_trainer.h
include/apertium-${V}/apertium/stream_tagger.h
include/apertium-${V}/apertium/stream_tagger_trainer.h
include/apertium-${V}/apertium/streamed_type.h
include/apertium-${V}/apertium/string_to_wostream.h
include/apertium-${V}/apertium/string_utils.h
include/apertium-${V}/apertium/tag.h
include/apertium-${V}/apertium/tagger.h
include/apertium-${V}/apertium/tagger_data.h
include/apertium-${V}/apertium/tagger_data_hmm.h
include/apertium-${V}/apertium/tagger_data_lsw.h
include/apertium-${V}/apertium/tagger_data_percep_coarse_tags.h
include/apertium-${V}/apertium/tagger_flags.h
include/apertium-${V}/apertium/tagger_utils.h
include/apertium-${V}/apertium/tagger_word.h
include/apertium-${V}/apertium/tmx_align_parameters.h
@ -137,17 +141,17 @@ include/apertium-${V}/apertium/transfer_word_list.h
include/apertium-${V}/apertium/trx_reader.h
include/apertium-${V}/apertium/tsx_reader.h
include/apertium-${V}/apertium/ttag.h
include/apertium-${V}/apertium/unigram_tagger.h
include/apertium-${V}/apertium/unlocked_cstdio.h
include/apertium-${V}/apertium/utf_converter.h
include/apertium-${V}/apertium/utils.h
include/apertium-${V}/apertium/wchar_t_exception.h
include/apertium-${V}/apertium/wchar_t_exception_type.h
include/apertium-${V}/apertium/xml_reader.h
@lib lib/libapertium3-${V}.so.${LIBapertium3-${V}_VERSION}
@static-lib lib/libapertium3.a
lib/libapertium3.la
@lib lib/libapertium3.so.${LIBapertium3_VERSION}
lib/pkgconfig/apertium.pc
@man man/man1/apertium-deshtml-alt.1
@man man/man1/apertium-deshtml.1
@man man/man1/apertium-deslatex.1
@man man/man1/apertium-desmediawiki.1
@ -193,20 +197,20 @@ lib/pkgconfig/apertium.pc
@man man/man1/apertium.1
share/aclocal/apertium.m4
share/apertium/
share/apertium/apertium-createmodes.awk
share/apertium/deformat.xsl
share/apertium/filter-dix.xslt
share/apertium/filter-rules.xslt
share/apertium/format.dtd
share/apertium/format.rnc
share/apertium/interchunk.dtd
share/apertium/interchunk.rnc
share/apertium/lexchoice.xsl
share/apertium/lexchoicebil.xsl
share/apertium/metalrx-to-lrx.xslt
share/apertium/modes/
share/apertium/modes.dtd
share/apertium/modes.rnc
share/apertium/modes/README
share/apertium/modes2bash.xsl
share/apertium/modes2debugmodes.xsl
share/apertium/new2old.xsl
share/apertium/postchunk.dtd
share/apertium/postchunk.rnc
@ -215,3 +219,4 @@ share/apertium/tagger.dtd
share/apertium/tagger.rnc
share/apertium/transfer.dtd
share/apertium/transfer.rnc
share/apertium/translate-to-default-equivalent.xslt

View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2019/11/12 20:18:55 espie Exp $
# $OpenBSD: Makefile,v 1.19 2021/11/15 04:23:37 bentley Exp $
COMMENT = finite-state lexical processing toolkit
V = 3.5
VER = 3.5.0
VER = 3.5.4
DISTNAME = lttoolbox-${VER}
REVISION = 1
SHARED_LIBS += lttoolbox3-$V 2.0 # 0.0
SHARED_LIBS += lttoolbox3 2.0 # 0.0
SHARED_LIBS += lttoolbox3-$V 3.0 # 0.0
SHARED_LIBS += lttoolbox3 3.0 # 0.0
CATEGORIES = textproc
HOMEPAGE = http://wiki.apertium.org/wiki/Lttoolbox
HOMEPAGE = https://wiki.apertium.org/wiki/Lttoolbox
MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
@ -27,13 +26,18 @@ WANTLIB += c iconv lzma m pthread ${COMPILER_LIBCXX} xml2 z
MASTER_SITES = https://github.com/apertium/lttoolbox/releases/download/v${VER}/
EXTRACT_SUFX = .tar.xz
# C++2a
COMPILER = base-clang ports-gcc
LIB_DEPENDS = converters/libiconv \
textproc/libxml
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
CONFIGURE_STYLE = autoreconf
SUBST_VARS = V

View File

@ -1,2 +1,2 @@
SHA256 (lttoolbox-3.5.0.tar.gz) = y/xuOLqZXYARSiUPl1a9KHCOmzUQveCf5/keCoO7xiM=
SIZE (lttoolbox-3.5.0.tar.gz) = 483444
SHA256 (lttoolbox-3.5.4.tar.xz) = 9TFSAI6oNZ2lXH1LKVhdDi4gIybxFahMq4oYptPryU4=
SIZE (lttoolbox-3.5.4.tar.xz) = 157504

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lttoolbox_deserialiser_h,v 1.2 2018/06/14 07:02:26 bentley Exp $
https://github.com/apertium/lttoolbox/issues/11
Index: lttoolbox/deserialiser.h
--- lttoolbox/deserialiser.h.orig
+++ lttoolbox/deserialiser.h
@@ -16,6 +16,8 @@
#ifndef DESERIALISER_H
#define DESERIALISER_H
+#define SIZET_NOT_CSTDINT
+
#include "exception.h"
#include <stdint.h>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_comp_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_comp_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_comp.cc
--- lttoolbox/lt_comp.cc.orig
+++ lttoolbox/lt_comp.cc
@@ -25,6 +25,7 @@
@@ -24,6 +24,7 @@
#include <libgen.h>
#include <string>
#include <getopt.h>
@ -11,7 +11,7 @@ Index: lttoolbox/lt_comp.cc
using namespace std;
@@ -58,6 +59,11 @@ void endProgram(char *name)
@@ -66,6 +67,11 @@ void endProgram(char *name)
int main(int argc, char *argv[])
{

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_expand_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_expand_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_expand.cc
--- lttoolbox/lt_expand.cc.orig
+++ lttoolbox/lt_expand.cc
@@ -23,6 +23,7 @@
@@ -22,6 +22,7 @@
#include <libgen.h>
#include <string>
#include <getopt.h>
@ -11,7 +11,7 @@ Index: lttoolbox/lt_expand.cc
#ifdef _MSC_VER
#include <io.h>
@@ -43,6 +44,11 @@ void endProgram(char *name)
@@ -55,6 +56,11 @@ void endProgram(char *name)
int main(int argc, char *argv[])
{
@ -22,4 +22,4 @@ Index: lttoolbox/lt_expand.cc
+
FILE *input = NULL, *output = NULL;
Expander e;
e.setKeepBoundaries(false);

View File

@ -1,25 +1,25 @@
$OpenBSD: patch-lttoolbox_lt_print_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_print_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_print.cc
--- lttoolbox/lt_print.cc.orig
+++ lttoolbox/lt_print.cc
@@ -25,6 +25,7 @@
#include <iostream>
#include <libgen.h>
#include <string>
#include <getopt.h>
+#include <unistd.h>
using namespace std;
@@ -41,6 +42,11 @@ void endProgram(char *name)
#ifdef _MSC_VER
#include <io.h>
@@ -48,6 +49,11 @@ void endProgram(char *name)
int main(int argc, char *argv[])
{
+ if (pledge("stdio rpath wpath cpath", NULL) == -1) {
+ wcerr << "pledge" << endl;
+ cerr << "pledge" << endl;
+ exit(EXIT_FAILURE);
+ }
+
if(argc != 2)
{
endProgram(argv[0]);
bool hfst = false;
FILE* input = NULL;
FILE* output = stdout;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_proc_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_proc_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_proc.cc
--- lttoolbox/lt_proc.cc.orig
+++ lttoolbox/lt_proc.cc
@@ -23,6 +23,7 @@
@@ -22,6 +22,7 @@
#include <getopt.h>
#include <iostream>
#include <libgen.h>
@ -11,7 +11,7 @@ Index: lttoolbox/lt_proc.cc
#ifdef _MSC_VER
#include <io.h>
@@ -105,6 +106,11 @@ void checkValidity(FSTProcessor const &fstp)
@@ -104,6 +105,11 @@ void checkValidity(FSTProcessor const &fstp)
int main(int argc, char *argv[])
{

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_tmxcomp_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_tmxcomp_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_tmxcomp.cc
--- lttoolbox/lt_tmxcomp.cc.orig
+++ lttoolbox/lt_tmxcomp.cc
@@ -22,6 +22,7 @@
@@ -21,6 +21,7 @@
#include <libgen.h>
#include <string>
#include <getopt.h>
@ -11,7 +11,7 @@ Index: lttoolbox/lt_tmxcomp.cc
using namespace std;
@@ -49,6 +50,11 @@ void endProgram(char *name)
@@ -48,6 +49,11 @@ void endProgram(char *name)
int main(int argc, char *argv[])
{

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_tmxproc_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_tmxproc_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_tmxproc.cc
--- lttoolbox/lt_tmxproc.cc.orig
+++ lttoolbox/lt_tmxproc.cc
@@ -23,6 +23,7 @@
@@ -22,6 +22,7 @@
#include <getopt.h>
#include <iostream>
#include <libgen.h>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lttoolbox_lt_trim_cc,v 1.1 2019/03/05 05:19:31 bentley Exp $
$OpenBSD: patch-lttoolbox_lt_trim_cc,v 1.2 2021/11/15 04:23:37 bentley Exp $
Index: lttoolbox/lt_trim.cc
--- lttoolbox/lt_trim.cc.orig
+++ lttoolbox/lt_trim.cc
@@ -25,6 +25,7 @@
@@ -24,6 +24,7 @@
#include <iostream>
#include <libgen.h>
#include <string>
@ -11,7 +11,7 @@ Index: lttoolbox/lt_trim.cc
void endProgram(char *name)
{
@@ -161,6 +162,11 @@ trim(FILE *file_mono, FILE *file_bi)
@@ -160,6 +161,11 @@ trim(FILE *file_mono, FILE *file_bi)
int main(int argc, char *argv[])
{

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lttoolbox_serialiser_h,v 1.2 2018/06/14 07:02:26 bentley Exp $
https://github.com/apertium/lttoolbox/issues/11
Index: lttoolbox/serialiser.h
--- lttoolbox/serialiser.h.orig
+++ lttoolbox/serialiser.h
@@ -16,6 +16,8 @@
#ifndef SERIALISER_H
#define SERIALISER_H
+#define SIZET_NOT_CSTDINT
+
#include "exception.h"
#include <stdint.h>