Permalink
Browse files

haserl: bump version to 0.9.32 (refs #2181)

git-svn-id: file:///var/svn/freetz/trunk@11027 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent 73459e1 commit f38f2cfd124acca2b2b0fb15fec79c53aaa49b1b Whoopie committed Sep 22, 2013
Showing with 14 additions and 13 deletions.
  1. +2 −2 CHANGELOG
  2. +2 −2 make/haserl/haserl.mk
  3. +10 −9 make/haserl/patches/100-lualib_inc.patch
View
@@ -52,8 +52,8 @@ Latest changes:
* git 1.8.3.4
* gmp 5.1.2
* haproxy 1.4.24
- * haserl 0.9.30
- * hplip 3.13.8
+ * haserl 0.9.32
+ * hplip 3.13.9
* httpry 0.1.7
* inadyn-mt 02.24.38
* lftp 4.4.8
View
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 0.9.30)
+$(call PKG_INIT_BIN, 0.9.32)
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=e25f1a13f7cfe5993e961803446cd718
+$(PKG)_SOURCE_MD5:=18e2208aea6d772d1670c1a648bb6b77
$(PKG)_SITE:=@SF/haserl
$(PKG)_BINARY:=$($(PKG)_DIR)/src/haserl
@@ -1,6 +1,6 @@
--- src/Makefile.in
+++ src/Makefile.in
-@@ -65,7 +65,7 @@
+@@ -92,7 +92,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
@@ -9,24 +9,25 @@
am__haserl_SOURCES_DIST = common.c common.h sliding_buffer.c \
sliding_buffer.h h_error.c h_error.h h_script.c h_script.h \
rfc2388.c rfc2388.h h_bash.c h_bash.h h_lua_common.c \
-@@ -533,16 +533,16 @@
+@@ -759,16 +759,16 @@
# lua2c_LIBS ?= -llua -ldl -lm
-@USE_LUA_TRUE@lua2c_LDFLAGS ?= -Wl,-E
-@USE_LUA_TRUE@lua2c: lua2c.c
--@USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
--@USE_LUA_TRUE@ -o $@ $^ $(LIBS)
-+#lua2c_LDFLAGS ?= -Wl,-E
-+#lua2c: lua2c.c
-+# $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
-+# -o $@ $^ $(LIBS)
-
+-@USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
+-@USE_LUA_TRUE@ -o $@ $^ $(LIBS) $(LUA_LIBS)
+-
-@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
-@USE_LUA_TRUE@ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
-@USE_LUA_TRUE@ rm $@; \
-@USE_LUA_TRUE@ exit 1 ;\
-@USE_LUA_TRUE@ fi
++#lua2c_LDFLAGS ?= -Wl,-E
++#lua2c: lua2c.c
++#(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
++# -o $@ $^ $(LIBS) $(LUA_LIBS)
++
+#haserl_lualib.inc : haserl_lualib.lua lua2c
+# if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
+# rm $@; \

0 comments on commit f38f2cf

Please sign in to comment.