From 5a01efb3518ceb9395847384a8b9604e845172a9 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 15 Mar 2015 01:00:12 +0000 Subject: Update chasen packages to 2.4.5. It includes security problem of 2.4.4 which was already fixed by official patch. pkgsrc change: Add comment in patches. --- textproc/chasen-base/Makefile | 14 +-- textproc/chasen-base/distinfo | 20 ++-- textproc/chasen-base/patches/patch-ai | 4 +- textproc/chasen-base/patches/patch-aj | 4 +- textproc/chasen-base/patches/patch-ak | 14 ++- textproc/chasen-base/patches/patch-am | 4 +- textproc/chasen-base/patches/patch-an | 216 ---------------------------------- textproc/chasen/Makefile.common | 4 +- 8 files changed, 34 insertions(+), 246 deletions(-) delete mode 100644 textproc/chasen-base/patches/patch-an diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index aedafa52393..7f51b34698e 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,25 +1,25 @@ -# $NetBSD: Makefile,v 1.22 2012/10/25 06:55:44 asau Exp $ +# $NetBSD: Makefile,v 1.23 2015/03/15 01:00:12 taca Exp $ # DISTNAME= chasen-${CHASEN_VERSION} PKGNAME= chasen-base-${CHASEN_VERSION} -PKGREVISION= 2 CATEGORIES= japanese textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=chasen-legacy/32224/} - -PATCHFILES= chasen244-secfix.diff -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=chasen-legacy/54111/} -PATCH_DIST_STRIP= -p1 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=chasen-legacy/56305/} MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://chasen-legacy.sourceforge.jp/ COMMENT= ChaSen, Japanese Morphological Analysis System +LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes +USE_TOOLS+= autoconf OWN_DIRS= ${PREFIX}/${CHASEN_DICDIR} +pre-configure: + cd ${WRKSRC} && autoreconf -fi + .include "../../textproc/chasen/Makefile.common" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/darts/buildlink3.mk" diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo index 8c3b88d2508..f287dfb2604 100644 --- a/textproc/chasen-base/distinfo +++ b/textproc/chasen-base/distinfo @@ -1,13 +1,9 @@ -$NetBSD: distinfo,v 1.11 2011/12/11 14:26:27 taca Exp $ +$NetBSD: distinfo,v 1.12 2015/03/15 01:00:12 taca Exp $ -SHA1 (chasen-2.4.4.tar.gz) = 3328e6667d6b74955b6c4b1b49a7d97805e4de8c -RMD160 (chasen-2.4.4.tar.gz) = ceb4a7c064ba5bf0d356d6db0e64b644b88dbc54 -Size (chasen-2.4.4.tar.gz) = 845720 bytes -SHA1 (chasen244-secfix.diff) = 00ba85fa737376b875425a2d87772a2aa3b8dc95 -RMD160 (chasen244-secfix.diff) = f5ef2a427fd8f1d83be3f8c4df780e4d7a25fccd -Size (chasen244-secfix.diff) = 559 bytes -SHA1 (patch-ai) = 7a9ffd640c275c1361e34591d08c1ce519df5dc7 -SHA1 (patch-aj) = 8c440610abaa31b22950ef41149736feefc968e8 -SHA1 (patch-ak) = 39d16817f60d93fbe376446b111a05a590928a23 -SHA1 (patch-am) = 99ab251e3152737c1fd71211a6a3a9f5e018d39a -SHA1 (patch-an) = 423696afe03b870a9e8570bb923955ea1c6be5f1 +SHA1 (chasen-2.4.5.tar.gz) = a07d7f423531d2c155384bc6de64d515c5f0ac1c +RMD160 (chasen-2.4.5.tar.gz) = 9878b9fc37d9293a448be60b07fe8bfc1f85f91e +Size (chasen-2.4.5.tar.gz) = 830940 bytes +SHA1 (patch-ai) = 6983226e216732d66889c1d84143b34c26387019 +SHA1 (patch-aj) = d5db1597ddc0411a3813b868d2e42ad03315fcb5 +SHA1 (patch-ak) = 3d6e2e40128f422df155677e4e64c1fc9a526460 +SHA1 (patch-am) = 35ebfdaa966b3d67a8b155587546637356a34542 diff --git a/textproc/chasen-base/patches/patch-ai b/textproc/chasen-base/patches/patch-ai index cad93b2e7ae..1a8a62539cf 100644 --- a/textproc/chasen-base/patches/patch-ai +++ b/textproc/chasen-base/patches/patch-ai @@ -1,4 +1,6 @@ -$NetBSD: patch-ai,v 1.3 2004/05/06 13:32:38 taca Exp $ +$NetBSD: patch-ai,v 1.4 2015/03/15 01:00:12 taca Exp $ + +Fix path for pkgsrc. --- chasen-config.in.orig 2003-06-10 16:39:01.000000000 +0900 +++ chasen-config.in diff --git a/textproc/chasen-base/patches/patch-aj b/textproc/chasen-base/patches/patch-aj index ff03bbd54b4..f3783f3c338 100644 --- a/textproc/chasen-base/patches/patch-aj +++ b/textproc/chasen-base/patches/patch-aj @@ -1,4 +1,6 @@ -$NetBSD: patch-aj,v 1.3 2004/05/06 13:32:38 taca Exp $ +$NetBSD: patch-aj,v 1.4 2015/03/15 01:00:12 taca Exp $ + +Fix path for pkgsrc. --- mkchadic/Makefile.am.orig 2003-07-12 18:18:58.000000000 +0900 +++ mkchadic/Makefile.am diff --git a/textproc/chasen-base/patches/patch-ak b/textproc/chasen-base/patches/patch-ak index 3a382ae323b..df937bfbb0b 100644 --- a/textproc/chasen-base/patches/patch-ak +++ b/textproc/chasen-base/patches/patch-ak @@ -1,13 +1,15 @@ -$NetBSD: patch-ak,v 1.4 2007/08/02 15:03:10 taca Exp $ +$NetBSD: patch-ak,v 1.5 2015/03/15 01:00:12 taca Exp $ ---- mkchadic/Makefile.in.orig 2007-07-03 15:55:27.000000000 +0900 +Fix path for pkgsrc. + +--- mkchadic/Makefile.in.orig 2012-06-25 22:37:25.000000000 +0000 +++ mkchadic/Makefile.in -@@ -184,7 +184,7 @@ LDADD = $(top_builddir)/lib/libchasen.la - LINK = $(LIBTOOL) --mode=link \ +@@ -160,7 +160,7 @@ LINK = $(LIBTOOL) --mode=link \ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + -pkglibexecdir = ${libexecdir}/chasen +pkglibexecdir = ${sbindir} + pkglibexec_PROGRAMS = makemat makeda + makemat_SOURCES = makemat.c - makeda_SOURCES = translate.c dumpdic.c - all: all-am diff --git a/textproc/chasen-base/patches/patch-am b/textproc/chasen-base/patches/patch-am index fadf645fbb0..e3a541f2ef4 100644 --- a/textproc/chasen-base/patches/patch-am +++ b/textproc/chasen-base/patches/patch-am @@ -1,4 +1,6 @@ -$NetBSD: patch-am,v 1.3 2008/08/03 15:24:05 taca Exp $ +$NetBSD: patch-am,v 1.4 2015/03/15 01:00:12 taca Exp $ + +Check for iconv. --- configure.in.orig 2008-07-23 13:15:36.000000000 +0900 +++ configure.in diff --git a/textproc/chasen-base/patches/patch-an b/textproc/chasen-base/patches/patch-an deleted file mode 100644 index 2ab5b11c97f..00000000000 --- a/textproc/chasen-base/patches/patch-an +++ /dev/null @@ -1,216 +0,0 @@ -$NetBSD: patch-an,v 1.2 2007/08/02 15:03:11 taca Exp $ - ---- configure.orig 2007-07-03 15:27:07.000000000 +0900 -+++ configure -@@ -20608,7 +20608,8 @@ done - - - --for ac_header in io.h windows.h -+ -+for ac_header in io.h windows.h iconv.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -22331,32 +22332,20 @@ if test "${with_libiconv+set}" = set; th - fi - - -- --{ echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 --echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; } --if test "${ac_cv_lib_iconv_iconv+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-liconv $LIBS" -+save_libs="$LIBS" -+LIBS="$LIBS -liconv" -+ac_cv_lib_iconv_iconv=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char iconv (); -+#include - int - main () - { --return iconv (); -+iconv(0, 0, 0, 0, 0) - ; - return 0; - } -@@ -22384,160 +22373,15 @@ else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_iconv_iconv=no -+ { { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5 -+echo "$as_me: error: ChaSen needs iconv" >&2;} -+ { (exit 1); exit 1; }; } - fi - - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi - { echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5 - echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6; } --if test $ac_cv_lib_iconv_iconv = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBICONV 1 --_ACEOF -- -- LIBS="-liconv $LIBS" -- --else -- -- if test "${ac_cv_header_iconv_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for iconv.h" >&5 --echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } --if test "${ac_cv_header_iconv_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 --echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } --else -- # Is the header compilable? --{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 --echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -- --# Is the header present? --{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 --echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} -- -- ;; --esac --{ echo "$as_me:$LINENO: checking for iconv.h" >&5 --echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } --if test "${ac_cv_header_iconv_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_iconv_h=$ac_header_preproc --fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 --echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -- --fi --if test $ac_cv_header_iconv_h = yes; then -- : --else -- { { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5 --echo "$as_me: error: ChaSen needs iconv" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- --fi -- - - - diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common index 4b4199adda6..42f2c145e97 100644 --- a/textproc/chasen/Makefile.common +++ b/textproc/chasen/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.10 2014/10/05 16:41:09 wiz Exp $ +# $NetBSD: Makefile.common,v 1.11 2015/03/15 01:00:12 taca Exp $ # # used by textproc/ipadic/Makefile # used by textproc/chasen-base/Makefile -CHASEN_VERSION= 2.4.4 +CHASEN_VERSION= 2.4.5 .include "../../mk/bsd.prefs.mk" -- cgit v1.2.3