pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/50105: Update pkgsrc/www/elinks from 0.12pre6 to 0.13 to fix SSL Error
The following reply was made to PR pkg/50105; it has been noted by GNATS.
From: atomicules <base%atomicules.co.uk@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/50105: Update pkgsrc/www/elinks from 0.12pre6 to 0.13 to fix
SSL Error
Date: Thu, 30 Jul 2015 19:28:50 +0100
--FL5UXtIhxfXey3p5
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Disposition: inline
Attempting to attach patch/diff for this PR
--FL5UXtIhxfXey3p5
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="0.13patch"
? 0.13patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile 19 Oct 2014 22:27:48 -0000 1.58
+++ Makefile 30 Jul 2015 17:17:09 -0000
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.58 2014/10/19 22:27:48 alnsn Exp $
-DISTNAME= elinks-0.12pre6
-PKGNAME= ${DISTNAME:S/pre/rc/}
-PKGREVISION= 8
+DISTNAME= elinks-current-0.13
+PKGNAME= elinks-0.13
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://elinks.or.cz/download/ \
http://ftp.icm.edu.pl/packages/elinks/
@@ -11,6 +11,11 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://elinks.or.cz/
COMMENT= Extended/Enhanced Links
+LICENSE= gnu-gpl-v2
+
+#This from wip/elinks-snapshot
+post-extract:
+ cd ${WRKDIR} && ${MV} elinks-* ${DISTNAME}
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 3 Nov 2012 14:43:25 -0000 1.28
+++ distinfo 30 Jul 2015 17:17:09 -0000
@@ -1,12 +1,10 @@
$NetBSD: distinfo,v 1.28 2012/11/03 14:43:25 wiz Exp $
-SHA1 (elinks-0.12pre6.tar.bz2) = 3517795e8a390cb36ca249a5be6514b9784520a5
-RMD160 (elinks-0.12pre6.tar.bz2) = 99d92dde61ed9c626f10d3d431ed4d325b2e33f6
-Size (elinks-0.12pre6.tar.bz2) = 2854500 bytes
-SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667
-SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd
-SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d
-SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622
-SHA1 (patch-ae) = a46c419ec3d96825958903459708b8b131862053
-SHA1 (patch-ag) = c31bede62a6baa1d43ab1dff639f9d7265d2bece
-SHA1 (patch-ah) = 25357fd0b0aa08f7ca55f3f8c262d2d1a4874710
+SHA1 (elinks-current-0.13.tar.bz2) = 220dc78cbf03f10bafc8cb92d9a5f93a4d313e7d
+RMD160 (elinks-current-0.13.tar.bz2) = 72ac8d33dac4608377f14a8ea15c89e780ffedce
+Size (elinks-current-0.13.tar.bz2) = 2924345 bytes
+SHA1 (patch-aa) = 77535c2d6c908aa61311789ced93cf1da1daa071
+SHA1 (patch-ad) = f4cfb51613892c551dc0a956ec1cca4d69240966
+SHA1 (patch-ae) = ce6a081cb0d5b05065c9851e62e6e727302b4f7d
+SHA1 (patch-ag) = f0d9fa00e9464f401165bd25ba53cd47ecfb3c74
+SHA1 (patch-ah) = 6c59e77b9fc9604e1a950317f0391c91d9830a73
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/patches/patch-aa,v
retrieving revision 1.11
diff -u -r1.11 patch-aa
--- patches/patch-aa 14 Jun 2011 13:36:34 -0000 1.11
+++ patches/patch-aa 30 Jul 2015 17:17:09 -0000
@@ -1,17 +1,9 @@
-$NetBSD: patch-aa,v 1.11 2011/06/14 13:36:34 wiz Exp $
+$NetBSD$
---- configure.orig 2009-07-08 09:57:36.000000000 +0000
+$Don't know why this is required, but as per pkgsrc elinks-0.12pre6
+--- configure.orig 2015-07-26 22:45:08.000000000 +0000
+++ configure
-@@ -18993,7 +18993,7 @@ if test -z "$disable_lua"; then
- for suffix in "" 50; do
- if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \
- test -f "$luadir/include/lua$suffix/lua.h" ) ; then
-- LUA_LIBS="-L$luadir/lib -llua$suffix -llualib$suffix -lm"
-+ LUA_LIBS="-L$luadir/lib -llua$suffix -lm"
- LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
-
- LIBS="$LUA_LIBS $LIBS_X"
-@@ -25064,7 +25064,7 @@ _ACEOF
+@@ -14143,7 +14143,7 @@ _ACEOF
# Create LIBDIR #define for config.h
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab 6 Nov 2008 08:33:31 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2008/11/06 08:33:31 bjs Exp $
-
---- src/scripting/lua/core.c.orig 2008-09-21 04:45:22.000000000 -0400
-+++ src/scripting/lua/core.c
-@@ -658,7 +658,7 @@ do_hooks_file(LS, unsigned char *prefix,
- if (file_can_read(file)) {
- int oldtop = lua_gettop(S);
-
-- if (lua_dofile(S, file) != 0)
-+ if (luaL_dofile(S, file) != 0)
- sleep(3); /* Let some time to see error messages. */
- lua_settop(S, oldtop);
- }
-@@ -669,13 +669,24 @@ do_hooks_file(LS, unsigned char *prefix,
- void
- init_lua(struct module *module)
- {
-- L = lua_open();
--
-- luaopen_base(L);
-- luaopen_table(L);
-- luaopen_io(L);
-- luaopen_string(L);
-- luaopen_math(L);
-+ static const luaL_Reg lualibs[] = {
-+ {"", luaopen_base},
-+ {LUA_TABLIBNAME, luaopen_table},
-+ {LUA_IOLIBNAME, luaopen_io},
-+ {LUA_OSLIBNAME, luaopen_os},
-+ {LUA_STRLIBNAME, luaopen_string},
-+ {LUA_MATHLIBNAME, luaopen_math},
-+ {NULL, NULL}
-+ };
-+ const luaL_Reg *lib = lualibs;
-+
-+ L = lua_open();
-+
-+ for (; lib->func; lib++) {
-+ lua_pushcfunction(L, lib->func);
-+ lua_pushstring(L, lib->name);
-+ lua_call(L, 1, 0);
-+ }
-
- lua_register(L, LUA_ALERT, l_alert);
- lua_register(L, "current_url", l_current_url);
-@@ -780,7 +791,7 @@ handle_ret_eval(struct session *ses)
- int oldtop = lua_gettop(L);
-
- if (prepare_lua(ses) == 0) {
-- lua_dostring(L, expr);
-+ luaL_dostring(L, expr);
- lua_settop(L, oldtop);
- finish_lua();
- }
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 6 Nov 2008 08:33:31 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2008/11/06 08:33:31 bjs Exp $
-
---- src/scripting/lua/hooks.c.orig 2008-09-21 04:45:22.000000000 -0400
-+++ src/scripting/lua/hooks.c
-@@ -200,7 +200,7 @@ static enum evhook_status
- script_hook_quit(va_list ap, void *data)
- {
- if (!prepare_lua(NULL)) {
-- lua_dostring(lua_state, "if quit_hook then quit_hook() end");
-+ luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
- finish_lua();
- }
-
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patches/patch-ad 6 Nov 2008 08:33:31 -0000 1.2
+++ patches/patch-ad 30 Jul 2015 17:17:09 -0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2008/11/06 08:33:31 bjs Exp $
+$NetBSD$
---- src/intl/gettext/Makefile.orig 2008-09-21 04:45:22.000000000 -0400
+$Don't know why this is required, but as per pkgsrc elinks-0.12pre6
+--- src/intl/gettext/Makefile.orig 2015-07-01 14:23:19.000000000 +0000
+++ src/intl/gettext/Makefile
@@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
@@ -8,5 +9,5 @@
builddir = $(top_builddir)/src/intl/gettext
+libdir = $(localedir)
- OBJS = \
- bindtextdom.o \
+ CFLAGS += $(GETTEXT_CFLAGS)
+
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/patches/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- patches/patch-ae 6 Nov 2008 08:33:31 -0000 1.2
+++ patches/patch-ae 30 Jul 2015 17:17:09 -0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2008/11/06 08:33:31 bjs Exp $
+$NetBSD$
---- src/util/memory.c.orig 2008-09-21 04:45:22.000000000 -0400
+$Don't know why this is required, but as per pkgsrc elinks-0.12pre6
+--- src/util/memory.c.orig 2015-07-01 14:23:19.000000000 +0000
+++ src/util/memory.c
@@ -21,6 +21,12 @@
#include "util/error.h"
@@ -15,7 +16,7 @@
#if !defined(DEBUG_MEMLEAK) && !defined(CONFIG_FASTMEM)
-@@ -181,7 +187,7 @@ mem_mmap_realloc(void *p, size_t old_siz
+@@ -165,7 +171,7 @@ mem_mmap_realloc(void *p, size_t old_siz
if (new_size) {
#ifdef HAVE_MREMAP
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/patches/patch-ag,v
retrieving revision 1.2
diff -u -r1.2 patch-ag
--- patches/patch-ag 6 Nov 2008 08:33:31 -0000 1.2
+++ patches/patch-ag 30 Jul 2015 17:17:09 -0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2008/11/06 08:33:31 bjs Exp $
+$NetBSD$
-Don't look for message catalogs in ../po/.
-
---- src/intl/gettext/loadmsgcat.c.orig 2008-09-21 04:45:22.000000000 -0400
+$Don't know why this is required, but as per pkgsrc elinks-0.12pre6
+--- src/intl/gettext/loadmsgcat.c.orig 2015-07-01 14:23:19.000000000 +0000
+++ src/intl/gettext/loadmsgcat.c
@@ -259,7 +259,7 @@ _nl_load_domain(struct loaded_l10nfile *
{
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- patches/patch-ah 2 Jul 2009 20:04:12 -0000 1.1
+++ patches/patch-ah 30 Jul 2015 17:17:09 -0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2009/07/02 20:04:12 drochner Exp $
+$NetBSD$
---- src/main/select.c.orig 2008-09-21 10:45:22.000000000 +0200
+$Don't know why this is required, but as per pkgsrc elinks-0.12pre6
+--- src/main/select.c.orig 2015-07-01 14:23:19.000000000 +0000
+++ src/main/select.c
-@@ -223,7 +223,7 @@ select_loop(void (*init)(void))
+@@ -229,7 +229,7 @@ select_loop(void (*init)(void))
check_bottom_halves();
while (!program.terminate) {
@@ -11,7 +12,7 @@
int n, i, has_timer;
timeval_T t;
-@@ -264,7 +264,9 @@ select_loop(void (*init)(void))
+@@ -270,7 +270,9 @@ select_loop(void (*init)(void))
if (has_timer) {
/* Be sure timeout is not negative. */
timeval_limit_to_zero_or_one(&t);
--FL5UXtIhxfXey3p5--
Home |
Main Index |
Thread Index |
Old Index