haserl: remove deprecated 0.8.x version

It'll be a year for the 2015.02 release so remove the old/deprecated
0.8.x version for the release.

Also update hash to match sourceforge (original) one.

And rename patch to new naming convention.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 69608c7039a5f1d41ed51ba880cd0d02eeba761c..db8c3b1b4d870f45175751cffcaec71e461ddc4e 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_HASERL_VERSION_0_8_X
+       bool "haserl 0.8.x version removed"
+       select BR2_LEGACY
+       help
+         The 0.8.x version option for haserl has been removed since it
+         has been deprecated for some time now.
+         You should be able to use the 0.9.x version without issues.
+
 config BR2_PACKAGE_STRONGSWAN_TOOLS
        bool "strongswan option has been removed"
        select BR2_LEGACY

diff --git a/package/haserl/0.8.0/haserl-0.8.0-legacy.patch b/package/haserl/0.8.0/haserl-0.8.0-legacy.patch
deleted file mode 100644 (file)
index bb6f3b0..0000000
--- a/package/haserl/0.8.0/haserl-0.8.0-legacy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN haserl-0.8.0-0rig/src/haserl.c haserl-0.8.0/src/haserl.c
---- haserl-0.8.0-0rig/src/haserl.c     2004-11-10 18:59:35.000000000 +0100
-+++ haserl-0.8.0/src/haserl.c  2007-10-12 14:36:28.000000000 +0200
-@@ -131,7 +131,7 @@
-       if (strlen(prefix)) { memcpy (entry, prefix, strlen(prefix)); }
-       memcpy ((char *) (entry + strlen(prefix)), newbuf, strlen(newbuf));
- 
--      keylen = (size_t) (index (entry, '=') - entry);
-+      keylen = (size_t) (strchr (entry, '=') - entry);
-       
-       if ( keylen <= 0 ) {
-                       free (entry);

diff --git a/package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch b/package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch
deleted file mode 100644 (file)
index f9e2a95..0000000
--- a/package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-[HACK] add preprocessed lualib file so host-lua isn't needed
-
-Haserl no longer ships with haserl_lualib.inc, causing lua2c (which needs
-host-lua support) to be built to generate it.
-
-Re-add .inc file from 0.9.33 so we don't need host-lua.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- src/Makefile.in       |    3 -
- src/haserl_lualib.inc |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 98 insertions(+), 2 deletions(-)
-
-Index: haserl-0.9.33/src/haserl_lualib.inc
-===================================================================
---- /dev/null
-+++ haserl-0.9.33/src/haserl_lualib.inc
-@@ -0,0 +1,109 @@
-+/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */
-+
-+static const unsigned char haserl_lualib[] = { 
-+   27, 76,117, 97, 81,  0,  1,  4,  8,  4,  8,  0, 19,  0,  0,  0,
-+    0,  0,  0,  0, 64,104, 97,115,101,114,108, 95,108,117, 97,108,
-+  105, 98, 46,108,117, 97,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-+    0,  2,  7, 24,  0,  0,  0, 10,  0,  0,  0, 74,  0,  0,  0,138,
-+    0,  0,  0,202,  0,  0,  0, 10,  1,  0,  0, 74,  1,  0,  0,138,
-+    1,  0,  0,135,129,  1,  0, 71, 65,  1,  0,  7,  1,  1,  0,199,
-+  192,  0,  0,135,128,  0,  0, 71, 64,  0,  0,  7,  0,  0,  0,  5,
-+    0,  0,  0,100,  0,  0,  0,  9, 64,128,131,  5,  0,  0,  0,100,
-+   64,  0,  0,  9, 64,  0,132,  5,  0,  0,  0,100,128,  0,  0,  9,
-+   64,128,132, 30,  0,128,  0, 10,  0,  0,  0,  4,  7,  0,  0,  0,
-+    0,  0,  0,  0,104, 97,115,101,114,108,  0,  4,  5,  0,  0,  0,
-+    0,  0,  0,  0, 70, 79, 82, 77,  0,  4,  4,  0,  0,  0,  0,  0,
-+    0,  0, 69, 78, 86,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 67,
-+   79, 79, 75, 73, 69,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 72,
-+   65, 83, 69, 82, 76,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0, 71,
-+   69, 84,  0,  4,  5,  0,  0,  0,  0,  0,  0,  0, 80, 79, 83, 84,
-+    0,  4,  9,  0,  0,  0,  0,  0,  0,  0,115,101,116,102,105,101,
-+  108,100,  0,  4,  9,  0,  0,  0,  0,  0,  0,  0,103,101,116,102,
-+  105,101,108,100,  0,  4,  9,  0,  0,  0,  0,  0,  0,  0,109,121,
-+  112,117,116,101,110,118,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
-+    0,  0,  0, 25,  0,  0,  0, 39,  0,  0,  0,  0,  2,  0, 10, 29,
-+    0,  0,  0,133,  0,  0,  0,197, 64,  0,  0,198,128,192,  1,  0,
-+    1,  0,  0, 65,193,  0,  0,220,  0,129,  1, 22,128,  4,128,  5,
-+    2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1, 26,  2,  0,  0, 22,
-+  192,  0,128,  5,  2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1,128,
-+    1,  0,  4, 23, 64,193,  3, 22,128,  1,128,  6,130,  1,  1, 26,
-+   66,  0,  0, 22,  0,  0,128, 10,  2,  0,  0,137,  0,  2,  3,134,
-+  128,  1,  1, 22,  0,  0,128,137, 64,  0,  3,225,128,  0,  0, 22,
-+  128,250,127, 30,  0,128,  0,  6,  0,  0,  0,  4,  3,  0,  0,  0,
-+    0,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0,
-+  115,116,114,105,110,103,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0,
-+  103,109, 97,116, 99,104,  0,  4, 15,  0,  0,  0,  0,  0,  0,  0,
-+   40, 91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46, 63, 41,  0,  4,
-+    9,  0,  0,  0,  0,  0,  0,  0,116,111,110,117,109, 98,101,114,
-+    0,  4,  2,  0,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0,  0,  0,
-+   29,  0,  0,  0, 27,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,
-+   28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,
-+   29,  0,  0,  0, 29,  0,  0,  0, 29,  0,  0,  0, 29,  0,  0,  0,
-+   29,  0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0,
-+   30,  0,  0,  0, 32,  0,  0,  0, 32,  0,  0,  0, 33,  0,  0,  0,
-+   33,  0,  0,  0, 33,  0,  0,  0, 33,  0,  0,  0, 33,  0,  0,  0,
-+   34,  0,  0,  0, 34,  0,  0,  0, 36,  0,  0,  0, 28,  0,  0,  0,
-+   37,  0,  0,  0, 39,  0,  0,  0,  8,  0,  0,  0,  2,  0,  0,  0,
-+    0,  0,  0,  0,102,  0,  0,  0,  0,  0, 28,  0,  0,  0,  2,  0,
-+    0,  0,  0,  0,  0,  0,118,  0,  0,  0,  0,  0, 28,  0,  0,  0,
-+    2,  0,  0,  0,  0,  0,  0,  0,116,  0,  1,  0,  0,  0, 28,  0,
-+    0,  0, 16,  0,  0,  0,  0,  0,  0,  0, 40,102,111,114, 32,103,
-+  101,110,101,114, 97,116,111,114, 41,  0,  6,  0,  0,  0, 28,  0,
-+    0,  0, 12,  0,  0,  0,  0,  0,  0,  0, 40,102,111,114, 32,115,
-+  116, 97,116,101, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0, 14,  0,
-+    0,  0,  0,  0,  0,  0, 40,102,111,114, 32, 99,111,110,116,114,
-+  111,108, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0,  2,  0,  0,  0,
-+    0,  0,  0,  0,119,  0,  7,  0,  0,  0, 26,  0,  0,  0,  2,  0,
-+    0,  0,  0,  0,  0,  0,100,  0,  7,  0,  0,  0, 26,  0,  0,  0,
-+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41,  0,  0,  0,
-+   47,  0,  0,  0,  0,  1,  0,  8, 12,  0,  0,  0, 69,  0,  0,  0,
-+  133, 64,  0,  0,134,128, 64,  1,192,  0,  0,  0,  1,193,  0,  0,
-+  156,  0,129,  1, 22,  0,  0,128, 70, 64,129,  0,161, 64,  0,  0,
-+   22,  0,255,127, 94,  0,  0,  1, 30,  0,128,  0,  4,  0,  0,  0,
-+    4,  3,  0,  0,  0,  0,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,
-+    0,  0,  0,  0,  0,115,116,114,105,110,103,  0,  4,  7,  0,  0,
-+    0,  0,  0,  0,  0,103,109, 97,116, 99,104,  0,  4,  7,  0,  0,
-+    0,  0,  0,  0,  0, 91, 37,119, 95, 93, 43,  0,  0,  0,  0,  0,
-+   12,  0,  0,  0, 42,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0,
-+   43,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0,
-+   44,  0,  0,  0, 43,  0,  0,  0, 44,  0,  0,  0, 46,  0,  0,  0,
-+   47,  0,  0,  0,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-+  102,  0,  0,  0,  0,  0, 11,  0,  0,  0,  2,  0,  0,  0,  0,  0,
-+    0,  0,118,  0,  1,  0,  0,  0, 11,  0,  0,  0, 16,  0,  0,  0,
-+    0,  0,  0,  0, 40,102,111,114, 32,103,101,110,101,114, 97,116,
-+  111,114, 41,  0,  6,  0,  0,  0, 10,  0,  0,  0, 12,  0,  0,  0,
-+    0,  0,  0,  0, 40,102,111,114, 32,115,116, 97,116,101, 41,  0,
-+    6,  0,  0,  0, 10,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,
-+   40,102,111,114, 32, 99,111,110,116,114,111,108, 41,  0,  6,  0,
-+    0,  0, 10,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,119,  0,
-+    7,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-+    0,  0,  0,  0, 49,  0,  0,  0, 55,  0,  0,  0,  0,  2,  0,  6,
-+   20,  0,  0,  0,133,  0,  0,  0,134, 64, 64,  1,192,  0,  0,  0,
-+    1,129,  0,  0, 65,193,  0,  0,156,128,  0,  2,  0,  0,  0,  1,
-+  133,  0,  0,  0,134, 64, 64,  1,192,  0,  0,  0,  1,  1,  1,  0,
-+   65,193,  0,  0,156,128,  0,  2,  0,  0,  0,  1,133, 64,  1,  0,
-+  134,128, 65,  1,192,  0,  0,  0,  0,  1,128,  0,156, 64,128,  1,
-+   30,  0,128,  0,  7,  0,  0,  0,  4,  7,  0,  0,  0,  0,  0,  0,
-+    0,115,116,114,105,110,103,  0,  4,  5,  0,  0,  0,  0,  0,  0,
-+    0,103,115,117, 98,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 91,
-+   92, 93, 92, 91, 93,  0,  4,  2,  0,  0,  0,  0,  0,  0,  0, 46,
-+    0,  4,  6,  0,  0,  0,  0,  0,  0,  0, 91, 92, 46, 93, 43,  0,
-+    4,  7,  0,  0,  0,  0,  0,  0,  0,104, 97,115,101,114,108,  0,
-+    4,  9,  0,  0,  0,  0,  0,  0,  0,115,101,116,102,105,101,108,
-+  100,  0,  0,  0,  0,  0, 20,  0,  0,  0, 51,  0,  0,  0, 51,  0,
-+    0,  0, 51,  0,  0,  0, 51,  0,  0,  0, 51,  0,  0,  0, 51,  0,
-+    0,  0, 51,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,
-+    0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,
-+    0,  0, 54,  0,  0,  0, 54,  0,  0,  0, 54,  0,  0,  0, 54,  0,
-+    0,  0, 54,  0,  0,  0, 55,  0,  0,  0,  2,  0,  0,  0,  4,  0,
-+    0,  0,  0,  0,  0,  0,107,101,121,  0,  0,  0,  0,  0, 19,  0,
-+    0,  0,  6,  0,  0,  0,  0,  0,  0,  0,118, 97,108,117,101,  0,
-+    0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 24,  0,  0,  0,
-+   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
-+   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
-+   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
-+   23,  0,  0,  0, 23,  0,  0,  0, 25,  0,  0,  0, 39,  0,  0,  0,
-+   25,  0,  0,  0, 41,  0,  0,  0, 47,  0,  0,  0, 41,  0,  0,  0,
-+   49,  0,  0,  0, 55,  0,  0,  0, 49,  0,  0,  0, 55,  0,  0,  0,
-+    0,  0,  0,  0,  0,  0,  0,  0,
-+};
-Index: haserl-0.9.29/src/Makefile.in
-===================================================================
---- haserl-0.9.29.orig/src/Makefile.in
-+++ haserl-0.9.29/src/Makefile.in
-@@ -32,7 +32,6 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
- @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
- @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
- bin_PROGRAMS = haserl$(EXEEXT)
-@@ -515,7 +514,7 @@
- @USE_LUA_TRUE@        $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
- @USE_LUA_TRUE@                -o $@ $^ $(LIBS)
- 
--@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
-+@USE_LUA_TRUE@haserl_lualib.inc :
- @USE_LUA_TRUE@        if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
- @USE_LUA_TRUE@                rm $@; \
- @USE_LUA_TRUE@                exit 1 ;\

diff --git a/package/haserl/0001-add-haserl_lualib.inc.patch b/package/haserl/0001-add-haserl_lualib.inc.patch
new file mode 100644 (file)
index 0000000..f9e2a95
--- /dev/null
+++ b/package/haserl/0001-add-haserl_lualib.inc.patch
@@ -0,0 +1,149 @@
+[HACK] add preprocessed lualib file so host-lua isn't needed
+
+Haserl no longer ships with haserl_lualib.inc, causing lua2c (which needs
+host-lua support) to be built to generate it.
+
+Re-add .inc file from 0.9.33 so we don't need host-lua.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+ src/Makefile.in       |    3 -
+ src/haserl_lualib.inc |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+), 2 deletions(-)
+
+Index: haserl-0.9.33/src/haserl_lualib.inc
+===================================================================
+--- /dev/null
++++ haserl-0.9.33/src/haserl_lualib.inc
+@@ -0,0 +1,109 @@
++/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */
++
++static const unsigned char haserl_lualib[] = { 
++   27, 76,117, 97, 81,  0,  1,  4,  8,  4,  8,  0, 19,  0,  0,  0,
++    0,  0,  0,  0, 64,104, 97,115,101,114,108, 95,108,117, 97,108,
++  105, 98, 46,108,117, 97,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
++    0,  2,  7, 24,  0,  0,  0, 10,  0,  0,  0, 74,  0,  0,  0,138,
++    0,  0,  0,202,  0,  0,  0, 10,  1,  0,  0, 74,  1,  0,  0,138,
++    1,  0,  0,135,129,  1,  0, 71, 65,  1,  0,  7,  1,  1,  0,199,
++  192,  0,  0,135,128,  0,  0, 71, 64,  0,  0,  7,  0,  0,  0,  5,
++    0,  0,  0,100,  0,  0,  0,  9, 64,128,131,  5,  0,  0,  0,100,
++   64,  0,  0,  9, 64,  0,132,  5,  0,  0,  0,100,128,  0,  0,  9,
++   64,128,132, 30,  0,128,  0, 10,  0,  0,  0,  4,  7,  0,  0,  0,
++    0,  0,  0,  0,104, 97,115,101,114,108,  0,  4,  5,  0,  0,  0,
++    0,  0,  0,  0, 70, 79, 82, 77,  0,  4,  4,  0,  0,  0,  0,  0,
++    0,  0, 69, 78, 86,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 67,
++   79, 79, 75, 73, 69,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 72,
++   65, 83, 69, 82, 76,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0, 71,
++   69, 84,  0,  4,  5,  0,  0,  0,  0,  0,  0,  0, 80, 79, 83, 84,
++    0,  4,  9,  0,  0,  0,  0,  0,  0,  0,115,101,116,102,105,101,
++  108,100,  0,  4,  9,  0,  0,  0,  0,  0,  0,  0,103,101,116,102,
++  105,101,108,100,  0,  4,  9,  0,  0,  0,  0,  0,  0,  0,109,121,
++  112,117,116,101,110,118,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
++    0,  0,  0, 25,  0,  0,  0, 39,  0,  0,  0,  0,  2,  0, 10, 29,
++    0,  0,  0,133,  0,  0,  0,197, 64,  0,  0,198,128,192,  1,  0,
++    1,  0,  0, 65,193,  0,  0,220,  0,129,  1, 22,128,  4,128,  5,
++    2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1, 26,  2,  0,  0, 22,
++  192,  0,128,  5,  2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1,128,
++    1,  0,  4, 23, 64,193,  3, 22,128,  1,128,  6,130,  1,  1, 26,
++   66,  0,  0, 22,  0,  0,128, 10,  2,  0,  0,137,  0,  2,  3,134,
++  128,  1,  1, 22,  0,  0,128,137, 64,  0,  3,225,128,  0,  0, 22,
++  128,250,127, 30,  0,128,  0,  6,  0,  0,  0,  4,  3,  0,  0,  0,
++    0,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0,
++  115,116,114,105,110,103,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0,
++  103,109, 97,116, 99,104,  0,  4, 15,  0,  0,  0,  0,  0,  0,  0,
++   40, 91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46, 63, 41,  0,  4,
++    9,  0,  0,  0,  0,  0,  0,  0,116,111,110,117,109, 98,101,114,
++    0,  4,  2,  0,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0,  0,  0,
++   29,  0,  0,  0, 27,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,
++   28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,
++   29,  0,  0,  0, 29,  0,  0,  0, 29,  0,  0,  0, 29,  0,  0,  0,
++   29,  0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0,
++   30,  0,  0,  0, 32,  0,  0,  0, 32,  0,  0,  0, 33,  0,  0,  0,
++   33,  0,  0,  0, 33,  0,  0,  0, 33,  0,  0,  0, 33,  0,  0,  0,
++   34,  0,  0,  0, 34,  0,  0,  0, 36,  0,  0,  0, 28,  0,  0,  0,
++   37,  0,  0,  0, 39,  0,  0,  0,  8,  0,  0,  0,  2,  0,  0,  0,
++    0,  0,  0,  0,102,  0,  0,  0,  0,  0, 28,  0,  0,  0,  2,  0,
++    0,  0,  0,  0,  0,  0,118,  0,  0,  0,  0,  0, 28,  0,  0,  0,
++    2,  0,  0,  0,  0,  0,  0,  0,116,  0,  1,  0,  0,  0, 28,  0,
++    0,  0, 16,  0,  0,  0,  0,  0,  0,  0, 40,102,111,114, 32,103,
++  101,110,101,114, 97,116,111,114, 41,  0,  6,  0,  0,  0, 28,  0,
++    0,  0, 12,  0,  0,  0,  0,  0,  0,  0, 40,102,111,114, 32,115,
++  116, 97,116,101, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0, 14,  0,
++    0,  0,  0,  0,  0,  0, 40,102,111,114, 32, 99,111,110,116,114,
++  111,108, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0,  2,  0,  0,  0,
++    0,  0,  0,  0,119,  0,  7,  0,  0,  0, 26,  0,  0,  0,  2,  0,
++    0,  0,  0,  0,  0,  0,100,  0,  7,  0,  0,  0, 26,  0,  0,  0,
++    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41,  0,  0,  0,
++   47,  0,  0,  0,  0,  1,  0,  8, 12,  0,  0,  0, 69,  0,  0,  0,
++  133, 64,  0,  0,134,128, 64,  1,192,  0,  0,  0,  1,193,  0,  0,
++  156,  0,129,  1, 22,  0,  0,128, 70, 64,129,  0,161, 64,  0,  0,
++   22,  0,255,127, 94,  0,  0,  1, 30,  0,128,  0,  4,  0,  0,  0,
++    4,  3,  0,  0,  0,  0,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,
++    0,  0,  0,  0,  0,115,116,114,105,110,103,  0,  4,  7,  0,  0,
++    0,  0,  0,  0,  0,103,109, 97,116, 99,104,  0,  4,  7,  0,  0,
++    0,  0,  0,  0,  0, 91, 37,119, 95, 93, 43,  0,  0,  0,  0,  0,
++   12,  0,  0,  0, 42,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0,
++   43,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0, 43,  0,  0,  0,
++   44,  0,  0,  0, 43,  0,  0,  0, 44,  0,  0,  0, 46,  0,  0,  0,
++   47,  0,  0,  0,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
++  102,  0,  0,  0,  0,  0, 11,  0,  0,  0,  2,  0,  0,  0,  0,  0,
++    0,  0,118,  0,  1,  0,  0,  0, 11,  0,  0,  0, 16,  0,  0,  0,
++    0,  0,  0,  0, 40,102,111,114, 32,103,101,110,101,114, 97,116,
++  111,114, 41,  0,  6,  0,  0,  0, 10,  0,  0,  0, 12,  0,  0,  0,
++    0,  0,  0,  0, 40,102,111,114, 32,115,116, 97,116,101, 41,  0,
++    6,  0,  0,  0, 10,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,
++   40,102,111,114, 32, 99,111,110,116,114,111,108, 41,  0,  6,  0,
++    0,  0, 10,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,119,  0,
++    7,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
++    0,  0,  0,  0, 49,  0,  0,  0, 55,  0,  0,  0,  0,  2,  0,  6,
++   20,  0,  0,  0,133,  0,  0,  0,134, 64, 64,  1,192,  0,  0,  0,
++    1,129,  0,  0, 65,193,  0,  0,156,128,  0,  2,  0,  0,  0,  1,
++  133,  0,  0,  0,134, 64, 64,  1,192,  0,  0,  0,  1,  1,  1,  0,
++   65,193,  0,  0,156,128,  0,  2,  0,  0,  0,  1,133, 64,  1,  0,
++  134,128, 65,  1,192,  0,  0,  0,  0,  1,128,  0,156, 64,128,  1,
++   30,  0,128,  0,  7,  0,  0,  0,  4,  7,  0,  0,  0,  0,  0,  0,
++    0,115,116,114,105,110,103,  0,  4,  5,  0,  0,  0,  0,  0,  0,
++    0,103,115,117, 98,  0,  4,  7,  0,  0,  0,  0,  0,  0,  0, 91,
++   92, 93, 92, 91, 93,  0,  4,  2,  0,  0,  0,  0,  0,  0,  0, 46,
++    0,  4,  6,  0,  0,  0,  0,  0,  0,  0, 91, 92, 46, 93, 43,  0,
++    4,  7,  0,  0,  0,  0,  0,  0,  0,104, 97,115,101,114,108,  0,
++    4,  9,  0,  0,  0,  0,  0,  0,  0,115,101,116,102,105,101,108,
++  100,  0,  0,  0,  0,  0, 20,  0,  0,  0, 51,  0,  0,  0, 51,  0,
++    0,  0, 51,  0,  0,  0, 51,  0,  0,  0, 51,  0,  0,  0, 51,  0,
++    0,  0, 51,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,
++    0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,
++    0,  0, 54,  0,  0,  0, 54,  0,  0,  0, 54,  0,  0,  0, 54,  0,
++    0,  0, 54,  0,  0,  0, 55,  0,  0,  0,  2,  0,  0,  0,  4,  0,
++    0,  0,  0,  0,  0,  0,107,101,121,  0,  0,  0,  0,  0, 19,  0,
++    0,  0,  6,  0,  0,  0,  0,  0,  0,  0,118, 97,108,117,101,  0,
++    0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 24,  0,  0,  0,
++   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
++   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
++   23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0, 23,  0,  0,  0,
++   23,  0,  0,  0, 23,  0,  0,  0, 25,  0,  0,  0, 39,  0,  0,  0,
++   25,  0,  0,  0, 41,  0,  0,  0, 47,  0,  0,  0, 41,  0,  0,  0,
++   49,  0,  0,  0, 55,  0,  0,  0, 49,  0,  0,  0, 55,  0,  0,  0,
++    0,  0,  0,  0,  0,  0,  0,  0,
++};
+Index: haserl-0.9.29/src/Makefile.in
+===================================================================
+--- haserl-0.9.29.orig/src/Makefile.in
++++ haserl-0.9.29/src/Makefile.in
+@@ -32,7 +32,6 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
+ @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
+ @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
+ bin_PROGRAMS = haserl$(EXEEXT)
+@@ -515,7 +514,7 @@
+ @USE_LUA_TRUE@        $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
+ @USE_LUA_TRUE@                -o $@ $^ $(LIBS)
+ 
+-@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
++@USE_LUA_TRUE@haserl_lualib.inc :
+ @USE_LUA_TRUE@        if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
+ @USE_LUA_TRUE@                rm $@; \
+ @USE_LUA_TRUE@                exit 1 ;\

diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 680e280a1ad3a1ff81df0fd41eeb283a8ed0f1da..1620d725ab89b79d1e462d0b148b59c5d3259e34 100644 (file)
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -8,37 +8,9 @@ config BR2_PACKAGE_HASERL
 
          http://haserl.sourceforge.net/
 
-if BR2_PACKAGE_HASERL
-
 config BR2_PACKAGE_HASERL_WITH_LUA
        bool "Lua support"
-       depends on BR2_PACKAGE_HASERL_VERSION_0_9_X
+       depends on BR2_PACKAGE_HASERL
        select BR2_PACKAGE_LUA
        help
          Enable Lua support for haserl
-
-choice
-       prompt "Haserl version"
-       default BR2_PACKAGE_HASERL_VERSION_0_9_X
-       help
-         Select the older stable version, or the newer developer version
-
-config BR2_PACKAGE_HASERL_VERSION_0_8_X
-       bool    "v 0.8.x"
-       depends on BR2_DEPRECATED_SINCE_2014_02
-       help
-         stable version
-
-config BR2_PACKAGE_HASERL_VERSION_0_9_X
-       bool    "v 0.9.x"
-       help
-         developer version - seems OK though
-
-endchoice
-
-endif
-
-config BR2_PACKAGE_HASERL_VERSION
-       string
-       default "0.8.0"         if BR2_PACKAGE_HASERL_VERSION_0_8_X
-       default "0.9.33"        if BR2_PACKAGE_HASERL_VERSION_0_9_X

diff --git a/package/haserl/haserl.hash b/package/haserl/haserl.hash
index 3573fa903744837cefb129a644463cc06df9168d..7b1bfa251a7ee3f82c3f06c1315b3230baa2f146 100644 (file)
--- a/package/haserl/haserl.hash
+++ b/package/haserl/haserl.hash
@@ -1,3 +1,3 @@
-# Locally computed:
-sha256  ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be  haserl-0.8.0.tar.gz
-sha256  9a65b14dc721643fc5b85c79117cb6d824bd3683b246744137bb5d978df7621b  haserl-0.9.33.tar.gz
+# From http://sourceforge.net/projects/haserl/files/haserl-devel/
+md5    a9decddb508944d56f71dd2f821e2ec5        haserl-0.9.33.tar.gz
+sha1   bbb5d55db911fdb854828794181e57a1a275e65d        haserl-0.9.33.tar.gz

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index f0de7908d4b4a85fdcd7ed1c01dc10dc452f126d..4985c095599d83059e0fb8723aeb12b00880e312 100644 (file)
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -4,12 +4,8 @@
 #
 ################################################################################
 
-HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-ifeq ($(BR2_PACKAGE_HASERL_VERSION_0_8_X),y)
-HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl/$(HASERL_VERSION)
-else
+HASERL_VERSION = 0.9.33
 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel
-endif
 HASERL_LICENSE = GPLv2
 HASERL_LICENSE_FILES = COPYING
 HASERL_DEPENDENCIES = host-pkgconf