- 0.2.3.2 (some bug fixes), updated URLs and patches, fixed License

- ipv6 patch: build with v6 support on builders w/o v6 in kernel too

Changed files:
    w3m-dontresetiso2.patch -> 1.2
    w3m-ipv6.patch -> 1.1
    w3m-ssl-segv.patch -> 1.2
    w3m.spec -> 1.27

diff --git a/w3m-dontresetiso2.patch b/w3m-dontresetiso2.patch
index 9882e0965b9816cf8bd62d00103470190c982f26..1d4609e8f03f2b5bf4d046aa2fc4d2b2c4f07229 100644 (file)
--- a/w3m-dontresetiso2.patch
+++ b/w3m-dontresetiso2.patch
@@ -7,9 +7,9 @@ diff -Nur w3m-0.2.0.orig/terms.c w3m-0.2.0/terms.c
  {
 -    if (DisplayCode != CODE_EUC && DisplayCode != CODE_SJIS)
 -#if defined(__EMX__)&&!defined(JP_CHARSET)
--      if(!CodePage)
+-      if (!CodePage)
 -#endif
--      writestr("\033(B");     /* designate US_ASCII */
+-          writestr("\033(B"); /* designate US_ASCII */
      writestr(T_op);           /* turn off */
      writestr(T_me);
      if (!Do_not_use_ti_te) {

diff --git a/w3m-ipv6.patch b/w3m-ipv6.patch
new file mode 100644 (file)
index 0000000..613b024
--- /dev/null
+++ b/w3m-ipv6.patch
@@ -0,0 +1,14 @@
+--- w3m-0.2.3.2/configure.orig Fri Dec 21 03:11:50 2001
++++ w3m-0.2.3.2/configure      Sun Dec 23 00:43:31 2001
+@@ -1760,9 +1760,9 @@
+ 
+ if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1
+ then
+-  if ./_zmachdep; then
++#  if ./_zmachdep; then
+     def_ipv6="#define INET6"
+-  fi
++#  fi
+   case $sysname in
+   *BSD|*bsd)
+     cat > _zmachdep.c <<EOF

diff --git a/w3m-ssl-segv.patch b/w3m-ssl-segv.patch
index fe6155c90e72bc8b52d602ce3b830479d648cfba..2986ccd50d8c343c3b97d414e15a96fe5792e1b7 100644 (file)
--- a/w3m-ssl-segv.patch
+++ b/w3m-ssl-segv.patch
@@ -1,30 +1,37 @@
---- w3m-0.2.1/url.c.orig       Fri Mar 23 02:51:04 2001
-+++ w3m-0.2.1/url.c    Thu Jul 19 15:28:13 2001
-@@ -169,6 +169,7 @@
+diff -Nur w3m-0.2.3.2.orig/url.c w3m-0.2.3.2/url.c
+--- w3m-0.2.3.2.orig/url.c     Fri Dec  7 08:58:07 2001
++++ w3m-0.2.3.2/url.c  Sun Dec 23 15:22:48 2001
+@@ -239,6 +239,7 @@
+ {
+     if (ssl_ctx != NULL)
+       SSL_CTX_free(ssl_ctx);
++    ssl_ctx = NULL;
+ }
  
- #ifdef USE_SSL
- SSL_CTX *ssl_ctx = NULL;
-+static ssl_atexit_done=0;
- 
- void
- free_ssl_ctx()
-@@ -269,6 +270,7 @@
-           }
-           if (ng) {
-               free_ssl_ctx();
-+              ssl_ctx = NULL;
-               goto eend;
-           }
-       }
-@@ -276,7 +278,10 @@
+ #if SSLEAY_VERSION_NUMBER >= 0x00905100
+@@ -288,7 +289,6 @@
+       ssl_path_modified = 1;
+ #else
+       free_ssl_ctx();
+-      ssl_ctx = NULL;
+ #endif
+     }
+ #ifdef USE_SSL_VERIFY
+@@ -298,7 +298,6 @@
+     }
+     if (ssl_path_modified) {
+       free_ssl_ctx();
+-      ssl_ctx = NULL;
+       ssl_path_modified = 0;
+     }
+ #endif                                /* defined(USE_SSL_VERIFY) */
+@@ -350,9 +349,6 @@
  #endif                                /* defined(USE_SSL_VERIFY) */
            SSL_CTX_set_default_verify_paths(ssl_ctx);
  #endif                                /* SSLEAY_VERSION_NUMBER >= 0x0800 */
--      atexit(free_ssl_ctx);
-+      if(!ssl_atexit_done) {
-+          ssl_atexit_done=1;
-+          atexit(free_ssl_ctx);
-+      }
+-/*** by inu
+-        atexit(free_ssl_ctx);
+-*/
      }
      handle = SSL_new(ssl_ctx);
      SSL_set_fd(handle, sock);

diff --git a/w3m.spec b/w3m.spec
index 8461b0cab0633dccf0f40ba1a68a80019c03e039..a8d95d05bdb44444c67bb5c1b4eefcac0f828efb 100644 (file)
--- a/w3m.spec
+++ b/w3m.spec
@@ -4,18 +4,19 @@ Summary(fr):  Navigateur en mode texte pour le world wide web
 Summary(pl):   Przegl±darka WWW pracuj±ca w trybie tekstowym
 Summary(tr):   Metin ekranda WWW tarayýcý
 Name:          w3m
-Version:       0.2.1
-Release:       2
+Version:       0.2.3.2
+Release:       1
 Epoch:         1
-License:       GPL
+License:       MIT-like
 Group:         Applications/Networking
 Group(de):     Applikationen/Netzwerkwesen
 Group(pl):     Aplikacje/Sieciowe
-Source0:       ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/w3m/%{name}-%{version}.tar.gz
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-dontresetiso2.patch
 Patch2:                %{name}-ssl-segv.patch
-URL:           http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/
+Patch3:                %{name}-ipv6.patch
+URL:           http://w3m.sourceforge.net/
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: openssl-devel >= 0.9.6a
 BuildRequires: gpm-devel
@@ -50,29 +51,30 @@ formlar ve tablolar i
 %patch0 -p1 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-find -name CVS -type d |xargs rm -rf 
-./configure <<EOF;
+./configure <<EOF
 %{_bindir}
 %{_libdir}/w3m
 %{_datadir}/w3m
+%{_sysconfdir}/w3m
 2
 y
+5
+y
+y
 y
 y
-n
 y
-5
 y
 /bin/vi
 /bin/mail
-%/usr/X11R6/bin/netscape
+/usr/X11R6/bin/netscape
 %{__cc}
 %{rpmcflags}
 -lncurses
--lnsl -lssl -lcrypto
-
+%{rpmldflags}
 EOF
 
 %{__make} 
@@ -81,24 +83,25 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install install-helpfile DESTDIR=$RPM_BUILD_ROOT
 
 mv -f doc/w3m.1 $RPM_BUILD_ROOT%{_mandir}/man1/w3m.1
 # symlink instead of duplicated file
 ln -sf w3mhelp-lynx_en.html $RPM_BUILD_ROOT%{_datadir}/w3m/w3mhelp.html
 
-gzip -9nf doc/*
+gzip -9nf doc/* NEWS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.gz
+%doc doc/*.gz *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/w3m
 %dir %{_datadir}/w3m
 %{_datadir}/w3m/w3mhelp.html
-%{_datadir}/w3m/w3mhelp*_en.html
-%lang(ja) %{_datadir}/w3m/w3mhelp*_ja.html
+%{_datadir}/w3m/w3mhelp*en.*
+%lang(ja) %{_datadir}/w3m/w3mhelp*ja.*
+%{_datadir}/w3m/w3mhelp-funcname.pl
 %{_mandir}/man1/*