Allow use of 'haserl' developer version

diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 54fe856f0c600a1b9a25361b2e3cc9792b58a1fc..c721daa8977899378da2d3cbc15bf2d2bf69fdd6 100644 (file)
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -7,3 +7,28 @@ config BR2_PACKAGE_HASERL
          where something like PHP is too big.
 
          http://haserl.sourceforge.net/
+
+choice
+       prompt "Haserl version"
+       default BR2_PACKAGE_HASERL_VERSION_0_9_20
+       depends on BR2_PACKAGE_HASERL
+       help
+         Select the older stable version, or the newer developer version
+
+config BR2_PACKAGE_HASERL_VERSION_0_8_0
+       bool    "v 0.8.0"
+       help
+         stable version
+
+config BR2_PACKAGE_HASERL_VERSION_0_9_20
+       bool    "v 0.9.20"
+       help
+         developer version - seems OK though
+
+endchoice
+
+
+config BR2_PACKAGE_HASERL_VERSION
+       string
+       default "0.8.0"         if BR2_PACKAGE_HASERL_VERSION_0_8_0
+       default "0.9.20"        if BR2_PACKAGE_HASERL_VERSION_0_9_20

diff --git a/package/haserl/haserl-0.9.20-legacy.patch b/package/haserl/haserl-0.9.20-legacy.patch
new file mode 100644 (file)
index 0000000..a8a93ac
--- /dev/null
+++ b/package/haserl/haserl-0.9.20-legacy.patch
@@ -0,0 +1,12 @@
+diff -urN haserl-0.9.20-0rig/src/haserl.c haserl-0.9.20/src/haserl.c
+--- haserl-0.9.20-0rig/src/haserl.c    2007-10-30 22:58:00.000000000 +0100
++++ haserl-0.9.20/src/haserl.c 2007-10-30 23:00:10.000000000 +0100
+@@ -210,7 +210,7 @@
+     }
+   memcpy ((char *) (entry + strlen (prefix)), str, strlen (str));
+ 
+-  keylen = (size_t) (index (entry, '=') - entry);
++  keylen = (size_t) (strchr (entry, '=') - entry);
+ 
+   if (keylen <= 0)
+     {

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index ccde75cc9be30551fd55a6e4115c2be4a77a5b33..9aca060600a785c4efd32bb6e76abe7d80d6eb57 100644 (file)
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-HASERL_VERSION=0.8.0
-HASERL_SOURCE=haserl-$(HASERL_VERSION).tar.gz
-HASERL_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
-HASERL_DIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
+HASERL_VERSION:=$(strip $(subst ",,$(BR2_PACKAGE_HASERL_VERSION)))
+#"))
+HASERL_SOURCE:=haserl-$(HASERL_VERSION).tar.gz
+HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
+HASERL_DIR:=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
 HASERL_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(HASERL_SOURCE):