Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
GfA
/
Display001GfA
4
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Gałąź: gfa-k44104-qt-57
Gałęzie Tagi
Display001GfA
/
patches
/
0024-civetweb-to-v1.11.patch

0024-civetweb-to-v1.11.patch 6.9 KB
Bezpośredni odnośnik Historia Czysty

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209 
  1. diff --git a/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch b/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch
    2. 

  2. deleted file mode 100644
    3. 

  3. index aee3cfc..0000000
    4. 

  4. --- a/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch
    5. 

  5. +++ /dev/null
    6. 

  6. @@ -1,27 +0,0 @@
    7. 

  7. -From 0821066f9adf8410891cd07684ecac50a9bc36a4 Mon Sep 17 00:00:00 2001
    8. 

  8. -From: Fabio Porcedda <fabio.porcedda@gmail>
    9. 

  9. -Date: Wed, 25 Feb 2015 18:40:24 +0100
    10. 

  10. -Subject: [PATCH] Lua: fix a typo changing %(LFS_DIR) to $(LFS_DIR)
    11. 

  11. -
    12. 

  12. -Also this fix a error on GNU Make v4.0:
    13. 

  13. -  Makefile:203: *** mixed implicit and normal rules.  Stop.
    14. 

  14. -
    15. 

  15. -Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail>
    16. 

  16. ----
    17. 

  17. - resources/Makefile.in-lua | 2 +-
    18. 

  18. - 1 file changed, 1 insertion(+), 1 deletion(-)
    19. 

  19. -
    20. 

  20. -diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua
    21. 

  21. -index 0902f11..f3d95fd 100644
    22. 

  22. ---- a/resources/Makefile.in-lua
    23. 

  23. -+++ b/resources/Makefile.in-lua
    24. 

  24. -@@ -57,5 +57,5 @@ LFS_CFLAGS = -I$(LFS_DIR)
    25. 

  25. - 
    26. 

  26. - OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS)
    27. 

  27. - CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
    28. 

  28. --SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)
    29. 

  29. -+SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR)
    30. 

  30. - 
    31. 

  31. --- 
    32. 

  32. -2.3.0
    33. 

  33. -
    34. 

  34. diff --git a/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch b/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
    35. 

  35. new file mode 100644
    36. 

  36. index 0000000..bd1b06a
    37. 

  37. --- /dev/null
    38. 

  38. +++ b/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
    39. 

  39. @@ -0,0 +1,34 @@
    40. 

  40. +From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001
    41. 

  41. +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    42. 

  42. +Date: Thu, 29 Nov 2018 21:43:28 +0100
    43. 

  43. +Subject: [PATCH] modlua.ini: include dlfcn.h
    44. 

  44. +
    45. 

  45. +dlfcn.h must be included to be able to use dlopen otherwise build will
    46. 

  46. +fail on:
    47. 

  47. +src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function)
    48. 

  48. +  lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY);
    49. 

  49. +
    50. 

  50. +Fixes:
    51. 

  51. + - http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19
    52. 

  52. +
    53. 

  53. +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    54. 

  54. +[Upstream status: https://github.com/civetweb/civetweb/pull/706]
    55. 

  55. +---
    56. 

  56. + src/mod_lua.inl | 1 +
    57. 

  57. + 1 file changed, 1 insertion(+)
    58. 

  58. +
    59. 

  59. +diff --git a/src/mod_lua.inl b/src/mod_lua.inl
    60. 

  60. +index 97a5de1e..ce7a4b2e 100644
    61. 

  61. +--- a/src/mod_lua.inl
    62. 

  62. ++++ b/src/mod_lua.inl
    63. 

  63. +@@ -2,6 +2,7 @@
    64. 

  64. +  * See https://github.com/civetweb/civetweb/
    65. 

  65. +  */
    66. 

  66. + 
    67. 

  67. ++#include <dlfcn.h>
    68. 

  68. + #include "civetweb_lua.h"
    69. 

  69. + #include "civetweb_private_lua.h"
    70. 

  70. + 
    71. 

  71. +-- 
    72. 

  72. +2.14.1
    73. 

  73. +
    74. 

  74. diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
    75. 

  75. index d68a1ff..9e43969 100644
    76. 

  76. --- a/package/civetweb/Config.in
    77. 

  77. +++ b/package/civetweb/Config.in
    78. 

  78. @@ -2,6 +2,7 @@ config BR2_PACKAGE_CIVETWEB
    79. 

  79.  	bool "civetweb"
    80. 

  80.  	depends on BR2_TOOLCHAIN_HAS_THREADS
    81. 

  81.  	depends on BR2_USE_MMU # fork()
    82. 

  82. +	select BR2_PACKAGE_CIVETWEB_SERVER if !BR2_PACKAGE_CIVETWEB_LIB
    83. 

  83.  	help
    84. 

  84.  	  Full featured embedded web server with Lua support.
    85. 

  85.  
    86. 

  86. @@ -9,6 +10,17 @@ config BR2_PACKAGE_CIVETWEB
    87. 

  87.  
    88. 

  88.  if BR2_PACKAGE_CIVETWEB
    89. 

  89.  
    90. 

  90. +config BR2_PACKAGE_CIVETWEB_SERVER
    91. 

  91. +	bool "enable the web server application"
    92. 

  92. +	help
    93. 

  93. +	  Include the web server and its config files.
    94. 

  94. +
    95. 

  95. +config BR2_PACKAGE_CIVETWEB_LIB
    96. 

  96. +	bool "enable library for embedding"
    97. 

  97. +	help
    98. 

  98. +	  Enable the civetweb library for embedding in another
    99. 

  99. +	  application.
    100. 

  100. +
    101. 

  101.  config BR2_PACKAGE_CIVETWEB_WITH_LUA
    102. 

  102.  	bool "enable Lua support"
    103. 

  103.  	# required by the bundled Sqlite3 and Lua code
    104. 

  104. diff --git a/package/civetweb/civetweb.hash b/package/civetweb/civetweb.hash
    105. 

  105. index 745f4a8..e6f60ff 100644
    106. 

  106. --- a/package/civetweb/civetweb.hash
    107. 

  107. +++ b/package/civetweb/civetweb.hash
    108. 

  108. @@ -1,2 +1,3 @@
    109. 

  109.  # Locally calculated
    110. 

  110. -sha256 79a852a26068eb6d2f8de5ee72e021f0d2c8bd176eb81f41909a876b736815d9  civetweb-v1.5.tar.gz
    111. 

  111. +sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42  civetweb-1.11.tar.gz
    112. 

  112. +sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706  LICENSE.md
    113. 

  113. diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
    114. 

  114. index d29765b..99da1b6 100644
    115. 

  115. --- a/package/civetweb/civetweb.mk
    116. 

  116. +++ b/package/civetweb/civetweb.mk
    117. 

  117. @@ -4,16 +4,26 @@
    118. 

  118.  #
    119. 

  119.  ################################################################################
    120. 

  120.  
    121. 

  121. -CIVETWEB_VERSION = v1.5
    122. 

  122. -CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
    123. 

  123. +CIVETWEB_VERSION = 1.11
    124. 

  124. +CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION))
    125. 

  125.  CIVETWEB_LICENSE = MIT
    126. 

  126.  CIVETWEB_LICENSE_FILES = LICENSE.md
    127. 

  127.  
    128. 

  128. -CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1
    129. 

  129. +CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \
    130. 

  130. +	$(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
    131. 

  131.  CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0
    132. 

  132.  CIVETWEB_LIBS = -lpthread -lm
    133. 

  133.  CIVETWEB_SYSCONFDIR = /etc
    134. 

  134.  CIVETWEB_HTMLDIR = /var/www
    135. 

  135. +CIVETWEB_INSTALL_OPTS = \
    136. 

  136. +	DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
    137. 

  137. +	CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
    138. 

  138. +	HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
    139. 

  139. +	SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)"
    140. 

  140. +
    141. 

  141. +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),)
    142. 

  142. +CIVETWEB_COPT += -DNO_ATOMICS=1
    143. 

  143. +endif
    144. 

  144.  
    145. 

  145.  ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)
    146. 

  146.  CIVETWEB_CONF_OPTS += WITH_LUA=1
    147. 

  147. @@ -22,25 +32,54 @@ endif
    148. 

  148.  
    149. 

  149.  ifeq ($(BR2_PACKAGE_OPENSSL),y)
    150. 

  150.  CIVETWEB_COPT += -DNO_SSL_DL
    151. 

  151. -CIVETWEB_LIBS += -lssl -lcrypto -lz
    152. 

  152. -CIVETWEB_DEPENDENCIES += openssl
    153. 

  153. +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
    154. 

  154. +CIVETWEB_DEPENDENCIES += openssl host-pkgconf
    155. 

  155.  else
    156. 

  156.  CIVETWEB_COPT += -DNO_SSL
    157. 

  157.  endif
    158. 

  158.  
    159. 

  159. +ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
    160. 

  160. +CIVETWEB_BUILD_TARGETS += build
    161. 

  161. +CIVETWEB_INSTALL_TARGETS += install
    162. 

  162. +endif
    163. 

  163. +
    164. 

  164. +ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
    165. 

  165. +CIVETWEB_INSTALL_STAGING = YES
    166. 

  166. +CIVETWEB_INSTALL_TARGETS += install-headers
    167. 

  167. +
    168. 

  168. +ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
    169. 

  169. +CIVETWEB_BUILD_TARGETS += lib
    170. 

  170. +CIVETWEB_INSTALL_TARGETS += install-lib
    171. 

  171. +endif
    172. 

  172. +
    173. 

  173. +ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
    174. 

  174. +CIVETWEB_BUILD_TARGETS += slib
    175. 

  175. +CIVETWEB_INSTALL_TARGETS += install-slib
    176. 

  176. +CIVETWEB_COPT += -fPIC
    177. 

  177. +endif
    178. 

  178. +
    179. 

  179. +endif # BR2_PACKAGE_CIVETWEB_LIB
    180. 

  180. +
    181. 

  181.  define CIVETWEB_BUILD_CMDS
    182. 

  182. -	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \
    183. 

  183. +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_BUILD_TARGETS) \
    184. 

  184.  		$(CIVETWEB_CONF_OPTS) \
    185. 

  185.  		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
    186. 

  186.  endef
    187. 

  187.  
    188. 

  188. +define CIVETWEB_INSTALL_STAGING_CMDS
    189. 

  189. +	mkdir -p $(STAGING_DIR)/usr/include
    190. 

  190. +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
    191. 

  191. +		PREFIX="$(STAGING_DIR)/usr" \
    192. 

  192. +		$(CIVETWEB_INSTALL_OPTS) \
    193. 

  193. +		$(CIVETWEB_CONF_OPTS) \
    194. 

  194. +		COPT='$(CIVETWEB_COPT)'
    195. 

  195. +endef
    196. 

  196. +
    197. 

  197.  define CIVETWEB_INSTALL_TARGET_CMDS
    198. 

  198. -	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
    199. 

  199. -		DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
    200. 

  200. -		CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
    201. 

  201. -		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
    202. 

  202. -		SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
    203. 

  203. +	mkdir -p $(TARGET_DIR)/usr/include
    204. 

  204. +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
    205. 

  205.  		PREFIX="$(TARGET_DIR)/usr" \
    206. 

  206. +		$(CIVETWEB_INSTALL_OPTS) \
    207. 

  207.  		$(CIVETWEB_CONF_OPTS) \
    208. 

  208.  		COPT='$(CIVETWEB_COPT)'
    209. 

  209.  endef
    210.