r35627 - /packages/wordnet/trunk/debian/patches/
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Thu Apr 9 08:11:29 UTC 2009
Author: tille
Date: Thu Apr 9 08:11:29 2009
New Revision: 35627
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35627
Log:
Use proper comments to all patches (and refreshed the patches)
Modified:
packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch
packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch
packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch
packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch
packages/wordnet/trunk/debian/patches/20_include_wn.h.patch
packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch
packages/wordnet/trunk/debian/patches/20_src_wnb.patch
packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch
packages/wordnet/trunk/debian/patches/30_src_grind.patch
packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch
packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch
packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch
packages/wordnet/trunk/debian/patches/51_overflows.patch
packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch
Modified: packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch (original)
+++ packages/wordnet/trunk/debian/patches/01_tcltk8.5.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,10 @@
-diff -ubrN WordNet-3.0.orig/aclocal.m4 WordNet-3.0/aclocal.m4
---- WordNet-3.0.orig/aclocal.m4 2007-06-28 08:27:15.000000000 +0200
-+++ WordNet-3.0/aclocal.m4 2008-05-05 11:49:08.000000000 +0200
+Change upstream source build stuff to use tcl/tk8.5 instead of tcl/tk8.4
+This included autogeneration of all automake / autoconf tools which makes
+this patch quite long
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/aclocal.m4
++++ WordNet-3.0/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1574,9 +1578,8 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -ubrN WordNet-3.0.orig/autogen.sh WordNet-3.0/autogen.sh
---- WordNet-3.0.orig/autogen.sh 2007-01-15 19:13:58.000000000 +0100
-+++ WordNet-3.0/autogen.sh 2008-05-05 11:48:11.000000000 +0200
+--- WordNet-3.0.orig/autogen.sh
++++ WordNet-3.0/autogen.sh
@@ -45,7 +45,7 @@
aclocal $aclocalinclude; \
autoheader; automake --add-missing; autoconf)
@@ -1586,9 +1589,8 @@
echo
echo "Now type 'make' to compile $PROG."
-diff -ubrN WordNet-3.0.orig/config.h.in WordNet-3.0/config.h.in
---- WordNet-3.0.orig/config.h.in 2007-06-28 08:27:18.000000000 +0200
-+++ WordNet-3.0/config.h.in 2008-05-05 11:49:10.000000000 +0200
+--- WordNet-3.0.orig/config.h.in
++++ WordNet-3.0/config.h.in
@@ -61,6 +61,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -1599,9 +1601,8 @@
/* Name of package */
#undef PACKAGE
-diff -ubrN WordNet-3.0.orig/configure WordNet-3.0/configure
---- WordNet-3.0.orig/configure 2007-06-28 21:56:07.000000000 +0200
-+++ WordNet-3.0/configure 2008-05-05 11:49:10.000000000 +0200
+--- WordNet-3.0.orig/configure
++++ WordNet-3.0/configure
@@ -831,12 +831,15 @@
host_cpu
host_vendor
@@ -1943,10 +1944,17 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -6666,6 +6824,318 @@
- ;;
- esac
-
+@@ -6662,9 +6820,321 @@
+ fi
+ fi
+
+- fi
+- ;;
+-esac
++ fi
++ ;;
++esac
++
+
+ case $host_os in
+ rhapsody* | darwin*)
@@ -2258,10 +2266,9 @@
+ ;;
+ esac
+
-+
+
enable_dlopen=no
enable_win32_dll=no
-
@@ -6704,10 +7174,10 @@
objext=$objext
@@ -3108,11 +3115,10 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10751,63 +11344,35 @@
- fi~
+@@ -10752,62 +11345,34 @@
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
-- ld_shlibs_CXX=no
+ ld_shlibs_CXX=no
- fi
- ;;
- darwin* | rhapsody*)
@@ -3132,7 +3138,6 @@
- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
-+ ld_shlibs_CXX=no
fi
;;
- esac
@@ -5234,9 +5239,8 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -ubrN WordNet-3.0.orig/configure.ac WordNet-3.0/configure.ac
---- WordNet-3.0.orig/configure.ac 2007-06-28 08:27:03.000000000 +0200
-+++ WordNet-3.0/configure.ac 2008-05-05 11:49:02.000000000 +0200
+--- WordNet-3.0.orig/configure.ac
++++ WordNet-3.0/configure.ac
@@ -12,6 +12,7 @@
# Checks for programs.
@@ -5258,9 +5262,8 @@
#AC_SUBST([TK_PREFIX])
#AC_SUBST([TCL_INCLUDE_SPEC])
-diff -ubrN WordNet-3.0.orig/contrib/Makefile.in WordNet-3.0/contrib/Makefile.in
---- WordNet-3.0.orig/contrib/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/contrib/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/contrib/Makefile.in
++++ WordNet-3.0/contrib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5334,9 +5337,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/contrib/wordnet_structures/Makefile.in WordNet-3.0/contrib/wordnet_structures/Makefile.in
---- WordNet-3.0.orig/contrib/wordnet_structures/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/contrib/wordnet_structures/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/contrib/wordnet_structures/Makefile.in
++++ WordNet-3.0/contrib/wordnet_structures/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5372,9 +5374,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/dict/dbfiles/Makefile.in WordNet-3.0/dict/dbfiles/Makefile.in
---- WordNet-3.0.orig/dict/dbfiles/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/dict/dbfiles/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/dict/dbfiles/Makefile.in
++++ WordNet-3.0/dict/dbfiles/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5410,9 +5411,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/dict/Makefile.in WordNet-3.0/dict/Makefile.in
---- WordNet-3.0.orig/dict/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/dict/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/dict/Makefile.in
++++ WordNet-3.0/dict/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5486,9 +5486,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/doc/html/Makefile.in WordNet-3.0/doc/html/Makefile.in
---- WordNet-3.0.orig/doc/html/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/doc/html/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/doc/html/Makefile.in
++++ WordNet-3.0/doc/html/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5524,9 +5523,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/doc/Makefile.in WordNet-3.0/doc/Makefile.in
---- WordNet-3.0.orig/doc/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/doc/Makefile.in 2008-05-05 11:49:11.000000000 +0200
+--- WordNet-3.0.orig/doc/Makefile.in
++++ WordNet-3.0/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5600,9 +5598,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/doc/man/Makefile.in WordNet-3.0/doc/man/Makefile.in
---- WordNet-3.0.orig/doc/man/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/doc/man/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/doc/man/Makefile.in
++++ WordNet-3.0/doc/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5638,9 +5635,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/doc/pdf/Makefile.in WordNet-3.0/doc/pdf/Makefile.in
---- WordNet-3.0.orig/doc/pdf/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/doc/pdf/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/doc/pdf/Makefile.in
++++ WordNet-3.0/doc/pdf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5676,9 +5672,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/doc/ps/Makefile.in WordNet-3.0/doc/ps/Makefile.in
---- WordNet-3.0.orig/doc/ps/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/doc/ps/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/doc/ps/Makefile.in
++++ WordNet-3.0/doc/ps/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5714,9 +5709,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/include/Makefile.in WordNet-3.0/include/Makefile.in
---- WordNet-3.0.orig/include/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/include/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/include/Makefile.in
++++ WordNet-3.0/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5790,9 +5784,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/lib/Makefile.in WordNet-3.0/lib/Makefile.in
---- WordNet-3.0.orig/lib/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/lib/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/lib/Makefile.in
++++ WordNet-3.0/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5897,9 +5890,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/lib/wnres/Makefile.in WordNet-3.0/lib/wnres/Makefile.in
---- WordNet-3.0.orig/lib/wnres/Makefile.in 2007-06-28 21:56:06.000000000 +0200
-+++ WordNet-3.0/lib/wnres/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/lib/wnres/Makefile.in
++++ WordNet-3.0/lib/wnres/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5935,9 +5927,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -ubrN WordNet-3.0.orig/Makefile.in WordNet-3.0/Makefile.in
---- WordNet-3.0.orig/Makefile.in 2007-06-28 21:56:07.000000000 +0200
-+++ WordNet-3.0/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/Makefile.in
++++ WordNet-3.0/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6062,9 +6053,8 @@
# Remove unneeded Makefiles
-diff -ubrN WordNet-3.0.orig/src/grind/Makefile.in WordNet-3.0/src/grind/Makefile.in
---- WordNet-3.0.orig/src/grind/Makefile.in 2007-06-28 21:56:07.000000000 +0200
-+++ WordNet-3.0/src/grind/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/src/grind/Makefile.in
++++ WordNet-3.0/src/grind/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6158,9 +6148,8 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -ubrN WordNet-3.0.orig/src/Makefile.in WordNet-3.0/src/Makefile.in
---- WordNet-3.0.orig/src/Makefile.in 2007-06-28 21:56:07.000000000 +0200
-+++ WordNet-3.0/src/Makefile.in 2008-05-05 11:49:12.000000000 +0200
+--- WordNet-3.0.orig/src/Makefile.in
++++ WordNet-3.0/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
Modified: packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch (original)
+++ packages/wordnet/trunk/debian/patches/10_wordnet_structures.patch Thu Apr 9 08:11:29 2009
@@ -1,5 +1,9 @@
---- wordnet-3.0/contrib/wordnet_structures/wordnet_structures.py.orig 2007-06-28 21:54:49.000000000 +0200
-+++ wordnet-3.0/contrib/wordnet_structures/wordnet_structures.py 2008-01-31 15:19:01.000000000 +0100
+Adapt wordnet_structures which is used to convert WordNet to dict format
+from WordNet 2.1 to WordNet 3.0 format
+Author: Sebastian Hagen <sebastian_hagen at memespace.net>
+
+--- WordNet-3.0.orig/contrib/wordnet_structures/wordnet_structures.py
++++ WordNet-3.0/contrib/wordnet_structures/wordnet_structures.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#Copyright 2007 Sebastian Hagen
Modified: packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_doc_Makefile.in.patch Thu Apr 9 08:11:29 2009
@@ -1,7 +1,10 @@
-diff -urNad wordnet-3.0/doc/Makefile.in.orig wordnet-3.0/doc/Makefile.in
---- wordnet-3.0/doc/Makefile.in.orig 2007-06-28 21:56:06.000000000 +0200
-+++ wordnet-3.0/doc/Makefile.in 2007-08-02 23:38:44.000000000 +0200
-@@ -173,7 +173,7 @@
+Do not build html, pdf and ps targets because they are not used in the package anyway.
+Just go with the man pages.
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/doc/Makefile.in
++++ WordNet-3.0/doc/Makefile.in
+@@ -176,7 +176,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Modified: packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_doc_man_wninput.patch Thu Apr 9 08:11:29 2009
@@ -1,5 +1,8 @@
---- wordnet-3.0/doc/man/wninput.5.orig 2006-11-14 22:40:34.000000000 +0100
-+++ wordnet-3.0/doc/man/wninput.5 2007-09-09 11:48:18.000000000 +0200
+Use proper sections of man pages
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/doc/man/wninput.5
++++ WordNet-3.0/doc/man/wninput.5
@@ -500,12 +500,12 @@
.fi
.RE
Modified: packages/wordnet/trunk/debian/patches/20_include_wn.h.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_include_wn.h.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_include_wn.h.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_include_wn.h.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,9 @@
-diff -urNad wordnet-3.0/src/wn.h.orig wordnet-3.0/wn.h
---- wordnet-3.0/include/wn.h.orig 2007-01-03 22:51:35.000000000 +0100
-+++ wordnet-3.0/include/wn.h 2007-01-19 09:09:35.000000000 +0100
+Enable setting dict dir as command line option in the build process rather
+than hard coding it into the header file
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/include/wn.h
++++ WordNet-3.0/include/wn.h
@@ -27,7 +27,9 @@
#define VRBIDXFILE "%s\\sentidx.vrb"
#define CNTLISTFILE "%s\\cntlist.rev"
Modified: packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_src_stubs_c.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,9 @@
-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
+Fix gcc4.x issue with constant strings
+Author: Matthew Wilcox <matthew at wil.cx>
+Closes: #389415
+
+--- WordNet-3.0.orig/src/stubs.c
++++ WordNet-3.0/src/stubs.c
@@ -14,7 +14,7 @@
#include <tk.h>
#include <wn.h>
Modified: packages/wordnet/trunk/debian/patches/20_src_wnb.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_src_wnb.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_src_wnb.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_src_wnb.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,8 @@
-diff -urNad wordnet-3.0/src/wnb.orig wordnet-3.0/src/wnb
---- wordnet-3.0/src/wnb.orig 2005-06-07 21:19:22.000000000 +0200
-+++ wordnet-3.0/src/wnb 2006-01-08 13:54:23.537621328 +0100
+Adapt pathes of tcl script to Debian locations
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/src/wnb
++++ WordNet-3.0/src/wnb
@@ -103,7 +103,7 @@
if {$tcl_platform(platform) == "unix"} {
Modified: packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch (original)
+++ packages/wordnet/trunk/debian/patches/20_verb.social_fix.patch Thu Apr 9 08:11:29 2009
@@ -1,5 +1,9 @@
---- wordnet-3.0/dict/dbfiles/verb.social.orig 2006-12-11 22:47:43.000000000 +0100
-+++ wordnet-3.0/dict/dbfiles/verb.social 2008-05-03 22:43:41.000000000 +0200
+Fix loop issue when look up the hypernyms of "inhibit".
+Author: Ben Haskell <ben at clarity.princeton.edu>
+Closes: #478803
+
+--- WordNet-3.0.orig/dict/dbfiles/verb.social
++++ WordNet-3.0/dict/dbfiles/verb.social
@@ -254,7 +254,7 @@
{ [let, prevent,!] allow, permit, frames: 25,35 (make it possible through a specific action or lack of action for something to happen; "This permits the water to rush in"; "This sealed door won't allow the water come into the basement"; "This will permit the rain to run off") }
{ pass11, allow,@ frames: 8 (allow to go without comment or censure; "the insult passed as if unnoticed") }
Modified: packages/wordnet/trunk/debian/patches/30_src_grind.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/30_src_grind.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/30_src_grind.patch (original)
+++ packages/wordnet/trunk/debian/patches/30_src_grind.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,8 @@
-diff -urNad wordnet-3.0/src/grind.orig/create.c wordnet-3.0/src/grind/create.c
---- wordnet-3.0/src/grind.orig/create.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/create.c 2007-08-02 22:17:34.000000000 +0200
+Add missing includes to work with gcc4.x
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/src/grind/create.c
++++ WordNet-3.0/src/grind/create.c
@@ -6,6 +6,7 @@
*/
@@ -9,9 +11,8 @@
#include <malloc.h>
#include <string.h>
#include "wngrind.h"
-diff -urNad wordnet-3.0/src/grind.orig/files.c wordnet-3.0/src/grind/files.c
---- wordnet-3.0/src/grind.orig/files.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/files.c 2007-08-02 22:17:53.000000000 +0200
+--- WordNet-3.0.orig/src/grind/files.c
++++ WordNet-3.0/src/grind/files.c
@@ -5,6 +5,7 @@
*/
@@ -20,9 +21,8 @@
#include "wngrind.h"
static char *Id = "$Id: files.c,v 1.7 2005/01/31 20:03:36 wn Rel $";
-diff -urNad wordnet-3.0/src/grind.orig/grind.c wordnet-3.0/src/grind/grind.c
---- wordnet-3.0/src/grind.orig/grind.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/grind.c 2007-08-02 22:19:08.000000000 +0200
+--- WordNet-3.0.orig/src/grind/grind.c
++++ WordNet-3.0/src/grind/grind.c
@@ -5,6 +5,7 @@
*/
@@ -45,9 +45,8 @@
char c;
Argv=argv;
-diff -urNad wordnet-3.0/src/grind.orig/makedb.c wordnet-3.0/src/grind/makedb.c
---- wordnet-3.0/src/grind.orig/makedb.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/makedb.c 2007-08-02 22:21:28.000000000 +0200
+--- WordNet-3.0.orig/src/grind/makedb.c
++++ WordNet-3.0/src/grind/makedb.c
@@ -5,6 +5,7 @@
*/
@@ -74,9 +73,8 @@
ptrsymbols[p->ptype],
p->psynset->filepos,
partchars[p->psynset->part],
-diff -urNad wordnet-3.0/src/grind.orig/resolve.c wordnet-3.0/src/grind/resolve.c
---- wordnet-3.0/src/grind.orig/resolve.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/resolve.c 2007-08-02 22:23:12.000000000 +0200
+--- WordNet-3.0.orig/src/grind/resolve.c
++++ WordNet-3.0/src/grind/resolve.c
@@ -174,7 +174,7 @@
static void CheckSimilars(G_Synset clusheadss)
{
@@ -95,9 +93,8 @@
if ( syn->ss == ss && p->fromwdnum == ALLWORDS) {
fprintf(logfile, "Self-referential pointer: %s in file %s, line %d\n",
-diff -urNad wordnet-3.0/src/grind.orig/util.c wordnet-3.0/src/grind/util.c
---- wordnet-3.0/src/grind.orig/util.c 2007-01-09 21:56:16.000000000 +0100
-+++ wordnet-3.0/src/grind/util.c 2007-08-02 22:23:44.000000000 +0200
+--- WordNet-3.0.orig/src/grind/util.c
++++ WordNet-3.0/src/grind/util.c
@@ -4,6 +4,8 @@
*/
Modified: packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch (original)
+++ packages/wordnet/trunk/debian/patches/40_doc_man_fix_names.patch Thu Apr 9 08:11:29 2009
@@ -1,6 +1,8 @@
-diff -ubrN wordnet-3.0/doc/man.orig/binsrch.3 wordnet-3.0/doc/man/binsrch.3
---- wordnet-3.0/doc/man.orig/binsrch.3 2006-11-14 22:36:00.000000000 +0100
-+++ wordnet-3.0/doc/man/binsrch.3 2007-11-07 14:20:54.000000000 +0100
+Fix NAME section of manpages
+Author: Andreas Tille <tille at debian.org>
+
+--- WordNet-3.0.orig/doc/man/binsrch.3
++++ WordNet-3.0/doc/man/binsrch.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH BINSRCH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -10,9 +12,8 @@
.SH SYNOPSIS
.LP
\fBchar *bin_search(char *key, FILE *fp);\fP
-diff -ubrN wordnet-3.0/doc/man.orig/lexnames.5 wordnet-3.0/doc/man/lexnames.5
---- wordnet-3.0/doc/man.orig/lexnames.5 2006-12-14 23:56:24.000000000 +0100
-+++ wordnet-3.0/doc/man/lexnames.5 2007-11-07 14:45:57.000000000 +0100
+--- WordNet-3.0.orig/doc/man/lexnames.5
++++ WordNet-3.0/doc/man/lexnames.5
@@ -3,7 +3,7 @@
.tr ~
.TH LEXNAMES 5WN "Dec 2006" "WordNet 3.0" "WordNet\(tm File Formats"
@@ -22,9 +23,8 @@
.SH DESCRIPTION
During WordNet development synsets are organized into forty-five
lexicographer files based on syntactic category and logical groupings.
-diff -ubrN wordnet-3.0/doc/man.orig/morph.3 wordnet-3.0/doc/man/morph.3
---- wordnet-3.0/doc/man.orig/morph.3 2006-11-14 22:37:34.000000000 +0100
-+++ wordnet-3.0/doc/man/morph.3 2007-11-07 14:22:19.000000000 +0100
+--- WordNet-3.0.orig/doc/man/morph.3
++++ WordNet-3.0/doc/man/morph.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH MORPH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -34,9 +34,8 @@
.SH SYNOPSIS
.LP
\fB#include "wn.h"\fP
-diff -ubrN wordnet-3.0/doc/man.orig/wnsearch.3 wordnet-3.0/doc/man/wnsearch.3
---- wordnet-3.0/doc/man.orig/wnsearch.3 2006-12-14 23:22:19.000000000 +0100
-+++ wordnet-3.0/doc/man/wnsearch.3 2007-11-07 14:22:04.000000000 +0100
+--- WordNet-3.0.orig/doc/man/wnsearch.3
++++ WordNet-3.0/doc/man/wnsearch.3
@@ -2,7 +2,7 @@
.\" $Id$
.TH WNSEARCH 3WN "Dec 2006" "WordNet 3.0" "WordNet\(tm Library Functions"
@@ -46,9 +45,8 @@
.SH SYNOPSIS
.LP
\fB#include "wn.h"
-diff -ubrN wordnet-3.0/doc/man.orig/wnutil.3 wordnet-3.0/doc/man/wnutil.3
---- wordnet-3.0/doc/man.orig/wnutil.3 2006-11-14 22:45:01.000000000 +0100
-+++ wordnet-3.0/doc/man/wnutil.3 2007-11-07 14:23:00.000000000 +0100
+--- WordNet-3.0.orig/doc/man/wnutil.3
++++ WordNet-3.0/doc/man/wnutil.3
@@ -5,7 +5,7 @@
wninit, re_wninit, cntwords, strtolower, ToLowerCase, strsubst,
getptrtype, getpos, getsstype, StrToPos, GetSynsetForSense,
Modified: packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch (original)
+++ packages/wordnet/trunk/debian/patches/41_doc_man_fix_names.patch Thu Apr 9 08:11:29 2009
@@ -1,3 +1,6 @@
+Fix some formating issues in manpages
+Author: Andreas Tille <tille at debian.org>
+
--- WordNet-3.0.orig/doc/man/wninput.5
+++ WordNet-3.0/doc/man/wninput.5
@@ -247,7 +247,6 @@
Modified: packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch (original)
+++ packages/wordnet/trunk/debian/patches/50_CVE-2008-2149_buffer_overflows.patch Thu Apr 9 08:11:29 2009
@@ -1,5 +1,12 @@
---- wordnet-3.0.orig/src/wn.c
-+++ wordnet-3.0/src/wn.c
+Fix CVE-2008-2149: buffer overflows by limiting the length of the string in sprintf
+format string
+Closes: #481186 (CVE-2008-2149)
+Please note: The WordNet code contains several other occurences of potentially
+exploitable functions like strcpy()/strcat()/... and so even if there are no
+known exploits the code needs a full security audit.
+
+--- WordNet-3.0.orig/src/wn.c
++++ WordNet-3.0/src/wn.c
@@ -206,7 +206,8 @@
outsenses += do_search(av[1], optptr->pos, optptr->search,
whichsense, optptr->label);
Modified: packages/wordnet/trunk/debian/patches/51_overflows.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/51_overflows.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/51_overflows.patch (original)
+++ packages/wordnet/trunk/debian/patches/51_overflows.patch Thu Apr 9 08:11:29 2009
@@ -7,11 +7,10 @@
part of the patch was removed from the whole patch
set and is moved to 51_overflows_memcpy.patch which
uses memcpy instead of the formerly used strcpy.
-diff --git a/lib/binsrch.c b/lib/binsrch.c
-index 85436f3..8b71216 100644
---- a/lib/binsrch.c
-+++ wordnet-3.0/lib/binsrch.c
-@@ -28,7 +28,7 @@ char *read_index(long offset, FILE *fp) {
+
+--- WordNet-3.0.orig/lib/binsrch.c
++++ WordNet-3.0/lib/binsrch.c
+@@ -28,7 +28,7 @@
char *linep;
linep = line;
@@ -20,7 +19,7 @@
fseek( fp, offset, SEEK_SET );
fgets(linep, LINE_LEN, fp);
-@@ -58,6 +58,8 @@ char *bin_search(char *searchkey, FILE *fp)
+@@ -58,6 +58,8 @@
last_bin_search_offset = ftell( fp );
fgets(linep, LINE_LEN, fp);
length = (int)(strchr(linep, ' ') - linep);
@@ -29,7 +28,7 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) < 0) {
-@@ -110,6 +112,8 @@ static int bin_search_key(char *searchkey, FILE *fp)
+@@ -110,6 +112,8 @@
line[length++] = c;
if (getc(fp) == EOF) { /* only 1 line in file */
length = (int)(strchr(linep, ' ') - linep);
@@ -38,7 +37,7 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) > 0) {
-@@ -132,6 +136,8 @@ static int bin_search_key(char *searchkey, FILE *fp)
+@@ -132,6 +136,8 @@
if (fgets(linep, LINE_LEN, fp) != NULL) {
offset2 = ftell(fp); /* offset at start of next line */
length = (int)(strchr(linep, ' ') - linep);
@@ -47,11 +46,9 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) < 0) { /* further in file */
-diff --git a/lib/morph.c b/lib/morph.c
-index 0cff594..ea4b4f8 100644
---- a/lib/morph.c
-+++ wordnet-3.0/lib/morph.c
-@@ -51,24 +51,24 @@ static struct {
+--- WordNet-3.0.orig/lib/morph.c
++++ WordNet-3.0/lib/morph.c
+@@ -51,24 +51,24 @@
char *str;
int strlen;
} prepositions[NUMPREPS] = {
@@ -92,7 +89,7 @@
static int do_init();
static int strend(char *, char *);
-@@ -100,7 +100,7 @@ int re_morphinit(void)
+@@ -100,7 +100,7 @@
{
int i;
@@ -101,7 +98,7 @@
if (exc_fps[i] != NULL) {
fclose(exc_fps[i]); exc_fps[i] = NULL;
}
-@@ -144,18 +144,19 @@ static int do_init(void)
+@@ -144,18 +144,19 @@
} else
sprintf(searchdir, DEFAULTPATH);
#else
@@ -129,7 +126,7 @@
"WordNet library error: Can't open exception file(%s)\n\n",
fname);
display_message(msgbuf);
-@@ -178,13 +179,16 @@ char *morphstr(char *origstr, int pos)
+@@ -178,13 +179,16 @@
int prep;
char *end_idx1, *end_idx2;
char *append;
@@ -147,7 +144,7 @@
/* Assume string hasn't had spaces substitued with '_' */
strtolower(strsubst(strcpy(str, origstr), ' ', '_'));
searchstr[0] = '\0';
-@@ -232,7 +236,7 @@ char *morphstr(char *origstr, int pos)
+@@ -232,7 +236,7 @@
if (end_idx < 0) return(NULL); /* shouldn't do this */
strncpy(word, str + st_idx, end_idx - st_idx);
word[end_idx - st_idx] = '\0';
@@ -156,7 +153,7 @@
strcat(searchstr,tmp);
else
strcat(searchstr,word);
-@@ -240,7 +244,7 @@ char *morphstr(char *origstr, int pos)
+@@ -240,7 +244,7 @@
st_idx = end_idx + 1;
}
@@ -165,7 +162,7 @@
strcat(searchstr,tmp);
else
strcat(searchstr,word);
-@@ -270,16 +274,15 @@ char *morphword(char *word, int pos)
+@@ -270,16 +274,15 @@
{
int offset, cnt;
int i;
@@ -188,7 +185,7 @@
/* first look for word on exception list */
if((tmp = exc_lookup(word, pos)) != NULL)
-@@ -335,7 +338,10 @@ static char *wordbase(char *word, int ender)
+@@ -335,7 +338,10 @@
{
char *pt1;
static char copy[WORDBUF];
@@ -200,7 +197,7 @@
strcpy(copy, word);
if(strend(copy,sufx[ender])) {
pt1=strchr(copy,'\0');
-@@ -368,13 +374,14 @@ static char *exc_lookup(char *word, int pos)
+@@ -368,13 +374,14 @@
{
static char line[WORDBUF], *beglp, *endlp;
char *excline;
@@ -216,7 +213,7 @@
if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
strcpy(line, excline);
endlp = strchr(line,' ');
-@@ -403,6 +410,9 @@ static char *morphprep(char *s)
+@@ -403,6 +410,9 @@
char word[WORDBUF], end[WORDBUF];
static char retval[WORDBUF];
@@ -226,7 +223,7 @@
/* Assume that the verb is the first word in the phrase. Strip it
off, check for validity, then try various morphs with the
rest of the phrase tacked on, trying to find a match. */
-@@ -410,7 +420,7 @@ static char *morphprep(char *s)
+@@ -410,7 +420,7 @@
rest = strchr(s, '_');
last = strrchr(s, '_');
if (rest != last) { /* more than 2 words */
@@ -235,10 +232,8 @@
strncpy(end, rest, last - rest + 1);
end[last-rest+1] = '\0';
strcat(end, lastwd);
-diff --git a/lib/search.c b/lib/search.c
-index 1cdedc3..bc781cd 100644
---- a/lib/search.c
-+++ wordnet-3.0/lib/search.c
+--- WordNet-3.0.orig/lib/search.c
++++ WordNet-3.0/lib/search.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
@@ -247,7 +242,7 @@
#include "wn.h"
-@@ -119,33 +120,22 @@ IndexPtr parse_index(long offset, int dbase, char *line) {
+@@ -119,33 +120,22 @@
if ( !line )
line = read_index( offset, indexfps[dbase] );
@@ -284,7 +279,7 @@
/* get the collins count */
ptrtok=strtok(NULL," \n");
-@@ -154,7 +144,12 @@ IndexPtr parse_index(long offset, int dbase, char *line) {
+@@ -154,7 +144,12 @@
/* get the number of pointers types */
ptrtok=strtok(NULL," \n");
idx->ptruse_cnt = atoi(ptrtok);
@@ -298,7 +293,7 @@
if (idx->ptruse_cnt) {
idx->ptruse = (int *) malloc(idx->ptruse_cnt * (sizeof(int)));
assert(idx->ptruse);
-@@ -173,9 +168,14 @@ IndexPtr parse_index(long offset, int dbase, char *line) {
+@@ -173,9 +168,14 @@
/* get the number of senses that are tagged */
ptrtok=strtok(NULL," \n");
idx->tagged_cnt = atoi(ptrtok);
@@ -315,7 +310,7 @@
assert(idx->offset);
/* get the offsets */
-@@ -197,15 +197,21 @@ IndexPtr getindex(char *searchstr, int dbase)
+@@ -197,15 +197,21 @@
char strings[MAX_FORMS][WORDBUF]; /* vector of search strings */
static IndexPtr offsets[MAX_FORMS];
static int offset;
@@ -327,20 +322,19 @@
one, or NULL if no more alternatives for this word. */
if (searchstr != NULL) {
--
-- offset = 0;
+ /* Bail out if the input is too long for us to handle */
+ if (strlen(searchstr) > (WORDBUF - 1)) {
+ strcpy(msgbuf, "WordNet library error: search term is too long\n");
+ display_message(msgbuf);
+ return(NULL);
+ }
-+
+
+- offset = 0;
+ offset = 0;
strtolower(searchstr);
for (i = 0; i < MAX_FORMS; i++) {
strcpy(strings[i], searchstr);
-@@ -229,11 +235,11 @@ IndexPtr getindex(char *searchstr, int dbase)
+@@ -229,11 +235,11 @@
/* Get offset of first entry. Then eliminate duplicates
and get offsets of unique strings. */
@@ -354,7 +348,7 @@
offsets[i] = index_lookup(strings[i], dbase);
}
-@@ -272,7 +278,7 @@ SynsetPtr read_synset(int dbase, long boffset, char *word)
+@@ -272,7 +278,7 @@
SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
{
static char line[LINEBUF];
@@ -363,7 +357,7 @@
char *ptrtok;
char *tmpptr;
int foundpert = 0;
-@@ -286,33 +292,11 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -286,33 +292,11 @@
if ((tmpptr = fgets(line, LINEBUF, fp)) == NULL)
return(NULL);
@@ -399,7 +393,7 @@
ptrtok = line;
-@@ -322,7 +306,7 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -322,7 +306,7 @@
/* sanity check - make sure starting file offset matches first field */
if (synptr->hereiam != loc) {
@@ -408,7 +402,7 @@
loc);
display_message(msgbuf);
free(synptr);
-@@ -335,16 +319,20 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -335,16 +319,20 @@
/* looking at POS */
ptrtok = strtok(NULL, " \n");
@@ -432,7 +426,7 @@
synptr->words = (char **)malloc(synptr->wcount * sizeof(char *));
assert(synptr->words);
synptr->wnsns = (int *)malloc(synptr->wcount * sizeof(int));
-@@ -354,9 +342,8 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -354,9 +342,8 @@
for (i = 0; i < synptr->wcount; i++) {
ptrtok = strtok(NULL, " \n");
@@ -443,7 +437,7 @@
/* is this the word we're looking for? */
-@@ -371,6 +358,12 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -371,6 +358,12 @@
ptrtok = strtok(NULL," \n");
synptr->ptrcount = atoi(ptrtok);
@@ -456,7 +450,7 @@
if (synptr->ptrcount) {
/* alloc storage for the pointers */
-@@ -455,21 +448,23 @@ SynsetPtr parse_synset(FILE *fp, int dbase, char *word)
+@@ -455,21 +448,23 @@
ptrtok = strtok(NULL," \n");
if (ptrtok) {
ptrtok = strtok(NULL," \n");
@@ -484,7 +478,7 @@
synptr->key = GetKeyForOffset(tmpbuf);
}
-@@ -635,7 +630,7 @@ static void traceptrs(SynsetPtr synptr, int ptrtyp, int dbase, int depth)
+@@ -635,7 +630,7 @@
if ((ptrtyp == PERTPTR || ptrtyp == PPLPTR) &&
synptr->pto[i] != 0) {
@@ -493,7 +487,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, PRINT_MARKER);
-@@ -656,7 +651,7 @@ static void traceptrs(SynsetPtr synptr, int ptrtyp, int dbase, int depth)
+@@ -656,7 +651,7 @@
traceptrs(cursyn, HYPERPTR, getpos(cursyn->pos), 0);
}
} else if (ptrtyp == ANTPTR && dbase != ADJ && synptr->pto[i] != 0) {
@@ -502,7 +496,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, PRINT_MARKER);
-@@ -817,7 +812,7 @@ static void tracenomins(SynsetPtr synptr, int dbase)
+@@ -817,7 +812,7 @@
cursyn = read_synset(synptr->ppos[i], synptr->ptroff[i], "");
@@ -511,7 +505,7 @@
cursyn->wnsns[synptr->pto[i] - 1]);
printsynset(prefix, cursyn, tbuf, DEFOFF, synptr->pto[i],
SKIP_ANTS, SKIP_MARKER);
-@@ -989,12 +984,12 @@ void getexample(char *offset, char *wd)
+@@ -989,12 +984,12 @@
char sentbuf[512];
if (vsentfilefp != NULL) {
@@ -526,7 +520,7 @@
printbuffer(sentbuf);
}
}
-@@ -1011,7 +1006,7 @@ int findexample(SynsetPtr synptr)
+@@ -1011,7 +1006,7 @@
if (vidxfilefp != NULL) {
wdnum = synptr->whichword - 1;
@@ -535,7 +529,7 @@
synptr->words[wdnum],
getpos(synptr->pos),
synptr->fnum,
-@@ -1124,7 +1119,7 @@ static void freq_word(IndexPtr index)
+@@ -1124,7 +1119,7 @@
if (cnt >= 17 && cnt <= 32) familiar = 6;
if (cnt > 32 ) familiar = 7;
@@ -544,7 +538,7 @@
"\n%s used as %s is %s (polysemy count = %d)\n",
index->wd, a_an[getpos(index->pos)], freqcats[familiar], cnt);
printbuffer(tmpbuf);
-@@ -1147,6 +1142,9 @@ void wngrep (char *word_passed, int pos) {
+@@ -1147,6 +1142,9 @@
}
rewind(inputfile);
@@ -554,7 +548,7 @@
strcpy (word, word_passed);
ToLowerCase(word); /* map to lower case for index file search */
strsubst (word, ' ', '_'); /* replace spaces with underscores */
-@@ -1169,7 +1167,7 @@ void wngrep (char *word_passed, int pos) {
+@@ -1169,7 +1167,7 @@
((line[loc + wordlen] == '-') || (line[loc + wordlen] == '_')))
) {
strsubst (line, '_', ' ');
@@ -563,7 +557,7 @@
printbuffer (tmpbuf);
break;
}
-@@ -1683,9 +1682,8 @@ SynsetPtr traceptrs_ds(SynsetPtr synptr, int ptrtyp, int dbase, int depth)
+@@ -1683,9 +1681,8 @@
cursyn = read_synset(synptr->ppos[i],
synptr->ptroff[i],
"");
@@ -574,7 +568,7 @@
synptr->headsense = cursyn->lexid[0];
free_synset(cursyn);
break;
-@@ -2013,7 +2011,7 @@ static int getsearchsense(SynsetPtr synptr, int whichword)
+@@ -2013,7 +2010,7 @@
strsubst(strcpy(wdbuf, synptr->words[whichword - 1]), ' ', '_');
strtolower(wdbuf);
@@ -583,7 +577,7 @@
for (i = 0; i < idx->off_cnt; i++)
if (idx->offset[i] == synptr->hereiam) {
free_index(idx);
-@@ -2037,7 +2035,7 @@ static void printsynset(char *head, SynsetPtr synptr, char *tail, int definition
+@@ -2037,7 +2034,7 @@
by flags */
if (offsetflag) /* print synset offset */
@@ -592,7 +586,7 @@
if (fileinfoflag) { /* print lexicographer file information */
sprintf(tbuf + strlen(tbuf), "<%s> ", lexfiles[synptr->fnum]);
prlexid = 1; /* print lexicographer id after word */
-@@ -2072,7 +2070,7 @@ static void printantsynset(SynsetPtr synptr, char *tail, int anttype, int defini
+@@ -2072,7 +2069,7 @@
tbuf[0] = '\0';
if (offsetflag)
@@ -601,11 +595,9 @@
if (fileinfoflag) {
sprintf(tbuf + strlen(tbuf),"<%s> ", lexfiles[synptr->fnum]);
prlexid = 1;
-diff --git a/lib/wnutil.c b/lib/wnutil.c
-index 5ee5d76..7b7948a 100644
---- a/lib/wnutil.c
-+++ wordnet-3.0/lib/wnutil.c
-@@ -48,7 +48,7 @@ int wninit(void)
+--- WordNet-3.0.orig/lib/wnutil.c
++++ WordNet-3.0/lib/wnutil.c
+@@ -48,7 +48,7 @@
char *env;
if (!done) {
@@ -614,7 +606,7 @@
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
-@@ -70,7 +70,7 @@ int re_wninit(void)
+@@ -70,7 +70,7 @@
closefps();
@@ -623,7 +615,7 @@
wnrelease = strdup(env); /* set release */
assert(wnrelease);
}
-@@ -149,25 +149,25 @@ static int do_init(void)
+@@ -149,25 +149,25 @@
sprintf(searchdir, DEFAULTPATH);
#else
if ((env = getenv("WNSEARCHDIR")) != NULL)
@@ -655,7 +647,7 @@
"WordNet library error: Can't open indexfile(%s)\n",
tmpbuf);
display_message(msgbuf);
-@@ -178,35 +178,35 @@ static int do_init(void)
+@@ -178,35 +178,35 @@
/* This file isn't used by the library and doesn't have to
be present. No error is reported if the open fails. */
@@ -699,11 +691,9 @@
"WordNet library warning: Can't open verb example sentence index file(%s)\n",
tmpbuf);
display_message(msgbuf);
-diff --git a/src/wn.c b/src/wn.c
-index ddb27aa..5c6a255 100644
---- a/src/wn.c
-+++ wordnet-3.0/src/wn.c
-@@ -129,7 +129,7 @@ static void printusage(), printlicense(),
+--- WordNet-3.0.orig/src/wn.c
++++ WordNet-3.0/src/wn.c
+@@ -131,7 +131,7 @@
printsearches(char *, int, unsigned long);
static int error_message(char *);
@@ -712,7 +702,7 @@
{
display_message = error_message;
-@@ -225,14 +225,14 @@ static int do_search(char *searchword, int pos, int search, int whichsense,
+@@ -228,14 +228,14 @@
printf("\n%s of %s %s\n%s",
label, partnames[pos], searchword, outbuf);
Modified: packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch?rev=35627&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch (original)
+++ packages/wordnet/trunk/debian/patches/51_overflows_memcpy.patch Thu Apr 9 08:11:29 2009
@@ -3,11 +3,10 @@
Unfortunately the original patch contained a bug which was
later fixed by the issuer of the patch Rob Holland <rob at ocert.org>
This part was now separated in this file.
-diff --git a/lib/search.c b/lib/search.c
-index 1cdedc3..bc781cd 100644
---- a/lib/search.c
-+++ wordnet-3.0/lib/search.c
-@@ -1570,7 +1568,8 @@ char *findtheinfo(char *searchstr, int dbase, int ptrtyp, int whichsense)
+
+--- WordNet-3.0.orig/lib/search.c
++++ WordNet-3.0/lib/search.c
+@@ -1568,7 +1568,8 @@
bufstart[0] = '\n';
bufstart++;
}
More information about the debian-science-commits
mailing list