- updated to 1.1.1-a23

- updated patches, removed obsolete libtool,cpp,format patches
- disable traditional layout, use sbindir for daemons

diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init
index 9b98b1c23aa6cf65895407d83dfb799650649438..abc2a5acb97e4860e12aa7055ce168a5d2c606b4 100644 (file)
--- a/FreeWnn-cWnn.init
+++ b/FreeWnn-cWnn.init
@@ -35,7 +35,7 @@ start() {
        if [ ! -f /var/lock/subsys/cWnn ]; then
                msg_starting cWnn
                rm -f /tmp/cd_sockV4
-               ( su - wnn -s /bin/sh -c '/usr/bin/cserver' | grep "Finished" > /dev/null ) \
+               ( su - wnn -s /bin/sh -c '/usr/sbin/cserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cWnn || RETVAL=1

diff --git a/FreeWnn-cpp.patch b/FreeWnn-cpp.patch
deleted file mode 100644 (file)
index e5763c0..0000000
--- a/FreeWnn-cpp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in.orig 2012-11-16 22:28:32.624376745 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in      2012-11-17 13:19:15.953262821 +0100
-@@ -421,7 +421,7 @@
-       $(LN) $? $@
- 
- std.fzk: fzk.master-.c $(FZK_SRC)
--      $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+      $(CPP) -traditional-cpp $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- 
- full.fzk: $(FZK_SRC)
-       $(MAKE) FZK_FLAG=-DKANSAI std.fzk
---- FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in.orig      2012-11-17 13:22:12.586592470 +0100
-+++ FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in   2012-11-17 13:25:13.339922041 +0100
-@@ -63,10 +63,10 @@
- $(DICS): $(HINSI)
- 
- $(FULL):: $(FZK_SRCS) con.master-.c
--      $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+      $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- 
- $(FULLR):: $(FZK_SRCS) con.masterR-.c
--      $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+      $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- 
- # To avoid circular dependency, we don't use 'con.master?.c'
- con.master-.c: con.master
---- FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in.orig      2012-11-17 13:25:46.083254689 +0100
-+++ FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in   2012-11-17 13:31:26.069914269 +0100
-@@ -63,10 +63,10 @@
- $(DICS): $(HINSI)
- 
- $(FULL):: $(FZK_SRCS) con.master-.c
--      $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+      $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- 
- $(FULLR):: $(FZK_SRCS) con.masterR-.c
--      $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+      $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- 
- # To avoid circular dependency, we don't use 'con.master?.c'
- con.master-.c: con.master

diff --git a/FreeWnn-fhs.patch b/FreeWnn-fhs.patch
index 4422be7b287a192d78469368e0010c7119ba0848..128953f16449eb95a0f5b9d32568aa60b3f3c9a7 100644 (file)
--- a/FreeWnn-fhs.patch
+++ b/FreeWnn-fhs.patch
@@ -1,50 +1,48 @@
---- FreeWnn-1.1.1-a013.orig/makerule.mk.in     Wed Sep 29 01:56:24 1999
-+++ FreeWnn-1.1.1-a013/makerule.mk.in  Mon Jan 31 13:26:50 2000
-@@ -113,7 +113,7 @@
-          prefix = @prefix@
+--- FreeWnn-1.1.1-a023/makerule.mk.in.orig     2013-06-06 20:24:38.000000000 +0200
++++ FreeWnn-1.1.1-a023/makerule.mk.in  2016-09-27 18:05:54.526987800 +0200
+@@ -136,7 +136,7 @@
      exec_prefix = @exec_prefix@
-          PREFIX = @prefix@
--      WNNWNNDIR = ${PREFIX}/lib/wnn
+          bindir = @bindir@
+         sbindir = @sbindir@
+-      WNNWNNDIR = $(exec_prefix)/lib/wnn
 +      WNNWNNDIR = /etc/FreeWnn
-       WNNBINDIR = ${PREFIX}/bin
+       WNNBINDIR = $(bindir)
+      WNNSBINDIR = @WNNSBINDIR@
        WNNINCDIR = @includedir@
-       WNNLIBDIR = @libdir@
-@@ -125,9 +125,9 @@
+@@ -157,12 +157,12 @@
+   WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic
+ 
           WNNTOP = $(IMTOP)/Wnn
 -       JWNNLANG = ja_JP
 +       JWNNLANG = ja
       JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG)
--     JWNNBINDIR = $(WNNBINDIR)/Wnn4
-+     JWNNBINDIR = $(WNNBINDIR)
+      JWNNBINDIR = $(WNNBINDIR)$(JWNNSUBBINDIR)
+     JWNNSBINDIR = $(WNNSBINDIR)$(JWNNSUBBINDIR)
       JWNNINCDIR = $(WNNINCDIR)/wnn
 -     JWNNDICDIR = $(JWNNWNNDIR)/dic
 +     JWNNDICDIR = /var/lib/wnn/$(JWNNLANG)/dic
    JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
  JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons
    JWNNFZKSRCDIR = $(JWNNDICDIR)/src
-@@ -155,8 +155,8 @@
-        CWNNLANG = zh_CN
-      CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG)
+@@ -193,7 +193,7 @@
       CWNNINCDIR = $(WNNINCDIR)/cwnn
--     CWNNBINDIR = $(WNNBINDIR)/cWnn4
+      CWNNBINDIR = $(WNNBINDIR)$(CWNNSUBBINDIR)
+     CWNNSBINDIR = $(WNNSBINDIR)$(CWNNSUBBINDIR)
 -     CWNNDICDIR = $(CWNNWNNDIR)/dic
-+     CWNNBINDIR = $(WNNBINDIR)
 +     CWNNDICDIR = /var/lib/wnn/$(CWNNLANG)/dic
    CWNNSYSDICDIR = $(CWNNDICDIR)/sys
        CWNNCDSRC = $(CWNNTOP)/cd
      CWNNCDICSRC = $(CWNNTOP)/cdic
-@@ -178,8 +178,8 @@
-        KWNNLANG = ko_KR
-      KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG)
+@@ -217,7 +217,7 @@
       KWNNINCDIR = $(WNNINCDIR)/kwnn
--     KWNNBINDIR = $(WNNBINDIR)/kWnn4
+      KWNNBINDIR = $(WNNBINDIR)$(KWNNSUBBINDIR)
+     KWNNSBINDIR = $(WNNSBINDIR)$(KWNNSUBBINDIR)
 -     KWNNDICDIR = $(KWNNWNNDIR)/dic
-+     KWNNBINDIR = $(WNNBINDIR)
 +     KWNNDICDIR = /var/lib/wnn/$(KWNNLANG)/dic
    KWNNSYSDICDIR = $(KWNNDICDIR)/sys
        KWNNKDSRC = $(KWNNTOP)/kd
      KWNNKDICSRC = $(KWNNTOP)/kdic
-@@ -199,7 +199,7 @@
+@@ -237,7 +237,7 @@
  
         TWNNLANG = zh_TW
       TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG)

diff --git a/FreeWnn-format.patch b/FreeWnn-format.patch
deleted file mode 100644 (file)
index ad5fa9a..0000000
--- a/FreeWnn-format.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- FreeWnn-1.1.1-a021/Wnn/jutil/wddel.c.orig  2002-05-13 00:51:17.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/jutil/wddel.c       2012-11-17 16:52:08.354757471 +0100
-@@ -95,8 +95,8 @@ usage ()
- static void
- err ()
- {
--  printf ((char *) wnn_perror ());
--  printf ("\n bye.\n");
-+  puts ((char *) wnn_perror ());
-+  printf (" bye.\n");
-   exit (1);
- }
- 
---- FreeWnn-1.1.1-a021/Wnn/jutil/wdreg.c.orig  2002-05-13 00:51:17.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/jutil/wdreg.c       2012-11-17 16:52:18.701902804 +0100
-@@ -95,8 +95,8 @@ usage ()
- static void
- err ()
- {
--  printf ((char *) wnn_perror ());
--  printf ("\n bye.\n");
-+  puts ((char *) wnn_perror ());
-+  printf (" bye.\n");
-   exit (1);
- }
- 

diff --git a/FreeWnn-ja.patch b/FreeWnn-ja.patch
index fb29747608b611c8d4d93956b2b5ffe090ab1c8e..c12c2002b1b12f21ddfa438f24959525c8a8aae1 100644 (file)
--- a/FreeWnn-ja.patch
+++ b/FreeWnn-ja.patch
@@ -120,14 +120,3 @@
      }
    else
      {
---- FreeWnn-1.1.1-a017.org/Wnn/uum/header.c    Thu Feb 24 00:31:42 2000
-+++ FreeWnn-1.1.1-a017/Wnn/uum/header.c        Thu Jul  6 11:46:50 2000
-@@ -131,7 +131,7 @@
- 
- FuncDataBase function_db[] = {
- #ifdef JAPANESE
--  {"ja_JP",
-+  {"ja",
-    {NULL, NULL, call_t_redraw_move_normal,
-     call_t_redraw_move_1_normal, call_t_redraw_move_2_normal,
-     call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal,

diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init
index a2bdd29fdcf2ce6c0298b1c7166a581fbdf54f0b..f5e34057058db5cef94899d65b41dac27e72cc14 100644 (file)
--- a/FreeWnn-kWnn.init
+++ b/FreeWnn-kWnn.init
@@ -35,7 +35,7 @@ start() {
        if [ ! -f /var/lock/subsys/kWnn ]; then
                msg_starting kWnn
                rm -f /tmp/kd_sockV4
-               ( su - wnn -s /bin/sh -c '/usr/bin/kserver' | grep "Finished" > /dev/null ) \
+               ( su - wnn -s /bin/sh -c '/usr/sbin/kserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/kWnn || RETVAL=1

diff --git a/FreeWnn-libtool.patch b/FreeWnn-libtool.patch
deleted file mode 100644 (file)
index 17b5c9a..0000000
--- a/FreeWnn-libtool.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- FreeWnn-1.1.1-a021/Wnn/romkan/Makefile.in.orig     2002-03-30 10:34:45.000000000 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/romkan/Makefile.in  2012-11-16 22:01:54.311076705 +0100
-@@ -46,7 +46,7 @@
- 
- .c.o:
-       $(RM) $@
--      $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
-       $(RM) -r .libs
---- FreeWnn-1.1.1-a021/Wnn/jlib.V3/Makefile.in.orig    2003-05-11 20:31:44.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/jlib.V3/Makefile.in 2012-11-16 22:28:08.311043918 +0100
-@@ -71,12 +71,12 @@
- 
- .c.o:
-       $(RM) $@
--      $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
- 
- all:: libjd.la
- 
- libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
--      $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
- 
- lintlib:: llib-ljd.ln
- 
-@@ -87,7 +87,7 @@
- install:: libjd.la
-       @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
-       else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
--      $(LIBTOOL) $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
-+      $(LIBTOOL) --mode=install $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
- 
- install:: jlib.h
-       @if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
-@@ -109,13 +109,13 @@
-       done
- 
- $(OBJ2) : $(SRC2)
--      $(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
- 
- $(OBJ3) : $(SRC3)
--      $(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
- 
- $(OBJ4) : $(SRC4)
--      $(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
- 
- depend:: .depend
- 
---- FreeWnn-1.1.1-a021/cWnn/romkan/Makefile.in.orig    2002-03-30 10:34:46.000000000 +0100
-+++ FreeWnn-1.1.1-a021/cWnn/romkan/Makefile.in 2012-11-17 13:21:51.449926244 +0100
-@@ -48,7 +48,7 @@
- 
- .c.o:
-       $(RM) $@
--      $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
-       $(RM) -r .libs
---- FreeWnn-1.1.1-a021/kWnn/romkan/Makefile.in.orig    2002-03-30 10:34:46.000000000 +0100
-+++ FreeWnn-1.1.1-a021/kWnn/romkan/Makefile.in 2012-11-17 14:06:00.029871041 +0100
-@@ -48,7 +48,7 @@
- 
- .c.o:
-       $(RM) $@
--      $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
-       $(RM) -r .libs

diff --git a/FreeWnn-link.patch b/FreeWnn-link.patch
index 864e4526573d7335fc9f8767c9f3b69614321b1f..8acbcc2139ae3173bb652b3d3c686e60ae52072d 100644 (file)
--- a/FreeWnn-link.patch
+++ b/FreeWnn-link.patch
@@ -1,59 +1,13 @@
---- FreeWnn-1.1.1-a021/configure.in.orig       2005-11-27 18:30:23.000000000 +0100
-+++ FreeWnn-1.1.1-a021/configure.in    2012-11-17 14:53:01.219812239 +0100
-@@ -359,9 +359,9 @@
- dnl ### AC_CHECK_LIB(curses, main)
+--- FreeWnn-1.1.1-a023/configure.in.orig       2016-09-27 19:05:57.673613326 +0200
++++ FreeWnn-1.1.1-a023/configure.in    2016-09-27 20:09:17.573569935 +0200
+@@ -494,8 +494,8 @@
+ dnl ### AC_CHECK_LIB(X11, main)
  
  AC_SEARCH_LIBS(crypt, crypt)
 -AC_CHECK_LIB(socket, connect)
 -AC_CHECK_LIB(bind, getservbyname)
--AC_CHECK_LIB(nsl, gethostbyname)
-+AC_SEARCH_LIBS(socket, connect)
++AC_SEARCH_LIBS(connect, socket)
 +AC_SEARCH_LIBS(getservbyname, bind)
-+AC_SEARCH_LIBS(gethostbyname, nsl)
- 
- dnl
- dnl Checks for header files.
---- FreeWnn-1.1.1-a021/Wnn/jlib/Makefile.in.orig       2004-09-12 18:56:55.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/jlib/Makefile.in    2012-11-17 15:10:24.289790498 +0100
-@@ -101,7 +101,7 @@
- all:: libwnn.la
- 
- libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
--      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) -lcrypt
- 
- lintlib:: llib-lwnn.ln
- 
---- FreeWnn-1.1.1-a021/Wnn/jlib.V3/Makefile.in.orig    2012-11-17 14:43:37.889823979 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/jlib.V3/Makefile.in 2012-11-17 15:10:42.919790109 +0100
-@@ -76,7 +76,7 @@
- all:: libjd.la
- 
- libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
--      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) -lcrypt
- 
- lintlib:: llib-ljd.ln
- 
---- FreeWnn-1.1.1-a021/cWnn/jlib/Makefile.in.orig      2004-09-12 18:56:55.000000000 +0200
-+++ FreeWnn-1.1.1-a021/cWnn/jlib/Makefile.in   2012-11-17 15:10:58.336456455 +0100
-@@ -119,7 +119,7 @@
- all:: libcwnn.la
- 
- libcwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
--      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(CWNNJLIBVERSION)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(CWNNJLIBVERSION) -lcrypt
- 
- lintlib:: llib-lcwnn.ln
- 
---- FreeWnn-1.1.1-a021/kWnn/jlib/Makefile.in.orig      2004-09-12 18:56:55.000000000 +0200
-+++ FreeWnn-1.1.1-a021/kWnn/jlib/Makefile.in   2012-11-17 15:11:12.683122821 +0100
-@@ -130,7 +130,7 @@
- all:: libkwnn.la
- 
- libkwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
--      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(KWNNJLIBVERSION)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(KWNNJLIBVERSION) -lcrypt
- 
- lintlib:: llib-lkwnn.ln
- 
+ AC_SEARCH_LIBS(gethostbyname, nsl)
+ dnl libutil only needed by uum with openpty... (determine later)
+ AC_CHECK_LIB(util, openpty, [HAVE_LIBUTIL='have_libutil'])

diff --git a/FreeWnn-noroot.patch b/FreeWnn-noroot.patch
index bd774708503d50869d915e12fabaef9c07ed234a..53df990d8cab9be6744be262f0d22757f93271ce 100644 (file)
--- a/FreeWnn-noroot.patch
+++ b/FreeWnn-noroot.patch
@@ -60,17 +60,6 @@
        done
  
  install:: $(DIC)
---- FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in.orig        2012-11-16 19:46:06.104579893 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in     2012-11-16 19:50:54.297907224 +0100
-@@ -35,7 +35,7 @@
-        VPATH = @srcdir@
- 
- INSTALL         = @INSTALL@ $(INSTALLFLAGS)
--LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
-+LOCAL_INSTFLAGS = $(INSTUIDFLAGS)
- 
-        UUMOWNER = root
-        INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir)
 --- FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in.orig        2001-08-14 15:43:21.000000000 +0200
 +++ FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in     2012-11-16 19:51:15.051240552 +0100
 @@ -33,7 +33,7 @@
@@ -178,17 +167,6 @@
        done
  
  install:: $(ALLTGT)
---- FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in.orig       2012-11-16 19:46:06.121246559 +0100
-+++ FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in    2012-11-16 19:54:31.347902697 +0100
-@@ -37,7 +37,7 @@
-        UUMOWNER = root
-        INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) -I$(top_builddir)
-         DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF)
--LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
-+LOCAL_INSTFLAGS =
- LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@
- 
- HDRS= buffer.h cvtcode.h sdefine.h sheader.h
 --- FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in.orig   2004-05-21 18:39:32.000000000 +0200
 +++ FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in        2012-11-16 19:46:06.121246559 +0100
 @@ -38,7 +38,7 @@
@@ -232,14 +210,3 @@
        done
  
  install:: $(ALLTGT)
---- FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in.orig       2012-11-16 19:46:06.124579892 +0100
-+++ FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in    2012-11-16 19:55:21.141234990 +0100
-@@ -37,7 +37,7 @@
-        UUMOWNER = root
-        INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) -I$(top_builddir)
-         DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
--LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
-+LOCAL_INSTFLAGS =
- LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@
- 
- HDRS= buffer.h cvtcode.h sdefine.h sheader.h

diff --git a/FreeWnn-reuid.patch b/FreeWnn-reuid.patch
index c8f5d86adf4d36ea091e47f536afb38b6adf397d..6567e34518369a4060cc07f12c4d6d93b3c70799 100644 (file)
--- a/FreeWnn-reuid.patch
+++ b/FreeWnn-reuid.patch
@@ -10,16 +10,16 @@
    get_options (argc, argv);
    print_version();
    log_debug("invoked as %s.", argv[0]);
---- FreeWnn-1.1.1-a017/Wnn/uum/jhlp.c.orig     Mon Jan 22 18:28:06 2001
-+++ FreeWnn-1.1.1-a017/Wnn/uum/jhlp.c  Mon Jan 22 18:32:53 2001
-@@ -1297,8 +1297,8 @@
-       dup2 (ttypfd, 1);
-       dup2 (ttypfd, 2);
- #else /* linux */
+--- FreeWnn-1.1.1-a023/Wnn/uum/jhlp.c.orig     2016-09-27 18:18:54.713645559 +0200
++++ FreeWnn-1.1.1-a023/Wnn/uum/jhlp.c  2016-09-27 18:37:20.170299605 +0200
+@@ -1661,8 +1661,8 @@
+       ioctl (ttyfd, TIOCSWINSZ, &win);
+ #endif
+ #ifdef linux
 -      setgid (getgid ());
 -      setuid (getuid ());
-+      setregid (getegid(), getegid());
-+      setreuid (geteuid(), geteuid());
-       close (0);
-       close (1);
-       close (2);
++      setregid (getegid (), getegid ());
++      setreuid (geteuid (), geteuid ());
+ #endif
+       execvp (cmdnm, argv);
+       uum_err ("exec fault.");

diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init
index 9b0a587f1bbd40652ba1adb3e1f675977c41d82c..a095b746c7335295a2fcaddc45e3cc1878572ad4 100644 (file)
--- a/FreeWnn-tWnn.init
+++ b/FreeWnn-tWnn.init
@@ -35,7 +35,7 @@ start() {
        if [ ! -f /var/lock/subsys/tWnn ]; then
                msg_starting tWnn
                rm -f /tmp/td_sockV4
-               ( su - wnn -s /bin/sh -c '/usr/bin/tserver' | grep "Finished" > /dev/null ) \
+               ( su - wnn -s /bin/sh -c '/usr/sbin/tserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tWnn

diff --git a/FreeWnn.init b/FreeWnn.init
index a76a56c1f86ef05cb6761e4ed12c92625a082621..de77fe09e1b35ae3a528790476ffefa5ae085e5d 100644 (file)
--- a/FreeWnn.init
+++ b/FreeWnn.init
@@ -36,7 +36,7 @@ start() {
        if [ ! -f /var/lock/subsys/FreeWnn ]; then
                msg_starting FreeWnn
                rm -f /tmp/jd_sockV4
-               ( su - wnn -s /bin/sh -c '/usr/bin/jserver' | grep "Finished" > /dev/null ) \
+               ( su - wnn -s /bin/sh -c '/usr/sbin/jserver' | grep "Finished" > /dev/null ) \
                        && ok || fail
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/FreeWnn || RETVAL=1

diff --git a/FreeWnn.spec b/FreeWnn.spec
index b25aff7318044a06db707bc8cada3d06913bdc4d..a07f07d05e89107933caeb843185c61ab0753d21 100644 (file)
--- a/FreeWnn.spec
+++ b/FreeWnn.spec
@@ -2,14 +2,14 @@ Summary:      FreeWnn Japanese Input System
 Summary(pl.UTF-8):     FreeWnn - system wprowadzania znaków japońskich
 Name:          FreeWnn
 Version:       1.1.1
-%define        subver  a021
-Release:       0.%{subver}.3
+%define        subver  a023
+Release:       0.%{subver}.1
 Epoch:         2
 License:       LGPL v2+ (libraries), GPL v2+ (programs)
 Group:         Applications/System
 #Source0Download: http://sourceforge.jp/projects/freewnn/releases/
-Source0:       http://dl.sourceforge.jp/freewnn/17724/%{name}-%{version}-%{subver}.tar.bz2
-# Source0-md5: 7e15ab385932d58e3743400d303a05e6
+Source0:       http://dl.sourceforge.jp/freewnn/63271/%{name}-%{version}-%{subver}.tar.bz2
+# Source0-md5: c45660a76babef22995737ed45c16b4e
 Source1:       %{name}.init
 Source2:       %{name}-cWnn.init
 Source3:       %{name}-tWnn.init
@@ -20,11 +20,8 @@ Patch2:              %{name}-noroot.patch
 Patch3:                %{name}-jserverrc-g-jinmei.patch
 Patch4:                %{name}-reuid.patch
 Patch5:                %{name}-manpaths.patch
-Patch6:                %{name}-libtool.patch
-Patch7:                %{name}-cpp.patch
-Patch8:                %{name}-install.patch
-Patch9:                %{name}-link.patch
-Patch10:       %{name}-format.patch
+Patch6:                %{name}-install.patch
+Patch7:                %{name}-link.patch
 URL:           http://www.freewnn.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -258,9 +255,6 @@ Ten pakiet zawiera statyczną wersję biblioteki kWnn.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 cp -p Wnn-consortium/dic/README README.Wnn-consortium.dic
 
@@ -268,8 +262,9 @@ cp -p Wnn-consortium/dic/README README.Wnn-consortium.dic
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
-%configure
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+%configure \
+       --disable-traditional-layout
 
 %{__make} -j1
 
@@ -374,13 +369,13 @@ fi
 %attr(755,root,root) %{_bindir}/atod
 %attr(755,root,root) %{_bindir}/atof
 %attr(755,root,root) %{_bindir}/dtoa
-%attr(755,root,root) %{_bindir}/jserver
 %attr(755,root,root) %{_bindir}/oldatonewa
 %attr(755,root,root) %{_bindir}/wddel
 %attr(755,root,root) %{_bindir}/wdreg
-%attr(755,root,root) %{_bindir}/wnnkill
-%attr(755,root,root) %{_bindir}/wnnstat
 %attr(755,root,root) %{_bindir}/wnntouch
+%attr(755,root,root) %{_sbindir}/jserver
+%attr(755,root,root) %{_sbindir}/wnnkill
+%attr(755,root,root) %{_sbindir}/wnnstat
 %{_mandir}/man1/atod.1*
 %{_mandir}/man1/atof.1*
 %{_mandir}/man1/dtoa.1*
@@ -476,7 +471,7 @@ fi
 %files -n cWnn
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/cWnn
-%attr(755,root,root) %{_bindir}/cserver
+%attr(755,root,root) %{_sbindir}/cserver
 %dir %{_sysconfdir}/zh_CN
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_CN/cixing.data
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_CN/cserverrc
@@ -506,12 +501,11 @@ fi
 %attr(755,root,root) %{_bindir}/cdtoa
 %attr(755,root,root) %{_bindir}/cwddel
 %attr(755,root,root) %{_bindir}/cwdreg
-%attr(755,root,root) %{_bindir}/cwnnkill
-%attr(755,root,root) %{_bindir}/cwnnstat
 %attr(755,root,root) %{_bindir}/cwnntouch
+%attr(755,root,root) %{_sbindir}/cwnnkill
+%attr(755,root,root) %{_sbindir}/cwnnstat
 %{_mandir}/man1/catod.1*
 %{_mandir}/man1/catof.1*
-%{_mandir}/man1/cdicsort.1*
 %{_mandir}/man1/cdtoa.1*
 %{_mandir}/man1/cuum.1*
 %{_mandir}/man1/cwddel.1*
@@ -542,7 +536,7 @@ fi
 %files -n tWnn
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/tWnn
-%attr(755,root,root) %{_bindir}/tserver
+%attr(755,root,root) %{_sbindir}/tserver
 %dir %{_sysconfdir}/zh_TW
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_TW/cixing.data
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_TW/tserverrc
@@ -568,12 +562,12 @@ fi
 %attr(755,root,root) %{_bindir}/katod
 %attr(755,root,root) %{_bindir}/katof
 %attr(755,root,root) %{_bindir}/kdtoa
-%attr(755,root,root) %{_bindir}/kserver
 %attr(755,root,root) %{_bindir}/kwddel
 %attr(755,root,root) %{_bindir}/kwdreg
-%attr(755,root,root) %{_bindir}/kwnnkill
-%attr(755,root,root) %{_bindir}/kwnnstat
 %attr(755,root,root) %{_bindir}/kwnntouch
+%attr(755,root,root) %{_sbindir}/kwnnkill
+%attr(755,root,root) %{_sbindir}/kwnnstat
+%attr(755,root,root) %{_sbindir}/kserver
 %dir %{_sysconfdir}/ko_KR
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ko_KR/hinsi.data
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ko_KR/kserverrc