diff options
Diffstat (limited to 'app-i18n/freewnn/files')
-rw-r--r-- | app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch | 318 | ||||
-rw-r--r-- | app-i18n/freewnn/files/freewnn-Wformat-security.patch | 143 | ||||
-rw-r--r-- | app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch | 13 | ||||
-rw-r--r-- | app-i18n/freewnn/files/freewnn.confd-r1 | 1 | ||||
-rw-r--r-- | app-i18n/freewnn/files/freewnn.initd | 16 | ||||
-rw-r--r-- | app-i18n/freewnn/files/freewnn.initd-r1 | 17 |
6 files changed, 0 insertions, 508 deletions
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch deleted file mode 100644 index 058225c36ee5..000000000000 --- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch +++ /dev/null @@ -1,318 +0,0 @@ -Description: Fix potential race condition when building in parallel mode -Origin: upstream, http://cvs.sourceforge.jp/cvs/view/freewnn/FreeWnn/Wnn/pubdicplus/Makefile.in?r1=1.7&r2=1.8&view=patch -Bug-Debian: http://bugs.debian.org/724058 - ---- a/Wnn/pubdicplus/Makefile.in 2010/02/22 17:06:54 1.7 -+++ b/Wnn/pubdicplus/Makefile.in 2013/11/08 18:54:44 1.8 -@@ -1,5 +1,5 @@ - # --# $Id: Makefile.in,v 1.7 2010/02/22 17:06:54 aonoto Exp $ -+# $Id: Makefile.in,v 1.8 2013/11/08 18:54:44 aonoto Exp $ - # - - # -@@ -10,7 +10,7 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010, 2013 - # - # Maintainer: FreeWnn Project - # -@@ -42,13 +42,12 @@ - ATOF = $(WNNJUTILOBJ)/atof - WNNTOUCH = $(WNNJUTILOBJ)/wnntouch - HINSI = @HINSI_DATA@ -- FZK_FLAG = - - LINKS = Version bio.hd chimei.hd computer.hd fzk.attr fzk.con fzk.fzkattr fzk.jirattr fzk.jircon fzk.master fzk.shuutan jinmei.hd kihon.hd koyuu.hd setsuji.hd special.hd special.u symbol.hd tankan.hd - - WNNDICS = bio.u chimei.u computer.u jinmei.u kihon.u koyuu.u setsuji.u symbol.u tankan.u - --FZK_SRC= fzk.master fzk.attr fzk.jirattr fzk.fzkattr fzk.jircon fzk.con fzk.shuutan -+FZK_SRC= fzk.master-.c fzk.attr fzk.jirattr fzk.fzkattr fzk.jircon fzk.con fzk.shuutan - - DIC= bio.dic chimei.dic computer.dic jinmei.dic kihon.dic koyuu.dic setsuji.dic special.dic symbol.dic tankan.dic - -@@ -68,24 +67,14 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: Version -- - depend:: Version - --clean:: -- $(RM) Version -- - bio.hd: $(PUBDICPLUSSRC)/bio.hd - $(RM) $@ - $(LN) $? $@ - --includes:: bio.hd -- - depend:: bio.hd - --clean:: -- $(RM) bio.hd -- - # bio.u: $(PUBDICPLUSSRC)/bio.u - # $(RM) $@ - # $(LN) $? $@ -@@ -101,13 +90,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: chimei.hd -- - depend:: chimei.hd - --clean:: -- $(RM) chimei.hd -- - # chimei.u: $(PUBDICPLUSSRC)/chimei.u - # $(RM) $@ - # $(LN) $? $@ -@@ -123,13 +107,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: computer.hd -- - depend:: computer.hd - --clean:: -- $(RM) computer.hd -- - # computer.u: $(PUBDICPLUSSRC)/computer.u - # $(RM) $@ - # $(LN) $? $@ -@@ -145,90 +124,50 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.attr -- - depend:: fzk.attr - --clean:: -- $(RM) fzk.attr -- - fzk.con: $(PUBDICPLUSSRC)/fzk.con - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.con -- - depend:: fzk.con - --clean:: -- $(RM) fzk.con -- - fzk.fzkattr: $(PUBDICPLUSSRC)/fzk.fzkattr - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.fzkattr -- - depend:: fzk.fzkattr - --clean:: -- $(RM) fzk.fzkattr -- - fzk.jirattr: $(PUBDICPLUSSRC)/fzk.jirattr - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.jirattr -- - depend:: fzk.jirattr - --clean:: -- $(RM) fzk.jirattr -- - fzk.jircon: $(PUBDICPLUSSRC)/fzk.jircon - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.jircon -- - depend:: fzk.jircon - --clean:: -- $(RM) fzk.jircon -- - fzk.master: $(PUBDICPLUSSRC)/fzk.master - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.master -- - depend:: fzk.master - --clean:: -- $(RM) fzk.master -- - fzk.shuutan: $(PUBDICPLUSSRC)/fzk.shuutan - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.shuutan -- - depend:: fzk.shuutan - --clean:: -- $(RM) fzk.shuutan -- - jinmei.hd: $(PUBDICPLUSSRC)/jinmei.hd - $(RM) $@ - $(LN) $? $@ - --includes:: jinmei.hd -- - depend:: jinmei.hd - --clean:: -- $(RM) jinmei.hd -- - # jinmei.u: $(PUBDICPLUSSRC)/jinmei.u - # $(RM) $@ - # $(LN) $? $@ -@@ -244,13 +183,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: kihon.hd -- - depend:: kihon.hd - --clean:: -- $(RM) kihon.hd -- - # kihon.u: $(PUBDICPLUSSRC)/kihon.u - # $(RM) $@ - # $(LN) $? $@ -@@ -266,13 +200,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: koyuu.hd -- - depend:: koyuu.hd - --clean:: -- $(RM) koyuu.hd -- - # koyuu.u: $(PUBDICPLUSSRC)/koyuu.u - # $(RM) $@ - # $(LN) $? $@ -@@ -288,13 +217,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: setsuji.hd -- - depend:: setsuji.hd - --clean:: -- $(RM) setsuji.hd -- - # setsuji.u: $(PUBDICPLUSSRC)/setsuji.u - # $(RM) $@ - # $(LN) $? $@ -@@ -310,35 +234,20 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: special.hd -- - depend:: special.hd - --clean:: -- $(RM) special.hd -- - special.u: $(PUBDICPLUSSRC)/special.u - $(RM) $@ - $(LN) $? $@ - --includes:: special.u -- - depend:: special.u - --clean:: -- $(RM) special.u -- - symbol.hd: $(PUBDICPLUSSRC)/symbol.hd - $(RM) $@ - $(LN) $? $@ - --includes:: symbol.hd -- - depend:: symbol.hd - --clean:: -- $(RM) symbol.hd -- - # symbol.u: $(PUBDICPLUSSRC)/symbol.u - # $(RM) $@ - # $(LN) $? $@ -@@ -354,13 +263,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: tankan.hd -- - depend:: tankan.hd - --clean:: -- $(RM) tankan.hd -- - # tankan.u: $(PUBDICPLUSSRC)/tankan.u - # $(RM) $@ - # $(LN) $? $@ -@@ -421,16 +325,14 @@ - $(RM) $@ - $(LN) $? $@ - --std.fzk: fzk.master-.c $(FZK_SRC) -- $(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+std.fsrc: $(FZK_SRC) -+ $(FZK_PP) fzk.master-.c > $@ -+ -+full.fsrc: $(FZK_SRC) -+ $(FZK_PP) -DKANSAI fzk.master-.c > $@ - --full.fzk: $(FZK_SRC) -- $(MAKE) FZK_FLAG=-DKANSAI std.fzk -- $(MV) std.fzk $@ -- --kougo.fzk: $(FZK_SRC) -- $(MAKE) FZK_FLAG=-DKOUGO std.fzk -- $(MV) std.fzk $@ -+kougo.fsrc: $(FZK_SRC) -+ $(FZK_PP) -DKOUGO fzk.master-.c > $@ - - # additional rule from PubdicPlus/Makefile.in : by aono - pod.o: $(PUBDICPLUSSRC)/pod.c -@@ -442,7 +344,7 @@ - $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.p - ./pod $(PUBDICPLUSSRC)/pubdic.p -w -1 -k `basename $@ .u` > $@ - --.SUFFIXES: .hd .u .dic .more -+.SUFFIXES: .hd .u .dic .more .fsrc .fzk - - .u.dic: - cat $*.hd $< | $(ATOD) -p $(VERSION) -P $(VERSION) -h $(HINSI) $@ -@@ -450,7 +352,10 @@ - .hd.more: - $(ATOD) -h $(HINSI) $@ < $< - -+.fsrc.fzk: -+ egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@ -+ - $(DIC): $(HINSI) - - clean:: -- $(RM) -f *.fzk *.dic *.more fzk.master-.c pod $(LINKS) -+ $(RM) -f *.fsrc *.dic *.more fzk.master-.c pod $(LINKS) $(FZKDATA) diff --git a/app-i18n/freewnn/files/freewnn-Wformat-security.patch b/app-i18n/freewnn/files/freewnn-Wformat-security.patch deleted file mode 100644 index b5b68314060d..000000000000 --- a/app-i18n/freewnn/files/freewnn-Wformat-security.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/Wnn/uum/jhlp.c -+++ b/Wnn/uum/jhlp.c -@@ -1135,7 +1135,7 @@ - else - { - signal (SIGCHLD, SIG_IGN); -- printf (MSG_GET (3)); -+ printf ("%s", MSG_GET (3)); - /* - printf("\r\nuumを終わります。\r\n"); - */ -@@ -1212,8 +1212,8 @@ - - if ((buf = (unsigned char *) malloc (maxchg * 4)) == NULL) - { -- printf (MSG_GET (2)); -- printf (MSG_GET (3)); -+ printf ("%s", MSG_GET (2)); -+ printf ("%s", MSG_GET (3)); - /* - printf("malloc に失敗しました。uumを終わります。\r\n"); - */ ---- a/Wnn/uum/jis_in.c -+++ b/Wnn/uum/jis_in.c -@@ -64,7 +64,7 @@ - - completely_start: - throw_c (0); /* モード表示の後に出す */ -- printf (MSG_GET (6)); -+ printf ("%s", MSG_GET (6)); - /* - printf("JISコード: "); - */ ---- a/Wnn/uum/jutil.c -+++ b/Wnn/uum/jutil.c -@@ -489,7 +489,7 @@ - /* - printf("只今、辞書を読み込んでいます。"); - */ -- printf (MSG_GET (60)); -+ printf ("%s", MSG_GET (60)); - flush (); - - if ((id = jl_dic_add (bun_data_, fname, hfname, 0, prio, rdonly, hrdonly, NULL, NULL, yes_or_no_or_newline, print_msg1)) == -1 && wnn_errorno != -1) -@@ -571,7 +571,7 @@ - int x; - throw_c (0); - clr_line (); -- printf (string); -+ printf ("%s", string); - flush (); - for (;;) - { ---- a/Wnn/uum/kensaku.c -+++ b/Wnn/uum/kensaku.c -@@ -112,7 +112,7 @@ - u_s_on (); - w_printf (kana_buf, maxlength - strlen (MSG_GET (27)) - 2); - u_s_off (); -- printf (MSG_GET (27)); -+ printf ("%s", MSG_GET (27)); - flush (); - keyin (); - return (NULL); ---- a/Wnn/uum/kuten.c -+++ b/Wnn/uum/kuten.c -@@ -63,7 +63,7 @@ - - completely_start: - throw_c (0); /* モード表示の後に出す */ -- printf (MSG_GET (7)); -+ printf ("%s", MSG_GET (7)); - /* - printf("区点 : "); - */ ---- a/Wnn/uum/prologue.c -+++ b/Wnn/uum/prologue.c -@@ -144,7 +144,7 @@ - /* - fprintf(stderr,"初期化でmalloc不能。\n"); - */ -- fprintf (stderr, MSG_GET (2)); -+ fprintf (stderr, "%s", MSG_GET (2)); - return (-1); - } - ---- a/Wnn/uum/screen.c -+++ b/Wnn/uum/screen.c -@@ -547,7 +547,7 @@ - { - push_cursor (); - throw_c (0); -- printf (msg); -+ printf ("%s", msg); - pop_cursor (); - flush (); - } ---- a/Wnn/uum/sdefine.h -+++ b/Wnn/uum/sdefine.h -@@ -191,8 +191,8 @@ - - - #define flush() fflush(stdout) --#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();pop_cursor();} --#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();keyin();pop_cursor();} -+#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();pop_cursor();} -+#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();keyin();pop_cursor();} - - - #define UNDER_LINE_MODE (0x02 | 0x08 | 0x20) ---- a/Wnn/uum/select_ele.c -+++ b/Wnn/uum/select_ele.c -@@ -224,7 +224,7 @@ - - throw_c (0); - clr_line (); -- printf (msg); -+ printf ("%s", msg); - for (k = dd[cc]; k < dd[cc + 1]; k++) - { - cp = findcp (k, cc); ---- a/Wnn/uum/termio.c -+++ b/Wnn/uum/termio.c -@@ -100,7 +100,7 @@ - - if ((strlen (Term_Name) > 2) && (strcmp (Term_Name + (strlen (Term_Name) - 2), "-j") == 0)) - { -- fprintf (stderr, MSG_GET (4)); -+ fprintf (stderr, "%s", MSG_GET (4)); - /* - fprintf(stderr,"Uum:uumからuumはおこせません。\n"); - */ ---- a/Wnn/uum/wnnrc_op.c -+++ b/Wnn/uum/wnnrc_op.c -@@ -754,7 +754,7 @@ - return fp; - } - error: -- fprintf (stderr, MSG_GET (14)); -+ fprintf (stderr, "%s", MSG_GET (14)); - /* - fprintf(stderr , "uumrc ファイルがありません。"); - */ diff --git a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch deleted file mode 100644 index 919492d912c6..000000000000 --- a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Wnn/include/wnn_config.h -+++ b/Wnn/include/wnn_config.h -@@ -149,8 +149,8 @@ - #define TTY_KCODE J_EUJIS - #define PTY_KCODE J_EUJIS - # else /* !DGUX */ --#define TTY_KCODE J_JIS --#define PTY_KCODE J_JIS -+#define TTY_KCODE J_EUJIS -+#define PTY_KCODE J_EUJIS - # endif - #endif - diff --git a/app-i18n/freewnn/files/freewnn.confd-r1 b/app-i18n/freewnn/files/freewnn.confd-r1 deleted file mode 100644 index c64e27196d50..000000000000 --- a/app-i18n/freewnn/files/freewnn.confd-r1 +++ /dev/null @@ -1 +0,0 @@ -FREEWNN_OPTS="" diff --git a/app-i18n/freewnn/files/freewnn.initd b/app-i18n/freewnn/files/freewnn.initd deleted file mode 100644 index ef4e20cf37c8..000000000000 --- a/app-i18n/freewnn/files/freewnn.initd +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/Wnn4/jserver" - -depend() { - use logger - need net -} - -stop() { - ebegin "Stopping ${name:-${RC_SVCNAME}}" - /usr/bin/Wnn4/wnnkill - eend ${?} -} diff --git a/app-i18n/freewnn/files/freewnn.initd-r1 b/app-i18n/freewnn/files/freewnn.initd-r1 deleted file mode 100644 index 57fd448f801c..000000000000 --- a/app-i18n/freewnn/files/freewnn.initd-r1 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/sbin/jserver" -command_args="${FREEWNN_OPTS}" - -depend() { - use logger - need net -} - -stop() { - ebegin "Stopping ${name:-${RC_SVCNAME}}" - /usr/sbin/wnnkill - eend ${?} -} |