Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Fixed a conflict with haserl 0.9.23 (FFLuCI) and haserl 0.8.x (OpenWRT)

Browse source 
- Thanks to mickey (FF Hannover) for this patch
This commit is contained in:
Steven Barth 2008-03-31 19:40:31 +00:00
parent 8e49fa9c73
commit 746fdf6b47
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/package/ffluci/Makefile
View file

@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
MAKE_ACTION:=dist-source MAKE_ACTION:=dist-source
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -25,7 +23,7 @@ define Package/ffluci
SECTION:=admin SECTION:=admin
CATEGORY:=Administration CATEGORY:=Administration
TITLE:=FFLuCI TITLE:=FFLuCI
DEPENDS:=+liblua +luaposix +haserl DEPENDS:=+liblua +luaposix +haserl-lua
MAINTAINER:=Steven Barth <steven-at-midlink-dot-org> MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
endef endef

12
contrib/package/haserl-devel/Makefile → contrib/package/haserl-lua/Makefile
View file

@ -4,22 +4,22 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
# $Id$ # $Id: Makefile 1719 2008-03-24 16:07:38Z Cyrus $
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=haserl PKG_NAME:=haserl-lua
PKG_VERSION:=0.9.23 PKG_VERSION:=0.9.23
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=haserl-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/haserl PKG_SOURCE_URL:=@SF/haserl
PKG_MD5SUM:=31d1f505afe3ba1b351e18612aa57a70 PKG_MD5SUM:=31d1f505afe3ba1b351e18612aa57a70
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/haserl define Package/haserl-lua
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=A CGI wrapper to embed shell scripts in HTML documents TITLE:=A CGI wrapper to embed shell scripts in HTML documents
@ -30,10 +30,10 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-lua --with-lua
define Package/haserl/install define Package/haserl-lua/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(STRIP) $(PKG_BUILD_DIR)/src/haserl $(STRIP) $(PKG_BUILD_DIR)/src/haserl
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haserl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haserl $(1)/usr/bin/
endef endef
$(eval $(call BuildPackage,haserl)) $(eval $(call BuildPackage,haserl-lua))

29
contrib/package/haserl-lua/patches/100-cookie_prefix.patch Normal file
View file

@ -0,0 +1,29 @@
--- haserl-0.9.23.orig/src/haserl.c 2008-03-18 18:17:55.000000000 +0100
+++ haserl-0.9.23/src/haserl.c 2008-03-27 16:58:27.000000000 +0100
@@ -340,7 +340,7 @@
{
token++;
}
- myputenv (env, token, global.var_prefix);
+ myputenv (env, token, global.cookie_prefix);
token = strtok (NULL, ";");
}
free (qs);
@@ -614,6 +614,7 @@
global.acceptall = FALSE; /* don't allow POST data for GET method */
global.uploadlist = NULL; /* we don't have any uploaded files */
global.var_prefix = HASERL_VAR_PREFIX;
+ global.cookie_prefix = "COOKIE_";
global.nul_prefix = "";
}
--- haserl-0.9.23.orig/src/haserl.h 2008-01-25 22:11:38.000000000 +0100
+++ haserl-0.9.23/src/haserl.h 2008-03-27 16:58:18.000000000 +0100
@@ -10,6 +10,7 @@
char *uploaddir; /* where we upload to */
char *uploadhandler; /* a handler for uploads */
char *var_prefix; /* what name we give to FORM variables */
+ char *cookie_prefix;
char *nul_prefix; /* what name we give to environment variables */
token_t *uploadlist; /* a linked list of pathspecs */
int debug; /* true if in "debug" mode */