- looks outdated

Changed files:
    Canna-bcopy.patch -> 1.2
    Canna-glibc.patch -> 1.2
    Canna-hosts.canna-fix.patch -> 1.2
    Canna-security.patch -> 1.2
    Canna-stdin.patch -> 1.2

diff --git a/Canna-bcopy.patch b/Canna-bcopy.patch
deleted file mode 100644 (file)
index 47e4a03..0000000
--- a/Canna-bcopy.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- Canna35b2/ccustom/canna.h.glibc    Wed Nov  6 20:21:45 1996
-+++ Canna35b2/ccustom/canna.h  Mon Jun 12 15:13:32 2000
-@@ -40,7 +40,7 @@
- 
- /*#include "jrkanji.h"*/
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
-+#if defined(SYSV) || defined(SVR4) || defined(__STDC__) && !defined(linux)
- # if defined(SYSV) || defined(SVR4)
- #  include <memory.h>
- # endif
---- Canna35b2/lib/RK/RKintern.h.glibc  Mon Jun 12 15:18:33 2000
-+++ Canna35b2/lib/RK/RKintern.h        Mon Jun 12 15:20:36 2000
-@@ -97,7 +97,7 @@
- #include      <ctype.h>
- #endif
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
-+#if (defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)) && !defined(linux)
- # if defined(SYSV) || defined(SVR4)
- #  include <memory.h>
- # endif
---- Canna35b2/lib/RK/ngram.c.glibc     Mon Jun 12 15:19:21 2000
-+++ Canna35b2/lib/RK/ngram.c   Mon Jun 12 15:19:35 2000
-@@ -42,7 +42,7 @@
- #include <sys/stat.h>
- #endif
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
-+#if defined(SYSV) || defined(SVR4) || defined(__STDC__) && !defined(linux)
- # if defined(SYSV) || defined(SVR4)
- #  include <memory.h>
- # endif
---- Canna35b2/lib/RKC/rkc.h.glibc      Mon Jun 12 15:17:43 2000
-+++ Canna35b2/lib/RKC/rkc.h    Mon Jun 12 15:21:14 2000
-@@ -41,7 +41,7 @@
- #include "RKrename.h"
- #endif
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
-+#if (defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)) && !defined(linux)
- # if defined(SYSV) || defined(SVR4) || defined(WIN)
- #  include <memory.h>
- # endif
---- Canna35b2/lib/canna/canna.h.glibc  Mon Jun 12 15:14:09 2000
-+++ Canna35b2/lib/canna/canna.h        Mon Jun 12 15:14:26 2000
-@@ -105,7 +105,7 @@
- 
- #define STROKE_LIMIT 500 /* ¥¹¥È¥í¡¼¥¯¤ÇÀܳ¤òÀÚ¤ë */
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN)
-+#if defined(SYSV) || defined(SVR4) || defined(__STDC__) || defined(WIN) && !defined(linux)
- # if defined(SYSV) || defined(SVR4)
- #  include <memory.h>
- # endif
---- Canna35b2/server/IR.h.glibc        Mon Jun 12 15:23:47 2000
-+++ Canna35b2/server/IR.h      Mon Jun 12 15:24:00 2000
-@@ -27,7 +27,7 @@
- #define EXTENSION
- #define DEBUG
- 
--#if defined(SYSV) || defined(SVR4) || defined(__STDC__)
-+#if (defined(SYSV) || defined(SVR4) || defined(__STDC__)) && !defined (linux)
- # if defined(SYSV) || defined(SVR4)
- #  include    <memory.h>
- # endif

diff --git a/Canna-glibc.patch b/Canna-glibc.patch
deleted file mode 100644 (file)
index 93f3be6..0000000
--- a/Canna-glibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmd/crxgram/crxgram.c.bak  Sun Nov  2 12:29:33 1997
-+++ cmd/crxgram/crxgram.c      Sun Nov  2 12:29:33 1997
-@@ -69,6 +69,7 @@
- static char   fileName[256];
- static int    lineNum;
- 
-+# ifndef __GLIBC__
- static char *
- basename(name)
-   char *name;
-@@ -83,6 +84,7 @@
-           break;
-     return ++s;
- }
-+#endif
- static void
- usage(prog)
-   char        *prog;

diff --git a/Canna-hosts.canna-fix.patch b/Canna-hosts.canna-fix.patch
deleted file mode 100644 (file)
index fa8e358..0000000
--- a/Canna-hosts.canna-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- canna-3.5b2/server/misc.c  Tue Jul 11 14:08:41 2000
-+++ canna-3.5b2/server/misc.c.new      Wed Sep  6 18:09:17 2000
-@@ -560,8 +567,6 @@
-       current->next = (ACLPtr)NULL ;
-       prev = current ;
-     }
--    if( current )
--      current->next = (ACLPtr)NULL ;
- 
-     fclose( fp ) ;
-     return 0;
-

diff --git a/Canna-security.patch b/Canna-security.patch
deleted file mode 100644 (file)
index 456e4ac..0000000
--- a/Canna-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- canna-3.5b2.orig/server/misc.c
-+++ canna-3.5b2/server/misc.c
-@@ -649,12 +649,22 @@
- 
-     if (client->username && client->username[0]) {
-       if (client->groupname && client->groupname[0]) {
-+      if (strlen(DDUSER) + strlen(client->username) +
-+          strlen(DDGROUP) + strlen(client->groupname) +
-+          strlen(DDPATH) + 4 >= 256) {
-+        return(-1);
-+      }
-+
-       sprintf(dichome, "%s/%s:%s/%s:%s",
-               DDUSER, client->username,
-               DDGROUP, client->groupname,
-               DDPATH);
-       }
-       else {
-+        if (strlen(DDUSER) + strlen(client->username) +
-+          strlen(DDPATH) + 2 >= 256) {
-+        return(-1);
-+      }
-       sprintf(dichome, "%s/%s:%s",
-               DDUSER, client->username,
-               DDPATH);

diff --git a/Canna-stdin.patch b/Canna-stdin.patch
deleted file mode 100644 (file)
index 5fbb44a..0000000
--- a/Canna-stdin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN Canna35b2.ORIG/dic/ideo/pubdic/pod.c Canna35b2/dic/ideo/pubdic/pod.c
---- Canna35b2.ORIG/dic/ideo/pubdic/pod.c       Tue May 31 06:42:12 1994
-+++ Canna35b2/dic/ideo/pubdic/pod.c    Thu Jan 21 04:21:27 1999
-@@ -51,7 +51,7 @@
- static int list_kinds;
- static int copy_frequency, extract_kana = 0;
- static long specific_kind;
--static FILE *in1 = stdin, *in2 = stdin;
-+static FILE *in1, *in2;
- static char *common_out, *old_out, *new_out, *hinshi_table, *bunrui;
- static char *description_table;
- static int selhinshi = 0;
-@@ -1373,6 +1373,8 @@
- int argc;
- char *argv[];
- {
-+  in1 = stdin;
-+  in2 = stdin;
- #ifndef POD_WCHAR
-   setlocale(LC_ALL, "");
- #endif