summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-dicts/wordnet/files')
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch20
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-format-security.patch48
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch12
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch133
4 files changed, 0 insertions, 213 deletions
diff --git a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch b/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
deleted file mode 100644
index fafaa2c331d7..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -p -u -r WordNet-3.0/lib/morph.c WordNet-3.0-mine/lib/morph.c
---- a/lib/morph.c 2010-04-12 13:53:04.000000000 +0200
-+++ b/lib/morph.c 2010-04-12 13:54:53.000000000 +0200
-@@ -375,14 +375,14 @@ static char *exc_lookup(char *word, int
- static char line[WORDBUF], *beglp, *endlp;
- char *excline;
-
-- if (exc_fps[pos] == NULL)
-+ if (exc_fps[pos-1] == NULL)
- return(NULL);
-
- /* first time through load line from exception file */
- if(word != NULL){
- if (strlen(word) > WORDBUF - 1)
- return(NULL);
-- if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
-+ if ((excline = bin_search(word, exc_fps[pos-1])) != NULL) {
- strcpy(line, excline);
- endlp = strchr(line,' ');
- } else
diff --git a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
deleted file mode 100644
index b5d86dbbdd89..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- lib/binsrch.c | 4 ++--
- src/wn.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/binsrch.c b/lib/binsrch.c
-index 8b71216..9ac51a7 100644
---- a/lib/binsrch.c
-+++ b/lib/binsrch.c
-@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char *searchkey, FILE *fp)
- copyfile(fp, tfp);
- if (fseek(fp, offset, 0) == -1)
- return(NULL); /* could not seek to offset */
-- fprintf(fp, new_line); /* write line */
-+ fprintf(fp, "%s", new_line); /* write line */
- rewind(tfp);
- copyfile(tfp, fp);
-
-@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *searchkey, FILE *fp)
- copyfile(fp, tfp);
- if (fseek(fp, offset, 0) == -1)
- return(NULL); /* could not seek to offset */
-- fprintf(fp, new_line); /* write line */
-+ fprintf(fp, "%s", new_line); /* write line */
- rewind(tfp);
- copyfile(tfp, fp);
-
-diff --git a/src/wn.c b/src/wn.c
-index 004e1e6..398632f 100644
---- a/src/wn.c
-+++ b/src/wn.c
-@@ -284,7 +284,7 @@ static void printsearches(char *word, int dbase, unsigned long search)
- printf("\t");
- printf(searchstr[j].template,
- partchars[dbase], partchars[dbase]);
-- printf(searchstr[j].helpstr);
-+ printf("%s", searchstr[j].helpstr);
- printf("\n");
- }
- }
-@@ -345,7 +345,7 @@ static int getoptidx(char *searchtype)
-
- static int error_message(char *msg)
- {
-- fprintf(stderr, msg);
-+ fprintf(stderr, "%s", msg);
- return(0);
- }
-
diff --git a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
deleted file mode 100644
index 29c42dea9c35..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c
---- wordnet-3.0/src/stubs.c.orig 2007-01-04 18:47:55.000000000 +0100
-+++ wordnet-3.0/src/stubs.c 2007-01-20 19:01:19.000000000 +0100
-@@ -14,7 +14,7 @@
- #include <tk.h>
- #include <wn.h>
-
--static char *Id = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-+static const char Id[] = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-
- static char resultbuf[SEARCHBUF];
-
diff --git a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
deleted file mode 100644
index 110ffc2110b8..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
+++ /dev/null
@@ -1,133 +0,0 @@
- src/stubs.c | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/stubs.c b/src/stubs.c
-index 794485c..cec2c04 100644
---- a/src/stubs.c
-+++ b/src/stubs.c
-@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
- char *morph;
- int pos;
- if (argc != 3) {
-- interp -> result =
-- "usage: findvalidsearches searchword partofspeechnum";
-+ Tcl_SetResult(interp,
-+ "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[2]);
-@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
- } while ((morph = morphstr (NULL, pos)) != NULL);
- }
- sprintf (bitfieldstr, "%u", bitfield);
-- interp -> result = bitfieldstr;
-+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
- static char bitfieldstr[32];
- int whichbit;
- if (argc != 2) {
-- interp -> result = "usage: bit bitnum";
-+ Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
- return TCL_ERROR;
- }
- whichbit = atoi (argv[1]);
- bitfield = bit (whichbit);
- sprintf (bitfieldstr, "%u", bitfield);
-- interp -> result = bitfieldstr;
-+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int pos, searchtype, sense;
- char *morph;
- if (argc != 5) {
-- interp -> result =
-- "usage: search searchword partofspeechnum searchtypenum sensenum";
-+ Tcl_SetResult(interp,
-+ "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[2]);
-@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
- } while ((morph = morphstr (NULL, pos)) != NULL);
- }
-- interp -> result = resultbuf;
-+ Tcl_SetResult(interp, resultbuf, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: glosses [1 | 0]";
-+ Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- dflag = atoi (argv[1]);
-@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: fileinfo [1 | 0]";
-+ Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- fileinfoflag = atoi (argv[1]);
-@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: byteoffset [1 | 0]";
-+ Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- offsetflag = atoi (argv[1]);
-@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: senseflag [1 | 0]";
-+ Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- wnsnsflag = atoi (argv[1]);
-@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- int pos, searchtype;
- if (argc != 3) {
-- interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
-+ Tcl_SetResult(interp,
-+ "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[1]);
- searchtype = atoi (argv[2]);
-- interp -> result = helptext[pos][searchtype];
-+ Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 1) {
-- interp -> result = "usage: reopendb";
-+ Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
- return TCL_ERROR;
- }
- re_wninit ();
-@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 1) {
-- interp -> result = "usage: abortsearch";
-+ Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
- return TCL_ERROR;
- }
- abortsearch = 1;