diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/w3m/DESCR | 7 | ||||
-rw-r--r-- | www/w3m/Makefile | 39 | ||||
-rw-r--r-- | www/w3m/PLIST | 9 | ||||
-rw-r--r-- | www/w3m/distinfo | 16 | ||||
-rw-r--r-- | www/w3m/patches/patch-aa | 39 | ||||
-rw-r--r-- | www/w3m/patches/patch-ab | 16 | ||||
-rw-r--r-- | www/w3m/patches/patch-af | 38 | ||||
-rw-r--r-- | www/w3m/patches/patch-ag | 41 | ||||
-rw-r--r-- | www/w3m/patches/patch-ah | 24 | ||||
-rw-r--r-- | www/w3m/patches/patch-ai | 17 | ||||
-rw-r--r-- | www/w3m/patches/patch-aj | 52 |
11 files changed, 40 insertions, 258 deletions
diff --git a/www/w3m/DESCR b/www/w3m/DESCR index 1231ec4dc52..172c7780c73 100644 --- a/www/w3m/DESCR +++ b/www/w3m/DESCR @@ -8,7 +8,7 @@ It uses Boehm-GC to implement the table/frame parser. Quoted from README.m17n: Muntilingualizaion of w3m - 2001/03/24 + 2002/02/16 H. Sakamoto Introduction @@ -16,8 +16,9 @@ Introduction I have tried the muntilingualization of w3m (w3m-m17n). The patch for w3m-0.2.1 is available on the following site. - http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/w3m-m17n-0.18.tar.gz - README.m17n + http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n + patch/w3m-0.2.5-m17n-20020216.tar.gz + patch/README.m17n It is a development version. And enough test is not preformed because I can understand Japanese only. Please use, test, and report bugs. diff --git a/www/w3m/Makefile b/www/w3m/Makefile index e02e79dcf05..2411830db4b 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,24 +1,19 @@ -# $NetBSD: Makefile,v 1.29 2001/11/29 01:12:52 hubertf Exp $ +# $NetBSD: Makefile,v 1.30 2002/03/02 00:08:15 kei Exp $ # -DISTNAME= w3m-0.2.1 -PKGNAME= w3m-0.2.1.0.19 -PKGREVISION= 2 +DISTNAME= w3m-0.2.5-m17n-20020216 +PKGNAME= w3m-0.2.5 CATEGORIES= www -MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ - -PATCH_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ -PATCHFILES= w3m-0.2.1-m17n-0.19.patch.gz -PATCH_DIST_STRIP= -p1 +MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ COMMENT= multilingualized version of a pager/text-based browser w3m -DEPENDS= boehm-gc>=5.3:../../devel/boehm-gc - CONFLICTS+= w3m-m17n-[0-9]* +USE_BUILDLINK_ONLY= yes + HELPDIR= share/doc/w3m HELPERDIR= lib/w3m @@ -57,10 +52,10 @@ CONFIGURE_ENV+= use_unicode=n .endif CONFIGURE_ENV+= charset=ISO-2022-JP-2 .if ${W3M_USE_JAPANESE_MESSAGES} == YES -CONFIGURE_ENV+= lang=ja +CONFIGURE_ARGS+= --lang=ja HELP_LANG= _ja .else -CONFIGURE_ENV+= lang=en +CONFIGURE_ARGS+= --lang=en HELP_LANG= _en .endif .if ${W3M_USE_COLOR} == YES @@ -81,6 +76,9 @@ CONFIGURE_ENV+= use_cookie=n .if ${W3M_USE_SSL} == YES USE_SSL= YES CONFIGURE_ENV+= use_ssl=y use_ssl_verify=n +CONFIGURE_ARGS+= --ssl-includedir=${BUILDLINK_DIR}/include/openssl +CONFIGURE_ARGS+= --ssl-libdir=${BUILDLINK_DIR}/lib +.include "../../security/openssl/buildlink.mk" .else CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n .endif @@ -91,16 +89,20 @@ HELP_W3M= -lynx CONFIGURE_ENV+= lynx_key=n HELP_W3M= -w3m .endif -CONFIGURE_ENV+= def_bindir=${LOCALBASE}/bin -CONFIGURE_ENV+= def_libdir=${LOCALBASE}/${HELPERDIR} -CONFIGURE_ENV+= def_helpdir=${LOCALBASE}/${HELPDIR} CONFIGURE_ENV+= use_menu=y use_matrix=n ansi_color=y CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser= CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap" CONFIGURE_ENV+= dldflags="-Wl,-rpath,${LOCALBASE}/lib -L${LOCALBASE}/lib" CONFIGURE_ENV+= dmodel=6 CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -CONFIGURE_ARGS+= -suffix= +CONFIGURE_ARGS+= --yes +CONFIGURE_ARGS+= --suffix= +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --bindir=${PREFIX}/bin +CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} +CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} +CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include +CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib post-extract: @(cd ${WRKSRC}/doc; ${RM} -fr CVS) @@ -111,7 +113,7 @@ post-patch: # do not look at previous configuration do-configure: - @yes '' | (cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \ + @(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \ INSTALL="${INSTALL_SCRIPT}" \ CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) @@ -144,4 +146,5 @@ post-install: ${RM} -f w3mhelp.html; \ ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html) +.include "../../devel/boehm-gc/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/PLIST b/www/w3m/PLIST index 9fdd79fee19..ad3921f74d0 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/02 00:08:15 kei Exp $ bin/w3m man/man1/w3m.1 man/ja_JP.EUC/man1/w3m.1 @@ -15,9 +15,9 @@ share/doc/w3m/doc/README share/doc/w3m/doc/README.cygwin share/doc/w3m/doc/README.dict share/doc/w3m/doc/README.func +share/doc/w3m/doc/README.img share/doc/w3m/doc/README.m17n share/doc/w3m/doc/STORY.html -share/doc/w3m/doc/history share/doc/w3m/doc/keymap.default share/doc/w3m/doc/keymap.lynx share/doc/w3m/doc/menu.default @@ -26,7 +26,6 @@ share/doc/w3m/doc/w3m.1 @comment share/doc/w3m/doc-jp share/doc/w3m/doc-jp/FAQ.html share/doc/w3m/doc-jp/HISTORY -share/doc/w3m/doc-jp/HISTORY.kokb share/doc/w3m/doc-jp/MANUAL.html share/doc/w3m/doc-jp/README share/doc/w3m/doc-jp/README.SSL @@ -34,14 +33,12 @@ share/doc/w3m/doc-jp/README.cookie share/doc/w3m/doc-jp/README.cygwin share/doc/w3m/doc-jp/README.dict share/doc/w3m/doc-jp/README.func -share/doc/w3m/doc-jp/README.hp +share/doc/w3m/doc-jp/README.img share/doc/w3m/doc-jp/README.keymap -share/doc/w3m/doc-jp/README.kokb share/doc/w3m/doc-jp/README.m17n share/doc/w3m/doc-jp/README.mailcap share/doc/w3m/doc-jp/README.menu share/doc/w3m/doc-jp/STORY.html -share/doc/w3m/doc-jp/TODO.m17n share/doc/w3m/doc-jp/keymap.default share/doc/w3m/doc-jp/keymap.lynx share/doc/w3m/doc-jp/menu.default diff --git a/www/w3m/distinfo b/www/w3m/distinfo index 974eac0a29b..feead70fe25 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1,13 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/09/28 10:10:40 itojun Exp $ +$NetBSD: distinfo,v 1.5 2002/03/02 00:08:15 kei Exp $ -SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29 -Size (w3m-0.2.1.tar.gz) = 844101 bytes -SHA1 (w3m-0.2.1-m17n-0.19.patch.gz) = fad1119054d27bff8683176ff0c02ba906535448 -Size (w3m-0.2.1-m17n-0.19.patch.gz) = 1245263 bytes -SHA1 (patch-aa) = 9c8e45448aedb1959d155eef355fe5d37599e11c -SHA1 (patch-ab) = 08a28e40907f8c3040b1e9253caf14b8b4f0dc7e -SHA1 (patch-af) = f43380334a92c609afef4058b03f1ef72ae77e2e -SHA1 (patch-ag) = e394cac02a053c8deb5cb6c2d946c9ae8edc891d -SHA1 (patch-ah) = 1d961e2a476a9e5d5422cc60fd1069823c3100cb -SHA1 (patch-ai) = 74a13fc7e13d6b989a64bef827ea6ebfe0abf57f -SHA1 (patch-aj) = cc098950a78dbf5a1bd2febf74f237ed60aac881 +SHA1 (w3m-0.2.5-m17n-20020216.tar.gz) = 7e754c61586818e731dc2a26f69a7c9505d2e640 +Size (w3m-0.2.5-m17n-20020216.tar.gz) = 2241365 bytes +SHA1 (patch-ab) = c0c21616d1d3557453648107eca26eaa91af4741 diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa deleted file mode 100644 index 41fd95dd22c..00000000000 --- a/www/w3m/patches/patch-aa +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2001/05/01 00:31:25 kei Exp $ - ---- configure.orig Sat Apr 21 13:43:38 2001 -+++ configure Sat Apr 21 13:44:34 2001 -@@ -194,7 +194,7 @@ - - find_ssl() { - sslinclude="" -- for i1 in /usr /usr/local -+ for i1 in /usr /usr/local /usr/pkg - do - for i2 in /openssl /ssl / - do -@@ -907,7 +907,7 @@ - gclib='' - gcinclude='' - gctarget='' --for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib -+for libdir in /lib /usr/lib ${LOCALBASE}/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib - do - if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then - echo "$libdir/libgc found" -@@ -915,7 +915,7 @@ - break - fi - done --for inc in /usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include -+for inc in /usr/include /usr/include/gc ${LOCALBASE}/include /usr/local/include /usr/local/include/gc ${HOME}/include - do - if [ -f $inc/gc.h ]; then - echo "$inc/gc.h found" -@@ -1600,6 +1600,7 @@ - if [ `expr "$perl" : 'not found'` != 0 ]; then - perl=/usr/local/bin/perl - fi -+perl=/usr/pkg/bin/perl - if [ $sysname = CYGWIN ]; then - cygwin=1 - else diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab index 9eee5c0a173..36143331432 100644 --- a/www/w3m/patches/patch-ab +++ b/www/w3m/patches/patch-ab @@ -1,21 +1,21 @@ -$NetBSD: patch-ab,v 1.8 2001/05/01 00:31:25 kei Exp $ +$NetBSD: patch-ab,v 1.9 2002/03/02 00:08:16 kei Exp $ ---- main.c.orig Fri Mar 23 11:14:58 2001 -+++ main.c Fri Mar 30 21:02:12 2001 -@@ -1645,7 +1645,17 @@ +--- main.c.orig Mon Jan 28 02:52:03 2002 ++++ main.c +@@ -2221,7 +2221,17 @@ shell = "/bin/sh"; system(shell); #else /* SIGSTOP */ +#ifdef SIGTSTP -+ signal(SIGTSTP, SIG_DFL); /* just in case */ ++ signal(SIGTSTP, SIG_DFL); /* just in case */ + /* + * Note: If susp() was called from SIGTSTP handler, + * unblocking SIGTSTP would be required here. + * Currently not. -+ */ -+ kill(0, SIGTSTP); /* stop whole job, not a single process */ ++ */ ++ kill(0, SIGTSTP); /* stop whole job, not a single process */ +#else - kill((pid_t)0, SIGSTOP); + kill((pid_t) 0, SIGSTOP); +#endif #endif /* SIGSTOP */ fmInit(); diff --git a/www/w3m/patches/patch-af b/www/w3m/patches/patch-af deleted file mode 100644 index 2e127501689..00000000000 --- a/www/w3m/patches/patch-af +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-af,v 1.3 2001/05/01 00:31:26 kei Exp $ - ---- libwc/Makefile.orig Sat Apr 21 16:23:53 2001 -+++ libwc/Makefile Sat Apr 21 16:32:43 2001 -@@ -1,10 +1,10 @@ - - LIBRARY = libwc.a --GCLIB = ../gc/gc.a --CC = cc -O -g -Wall -DUSE_UNICODE --CFLAGS = -I. -I.. -I../gc/include -I../gc --AR = ar --RANLIB = ranlib -+GCLIB = ${PREFIX}/lib/libgc.a -+CC = ${CC} -O -g -Wall -DUSE_UNICODE -+CFLAGS = -I. -I.. -I${PREFIX}/include -+AR = ${AR} -+RANLIB = ${RANLIB} - - SRCS = big5.c \ - ces.c \ -@@ -90,7 +90,7 @@ - ces.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h hz.h \ - big5.h johab.h gbk.h gb18030.h uhc.h viet.h utf8.h - char_conv.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h --charset.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ -+charset.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ - priv.h - combining.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h \ - map/iso88596_combining.map map/iso885911_combining.map \ -@@ -117,7 +117,7 @@ - search.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h - sjis.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h jis.h \ - wtf.h ucs.h map/jisx02132_sjis.map --status.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ -+status.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ - priv.h ucs.h - test.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h - ucs.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h search.h \ diff --git a/www/w3m/patches/patch-ag b/www/w3m/patches/patch-ag deleted file mode 100644 index 28dd41800de..00000000000 --- a/www/w3m/patches/patch-ag +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2001/06/24 05:57:24 itojun Exp $ - -plug buffer overrun vulnerability in mime charset parsing -http://mi.med.tohoku.ac.jp/~satodai/w3m-dev-en/200106.month/537.html - ---- mimehead.c Sun Jun 24 14:49:45 2001 -+++ mimehead.c Sun Jun 24 14:46:53 2001 -@@ -173,27 +173,26 @@ - decodeWord(char **ow) - { - #endif -- char buf[32]; - char *p, *w = *ow; - char method; - Str a = Strnew(); -+ Str cs = Strnew(); - - if (*w != '=' || *(w + 1) != '?') - goto convert_fail; - w += 2; -- for (p = buf; p - buf < 31 && *w != '?'; w++) { -+ for (; *w != '?'; w++) { - if (*w == '\0') - goto convert_fail; -- *(p++) = *w; -+ Strcat_char(cs, *w); - } -- *p = '\0'; - #ifdef USE_M17N -- c = wc_guess_charset(buf, 0); -+ c = wc_guess_charset(cs->ptr, 0); - if (! c) - goto convert_fail; - #else -- if (strcasecmp(buf, "ISO-8859-1") != 0 && -- strcasecmp(buf, "US_ASCII") != 0) -+ if (Strcasecmp_charp(cs, "ISO-8859-1") != 0 && -+ Strcasecmp_charp(cs, "US_ASCII") != 0) - /* NOT ISO-8859-1 encoding ... don't convert */ - goto convert_fail; - #endif diff --git a/www/w3m/patches/patch-ah b/www/w3m/patches/patch-ah deleted file mode 100644 index 9d45d29919d..00000000000 --- a/www/w3m/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2001/09/28 10:10:41 itojun Exp $ - -plug security hole. -http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/200109.month/2226.html - ---- indep.c.orig Fri Sep 28 18:57:03 2001 -+++ indep.c Fri Sep 28 18:58:06 2001 -@@ -74,14 +74,14 @@ - #endif /* __EMX__ */ - - char * --cleanupName(char *name) -+cleanupName2(char *name, int flag) - { - char *buf, *p, *q; - - buf = allocStr(name, 0); - p = buf; - q = name; -- while (*q != '\0' && *q != '?') { -+ while (*q != '\0' && (*q != '?' || ! flag)) { - if (strncmp(p, "/../", 4) == 0) { /* foo/bar/../FOO */ - if (p - 2 == buf && strncmp(p - 2, "..", 2) == 0) { - /* ../../ */ diff --git a/www/w3m/patches/patch-ai b/www/w3m/patches/patch-ai deleted file mode 100644 index b176fba132a..00000000000 --- a/www/w3m/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2001/09/28 10:10:41 itojun Exp $ - -plug security hole. -http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/200109.month/2226.html - ---- indep.h.orig Fri Sep 28 18:57:03 2001 -+++ indep.h Fri Sep 28 18:57:45 2001 -@@ -20,7 +20,8 @@ - extern char *allocStr(const char *s, int len); - extern int strCmp(const void *s1, const void *s2); - extern char *currentdir(void); --extern char *cleanupName(char *name); -+extern char *cleanupName2(char *name, int flag); -+#define cleanupName(name) cleanupName2((name), TRUE) - extern char *expandPath(char *name); - extern char *strcasestr(char *s1, char *s2); - extern int strcasemstr(char *str, char *srch[], char **ret_ptr); diff --git a/www/w3m/patches/patch-aj b/www/w3m/patches/patch-aj deleted file mode 100644 index dabdc2abab7..00000000000 --- a/www/w3m/patches/patch-aj +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2001/09/28 10:10:41 itojun Exp $ - -plug security hole. -http://mi.med.tohoku.ac.jp/~satodai/w3m-dev/200109.month/2226.html - ---- url.c.orig Fri Sep 28 18:57:05 2001 -+++ url.c Fri Sep 28 18:59:14 2001 -@@ -949,7 +949,7 @@ - pu->file = cleanupName(pu->file); - } - if (pu->scheme == SCM_LOCAL) -- pu->real_file = file_unquote(pu->file); -+ pu->real_file = cleanupName2(file_unquote(pu->file), FALSE); - } - } - -@@ -1247,7 +1247,7 @@ - Str tmp2 = Strnew_charp("#"); - Strcat_charp(tmp2, pu->label); - pu->file = tmp2->ptr; -- pu->real_file = file_unquote(pu->file); -+ pu->real_file = cleanupName2(file_unquote(pu->file), FALSE); - pu->label = NULL; - } - else { -@@ -1284,7 +1284,7 @@ - else if ((q = strchr(pu->file, '?')) != NULL) { - /* local CGI: GET */ - p = Strnew_charp_n(pu->file, (int)(q - pu->file))->ptr; -- pu->real_file = file_unquote(p); -+ pu->real_file = cleanupName2(file_unquote(p), FALSE); - uf.stream = newFileStream(localcgi_get(pu->real_file, q + 1, option->referer), - (void (*)()) pclose); - if (uf.stream != NULL) { -@@ -1322,7 +1322,7 @@ - Strcat_char(tmp, '/'); - Strcat_charp(tmp, pu->file); - p = cleanupName(tmp->ptr); -- q = file_unquote(p); -+ q = cleanupName2(file_unquote(p), FALSE); - if (dir_exist(q)) { - pu->file = p; - pu->real_file = q; -@@ -1606,7 +1606,7 @@ - } - p = Strnew_m_charp(pu->file, "/", file_quote(index_file), NULL)->ptr; - p = cleanupName(p); -- q = file_unquote(p); -+ q = cleanupName2(file_unquote(p), FALSE); - examineFile(q, uf); - if (uf->stream == NULL) - return; |