projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uhttpd: update to latest git revision
[openwrt/openwrt.git]
/
package
/
network
/
services
/
uhttpd
/
Makefile
diff --git
a/package/network/services/uhttpd/Makefile
b/package/network/services/uhttpd/Makefile
index e3c8417a1c3d6fe9891dbc517e0b0b6d9cc42aa9..253da4492069ed57fb0fb9fbe9997e6d75a564a8 100644
(file)
--- a/
package/network/services/uhttpd/Makefile
+++ b/
package/network/services/uhttpd/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2010-201
2
Jo-Philipp Wich <jow@openwrt.org>
+# Copyright (C) 2010-201
5
Jo-Philipp Wich <jow@openwrt.org>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-8,21
+8,22
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_VERSION:=201
3-01-19
+PKG_VERSION:=201
5-10-17
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=
56278d4af64256e703a6c4cf3d854aac689c391c
+PKG_SOURCE_VERSION:=
3614ae6eb7b6101fa5d0f14ff0d3a6eb4970c3da
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=ISC
+
+PKG_BUILD_DEPENDS = ustream-ssl
-PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_uhttpd-mod-tls
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
-
define Package/uhttpd/default
SECTION:=net
CATEGORY:=Network
define Package/uhttpd/default
SECTION:=net
CATEGORY:=Network
@@
-51,7
+52,10
@@
endef
define Package/uhttpd-mod-tls
$(Package/uhttpd/default)
TITLE+= (TLS plugin)
define Package/uhttpd-mod-tls
$(Package/uhttpd/default)
TITLE+= (TLS plugin)
- DEPENDS:=uhttpd +PACKAGE_uhttpd-mod-tls_cyassl:libustream-cyassl +PACKAGE_uhttpd-mod-tls_openssl:libustream-cyassl
+ DEPENDS:=uhttpd \
+ +PACKAGE_uhttpd-mod-tls_polarssl:libustream-polarssl \
+ +PACKAGE_uhttpd-mod-tls_cyassl:libustream-cyassl \
+ +PACKAGE_uhttpd-mod-tls_openssl:libustream-openssl
endef
define Package/uhttpd-mod-tls/description
endef
define Package/uhttpd-mod-tls/description
@@
-62,7
+66,10
@@
define Package/uhttpd-mod-tls/config
choice
depends on PACKAGE_uhttpd-mod-tls
prompt "TLS Provider"
choice
depends on PACKAGE_uhttpd-mod-tls
prompt "TLS Provider"
- default PACKAGE_uhttpd-mod-tls_cyassl
+ default PACKAGE_uhttpd-mod-tls_polarssl
+
+ config PACKAGE_uhttpd-mod-tls_polarssl
+ bool "PolarSSL"
config PACKAGE_uhttpd-mod-tls_cyassl
bool "CyaSSL"
config PACKAGE_uhttpd-mod-tls_cyassl
bool "CyaSSL"
@@
-100,9
+107,13
@@
define Package/uhttpd/conffiles
/etc/uhttpd.key
endef
/etc/uhttpd.key
endef
+ifneq ($(CONFIG_USE_GLIBC),)
+ TARGET_CFLAGS += -D_DEFAULT_SOURCE
+endif
+
TARGET_LDFLAGS += -lcrypt
TARGET_LDFLAGS += -lcrypt
-CMAKE_OPTIONS = -DTLS_SUPPORT=
$(if $(CONFIG_PACKAGE_uhttpd-mod-tls),on,off)
+CMAKE_OPTIONS = -DTLS_SUPPORT=
on
define Package/uhttpd/install
$(INSTALL_DIR) $(1)/etc/init.d
define Package/uhttpd/install
$(INSTALL_DIR) $(1)/etc/init.d
@@
-123,8
+134,9
@@
define Package/uhttpd-mod-lua/install
endef
define Package/uhttpd-mod-ubus/install
endef
define Package/uhttpd-mod-ubus/install
- $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/lib
$(1)/etc/uci-defaults
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
+ $(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
endef
endef