Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 24 insertions, 26 deletions

diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 77cb6ef3e..b15da35e6 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lynx
-PKG_VERSION:=		2.8.7
+PKG_VERSION:=		2.8.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e36d70f3f09b2d502055ca67f09e363c
+PKG_MD5SUM:=		7caa6773f94e136556c1c30629fe1431
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libncurses libopenssl zlib
@@ -17,7 +17,7 @@ PKG_SITES:=		http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/
 PKG_NOPARALLEL:=	1
 
 DISTFILES=		${PKG_NAME}${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/lynx2-8-7
+WRKDIST=		${WRKDIR}/lynx2-8-8
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
index d16953cca..c8217b70e 100644
--- a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
+++ b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
@@ -1,6 +1,6 @@
---- lynx2-8-7.orig/WWW/Library/Implementation/HTUtils.h	2009-05-25 23:05:31.000000000 +0200
-+++ lynx2-8-7/WWW/Library/Implementation/HTUtils.h	2010-05-29 12:56:42.125000000 +0200
-@@ -677,6 +677,8 @@ extern int WWW_TraceMask;
+--- lynx2-8-8.orig/WWW/Library/Implementation/HTUtils.h	2014-02-05 01:50:18.000000000 +0100
++++ lynx2-8-8/WWW/Library/Implementation/HTUtils.h	2014-03-21 22:14:07.000000000 +0100
+@@ -725,6 +725,8 @@ extern int WWW_TraceMask;
  
  #define SHORTENED_RBIND		/* FIXME: do this in configure-script */
  
@@ -9,15 +9,15 @@
  #ifdef USE_SSL
  
  #define free_func free__func
-@@ -717,6 +719,7 @@ extern int WWW_TraceMask;
+@@ -765,6 +767,7 @@ extern int WWW_TraceMask;
  
  #undef free_func
  #endif /* USE_SSL */
 +#endif
  
- #ifdef HAVE_LIBDMALLOC
- #include <dmalloc.h>		/* Gray Watson's library */
-@@ -747,11 +750,14 @@ extern "C" {
+ #ifdef HAVE_BSD_STDLIB_H
+ #include <bsd/stdlib.h>		/* prototype for arc4random.h */
+@@ -801,11 +804,14 @@ extern "C" {
  
      extern FILE *TraceFP(void);
  
diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in
new file mode 100644
index 000000000..5cb6b5962
--- /dev/null
+++ b/package/lynx/patches/patch-makefile_in
@@ -0,0 +1,11 @@
+--- lynx2-8-8.orig/makefile.in	2014-03-09 22:43:10.000000000 +0100
++++ lynx2-8-8/makefile.in	2014-03-21 23:17:26.000000000 +0100
+@@ -210,7 +210,7 @@ SRC_CFLAGS = \
+ 	WWWINC=$(WWW_DIR) \
+ 	WWWLIB="../$(WWW_DIR)/libwww.a"
+ 
+-actual_PROG  = `echo lynx|    sed '$(transform)'`
++actual_PROG  = lynx
+ binary_PROG  = $(actual_PROG)$x
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
index 9f23671e7..9972a6f8c 100644
--- a/package/lynx/patches/patch-src_chrtrans_makeuctb_c
+++ b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
@@ -1,23 +1,10 @@
---- lynx2-8-7.orig/src/chrtrans/makeuctb.c	2009-02-02 02:41:02.000000000 +0100
-+++ lynx2-8-7/src/chrtrans/makeuctb.c	2010-05-29 12:55:33.031250000 +0200
-@@ -18,6 +18,7 @@
-  *  version 2, or at your option any later version.
-  */
- 
-+
- #ifndef HAVE_CONFIG_H
- /* override HTUtils.h fallbacks for cross-compiling */
- #undef HAVE_LSTAT
-@@ -28,10 +29,12 @@
+--- lynx2-8-8.orig/src/chrtrans/makeuctb.c	2013-11-29 01:52:56.000000000 +0100
++++ lynx2-8-8/src/chrtrans/makeuctb.c	2014-03-21 22:12:13.000000000 +0100
+@@ -28,6 +28,7 @@
  
  #define DONT_USE_GETTEXT
  #define DONT_USE_SOCKS5
 +#define DONT_USE_SSL
  #include <UCDefs.h>
  #include <UCkd.h>
- #include <LYUtils.h>
  
-+
- /*
-  *  Don't try to use LYexit() since this is a standalone file.
-  */