diff options
96 files changed, 1839 insertions, 3558 deletions
diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile index 547fc46af..c05b8742a 100644 --- a/admin/netdata/Makefile +++ b/admin/netdata/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata PKG_VERSION:=1.4.0 -PKG_RELEASE:=1 -PKG_MAINTAINER:=Sebastian Careba <nitroshift@yahoo.com> +PKG_RELEASE:=2 +PKG_MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net> PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING @@ -21,8 +21,6 @@ PKG_SOURCE_VERSION:=3028b87ee19e8550df6b9decc49733d595e0bd6e PKG_INSTALL:=1 PKG_FIXUP:=autoreconf -TARGET_CFLAGS+= -DNETDATA_NO_ATOMIC_INSTRUCTIONS=1 - include $(INCLUDE_DIR)/package.mk define Package/netdata @@ -43,19 +41,28 @@ define Package/netdata/conffiles endef define Package/netdata/install - $(INSTALL_DIR) $(1)/etc/netdata - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/netdata/apps_groups.conf $(1)/etc/netdata - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/netdata/charts.d.conf $(1)/etc/netdata - $(INSTALL_CONF) ./files/netdata.conf $(1)/etc/netdata - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/usr/share/netdata - $(INSTALL_DIR) $(1)/usr/lib/netdata + mkdir -p $(1)/etc/netdata + $(CP) $(PKG_INSTALL_DIR)/etc/netdata $(1)/etc + $(CP) ./files/netdata.conf $(1)/etc/netdata + mkdir -p $(1)/usr/share/netdata $(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share + rm $(1)/usr/share/netdata/web/images/animated.gif + rm -rf $(1)/usr/share/netdata/web/old + rm $(1)/usr/share/netdata/web/demo*html + rm $(1)/usr/share/netdata/web/fonts/*.svg + rm $(1)/usr/share/netdata/web/fonts/*.ttf + rm $(1)/usr/share/netdata/web/fonts/*.woff + rm $(1)/usr/share/netdata/web/fonts/*.otf + mkdir -p $(1)/usr/lib/netdata $(CP) $(PKG_INSTALL_DIR)/usr/lib/netdata $(1)/usr/lib + rm $(1)/usr/lib/netdata/python.d/python-modules-installer.sh + rm -rf $(1)/usr/lib/netdata/python.d/python_modules/pyyaml2 + rm -rf $(1)/usr/lib/netdata/python.d/python_modules/pyyaml3 chmod 4755 $(1)/usr/lib/netdata/plugins.d/apps.plugin + mkdir -p $(1)/etc/init.d + $(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata + mkdir -p $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin endef $(eval $(call BuildPackage,netdata)) diff --git a/admin/netdata/files/netdata.conf b/admin/netdata/files/netdata.conf index e1f096441..885ec23a9 100644 --- a/admin/netdata/files/netdata.conf +++ b/admin/netdata/files/netdata.conf @@ -1,3 +1,16 @@ +### NetData Configuration + +### Notes about plugins +### +### charts.d - REQUIRES Bash, enable here and edit charts.d.conf +### apps - none atm +### node.d - REQURIES node.js +### tc - QoS stats (if wanted) +### cgcroups - No support in OpenWRT/LEDE by default +### health - Disabled by default +### KSM - No support in OpenWRT/LEDE by default +### python.d - REQUIRES python and PyYAML, edit python.d.conf to enable + [global] run as user = nobody web files owner = root @@ -14,3 +27,10 @@ apps = no node.d = no tc = no + cgroups = no + +[health] + enabled = no + +[plugin:proc] + /sys/kernel/mm/ksm = no diff --git a/admin/netdata/patches/001-disable_external_plugins_by_default.patch b/admin/netdata/patches/001-disable_external_plugins_by_default.patch new file mode 100644 index 000000000..cf9dc83ec --- /dev/null +++ b/admin/netdata/patches/001-disable_external_plugins_by_default.patch @@ -0,0 +1,26 @@ +diff --git a/conf.d/charts.d.conf b/conf.d/charts.d.conf +index acb2a6f..8111859 100644 +--- a/conf.d/charts.d.conf ++++ b/conf.d/charts.d.conf +@@ -30,7 +30,7 @@ + + # the default enable/disable for all charts.d collectors + # the default is "yes" +-# enable_all_charts="yes" ++enable_all_charts="no" + + # BY DEFAULT ENABLED MODULES + # ap=yes +diff --git a/conf.d/python.d.conf b/conf.d/python.d.conf +index 940bd91..78e2f0a 100644 +--- a/conf.d/python.d.conf ++++ b/conf.d/python.d.conf +@@ -7,7 +7,7 @@ + # + + # Enable / disable the whole python.d.plugin (all its modules) +-enabled: yes ++enabled: no + + # Prevent log flood + # Define how many log messages can be written to log file in one log_interval diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 33e705613..598654d13 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -21,6 +21,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +CONFIGURE_VARS += M4=m4 EMACS=no + define Package/autoconf SECTION:=devel CATEGORY:=Development @@ -42,7 +44,6 @@ endef define Package/autoconf/install $(INSTALL_DIR) $(1)/usr/bin - $(SED) 's|$(STAGING_DIR_HOST)|/usr|g' $(PKG_INSTALL_DIR)/usr/bin/autom4te $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share/autoconf $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/autoconf/INSTALL \ diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 88cdbd14d..8357011c7 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -34,6 +34,8 @@ define Package/automake/description with the GNU Coding Standards. endef +FIX_PATHS = $(SED) '1c \#!/usr/bin/perl' -e 's| /[^ ]*/bin/perl| /usr/bin/perl|g' + define Package/automake/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/automake-$(PKG_VERSION) \ @@ -42,10 +44,8 @@ define Package/automake/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aclocal-$(PKG_VERSION) \ $(1)/usr/bin/aclocal-$(PKG_VERSION) $(LN) aclocal-$(PKG_VERSION) $(1)/usr/bin/aclocal - $(SED) 's|$(STAGING_DIR_HOST)|/usr|g' \ - $(1)/usr/bin/automake-$(PKG_VERSION) - $(SED) 's|$(STAGING_DIR_HOST)|/usr|g' \ - $(1)/usr/bin/aclocal-$(PKG_VERSION) + $(FIX_PATHS) $(1)/usr/bin/automake-$(PKG_VERSION) + $(FIX_PATHS) $(1)/usr/bin/aclocal-$(PKG_VERSION) $(INSTALL_DIR) $(1)/usr/share/automake-$(PKG_VERSION) for dir in \ diff --git a/devel/libtool-bin/Makefile b/devel/libtool-bin/Makefile index e7922c33e..a10303eb2 100644 --- a/devel/libtool-bin/Makefile +++ b/devel/libtool-bin/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtool PKG_VERSION:=2.4.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/libtool -PKG_MD5SUM:=addf44b646ddb4e3919805aa88fa7c5e +PKG_MD5SUM:=1bfb9b923f2c1339b4d2ce1807064aa5 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de> PKG_LICENSE:=GPL-2.0+ PKG_BUILD_DIR = $(BUILD_DIR)/libtool-bin/$(PKG_NAME)-$(PKG_VERSION) @@ -22,6 +22,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +CONFIGURE_VARS += GREP=grep SED=sed + define Package/libtool-bin SECTION:=devel CATEGORY:=Development @@ -39,7 +41,6 @@ endef define Package/libtool-bin/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/ - $(SED) 's|$(STAGING_DIR_HOST)||g' $(1)/usr/bin/libtoolize $(INSTALL_DIR) $(1)/usr/share/aclocal/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \ $(1)/usr/share/aclocal/ diff --git a/lang/lua-openssl/Makefile b/lang/lua-openssl/Makefile new file mode 100644 index 000000000..6f46e7a08 --- /dev/null +++ b/lang/lua-openssl/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2016 Amnon Paz <pazamnon@gmail.com> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=lua-openssl +PKG_VERSION:=0.6.0 +PKG_RELEASE:=1 +PKG_MAINTAINER:=Amnon Paz <pazamnon@gmail.com> +PKG_LICENSE:=MIT + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://github.com/zhaozg/lua-openssl.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=1b950e6ff8617205cda1a1b612637ef21b9daf96 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SUBMENU:=Lua + SECTION:=lang + CATEGORY:=Languages + TITLE:=Lua openSSL binding + URL:=http://github.com/zhaozg/lua-openssl + DEPENDS:=+lua +libopenssl +librt +endef + +define Package/lua-openssl/description + A free, MIT-licensed OpenSSL binding for Lua. +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/openssl.so $(1)/usr/lib/lua/ +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/lua-openssl/patches/0001-Revise-Makefile.patch b/lang/lua-openssl/patches/0001-Revise-Makefile.patch new file mode 100644 index 000000000..a70a218b5 --- /dev/null +++ b/lang/lua-openssl/patches/0001-Revise-Makefile.patch @@ -0,0 +1,135 @@ +diff --git a/Makefile b/Makefile +index 6cb1176..6605879 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,85 +1,45 @@ +-T=openssl +- +-PREFIX ?=/usr/local +-LIB_OPTION ?= -shared +- +-#Lua auto detect +-LUA_VERSION ?= $(shell pkg-config luajit --print-provides) +-ifeq ($(LUA_VERSION),) ############ Not use luajit +-LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") +-LUA_CFLAGS ?= -I$(PREFIX)/include/lua$(LUAV) +-LUA_LIBS ?= -L$(PREFIX)/lib +-LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV) +-else +-LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") +-LUA_CFLAGS ?= $(shell pkg-config luajit --cflags) +-LUA_LIBS ?= $(shell pkg-config luajit --libs) +-LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV) +-endif +- +-#OS auto detect +-SYS := $(shell gcc -dumpmachine) +- +-ifneq (, $(findstring linux, $(SYS))) +-# Do linux things +-LDFLAGS = -fPIC -lrt -ldl +-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) +-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) +-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) +-endif +-ifneq (, $(findstring apple, $(SYS))) +-# Do darwin things +-LDFLAGS = -fPIC -lrt -ldl +-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) +-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) +-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) +-endif +-ifneq (, $(findstring mingw, $(SYS))) +-# Do mingw things +-V = $(shell lua -e "v=string.gsub('$(LUAV)','%.','');print(v)") +-LDFLAGS = -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll +-LUA_CFLAGS = -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/ +-CFLAGS = $(OPENSSL_CFLAGS) $(LUA_CFLAGS) +-endif +-ifneq (, $(findstring cygwin, $(SYS))) +-# Do cygwin things +-OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) +-OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) +-CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) +-endif +-#custome config +-ifeq (.config, $(wildcard .config)) +-include .config +-endif +- +-LIBNAME= $T.so.$V +- +-#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X +- +-# Compilation directives +-WARN_MOST = -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic +-WARN = -Wall -Wno-unused-value +-WARN_MIN = +-CFLAGS += $(WARN_MIN) -DPTHREADS +-CC= gcc -g $(CFLAGS) -Ideps +- +- +-OBJS=src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \ +-src/ec.o src/engine.o src/hmac.o src/lbn.o src/lhash.o src/misc.o src/ocsp.o src/openssl.o src/ots.o src/pkcs12.o src/pkcs7.o \ +-src/pkey.o src/rsa.o src/ssl.o src/th-lock.o src/util.o src/x509.o src/xattrs.o src/xexts.o src/xname.o src/xstore.o src/xalgor.o src/callback.o +- +-.c.o: +- $(CC) -c -o $@ $? +- +-all: $T.so +- echo $(SYS) +- +-$T.so: $(OBJS) +- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o $T.so $(OBJS) $(OPENSSL_LIBS) $(LUA_LIBS) $(LDFLAGS) +- +-install: all +- mkdir -p $(LUA_LIBDIR) +- cp $T.so $(LUA_LIBDIR) +- +-clean: +- rm -f $T.so $(OBJS) ++.PHONY: install clean ++ ++PKGC ?= pkg-config ++ ++LIBNAME = openssl.so ++LIB_OPTION = -shared ++ ++# lua's package config can be under various names ++LUAPKGC := $(shell for pc in lua lua5.1 lua5.2 lua5.3; do \ ++ $(PKGC) --exists $$pc && echo $$pc && break; \ ++ done) ++ ++BUILD_DIR = $(shell pwd) ++ ++# LUA include/libraries build flags ++LUA_LIBDIR := $(shell $(PKGC) --variable=libdir $(LUAPKGC)) ++LUA_CFLAGS := $(shell $(PKGC) --cflags $(LUAPKGC)) ++LUA_LIBS := $(shell $(PKGC) --libs-only-L $(LUAPKGC)) ++ ++# openssl include/libraries build flags ++OPENSSL_LIBS = $(shell $(PKGC) openssl --libs) ++OPENSSL_CFLAGS = $(shell $(PKGC) openssl --cflags) ++ ++# openssl include/libraries build flags ++LOCAL_INCLUDE = -I$(BUILD_DIR)/deps ++ ++CFLAGS += -fPIC -DPTHREADS -g $(LOCAL_INCLUDE) $(OPENSSL_CFLAGS) $(LUA_CFLAGS) ++LDFLAGS += -lrt -ldl $(OPENSSL_LIBS) $(LUA_LIBS) ++ ++OBJS = src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o src/ec.o src/engine.o src/hmac.o src/lbn.o src/lhash.o src/misc.o src/ocsp.o src/openssl.o src/ots.o src/pkcs12.o src/pkcs7.o src/pkey.o src/rsa.o src/ssl.o src/th-lock.o src/util.o src/x509.o src/xattrs.o src/xexts.o src/xname.o src/xstore.o src/xalgor.o src/callback.o ++ ++all: clean $(LIBNAME) ++ ++$(LIBNAME): $(OBJS) ++ $(CC) $(LDFLAGS) $(LIB_OPTION) $(OBJS) -o $@ ++ ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< -o $@ ++ ++install: all ++ mkdir -p $(LUA_LIBDIR) ++ cp $(LIBNAME) $(LUA_LIBDIR) ++ ++clean: ++ rm -f $(LIBNAME) $(OBJS) diff --git a/lang/lua-openssl/patches/0010-Fix-Linkage.patch b/lang/lua-openssl/patches/0010-Fix-Linkage.patch new file mode 100644 index 000000000..52bcf1ae8 --- /dev/null +++ b/lang/lua-openssl/patches/0010-Fix-Linkage.patch @@ -0,0 +1,36 @@ +diff --git a/deps/lua-compat/c-api/compat-5.3.c b/deps/lua-compat/c-api/compat-5.3.c +index 4395bbc..4a8877c 100644 +--- a/deps/lua-compat/c-api/compat-5.3.c ++++ b/deps/lua-compat/c-api/compat-5.3.c +@@ -491,17 +491,6 @@ COMPAT53_API int lua_geti (lua_State *L, int index, lua_Integer i) { + } + + +-COMPAT53_API int lua_isinteger (lua_State *L, int index) { +- if (lua_type(L, index) == LUA_TNUMBER) { +- lua_Number n = lua_tonumber(L, index); +- lua_Integer i = lua_tointeger(L, index); +- if (i == n) +- return 1; +- } +- return 0; +-} +- +- + static void compat53_reverse (lua_State *L, int a, int b) { + for (; a < b; ++a, --b) { + lua_pushvalue(L, a); +diff --git a/deps/lua-compat/c-api/compat-5.3.h b/deps/lua-compat/c-api/compat-5.3.h +index 2309294..8e67bae 100644 +--- a/deps/lua-compat/c-api/compat-5.3.h ++++ b/deps/lua-compat/c-api/compat-5.3.h +@@ -244,9 +244,6 @@ typedef int (*lua_KFunction)(lua_State *L, int status, lua_KContext ctx); + #define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti) + COMPAT53_API int lua_geti (lua_State *L, int index, lua_Integer i); + +-#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger) +-COMPAT53_API int lua_isinteger (lua_State *L, int index); +- + #define lua_numbertointeger(n, p) \ + ((*(p) = (lua_Integer)(n)), 1) + diff --git a/lang/lua-openssl/patches/0020-support-OPENSSL_NO_SSL3_METHOD.patch b/lang/lua-openssl/patches/0020-support-OPENSSL_NO_SSL3_METHOD.patch new file mode 100644 index 000000000..2f296801d --- /dev/null +++ b/lang/lua-openssl/patches/0020-support-OPENSSL_NO_SSL3_METHOD.patch @@ -0,0 +1,41 @@ +--- lua-openssl-0.6.0.old/src/ssl.c 2016-09-19 08:30:43.735075695 +0200 ++++ lua-openssl-0.6.0/src/ssl.c 2016-09-19 09:02:45.733813437 +0200 +@@ -24,12 +24,17 @@ + SSL_METHOD* method = NULL; + const char* ciphers; + SSL_CTX* ctx; +- if (strcmp(meth, "SSLv3") == 0) ++ if (0); ++ ++#ifndef OPENSSL_NO_SSL3 ++ else if (strcmp(meth, "SSLv3") == 0) + method = SSLv3_method(); /* SSLv3 */ + else if (strcmp(meth, "SSLv3_server") == 0) + method = SSLv3_server_method(); /* SSLv3 */ + else if (strcmp(meth, "SSLv3_client") == 0) + method = SSLv3_client_method(); /* SSLv3 */ ++#endif ++ + else if (strcmp(meth, "SSLv23") == 0) + method = SSLv23_method(); /* SSLv3 but can rollback to v2 */ + else if (strcmp(meth, "SSLv23_server") == 0) +@@ -79,15 +84,15 @@ + #endif + else + luaL_error(L, "#1:%s not supported\n" +- "Maybe SSLv3 SSLv23 TLSv1 TLSv1_1 TLSv1_2 DTLSv1 [SSLv2], option followed by _client or _server\n", +- "default is SSLv3", ++ "Maybe [SSLv3] SSLv23 TLSv1 TLSv1_1 TLSv1_2 DTLSv1 [SSLv2], option followed by _client or _server\n", ++ "default is TLSv1", + meth); + ciphers = luaL_optstring(L, 2, SSL_DEFAULT_CIPHER_LIST); + ctx = SSL_CTX_new(method); + if (!ctx) + luaL_error(L, "#1:%s not supported\n" +- "Maybe SSLv3 SSLv23 TLSv1 TLSv1_1 TLSv1_2 DTLSv1 [SSLv2], option followed by _client or _server\n", +- "default is SSLv3", ++ "Maybe [SSLv3] SSLv23 TLSv1 TLSv1_1 TLSv1_2 DTLSv1 [SSLv2], option followed by _client or _server\n", ++ "default is TLSv1", + meth); + openssl_newvalue(L, ctx); + SSL_CTX_set_cipher_list(ctx, ciphers); diff --git a/lang/lua-openssl/patches/0030-support-OPENSSL_NO_COMP.patch b/lang/lua-openssl/patches/0030-support-OPENSSL_NO_COMP.patch new file mode 100644 index 000000000..44e53309d --- /dev/null +++ b/lang/lua-openssl/patches/0030-support-OPENSSL_NO_COMP.patch @@ -0,0 +1,20 @@ +--- lua-openssl-0.6.0.old/src/ssl.c 2016-09-19 08:30:43.735075695 +0200 ++++ lua-openssl-0.6.0/src/ssl.c 2016-09-19 08:48:37.393737125 +0200 +@@ -1245,7 +1250,7 @@ + lua_pushinteger(L, st); + return 2; + } +-#ifndef LIBRESSL_VERSION_NUMBER ++#if !defined(OPENSSL_NO_COMP) && !defined(LIBRESSL_VERSION_NUMBER) + static int openssl_ssl_current_compression(lua_State *L) + { + SSL* s = CHECK_OBJECT(1, SSL, "openssl.ssl"); +@@ -1803,7 +1808,7 @@ + {"getfd", openssl_ssl_getfd}, + + {"current_cipher", openssl_ssl_current_cipher}, +-#ifndef LIBRESSL_VERSION_NUMBER ++#if !defined(OPENSSL_NO_COMP) && !defined(LIBRESSL_VERSION_NUMBER) + {"current_compression", openssl_ssl_current_compression}, + #endif + {"getpeerverification", openssl_ssl_getpeerverification}, diff --git a/lang/php5-pecl-dio/Makefile b/lang/php5-pecl-dio/Makefile deleted file mode 100644 index e7b9507ff..000000000 --- a/lang/php5-pecl-dio/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2012-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PECL_NAME:=dio -PECL_LONGNAME:=Direct I/O functions - -PKG_VERSION:=0.0.7 -PKG_RELEASE:=1 -PKG_MD5SUM:=a1a4df428a17dbe1ab4277b492dfa052 - -PKG_NAME:=php5-pecl-$(PECL_NAME) -PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://pecl.php.net/get/ - -PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php5/$(PECL_NAME)-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> - -PKG_LICENSE:=PHPv3.01 -PKG_LICENSE_FILES:= - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -include ../php5/pecl.mk - -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php5-pecl-dio/patches/010-additional-baudrates.patch b/lang/php5-pecl-dio/patches/010-additional-baudrates.patch deleted file mode 100644 index 5032e6e14..000000000 --- a/lang/php5-pecl-dio/patches/010-additional-baudrates.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/dio.c -+++ b/dio.c -@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr) - - /* assign to correct values... */ - switch (Baud_Rate) { -+#ifdef B460800 -+ case 460800: -+ BAUD = B460800; -+ break; -+#endif -+#ifdef B230400 -+ case 230400: -+ BAUD = B230400; -+ break; -+#endif -+#ifdef B115200 -+ case 115200: -+ BAUD = B115200; -+ break; -+#endif -+#ifdef B57600 -+ case 57600: -+ BAUD = B57600; -+ break; -+#endif - case 38400: - BAUD = B38400; - break; diff --git a/lang/php5-pecl-libevent/Makefile b/lang/php5-pecl-libevent/Makefile deleted file mode 100644 index af7e92f21..000000000 --- a/lang/php5-pecl-libevent/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2012-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PECL_NAME:=libevent -PECL_LONGNAME:=Libevent - event notification - -PKG_VERSION:=0.1.0 -PKG_RELEASE:=2 -PKG_MD5SUM:=e091371a9e714098a4c04a6e3daeb56a - -PKG_NAME:=php5-pecl-$(PECL_NAME) -PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://pecl.php.net/get/ - -PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> - -PKG_LICENSE:=PHPv3.01 -PKG_LICENSE_FILES:= - -PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php5/$(PECL_NAME)-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -include ../php5/pecl.mk - -CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" - -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php5-mod-sockets)) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php5-pecl-libevent/patches/010-libevent2.patch b/lang/php5-pecl-libevent/patches/010-libevent2.patch deleted file mode 100644 index 961fb3608..000000000 --- a/lang/php5-pecl-libevent/patches/010-libevent2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/libevent.c -+++ b/libevent.c -@@ -42,10 +42,12 @@ - (rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type)) - #endif - --#ifdef PHP_WIN32 -+//#ifdef PHP_WIN32 - /* XXX compiling with 2.x on Windows. Luckily the ext code works thanks to the - compat exports from the libevent. However it might need to be adapted to the - never version, so this ifdefs would go away. */ -+#if 1 -+/* force use of libevent2 on OpenWrt and by-pass compat event.h */ - # include <event2/event.h> - # include <event2/event_compat.h> - # include <event2/event_struct.h> diff --git a/lang/php5-pecl-propro/Makefile b/lang/php5-pecl-propro/Makefile deleted file mode 100644 index bb0cc24da..000000000 --- a/lang/php5-pecl-propro/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PECL_NAME:=propro -PECL_LONGNAME:=Property proxy - -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 -PKG_MD5SUM:=9c775035fd17c65f0162b7eb1b4f8564 - -PKG_NAME:=php5-pecl-propro -PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://pecl.php.net/get/ - -PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php5/$(PECL_NAME)-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -include ../php5/pecl.mk - -CONFIGURE_ARGS+= \ - --enable-propro - -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php5-pecl-raphf/Makefile b/lang/php5-pecl-raphf/Makefile deleted file mode 100644 index 69c8a4aaf..000000000 --- a/lang/php5-pecl-raphf/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PECL_NAME:=raphf -PECL_LONGNAME:=Resource and persistent handles factory - -PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 -PKG_MD5SUM:=4d95c44dc28be089ce59bceb647b8db2 - -PKG_NAME:=php5-pecl-raphf -PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://pecl.php.net/get/ - -PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php5/$(PECL_NAME)-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -include ../php5/pecl.mk - -CONFIGURE_ARGS+= \ - --enable-raphf - -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php5/Makefile b/lang/php5/Makefile deleted file mode 100644 index 47d09ed11..000000000 --- a/lang/php5/Makefile +++ /dev/null @@ -1,582 +0,0 @@ -# -# Copyright (C) 2006-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=php -PKG_VERSION:=5.6.26 -PKG_RELEASE:=1 - -PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>, Michael Heimpold <mhei@heimpold.de> - -PKG_LICENSE:=PHPv3.01 -PKG_LICENSE_FILES:=LICENSE - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=c51e9115263b4d63ef8f68935cefd7d4 - -PKG_FIXUP:=libtool autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PHP5_MODULES = \ - calendar ctype curl \ - fileinfo \ - dom \ - exif \ - ftp \ - gettext gd gmp \ - hash \ - iconv intl \ - json \ - ldap \ - mbstring mcrypt mysql mysqli \ - opcache openssl \ - pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \ - session shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm \ - tokenizer \ - xml xmlreader xmlwriter zip \ - -PKG_CONFIG_DEPENDS:= \ - $(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \ - CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML CONFIG_PHP5_SYSTEMTZDATA - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/php5/Default - SUBMENU:=PHP - SECTION:=lang - CATEGORY:=Languages - TITLE:=PHP5 Hypertext preprocessor - URL:=http://www.php.net/ - DEPENDS:=php5 -endef - -define Package/php5/Default/description - PHP is a widely-used general-purpose scripting language that is especially - suited for Web development and can be embedded into HTML. -endef - -define Package/php5/config - config PHP5_FILTER - bool "PHP5 Filter support" - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - - config PHP5_LIBXML - bool "PHP5 LIBXML support" - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - - config PHP5_SYSTEMTZDATA - bool "Use system timezone data instead of php's built-in database" - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - select PACKAGE_zoneinfo-core - default y - help - Enabling this feature automatically selects the zoneinfo-core package - which contains data for UTC timezone. To use other timezones you have - to install the corresponding zoneinfo-... package(s). -endef - -define Package/php5 - $(call Package/php5/Default) - - DEPENDS:=+libpcre +zlib \ - +PHP5_LIBXML:libxml2 -endef - -define Package/php5/description - $(call Package/php5/Default/description) - This package contains only the PHP config file. You must actually choose - your PHP flavour (cli, cgi or fastcgi). -endef - -define Package/php5-cli - $(call Package/php5/Default) - DEPENDS+= +PACKAGE_php5-mod-intl:libstdcpp - TITLE+= (CLI) -endef - -define Package/php5-cli/description - $(call Package/php5/Default/description) - This package contains the CLI version of the PHP5 interpreter. -endef - -define Package/php5-cgi - $(call Package/php5/Default) - DEPENDS+= +PACKAGE_php5-mod-intl:libstdcpp - TITLE+= (CGI & FastCGI) -endef - -define Package/php5-cgi/description - $(call Package/php5/Default/description) - This package contains the CGI version of the PHP5 interpreter. -endef - -define Package/php5-fastcgi - $(call Package/php5/Default) - DEPENDS+= +php5-cgi - TITLE:=FastCGI startup script -endef - -define Package/php5-fastcgi/description - As FastCGI support is now a core feature the php5-fastcgi package now depends - on the php5-cgi package, containing just the startup script. -endef - -define Package/php5-fpm - $(call Package/php5/Default) - DEPENDS+= +php5-cgi - TITLE+= (FPM) -endef - -define Package/php5-fpm/description - $(call Package/php5/Default/description) - This package contains the FastCGI Process Manager of the PHP5 interpreter. -endef - -CONFIGURE_ARGS+= \ - --enable-cli \ - --enable-cgi \ - --enable-fpm \ - --enable-shared \ - --disable-static \ - --disable-rpath \ - --disable-debug \ - --without-pear \ - \ - --with-config-file-path=/etc \ - --with-config-file-scan-dir=/etc/php5 \ - --disable-short-tags \ - \ - --with-zlib="$(STAGING_DIR)/usr" \ - --with-zlib-dir="$(STAGING_DIR)/usr" \ - --with-pcre-regex="$(STAGING_DIR)/usr" \ - --disable-phar - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),) - CONFIGURE_ARGS+= --enable-calendar=shared -else - CONFIGURE_ARGS+= --disable-calendar -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),) - CONFIGURE_ARGS+= --enable-ctype=shared -else - CONFIGURE_ARGS+= --disable-ctype -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),) - CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-curl -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),) - CONFIGURE_ARGS+= --enable-fileinfo=shared -else - CONFIGURE_ARGS+= --disable-fileinfo -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gettext),) - CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full" -else - CONFIGURE_ARGS+= --without-gettext -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),) - CONFIGURE_ARGS+= --enable-dom=shared -else - CONFIGURE_ARGS+= --disable-dom -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),) - CONFIGURE_ARGS+= --enable-exif=shared -else - CONFIGURE_ARGS+= --disable-exif -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),) - CONFIGURE_ARGS+= --enable-ftp=shared -else - CONFIGURE_ARGS+= --disable-ftp -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),) - CONFIGURE_ARGS+= \ - --with-gd=shared \ - --without-freetype-dir \ - --with-jpeg-dir="$(STAGING_DIR)/usr" \ - --with-png-dir="$(STAGING_DIR)/usr" \ - --without-xpm-dir \ - --without-t1lib \ - --enable-gd-native-ttf \ - --disable-gd-jis-conv -else - CONFIGURE_ARGS+= --without-gd -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),) - CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-gmp -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),) - CONFIGURE_ARGS+= --enable-hash=shared -else - CONFIGURE_ARGS+= --disable-hash -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),) - CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)" -else - CONFIGURE_ARGS+= --without-iconv -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-intl),) - CONFIGURE_ARGS+= --enable-intl=shared -else - CONFIGURE_ARGS+= --disable-intl -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-json),) - CONFIGURE_ARGS+= --enable-json=shared -else - CONFIGURE_ARGS+= --disable-json -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),) - CONFIGURE_ARGS+= \ - --with-ldap=shared,"$(STAGING_DIR)/usr" \ - --with-ldap-sasl="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-ldap -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),) - CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex -else - CONFIGURE_ARGS+= --disable-mbstring -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),) - CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-mcrypt -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),) - CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-mysql -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysqli),) - CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config" -else - CONFIGURE_ARGS+= --without-mysqli -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-opcache),) - CONFIGURE_ARGS+= --enable-opcache=shared -else - CONFIGURE_ARGS+= --disable-opcache -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),) - CONFIGURE_ARGS+= \ - --with-openssl=shared,"$(STAGING_DIR)/usr" \ - --with-kerberos=no \ - --with-openssl-dir="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-openssl -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),) - CONFIGURE_ARGS+= --enable-pcntl=shared -else - CONFIGURE_ARGS+= --disable-pcntl -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),) - CONFIGURE_ARGS+= --enable-pdo=shared - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-mysql),) - CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr" - else - CONFIGURE_ARGS+= --without-pdo-mysql - endif - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-pgsql),) - CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr" - else - CONFIGURE_ARGS+= --without-pdo-pgsql - endif - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) - CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr" - else - CONFIGURE_ARGS+= --without-pdo-sqlite - endif -else - CONFIGURE_ARGS+= --disable-pdo -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),) - CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-pgsql -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),) - CONFIGURE_ARGS+= --enable-session=shared -else - CONFIGURE_ARGS+= --disable-session -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-shmop),) - CONFIGURE_ARGS+= --enable-shmop=shared -else - CONFIGURE_ARGS+= --disable-shmop -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),) - CONFIGURE_ARGS+= --enable-simplexml=shared -else - CONFIGURE_ARGS+= --disable-simplexml -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),) - CONFIGURE_ARGS+= --enable-soap=shared -else - CONFIGURE_ARGS+= --disable-soap -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),) - CONFIGURE_ARGS+= --enable-sockets=shared -else - CONFIGURE_ARGS+= --disable-sockets -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),) - CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-sqlite3 -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),) - CONFIGURE_ARGS+= --enable-sysvmsg=shared -else - CONFIGURE_ARGS+= --disable-sysvmsg -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),) - CONFIGURE_ARGS+= --enable-sysvsem=shared -else - CONFIGURE_ARGS+= --disable-sysvsem -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),) - CONFIGURE_ARGS+= --enable-sysvshm=shared -else - CONFIGURE_ARGS+= --disable-sysvshm -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),) - CONFIGURE_ARGS+= --enable-tokenizer=shared -else - CONFIGURE_ARGS+= --disable-tokenizer -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),) - CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr" - ifneq ($(CONFIG_PHP5_LIBXML),) - CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" - else - CONFIGURE_ARGS+= --with-libexpat-dir="$(STAGING_DIR)/usr" - endif -else - CONFIGURE_ARGS+= --disable-xml -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),) - CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --disable-xmlreader -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),) - CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --disable-xmlwriter -endif - -ifneq ($(CONFIG_PACKAGE_php5-mod-zip),) - CONFIGURE_ARGS+= --enable-zip=shared -else - CONFIGURE_ARGS+= --disable-zip -endif - -ifneq ($(SDK)$(CONFIG_PHP5_FILTER),) - CONFIGURE_ARGS+= --enable-filter -else - CONFIGURE_ARGS+= --disable-filter -endif - -ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),) - CONFIGURE_ARGS+= --enable-libxml - CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" -else - CONFIGURE_ARGS+= --disable-libxml -endif - -ifneq ($(CONFIG_PHP5_SYSTEMTZDATA),) - CONFIGURE_ARGS+= --with-system-tzdata -else - CONFIGURE_ARGS+= --without-system-tzdata -endif - -CONFIGURE_VARS+= \ - ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ - php_cv_cc_rpath="no" \ - iconv_impl_name="gnu_libiconv" \ - ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \ - -define Package/php5/conffiles -/etc/php.ini -endef - -define Package/php5/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) ./files/php.ini $(1)/etc/ -endef - -define Package/php5-cli/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/sapi/cli/php $(1)/usr/bin/php-cli -endef - -define Package/php5-cgi/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(1)/usr/bin/php-cgi - ln -sf php-cgi $(1)/usr/bin/php-fcgi -endef - -define Package/php5-fastcgi/install - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/php5-fastcgi.config $(1)/etc/config/php5-fastcgi - - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/php5-fastcgi.init $(1)/etc/init.d/php5-fastcgi -endef - -define Package/php5-fpm/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sapi/fpm/php-fpm $(1)/usr/bin/php-fpm - - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) ./files/php5-fpm.conf $(1)/etc/php5-fpm.conf - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/php5-fpm.config $(1)/etc/config/php5-fpm - - $(INSTALL_DIR) $(1)/etc/php5-fpm.d - $(INSTALL_DATA) ./files/php5-fpm-www.conf $(1)/etc/php5-fpm.d/www.conf - - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/php5-fpm.init $(1)/etc/init.d/php5-fpm -endef - -define Build/Prepare - $(call Build/Prepare/Default) - ( cd $(PKG_BUILD_DIR); touch configure.in; ./buildconf --force ) -endef - -define Build/InstallDev - mkdir -p $(PKG_BUILD_DIR)/staging/usr/bin - make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging - rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php - $(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR)/host - sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR)/host/usr'#" $(STAGING_DIR)/host/usr/bin/phpize - sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR)/host/usr'#" $(STAGING_DIR)/host/usr/bin/phpize - sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR)/host/usr\"#" $(STAGING_DIR)/host/usr/bin/php-config -endef - -define BuildModule - - define Package/php5-mod-$(1) - $(call Package/php5/Default) - - ifneq ($(3),) - DEPENDS+=$(3) - endif - - TITLE:=$(2) shared module - endef - - define Package/php5-mod-$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib/php - $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/ - $(INSTALL_DIR) $$(1)/etc/php5 - ifeq ($(4),zend) - echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini - else - echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini - endif - endef - - $$(eval $$(call BuildPackage,php5-mod-$(1))) - -endef - -$(eval $(call BuildPackage,php5)) -$(eval $(call BuildPackage,php5-cgi)) -$(eval $(call BuildPackage,php5-cli)) -$(eval $(call BuildPackage,php5-fastcgi)) -$(eval $(call BuildPackage,php5-fpm)) - -#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS])) -$(eval $(call BuildModule,calendar,Calendar)) -$(eval $(call BuildModule,ctype,Ctype)) -$(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl)) -$(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2)) -$(eval $(call BuildModule,exif,EXIF)) -$(eval $(call BuildModule,fileinfo,Fileinfo)) -$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl)) -$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng)) -$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full)) -$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) -$(eval $(call BuildModule,hash,Hash)) -$(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS))) -$(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php5-mod-intl:icu)) -$(eval $(call BuildModule,json,JSON)) -$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2)) -$(eval $(call BuildModule,mbstring,MBString)) -$(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl)) -$(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient)) -$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php5-mod-mysqli:libmysqlclient)) -$(eval $(call BuildModule,opcache,OPcache,,zend)) -$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl)) -$(eval $(call BuildModule,pcntl,PCNTL)) -$(eval $(call BuildModule,pdo,PHP Data Objects)) -$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-mysql:libmysqlclient)) -$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-pgsql:libpq)) -$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php5-mod-pdo +PACKAGE_php5-mod-pdo-sqlite:libsqlite3 +PACKAGE_php5-mod-pdo-sqlite:librt)) -$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php5-mod-pgsql:libpq)) -$(eval $(call BuildModule,session,Session)) -$(eval $(call BuildModule,shmop,Shared Memory)) -$(eval $(call BuildModule,simplexml,SimpleXML,+@PHP5_LIBXML +PACKAGE_php5-mod-simplexml:libxml2)) -$(eval $(call BuildModule,soap,SOAP,+@PHP5_LIBXML +PACKAGE_php5-mod-soap:libxml2)) -$(eval $(call BuildModule,sockets,Sockets)) -$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3)) -$(eval $(call BuildModule,sysvmsg,System V messages)) -$(eval $(call BuildModule,sysvsem,System V shared memory)) -$(eval $(call BuildModule,sysvshm,System V semaphore)) -$(eval $(call BuildModule,tokenizer,Tokenizer)) -$(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat)) -$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlreader:libxml2)) -$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2)) -$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib)) diff --git a/lang/php5/files/php.ini b/lang/php5/files/php.ini deleted file mode 100644 index 23a8bb988..000000000 --- a/lang/php5/files/php.ini +++ /dev/null @@ -1,321 +0,0 @@ -[PHP] - -zend.ze1_compatibility_mode = Off - -; Language Options - -engine = On -;short_open_tag = Off -precision = 12 -y2k_compliance = On -output_buffering = Off -;output_handler = -zlib.output_compression = Off -;zlib.output_compression_level = -1 -;zlib.output_handler = -implicit_flush = Off -unserialize_callback_func = -serialize_precision = 100 - -;open_basedir = -disable_functions = -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; <span style="color: ???????"> would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -;ignore_user_abort = On -;realpath_cache_size = 16k -;realpath_cache_ttl = 120 - -; Miscellaneous - -expose_php = On - -; Resource Limits - -max_execution_time = 30 ; Maximum execution time of each script, in seconds. -max_input_time = 60 ; Maximum amount of time each script may spend parsing request data. -;max_input_nesting_level = 64 -memory_limit = 8M ; Maximum amount of memory a script may consume. - -; Error handling and logging - -; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 6.0.0) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; E_DEPRECATED - warn about code that will not work in future versions -; of PHP -; E_USER_DEPRECATED - user-generated deprecation warnings -; -; Common Values: -; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.) -; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices) -; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) -; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.) -; Default Value: E_ALL & ~E_NOTICE -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT - -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -;report_zend_debug = 0 -track_errors = Off -;html_errors = Off -;docref_root = "/phpmanual/" -;docref_ext = .html -;error_prepend_string = "<font color=#ff0000>" -;error_append_string = "</font>" -; Log errors to specified file. -;error_log = /var/log/php_errors.log -; Log errors to syslog. -;error_log = syslog - -; Data Handling - -;arg_separator.output = "&" -;arg_separator.input = ";&" -variables_order = "EGPCS" -request_order = "GP" -register_globals = Off -register_long_arrays = Off -register_argc_argv = On -auto_globals_jit = On -post_max_size = 8M -;magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -auto_prepend_file = -auto_append_file = -default_mimetype = "text/html" -;default_charset = "iso-8859-1" -;always_populate_raw_post_data = On - -; Paths and Directories - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -doc_root = "/www" -user_dir = -extension_dir = "/usr/lib/php" -enable_dl = On -;cgi.force_redirect = 1 -;cgi.nph = 1 -;cgi.redirect_status_env = ; -cgi.fix_pathinfo=1 -;fastcgi.impersonate = 1; -;fastcgi.logging = 0 -;cgi.rfc2616_headers = 0 - -; File Uploads - -file_uploads = On -upload_tmp_dir = "/tmp" -upload_max_filesize = 2M -max_file_uploads = 20 - -; Fopen wrappers - -allow_url_fopen = On -allow_url_include = Off -;from="john@doe.com" -;user_agent="PHP" -default_socket_timeout = 60 -;auto_detect_line_endings = Off - -; Dynamic Extensions - -;extension=ctype.so -;extension=curl.so -;extension=dom.so -;extension=exif.so -;extension=ftp.so -;extension=gd.so -;extension=gmp.so -;extension=hash.so -;extension=iconv.so -;extension=json.so -;extension=ldap.so -;extension=mbstring.so -;extension=mcrypt.so -;extension=mysql.so -;extension=openssl.so -;extension=pcre.so -;extension=pdo.so -;extension=pdo-mysql.so -;extension=pdo-pgsql.so -;extension=pdo_sqlite.so -;extension=pgsql.so -;extension=session.so -;extension=soap.so -;extension=sockets.so -;extension=sqlite.so -;extension=sqlite3.so -;extension=tokenizer.so -;extension=xml.so -;extension=xmlreader.so -;extension=xmlwriter.so - -; Module Settings - -[APC] -apc.enabled = 1 -apc.shm_segments = 1 ;The number of shared memory segments to allocate for the compiler cache. -apc.shm_size = 4M ;The size of each shared memory segment. - -[Date] -;date.timezone = -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[sqlite3] -;sqlite3.extension_dir = - -[Pdo_mysql] -pdo_mysql.cache_size = 2000 -pdo_mysql.default_socket= - -[MySQL] -mysql.allow_local_infile = On -mysql.allow_persistent = On -mysql.cache_size = 2000 -mysql.max_persistent = -1 -mysql.max_links = -1 -mysql.default_port = -mysql.default_socket = -mysql.default_host = -mysql.default_user = -mysql.default_password = -mysql.connect_timeout = 60 -mysql.trace_mode = Off - -[PostgresSQL] -pgsql.allow_persistent = On -pgsql.auto_reset_persistent = Off -pgsql.max_persistent = -1 -pgsql.max_links = -1 -pgsql.ignore_notice = 0 -pgsql.log_notice = 0 - -[Session] -session.save_handler = files -session.save_path = "/tmp" -session.use_cookies = 1 -;session.cookie_secure = -session.use_only_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.cookie_httponly = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 100 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = On -session.bug_compat_warn = On -session.referer_check = -session.entropy_length = 0 -;session.entropy_file = /dev/urandom -session.entropy_file = -;session.entropy_length = 16 -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 -session.hash_function = 0 -session.hash_bits_per_character = 4 -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" - -[mbstring] -;mbstring.language = Japanese -;mbstring.internal_encoding = EUC-JP -;mbstring.http_input = auto -;mbstring.http_output = SJIS -;mbstring.encoding_translation = Off -;mbstring.detect_order = auto -;mbstring.substitute_character = none; -;mbstring.func_overload = 0 -;mbstring.strict_detection = Off -;mbstring.http_output_conv_mimetype= -;mbstring.script_encoding= - -[gd] -;gd.jpeg_ignore_warning = 0 - -[exif] -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[soap] -soap.wsdl_cache_enabled=1 -soap.wsdl_cache_dir="/tmp" -soap.wsdl_cache_ttl=86400 -soap.wsdl_cache_limit = 5 - -[sysvshm] -;sysvshm.init_mem = 10000 - -[ldap] -ldap.max_links = -1 - -[mcrypt] -;mcrypt.algorithms_dir= -;mcrypt.modes_dir= - -[opcache] -;opcache.memory_consumption=8 ; 8M is the allowed minimum -;opcache.interned_strings_buffer=1 -opcache.max_accelerated_files=200 ; 200 is the allowed minimum -;opcache.revalidate_freq=60 -;opcache.fast_shutdown=1 -opcache.enable_cli=1 -opcache.enable=1 -;opcache.log_verbosity_level=4 diff --git a/lang/php5/files/php5-fastcgi.config b/lang/php5/files/php5-fastcgi.config deleted file mode 100644 index 039d3bbc5..000000000 --- a/lang/php5/files/php5-fastcgi.config +++ /dev/null @@ -1,3 +0,0 @@ -config php5-fastcgi - option enabled 1 - option port '1026' diff --git a/lang/php5/files/php5-fastcgi.init b/lang/php5/files/php5-fastcgi.init deleted file mode 100644 index 0c452ad27..000000000 --- a/lang/php5/files/php5-fastcgi.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org - -START=50 - -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -start_instance() { - local section="$1" - local enabled - local port - - config_get_bool enabled "$section" 'enabled' 0 - config_get port "$section" 'port' 1026 - - [ $enabled -gt 0 ] || return 1 - - PHP_FCGI_CHILDREN='' \ - service_start /usr/bin/php-fcgi -b $port -} - -start() { - config_load 'php5-fastcgi' - config_foreach start_instance 'php5-fastcgi' -} - -stop() { - service_stop /usr/bin/php-fcgi -} diff --git a/lang/php5/files/php5-fpm-www.conf b/lang/php5/files/php5-fpm-www.conf deleted file mode 100644 index 4776bbaea..000000000 --- a/lang/php5/files/php5-fpm-www.conf +++ /dev/null @@ -1,392 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = nobody -;group = - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php5-fpm.sock - -; Set listen(2) backlog. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 128 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0666 -;listen.owner = www-data -;listen.group = www-data -;listen.mode = 0666 - -; List of ipv4 addresses of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; priority = -19 - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: ${prefix}/share/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: ouput header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = / - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/lang/php5/files/php5-fpm.conf b/lang/php5/files/php5-fpm.conf deleted file mode 100644 index 00c8e4f53..000000000 --- a/lang/php5/files/php5-fpm.conf +++ /dev/null @@ -1,121 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;; -; FPM Configuration ; -;;;;;;;;;;;;;;;;;;;;; - -; All relative paths in this configuration file are relative to PHP's install -; prefix (/usr). This prefix can be dynamically changed by using the -; '-p' argument from the command line. - -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p argument) -; - /usr otherwise -;include=/etc/php5/fpm/*.conf - -;;;;;;;;;;;;;;;;;; -; Global Options ; -;;;;;;;;;;;;;;;;;; - -[global] -; Pid file -; Note: the default prefix is /var -; Default Value: none -pid = /var/run/php5-fpm.pid - -; Error log file -; If it's set to "syslog", log is sent to syslogd instead of being written -; in a local file. -; Note: the default prefix is /var -; Default Value: log/php-fpm.log -error_log = /var/log/php5-fpm.log - -; syslog_facility is used to specify what type of program is logging the -; message. This lets syslogd specify that messages from different facilities -; will be handled differently. -; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) -; Default Value: daemon -;syslog.facility = daemon - -; syslog_ident is prepended to every message. If you have multiple FPM -; instances running on the same server, you can change the default value -; which must suit common needs. -; Default Value: php-fpm -;syslog.ident = php-fpm - -; Log level -; Possible Values: alert, error, warning, notice, debug -; Default Value: notice -;log_level = notice - -; If this number of child processes exit with SIGSEGV or SIGBUS within the time -; interval set by emergency_restart_interval then FPM will restart. A value -; of '0' means 'Off'. -; Default Value: 0 -;emergency_restart_threshold = 0 - -; Interval of time used by emergency_restart_interval to determine when -; a graceful restart will be initiated. This can be useful to work around -; accidental corruptions in an accelerator's shared memory. -; Available Units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;emergency_restart_interval = 0 - -; Time limit for child processes to wait for a reaction on signals from master. -; Available units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;process_control_timeout = 0 - -; The maximum number of processes FPM will fork. This has been design to control -; the global number of processes when using dynamic PM within a lot of pools. -; Use it with caution. -; Note: A value of 0 indicates no limit -; Default Value: 0 -; process.max = 128 - -; Specify the nice(2) priority to apply to the master process (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool process will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. -; Default Value: yes -;daemonize = yes - -; Set open file descriptor rlimit for the master process. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit for the master process. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Specify the event mechanism FPM will use. The following is available: -; - select (any POSIX os) -; - poll (any POSIX os) -; - epoll (linux >= 2.5.44) -; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0) -; - /dev/poll (Solaris >= 7) -; - port (Solaris >= 10) -; Default Value: not set (auto detection) -; events.mechanism = epoll - -;;;;;;;;;;;;;;;;;;;; -; Pool Definitions ; -;;;;;;;;;;;;;;;;;;;; - -; Multiple pools of child processes may be started with different listening -; ports and different management options. The name of the pool will be -; used in logs and stats. There is no limitation on the number of pools which -; FPM can handle. Your system will tell you anyway :) - -; To configure the pools it is recommended to have one .conf file per -; pool in the following directory: -include=/etc/php5-fpm.d/*.conf diff --git a/lang/php5/files/php5-fpm.config b/lang/php5/files/php5-fpm.config deleted file mode 100644 index 4f40c9256..000000000 --- a/lang/php5/files/php5-fpm.config +++ /dev/null @@ -1,2 +0,0 @@ -config php5-fpm - option enabled 1 diff --git a/lang/php5/files/php5-fpm.init b/lang/php5/files/php5-fpm.init deleted file mode 100644 index aa5397a5d..000000000 --- a/lang/php5/files/php5-fpm.init +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2015 OpenWrt.org - -START=50 - -PROG=/usr/bin/php-fpm -CONFIG=/etc/php5-fpm.conf - -SERVICE_PID_FILE=/var/run/php5-fpm.pid - -start_instance() { - local section="$1" - local enabled - - config_get_bool enabled "$section" 'enabled' 0 - - [ $enabled -gt 0 ] || return 1 - - service_start $PROG -y $CONFIG -g $SERVICE_PID_FILE -} - -start() { - config_load 'php5-fpm' - config_foreach start_instance 'php5-fpm' -} - -stop() { - service_stop $PROG -} diff --git a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch deleted file mode 100644 index 3e81dd6b9..000000000 --- a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ext/standard/php_crypt_r.c -+++ b/ext/standard/php_crypt_r.c -@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) - InterlockedIncrement(&initialized); - #elif defined(HAVE_SYNC_FETCH_AND_ADD) - __sync_fetch_and_add(&initialized, 1); -+#elif (defined(__GNUC__) && (__GNUC__ == 3)) -+ initialized = 1; - #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ - membar_producer(); - atomic_add_int(&initialized, 1); diff --git a/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch deleted file mode 100644 index bfbed435c..000000000 --- a/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch +++ /dev/null @@ -1,640 +0,0 @@ -Add support for use of the system timezone database, rather -than embedding a copy. Discussed upstream but was not desired. - -History: -r11: adopted to php 5.6.9 -r10: make timezone case insensitive -r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold) -r8: fix compile error without --with-system-tzdata configured -r7: improve check for valid timezone id to exclude directories -r6: fix fd leak in r5, fix country code/BC flag use in. - timezone_identifiers_list() using system db, - fix use of PECL timezonedb to override system db, -r5: reverts addition of "System/Localtime" fake tzname. - updated for 5.3.0, parses zone.tab to pick up mapping between - timezone name, country code and long/lat coords -r4: added "System/Localtime" tzname which uses /etc/localtime -r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) -r2: add filesystem trawl to set up name alias index -r1: initial revision - ---- a/ext/date/lib/parse_tz.c -+++ b/ext/date/lib/parse_tz.c -@@ -18,8 +18,22 @@ - - /* $Id$ */ - -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif -+ - #include "timelib.h" - -+#ifdef HAVE_SYSTEM_TZDATA -+#include <sys/mman.h> -+#include <sys/stat.h> -+#include <limits.h> -+#include <fcntl.h> -+#include <unistd.h> -+ -+#include "php_scandir.h" -+#endif -+ - #include <stdio.h> - - #ifdef HAVE_LOCALE_H -@@ -32,8 +46,12 @@ - #include <strings.h> - #endif - -+#ifndef HAVE_SYSTEM_TZDATA - #define TIMELIB_SUPPORTS_V2DATA - #include "timezonedb.h" -+#endif -+ -+#include <ctype.h> - - #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) - # if defined(__LITTLE_ENDIAN__) -@@ -55,6 +73,11 @@ static int read_preamble(const unsigned - { - uint32_t version; - -+ if (memcmp(tzf, "TZif", 4) == 0) { -+ *tzf += 20; -+ return -1; -+ } -+ - /* read ID */ - version = (*tzf)[3] - '0'; - *tzf += 4; -@@ -298,7 +321,406 @@ void timelib_dump_tzinfo(timelib_tzinfo - } - } - --static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) -+#ifdef HAVE_SYSTEM_TZDATA -+ -+#ifdef HAVE_SYSTEM_TZDATA_PREFIX -+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX -+#else -+#define ZONEINFO_PREFIX "/usr/share/zoneinfo" -+#endif -+ -+/* System timezone database pointer. */ -+static const timelib_tzdb *timezonedb_system; -+ -+/* Hash table entry for the cache of the zone.tab mapping table. */ -+struct location_info { -+ char code[2]; -+ double latitude, longitude; -+ char name[64]; -+ char *comment; -+ struct location_info *next; -+}; -+ -+/* Cache of zone.tab. */ -+static struct location_info **system_location_table; -+ -+/* Size of the zone.tab hash table; a random-ish prime big enough to -+ * prevent too many collisions. */ -+#define LOCINFO_HASH_SIZE (1021) -+ -+/* Compute a case insensitive hash of str */ -+static uint32_t tz_hash(const char *str) -+{ -+ const unsigned char *p = (const unsigned char *)str; -+ uint32_t hash = 5381; -+ int c; -+ -+ while ((c = tolower(*p++)) != '\0') { -+ hash = (hash << 5) ^ hash ^ c; -+ } -+ -+ return hash % LOCINFO_HASH_SIZE; -+} -+ -+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the -+ * parsed string on success, or NULL on parse error. On success, -+ * writes the parsed number to *result. */ -+static char *parse_iso6709(char *p, double *result) -+{ -+ double v, sign; -+ char *pend; -+ size_t len; -+ -+ if (*p == '+') -+ sign = 1.0; -+ else if (*p == '-') -+ sign = -1.0; -+ else -+ return NULL; -+ -+ p++; -+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) -+ ;; -+ -+ /* Annoying encoding used by zone.tab has no decimal point, so use -+ * the length to determine the format: -+ * -+ * 4 = DDMM -+ * 5 = DDDMM -+ * 6 = DDMMSS -+ * 7 = DDDMMSS -+ */ -+ len = pend - p; -+ if (len < 4 || len > 7) { -+ return NULL; -+ } -+ -+ /* p => [D]DD */ -+ v = (p[0] - '0') * 10.0 + (p[1] - '0'); -+ p += 2; -+ if (len == 5 || len == 7) -+ v = v * 10.0 + (*p++ - '0'); -+ /* p => MM[SS] */ -+ v += (10.0 * (p[0] - '0') -+ + p[1] - '0') / 60.0; -+ p += 2; -+ /* p => [SS] */ -+ if (len > 5) { -+ v += (10.0 * (p[0] - '0') -+ + p[1] - '0') / 3600.0; -+ p += 2; -+ } -+ -+ /* Round to five decimal place, not because it's a good idea, -+ * but, because the builtin data uses rounded data, so, match -+ * that. */ -+ *result = round(v * sign * 100000.0) / 100000.0; -+ -+ return p; -+} -+ -+/* This function parses the zone.tab file to build up the mapping of -+ * timezone to country code and geographic location, and returns a -+ * hash table. The hash table is indexed by the function: -+ * -+ * tz_hash(timezone-name) -+ */ -+static struct location_info **create_location_table(void) -+{ -+ struct location_info **li, *i; -+ char zone_tab[PATH_MAX]; -+ char line[512]; -+ FILE *fp; -+ -+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); -+ -+ fp = fopen(zone_tab, "r"); -+ if (!fp) { -+ return NULL; -+ } -+ -+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); -+ -+ while (fgets(line, sizeof line, fp)) { -+ char *p = line, *code, *name, *comment; -+ uint32_t hash; -+ double latitude, longitude; -+ -+ while (isspace(*p)) -+ p++; -+ -+ if (*p == '#' || *p == '\0' || *p == '\n') -+ continue; -+ -+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') -+ continue; -+ -+ /* code => AA */ -+ code = p; -+ p[2] = 0; -+ p += 3; -+ -+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ -+ p = parse_iso6709(p, &latitude); -+ if (!p) { -+ continue; -+ } -+ p = parse_iso6709(p, &longitude); -+ if (!p) { -+ continue; -+ } -+ -+ if (!p || *p != '\t') { -+ continue; -+ } -+ -+ /* name = string */ -+ name = ++p; -+ while (*p != '\t' && *p && *p != '\n') -+ p++; -+ -+ *p++ = '\0'; -+ -+ /* comment = string */ -+ comment = p; -+ while (*p != '\t' && *p && *p != '\n') -+ p++; -+ -+ if (*p == '\n' || *p == '\t') -+ *p = '\0'; -+ -+ hash = tz_hash(name); -+ i = malloc(sizeof *i); -+ memcpy(i->code, code, 2); -+ strncpy(i->name, name, sizeof i->name); -+ i->comment = strdup(comment); -+ i->longitude = longitude; -+ i->latitude = latitude; -+ i->next = li[hash]; -+ li[hash] = i; -+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ -+ } -+ -+ fclose(fp); -+ -+ return li; -+} -+ -+/* Return location info from hash table, using given timezone name. -+ * Returns NULL if the name could not be found. */ -+const struct location_info *find_zone_info(struct location_info **li, -+ const char *name) -+{ -+ uint32_t hash = tz_hash(name); -+ const struct location_info *l; -+ -+ if (!li) { -+ return NULL; -+ } -+ -+ for (l = li[hash]; l; l = l->next) { -+ if (strcasecmp(l->name, name) == 0) -+ return l; -+ } -+ -+ return NULL; -+} -+ -+/* Filter out some non-tzdata files and the posix/right databases, if -+ * present. */ -+static int index_filter(const struct dirent *ent) -+{ -+ return strcmp(ent->d_name, ".") != 0 -+ && strcmp(ent->d_name, "..") != 0 -+ && strcmp(ent->d_name, "posix") != 0 -+ && strcmp(ent->d_name, "posixrules") != 0 -+ && strcmp(ent->d_name, "right") != 0 -+ && strstr(ent->d_name, ".tab") == NULL; -+} -+ -+static int sysdbcmp(const void *first, const void *second) -+{ -+ const timelib_tzdb_index_entry *alpha = first, *beta = second; -+ -+ return strcmp(alpha->id, beta->id); -+} -+ -+ -+/* Create the zone identifier index by trawling the filesystem. */ -+static void create_zone_index(timelib_tzdb *db) -+{ -+ size_t dirstack_size, dirstack_top; -+ size_t index_size, index_next; -+ timelib_tzdb_index_entry *db_index; -+ char **dirstack; -+ -+ /* LIFO stack to hold directory entries to scan; each slot is a -+ * directory name relative to the zoneinfo prefix. */ -+ dirstack_size = 32; -+ dirstack = malloc(dirstack_size * sizeof *dirstack); -+ dirstack_top = 1; -+ dirstack[0] = strdup(""); -+ -+ /* Index array. */ -+ index_size = 64; -+ db_index = malloc(index_size * sizeof *db_index); -+ index_next = 0; -+ -+ do { -+ struct dirent **ents; -+ char name[PATH_MAX], *top; -+ int count; -+ -+ /* Pop the top stack entry, and iterate through its contents. */ -+ top = dirstack[--dirstack_top]; -+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); -+ -+ count = php_scandir(name, &ents, index_filter, php_alphasort); -+ -+ while (count > 0) { -+ struct stat st; -+ const char *leaf = ents[count - 1]->d_name; -+ -+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", -+ top, leaf); -+ -+ if (strlen(name) && stat(name, &st) == 0) { -+ /* Name, relative to the zoneinfo prefix. */ -+ const char *root = top; -+ -+ if (root[0] == '/') root++; -+ -+ snprintf(name, sizeof name, "%s%s%s", root, -+ *root ? "/": "", leaf); -+ -+ if (S_ISDIR(st.st_mode)) { -+ if (dirstack_top == dirstack_size) { -+ dirstack_size *= 2; -+ dirstack = realloc(dirstack, -+ dirstack_size * sizeof *dirstack); -+ } -+ dirstack[dirstack_top++] = strdup(name); -+ } -+ else { -+ if (index_next == index_size) { -+ index_size *= 2; -+ db_index = realloc(db_index, -+ index_size * sizeof *db_index); -+ } -+ -+ db_index[index_next++].id = strdup(name); -+ } -+ } -+ -+ free(ents[--count]); -+ } -+ -+ if (count != -1) free(ents); -+ free(top); -+ } while (dirstack_top); -+ -+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); -+ -+ db->index = db_index; -+ db->index_size = index_next; -+ -+ free(dirstack); -+} -+ -+#define FAKE_HEADER "1234\0??\1??" -+#define FAKE_UTC_POS (7 - 4) -+ -+/* Create a fake data segment for database 'sysdb'. */ -+static void fake_data_segment(timelib_tzdb *sysdb, -+ struct location_info **info) -+{ -+ size_t n; -+ char *data, *p; -+ -+ data = malloc(3 * sysdb->index_size + 7); -+ -+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); -+ -+ for (n = 0; n < sysdb->index_size; n++) { -+ const struct location_info *li; -+ timelib_tzdb_index_entry *ent; -+ -+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; -+ -+ /* Lookup the timezone name in the hash table. */ -+ if (strcmp(ent->id, "UTC") == 0) { -+ ent->pos = FAKE_UTC_POS; -+ continue; -+ } -+ -+ li = find_zone_info(info, ent->id); -+ if (li) { -+ /* If found, append the BC byte and the -+ * country code; set the position for this -+ * section of timezone data. */ -+ ent->pos = (p - data) - 4; -+ *p++ = '\1'; -+ *p++ = li->code[0]; -+ *p++ = li->code[1]; -+ } -+ else { -+ /* If not found, the timezone data can -+ * point at the header. */ -+ ent->pos = 0; -+ } -+ } -+ -+ sysdb->data = (unsigned char *)data; -+} -+ -+/* Returns true if the passed-in stat structure describes a -+ * probably-valid timezone file. */ -+static int is_valid_tzfile(const struct stat *st) -+{ -+ return S_ISREG(st->st_mode) && st->st_size > 20; -+} -+ -+/* Return the mmap()ed tzfile if found, else NULL. On success, the -+ * length of the mapped data is placed in *length. */ -+static char *map_tzfile(const char *timezone, size_t *length) -+{ -+ char fname[PATH_MAX]; -+ struct stat st; -+ char *p; -+ int fd; -+ -+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { -+ return NULL; -+ } -+ -+ if (system_location_table) { -+ const struct location_info *li; -+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { -+ /* Use the stored name to avoid case issue */ -+ timezone = li->name; -+ } -+ } -+ -+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); -+ -+ fd = open(fname, O_RDONLY); -+ if (fd == -1) { -+ return NULL; -+ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st)) { -+ close(fd); -+ return NULL; -+ } -+ -+ *length = st.st_size; -+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); -+ close(fd); -+ -+ return p != MAP_FAILED ? p : NULL; -+} -+ -+#endif -+ -+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) - { - int left = 0, right = tzdb->index_size - 1; - #ifdef HAVE_SETLOCALE -@@ -337,21 +759,90 @@ static int seek_to_tz_position(const uns - return 0; - } - -+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, -+ char **map, size_t *maplen, -+ const timelib_tzdb *tzdb) -+{ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (tzdb == timezonedb_system) { -+ char *orig; -+ -+ orig = map_tzfile(timezone, maplen); -+ if (orig == NULL) { -+ return 0; -+ } -+ -+ (*tzf) = (unsigned char *)orig; -+ *map = orig; -+ -+ return 1; -+ } -+ else -+#endif -+ { -+ return inmem_seek_to_tz_position(tzf, timezone, tzdb); -+ } -+} -+ - const timelib_tzdb *timelib_builtin_db(void) - { -+#ifdef HAVE_SYSTEM_TZDATA -+ if (timezonedb_system == NULL) { -+ timelib_tzdb *tmp = malloc(sizeof *tmp); -+ -+ tmp->version = "0.system"; -+ tmp->data = NULL; -+ create_zone_index(tmp); -+ system_location_table = create_location_table(); -+ fake_data_segment(tmp, system_location_table); -+ timezonedb_system = tmp; -+ } -+ -+ -+ return timezonedb_system; -+#else - return &timezonedb_builtin; -+#endif - } - - const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count) - { -+#ifdef HAVE_SYSTEM_TZDATA -+ *count = timezonedb_system->index_size; -+ return timezonedb_system->index; -+#else - *count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); - return timezonedb_idx_builtin; -+#endif - } - - int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) - { - const unsigned char *tzf; -- return (seek_to_tz_position(&tzf, timezone, tzdb)); -+ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (tzdb == timezonedb_system) { -+ char fname[PATH_MAX]; -+ struct stat st; -+ -+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { -+ return 0; -+ } -+ -+ if (system_location_table) { -+ if (find_zone_info(system_location_table, timezone) != NULL) { -+ /* found in cache */ -+ return 1; -+ } -+ } -+ -+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); -+ -+ return stat(fname, &st) == 0 && is_valid_tzfile(&st); -+ } -+#endif -+ -+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); - } - - static void skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -376,10 +867,12 @@ static void read_64bit_header(const unsi - timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) - { - const unsigned char *tzf; -+ char *memmap = NULL; -+ size_t maplen; - timelib_tzinfo *tmp; - int version; - -- if (seek_to_tz_position(&tzf, timezone, tzdb)) { -+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { - tmp = timelib_tzinfo_ctor(timezone); - - version = read_preamble(&tzf, tmp); -@@ -393,7 +886,34 @@ timelib_tzinfo *timelib_parse_tzfile(cha - skip_64bit_types(&tzf, tmp); - skip_posix_string(&tzf, tmp); - } -- read_location(&tzf, tmp); -+ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (memmap) { -+ const struct location_info *li; -+ -+ /* TZif-style - grok the location info from the system database, -+ * if possible. */ -+ -+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { -+ tmp->location.comments = strdup(li->comment); -+ strncpy(tmp->location.country_code, li->code, 2); -+ tmp->location.longitude = li->longitude; -+ tmp->location.latitude = li->latitude; -+ tmp->bc = 1; -+ } else { -+ strcpy(tmp->location.country_code, "??"); -+ tmp->bc = 0; -+ tmp->location.comments = strdup(""); -+ } -+ -+ /* Now done with the mmap segment - discard it. */ -+ munmap(memmap, maplen); -+ } else -+#endif -+ { -+ /* PHP-style - use the embedded info. */ -+ read_location(&tzf, tmp); -+ } - } else { - tmp = NULL; - } ---- a/ext/date/lib/timelib.m4 -+++ b/ext/date/lib/timelib.m4 -@@ -78,3 +78,17 @@ stdlib.h - - dnl Check for strtoll, atoll - AC_CHECK_FUNCS(strtoll atoll strftime) -+ -+PHP_ARG_WITH(system-tzdata, for use of system timezone data, -+[ --with-system-tzdata[=DIR] to specify use of system timezone data], -+no, no) -+ -+if test "$PHP_SYSTEM_TZDATA" != "no"; then -+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) -+ -+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then -+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", -+ [Define for location of system timezone data]) -+ fi -+fi -+ diff --git a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch deleted file mode 100644 index ae8d1827a..000000000 --- a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch +++ /dev/null @@ -1,19 +0,0 @@ -Author: Sean Finney <seanius@debian.org> -Forwarded: no (upstream doesn't want it) -Description: Silence warnings about using the default system timezone info - In vanilla upstream php, this is considered an error (i.e. the user must - set the timezone explicitly), though with our use of the system timezonedb - patch, we actually feel quite comfortable using the default timezone info. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 ---- a/ext/date/tests/date_default_timezone_set-1.phpt -+++ b/ext/date/tests/date_default_timezone_set-1.phpt -@@ -22,9 +22,6 @@ date.timezone= - echo date(DATE_ISO8601, $date4), "\n"; - ?> - --EXPECTF-- --Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 3 -- --Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 4 - America/Indiana/Knox - 2005-01-12T03:00:00-0500 - 2005-07-12T03:00:00-0500 diff --git a/lang/php5/patches/200-ext-opcache-fix-detection-of-shm-mmap.patch b/lang/php5/patches/200-ext-opcache-fix-detection-of-shm-mmap.patch deleted file mode 100644 index d2a1e91af..000000000 --- a/lang/php5/patches/200-ext-opcache-fix-detection-of-shm-mmap.patch +++ /dev/null @@ -1,159 +0,0 @@ -From dc8bb6a53bfdfe42d9ae81d4e78c6155ad4bfd6e Mon Sep 17 00:00:00 2001 -From: Michael Heimpold <mhei@heimpold.de> -Date: Sun, 17 May 2015 16:50:50 +0200 -Subject: [PATCH] ext/opcache: fix detection of shm/mmap - -The detection of sysvipc and mmap doesn't work well when cross-compiling, -so I decided to only check for the availability of the functions involved. -This is not a clean solution, but works for now(tm) :-) - -It should be discussed with upstream to find a better solution. - -This solves the issue reported at -https://github.com/openwrt/packages/issues/1010 -and makes opcache usable on OpenWrt. - -Signed-off-by: Michael Heimpold <mhei@heimpold.de> ---- - ext/opcache/config.m4 | 122 ++----------------------------------------------- - 1 file changed, 4 insertions(+), 118 deletions(-) - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index b7e4835..7b6c0aa 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -11,127 +11,13 @@ if test "$PHP_OPCACHE" != "no"; then - AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function]) - ]) - -- AC_MSG_CHECKING(for sysvipc shared memory support) -- AC_TRY_RUN([ --#include <sys/types.h> --#include <sys/wait.h> --#include <sys/ipc.h> --#include <sys/shm.h> --#include <unistd.h> --#include <string.h> -- --int main() { -- pid_t pid; -- int status; -- int ipc_id; -- char *shm; -- struct shmid_ds shmbuf; -- -- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W)); -- if (ipc_id == -1) { -- return 1; -- } -- -- shm = shmat(ipc_id, NULL, 0); -- if (shm == (void *)-1) { -- shmctl(ipc_id, IPC_RMID, NULL); -- return 2; -- } -- -- if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) { -- shmdt(shm); -- shmctl(ipc_id, IPC_RMID, NULL); -- return 3; -- } -- -- shmbuf.shm_perm.uid = getuid(); -- shmbuf.shm_perm.gid = getgid(); -- shmbuf.shm_perm.mode = 0600; -- -- if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) { -- shmdt(shm); -- shmctl(ipc_id, IPC_RMID, NULL); -- return 4; -- } -- -- shmctl(ipc_id, IPC_RMID, NULL); -- -- strcpy(shm, "hello"); -- -- pid = fork(); -- if (pid < 0) { -- return 5; -- } else if (pid == 0) { -- strcpy(shm, "bye"); -- return 6; -- } -- if (wait(&status) != pid) { -- return 7; -- } -- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { -- return 8; -- } -- if (strcmp(shm, "bye") != 0) { -- return 9; -- } -- return 0; --} --],dnl -+ AC_CHECK_FUNC(shmget,[ - AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) -- msg=yes,msg=no,msg=no) -- AC_MSG_RESULT([$msg]) -- -- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) -- AC_TRY_RUN([ --#include <sys/types.h> --#include <sys/wait.h> --#include <sys/mman.h> --#include <unistd.h> --#include <string.h> -- --#ifndef MAP_ANON --# ifdef MAP_ANONYMOUS --# define MAP_ANON MAP_ANONYMOUS --# endif --#endif --#ifndef MAP_FAILED --# define MAP_FAILED ((void*)-1) --#endif -- --int main() { -- pid_t pid; -- int status; -- char *shm; -- -- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); -- if (shm == MAP_FAILED) { -- return 1; -- } -- -- strcpy(shm, "hello"); -+ ]) - -- pid = fork(); -- if (pid < 0) { -- return 5; -- } else if (pid == 0) { -- strcpy(shm, "bye"); -- return 6; -- } -- if (wait(&status) != pid) { -- return 7; -- } -- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { -- return 8; -- } -- if (strcmp(shm, "bye") != 0) { -- return 9; -- } -- return 0; --} --],dnl -+ AC_CHECK_FUNC(mmap,[ - AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) -- msg=yes,msg=no,msg=no) -- AC_MSG_RESULT([$msg]) -+ ]) - - AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) - AC_TRY_RUN([ --- -1.7.10.4 - diff --git a/lang/php5/patches/800-gd-iconv.patch b/lang/php5/patches/800-gd-iconv.patch deleted file mode 100644 index 1418c276f..000000000 --- a/lang/php5/patches/800-gd-iconv.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/ext/gd/libgd/gdkanji.c -+++ b/ext/gd/libgd/gdkanji.c -@@ -9,6 +9,11 @@ - #include "gdhelpers.h" - - #include <stdarg.h> -+ -+/* force usage of internal conversation routine */ -+#undef HAVE_ICONV_H -+#undef HAVE_ICONV -+ - #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) - #include <iconv.h> - #ifdef HAVE_ERRNO_H diff --git a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch deleted file mode 100644 index 22122ec82..000000000 --- a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl) - PHP_CHECK_FUNC(gethostbyaddr, nsl) - PHP_CHECK_FUNC(yp_get_default_domain, nsl) - --PHP_CHECK_FUNC(dlopen, dl) -+PHP_ADD_LIBRARY(dl) -+PHP_DEF_HAVE(dlopen) -+PHP_DEF_HAVE(libdl) -+ac_cv_func_dlopen=yes - if test "$ac_cv_func_dlopen" = "yes"; then - AC_DEFINE(HAVE_LIBDL, 1, [ ]) - fi ---- a/ext/fileinfo/config.m4 -+++ b/ext/fileinfo/config.m4 -@@ -46,6 +46,10 @@ int main(void) - AC_MSG_RESULT(no) - AC_MSG_NOTICE(using libmagic strcasestr implementation) - libmagic_sources="$libmagic_sources libmagic/strcasestr.c" -+ ],[ -+ dnl cross-compiling; assume not present -+ AC_MSG_NOTICE(using libmagic strcasestr implementation) -+ libmagic_sources="$libmagic_sources libmagic/strcasestr.c" - ]) - - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -227,7 +227,14 @@ AC_TRY_RUN([ - flock_type=linux - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") -+], [ -+ dnl cross-compiling; assume Linux -+ flock_type=linux -+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -+ AC_MSG_RESULT("yes") -+]) - - AC_MSG_CHECKING("whether flock struct is BSD ordered") - AC_TRY_RUN([ -@@ -243,7 +250,12 @@ AC_TRY_RUN([ - flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) - AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") -+], [ -+ dnl cross-compiling; assume Linux -+ AC_MSG_RESULT("no") -+]) - - if test "$flock_type" == "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) diff --git a/lang/php5/pecl.mk b/lang/php5/pecl.mk deleted file mode 100644 index 88d3a98bb..000000000 --- a/lang/php5/pecl.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2011-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Package/php5-pecl/Default - SUBMENU:=PHP - SECTION:=lang - CATEGORY:=Languages - URL:=http://pecl.php.net/ - DEPENDS:=php5 -endef - -define Build/Prepare - $(Build/Prepare/Default) - ( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/host/usr/bin/phpize ) -endef - -CONFIGURE_ARGS+= \ - --with-php-config=$(STAGING_DIR)/host/usr/bin/php-config - -define PECLPackage - - define Package/php5-pecl-$(1) - $(call Package/php5-pecl/Default) - TITLE:=$(2) - - ifneq ($(3),) - DEPENDS+=$(3) - endif - endef - - define Package/php5-pecl-$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib/php - $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/ - $(INSTALL_DIR) $$(1)/etc/php5 - ifeq ($(4),zend) - echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini - else - echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini - endif - endef - -endef diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 11ad3183d..e8c701ef8 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.0.11 +PKG_VERSION:=7.0.12 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> @@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=9a6013a5e9f258bbfb62ae5ac66b72da +PKG_MD5SUM:=bdcc4dbdac90c2a39422786653059f70 PKG_FIXUP:=libtool autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch index c6ee584be..7639e5672 100644 --- a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch +++ b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch @@ -105,10 +105,10 @@ index b0ea105..4feb8f3 100644 case 'v': if (php_request_startup() != FAILURE) { #if ZEND_DEBUG -- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); +- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #else -- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif #ifdef PHP_OUTPUT_NEWAPI diff --git a/lang/python-cffi/Makefile b/lang/python-cffi/Makefile index 8fd86939a..b8a50009d 100644 --- a/lang/python-cffi/Makefile +++ b/lang/python-cffi/Makefile @@ -45,7 +45,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") endef define Host/Install diff --git a/lang/python-packages/Makefile b/lang/python-packages/Makefile new file mode 100644 index 000000000..f12b78e4d --- /dev/null +++ b/lang/python-packages/Makefile @@ -0,0 +1,131 @@ +# +# Copyright (C) 2016 Yousong Zhou <yszhou4tech@gmail.com> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-packages +PKG_VERSION:=1.0 +PKG_RELEASE:=1 + +PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> + +# +# NOTE: move the host module installation to Host/Compile when +# HOST_CONFIG_DEPENDS is supported +# +# NOTE: PKG_CONFIG_DEPENDS cannot correctly track changes of string type config +# options, so you may want to do manual cleanup on config change. +# +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_python-packages-list-host \ + CONFIG_PACKAGE_python-packages-list \ + CONFIG_PACKAGE_python-packages-list-cleanup \ + CONFIG_PACKAGE_python-packages-envs \ + CONFIG_PACKAGE_python-packages-extra-deps \ + CONFIG_PACKAGE_python-packages-index-url \ + CONFIG_PACKAGE_python-packages-pip-opts \ + +PKG_BUILD_DEPENDS:=python python-pip/host + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-host.mk) +$(call include_mk, python-package.mk) + +define Package/python-packages + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=A dummy package for packaging python modules with pip + DEPENDS:=@DEVEL +python +endef + +define Package/python-packages/config +if PACKAGE_python-packages +config PACKAGE_python-packages-list-host + string "List of python packages to install on host" +config PACKAGE_python-packages-list + string "List of python packages to install on target" +config PACKAGE_python-packages-list-cleanup + string "List of python packages to cleanup to avoid clash with existing packages" +config PACKAGE_python-packages-envs + string "Extra environment variables to pass on to pip and its children on target build" +config PACKAGE_python-packages-extra-deps + string "List of deps fulfilled but not tracked by the build system" +config PACKAGE_python-packages-index-url + string "Index URL passed to pip with --index-url" +config PACKAGE_python-packages-pip-opts + string "Additional arguments to pip command line" +endif +endef + +CONFIG_PACKAGE_python-packages-list-host:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list-host)) +CONFIG_PACKAGE_python-packages-list:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list)) +CONFIG_PACKAGE_python-packages-list-cleanup:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list-cleanup)) +CONFIG_PACKAGE_python-packages-envs:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-envs)) +CONFIG_PACKAGE_python-packages-extra-deps:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-extra-deps)) +CONFIG_PACKAGE_python-packages-pip-opts:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-pip-opts)) + +HOST_PYTHON_PIP:=$(STAGING_DIR)/host/bin/pip$(PYTHON_VERSION) + +decr=$(word $(1),0 1 2 3 4 5 6 7 8 9 10) +recur=$(if $(subst 0,,$(2)),$(call recur,$(1),$(call decr,$(2)),$(call $(1)$(2),$(3))),$(3)) +_req2dir1=$(subst >,gt,$(1)) +_req2dir2=$(subst <,lt,$(1)) +_req2dir3=$(subst >=,geq,$(1)) +_req2dir4=$(subst <=,leq,$(1)) +_req2dir5=$(subst ://,:::,$(1)) +_req2dir6=$(subst *,_,$(1)) +_req2dir7=$(subst ?,_,$(1)) +req2dir=$(call recur,_req2dir,7,$(1)) + +# --ignore-installed, it may happen that host pip will ignore target install if +# it was already installed as host module, e.g. cffi deps of cryptograph +HOST_PYTHON_PIP_INSTALL=$(HOST_PYTHON_PIP) install \ + --root=$(1) \ + --prefix=$(2) \ + --ignore-installed \ + --no-compile \ + $(if $(CONFIG_PACKAGE_python-packages-index-url), --index-url $(CONFIG_PACKAGE_python-packages-index-url)) \ + $(if $(CONFIG_PACKAGE_python-packages-pip-opts), $(CONFIG_PACKAGE_python-packages-pip-opts)) \ + +HOST_PYTHON_PIP_INSTALL_HOST:=$(call HOST_PYTHON_PIP_INSTALL,$(STAGING_DIR)/host,"") +HOST_PYTHON_PIP_INSTALL_TARGET=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/$(call req2dir,$(pkg)),/usr) +HOST_PYTHON_PIP_INSTALL_CLEANUP:=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/_cleanup,/usr) + +define Build/Compile + $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list-host), + $(call Build/Compile/HostPyRunHost,,$(HOST_PYTHON_PIP_INSTALL_HOST) $(pkg)) + ) + $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list), + $(call Build/Compile/HostPyRunTarget,,$(call HOST_PYTHON_PIP_INSTALL_TARGET,$(pkg)) $(pkg),$(CONFIG_PACKAGE_python-packages-envs)) + ) + $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list-cleanup), + $(call Build/Compile/HostPyRunTarget,,$(HOST_PYTHON_PIP_INSTALL_CLEANUP) $(pkg),$(CONFIG_PACKAGE_python-packages-envs)) + ) +endef + +define Package/python-packages/install + $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list), + $(CP) "$(PKG_INSTALL_DIR)/$(call req2dir,$(pkg))"/* $(1) + ) + + find "$(PKG_INSTALL_DIR)/_cleanup" -mindepth 1 -depth | while read sf; do \ + tf="$$$${sf#$(PKG_INSTALL_DIR)/_cleanup/}"; \ + tf="$(1)/$$$$tf"; \ + if [ -f "$$$$tf" -o -L "$$$$tf" ]; then \ + rm -vf "$$$$tf"; \ + elif [ -d "$$$$tf" ]; then \ + rmdir -v -p "$$$$tf" || true; \ + fi \ + done +endef + +define Package/python-packages/extra_provides + echo $(CONFIG_PACKAGE_python-packages-extra-deps) | tr ' ' '\n' +endef + +$(eval $(call BuildPackage,python-packages)) diff --git a/lang/python-packages/README.md b/lang/python-packages/README.md new file mode 100644 index 000000000..3c09d8eb6 --- /dev/null +++ b/lang/python-packages/README.md @@ -0,0 +1,72 @@ +This package allows users to package python modules without creating package +Makefiles for each individual module and their dependencies. It provides a +way making packaging python packages faster and may also facilitate the process +of developing Makefiles for new python packages + +This is a raw DEVEL only package. Using it may entail a lot of implementation +details and you may need to resolve target dependencies and package details on +your own + +- Third party python packages may depend on features not included in e.g. + python-light +- Some python modules may require host install of another module to progress, + e.g. target cryptography requires host cffi +- Some python modules have external C library dependencies, e.g. pyOpenSSL + requires openssl libs +- Some packages may have an autoconf configure script whose arguments we + cannot control with pip and has to be passed on (hacked) by overriding some + environment variables + +## How it works + +1. Install host modules required for building target modules +2. Install each target module to separate directories +3. Install another copy of modules for cleanup purposes to make list of + installed files to be removed from target modules installed in step 2 + +Why should it be so + +1. Installing target cryptography requires host installation of cffi module +2. cryptography requires setuptools and pip will install its own copy with + --ignore-installed. When PACKAGE_python-setuptools is also selected, opkg + will complain of data file clashes if it was not removed here. + +Pip will handle dependency requirements of python modules, but external +dependencies like c libraries has to be prepared by the build system. The +issue is that there is currently no way to express such dependencies, thus may +cause build failure, e.g. pycrypto requires the presence of libgmp to build +successfully. + +## Tips + +If something goes wrong, we can add additional arguments to pip command +line to check the detailed build process. Some useful arguments may be + +- -v, for verbose output. Repeat this option if the current level of + verbosity is not enough +- --no-clean, for preserving pip build dir on build failure + +## Examples + +tornado (python-only module) + + CONFIG_PACKAGE_python-packages=y + CONFIG_PACKAGE_python-packages-list="tornado==4.4.2" + +cryptography (requires installation of host modules and cleanup on target modules) + + CONFIG_PACKAGE_python-packages=y + CONFIG_PACKAGE_python-packages-list-host="cffi" + CONFIG_PACKAGE_python-packages-list="cryptography" + CONFIG_PACKAGE_python-packages-list-cleanup="setuptools" + +pycrypto 2.7a1 (python module with autoconf configure script; depends on +libgmp; broken wmmintrin.h). 2.6.1 does not work because of a flaw in +the setup.py hardcoding host include directory + + CONFIG_PACKAGE_libgmp=y + CONFIG_PACKAGE_python-packages=y + CONFIG_PACKAGE_python-packages-list="https://github.com/dlitz/pycrypto/archive/v2.7a1.tar.gz" + CONFIG_PACKAGE_python-packages-envs="ac_cv_header_wmmintrin_h=no build_alias=$(GNU_HOST_NAME) host_alias=$(GNU_TARGET_NAME) target_alias=$(GNU_TARGET_NAME)" + CONFIG_PACKAGE_python-packages-extra-deps="libgmp.so.10" + diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile index 3be956516..db40f8f6a 100644 --- a/lang/python-pip/Makefile +++ b/lang/python-pip/Makefile @@ -17,10 +17,16 @@ PKG_MD5SUM:=87083c0b9867963b29f7aba3613e8f4a PKG_BUILD_DIR:=$(BUILD_DIR)/python-pip-$(PKG_VERSION) PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/python-pip-$(PKG_VERSION) +HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) PKG_USE_MIPS16:=0 +HOST_BUILD_DEPENDS:=python python/host python-setuptools/host + +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) +$(call include_mk, python-host.mk) define Package/python-pip SUBMENU:=Python @@ -54,6 +60,17 @@ define PyPackage/python-pip/install $(INSTALL_CONF) ./files/pip.conf $(1)/etc/ endef +define Host/Compile + $(call Build/Compile/HostPyMod,,\ + install --root="$(STAGING_DIR)/host" --prefix="" \ + --single-version-externally-managed \ + ) +endef + +define Host/Install +endef + +$(eval $(call HostBuild)) + $(eval $(call PyPackage,python-pip)) $(eval $(call BuildPackage,python-pip)) - diff --git a/lang/python-ply/Makefile b/lang/python-ply/Makefile index fe1306095..ba90ecb30 100644 --- a/lang/python-ply/Makefile +++ b/lang/python-ply/Makefile @@ -46,7 +46,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") endef define Host/Install diff --git a/lang/python-pycparser/Makefile b/lang/python-pycparser/Makefile index 8acab48f0..ff17417e7 100644 --- a/lang/python-pycparser/Makefile +++ b/lang/python-pycparser/Makefile @@ -47,7 +47,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") endef define Host/Install diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile index 61b094f12..6efc433a4 100644 --- a/lang/python-setuptools/Makefile +++ b/lang/python-setuptools/Makefile @@ -63,7 +63,7 @@ endef define Host/Compile $(call Build/Compile/HostPyMod,,\ - install --root="$(STAGING_DIR)/host" --prefix="" \ + install --root="$(HOST_BUILD_PREFIX)" --prefix="" \ --single-version-externally-managed \ ) endef diff --git a/lang/python/Makefile b/lang/python/Makefile index 02c473769..c333f8e08 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -144,13 +144,13 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ + $(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ - $(STAGING_DIR)/host/lib/pkgconfig/python.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python2.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python.pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python2.pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ @@ -221,20 +221,20 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR)/host \ - --exec-prefix=$(STAGING_DIR)/host \ - --sysconfdir=$(STAGING_DIR_HOST)/host/etc \ - --localstatedir=$(STAGING_DIR)/host/var \ - --sbindir=$(STAGING_DIR)/host/bin \ - --with-system-expat=$(STAGING_DIR)/host \ - --with-system-ffi=$(STAGING_DIR)/host \ + --prefix=$(HOST_BUILD_PREFIX) \ + --exec-prefix=$(HOST_BUILD_PREFIX) \ + --sysconfdir=$(HOST_BUILD_PREFIX)/etc \ + --localstatedir=$(HOST_BUILD_PREFIX)/var \ + --sbindir=$(HOST_BUILD_PREFIX)/bin \ + --with-system-expat=$(HOST_BUILD_PREFIX) \ + --with-system-ffi=$(HOST_BUILD_PREFIX) \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen2 + $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen2 endef $(eval $(call HostBuild)) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 8736d29ad..080704bba 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -HOST_PYTHON_DIR:=$(STAGING_DIR)/host +HOST_PYTHON_DIR:=$(HOST_BUILD_PREFIX) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) @@ -13,7 +13,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION) -HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR) +HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_BUILD_PREFIX)/$(HOST_PYTHON_PKG_DIR) define HostPython if [ "$(strip $(3))" == "HOST" ]; then \ @@ -31,12 +31,12 @@ define HostPython $(HOST_PYTHON_BIN) $(2); endef -# $(1) => build subdir -# $(2) => additional arguments to setup.py +# $(1) => commands to execute before running pythons script +# $(2) => python script and its arguments # $(3) => additional variables -define Build/Compile/HostPyMod +define Build/Compile/HostPyRunHost $(call HostPython, \ - cd $(HOST_BUILD_DIR)/$(strip $(1)); \ + $(if $(1),$(1);) \ CC="$(HOSTCC)" \ CCSHARED="$(HOSTCC) $(HOST_FPIC)" \ CXX="$(HOSTCXX)" \ @@ -44,13 +44,24 @@ define Build/Compile/HostPyMod LDSHARED="$(HOSTCC) -shared" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \ - LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR)/host/lib" \ + LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(HOST_BUILD_PREFIX)/lib" \ _PYTHON_HOST_PLATFORM=linux2 \ $(3) \ , \ - ./setup.py $(2) \ + $(2) \ , \ HOST \ ) endef + +# $(1) => build subdir +# $(2) => additional arguments to setup.py +# $(3) => additional variables +define Build/Compile/HostPyMod + $(call Build/Compile/HostPyRunHost, \ + cd $(HOST_BUILD_DIR)/$(strip $(1)), \ + ./setup.py $(2), \ + $(3)) +endef + diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index 1f824cba6..52b6cf37e 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -82,13 +82,12 @@ endef $(call include_mk, python-host.mk) -# $(1) => build subdir -# $(2) => additional arguments to setup.py +# $(1) => commands to execute before running pythons script +# $(2) => python script and its arguments # $(3) => additional variables -define Build/Compile/PyMod - $(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) +define Build/Compile/HostPyRunTarget $(call HostPython, \ - cd $(PKG_BUILD_DIR)/$(strip $(1)); \ + $(if $(1),$(1);) \ CC="$(TARGET_CC)" \ CCSHARED="$(TARGET_CC) $(FPIC)" \ CXX="$(TARGET_CXX)" \ @@ -101,8 +100,19 @@ define Build/Compile/PyMod __PYVENV_LAUNCHER__="/usr/bin/$(PYTHON)" \ $(3) \ , \ - ./setup.py $(2) \ + $(2) \ ) +endef + +# $(1) => build subdir +# $(2) => additional arguments to setup.py +# $(3) => additional variables +define Build/Compile/PyMod + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) + $(call Build/Compile/HostPyRunTarget, \ + cd $(PKG_BUILD_DIR)/$(strip $(1)), \ + ./setup.py $(2), \ + $(3)) find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f endef diff --git a/lang/python3/Makefile b/lang/python3/Makefile index d0b5b5eae..2463f92a0 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -146,7 +146,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ + $(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ @@ -216,13 +216,13 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR)/host \ - --exec-prefix=$(STAGING_DIR)/host \ - --sysconfdir=$(STAGING_DIR_HOST)/host/etc \ - --localstatedir=$(STAGING_DIR)/host/var \ - --sbindir=$(STAGING_DIR)/host/bin \ - --with-system-expat=$(STAGING_DIR)/host \ - --with-system-ffi=$(STAGING_DIR)/host \ + --prefix=$(HOST_BUILD_PREFIX) \ + --exec-prefix=$(HOST_BUILD_PREFIX) \ + --sysconfdir=$(HOST_BUILD_PREFIX)/etc \ + --localstatedir=$(HOST_BUILD_PREFIX)/var \ + --sbindir=$(HOST_BUILD_PREFIX)/bin \ + --with-system-expat=$(HOST_BUILD_PREFIX) \ + --with-system-ffi=$(HOST_BUILD_PREFIX) \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" @@ -233,10 +233,11 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3 - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib + + $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen3 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(HOST_BUILD_PREFIX)/bin/_freeze_importlib endef $(eval $(call HostBuild)) diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index 3d0413c1c..d2697d9d4 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(HOST_BUILD_PREFIX)/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(HOST_BUILD_PREFIX)/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3 diff --git a/libs/boost/Makefile b/libs/boost/Makefile index 6dce9ee5a..eadd98fd5 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -16,15 +16,15 @@ include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=boost -PKG_VERSION:=1.61.0 -PKG_SOURCE_VERSION=1_61_0 -PKG_RELEASE:=2 +PKG_VERSION:=1.62.0 +PKG_SOURCE_VERSION:=1_62_0 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/boost/$(PKG_NAME)/$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) -PKG_MD5SUM:=874805ba2e2ee415b1877ef3297bf8ad +PKG_MD5SUM:=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 PKG_LICENSE:=Boost Software License <http://www.boost.org/users/license.html> PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com> @@ -45,22 +45,35 @@ define Package/boost/Default endef define Package/boost/description -This package provides the Boost v1.61 libraries. +This package provides the Boost v1.62 libraries. Boost is a set of free, peer-reviewed, portable C++ source libraries. + +----------------------------------------------------------------------------- +| Warning | +| In order to build all of the Boost Libraries, it is necessary | +| to use, at least, GCC version 5 (C++14 support) and, it is necessary to | +| compile the kernel with Full Language Support. | +| Without these requirerements, the following libs will not be available: | +| - Boost.Locale | +| - Boost.Coroutine2 | +| - Boost.Fiber | +----------------------------------------------------------------------------- + This package provides the following run-time libraries: - atomic - chrono - container - context - - coroutine - - - coroutine2 (requires GCC v5 and up) + - coroutine (Deprecated - use Coroutine2) + - - coroutine2 (Requires GCC v5 and up) - date_time - exception - filesystem + - fiber (Requires GCC v5 and up) - BROKEN - graph - - graph-parallel - iostreams - - locale (requires kernel being compiled with full language support) + - locale (Requires kernel being compiled with full language support) - log - math - program_options @@ -74,8 +87,9 @@ This package provides the following run-time libraries: - thread - timer - wave - There are many more header-only libraries supported by Boost. - See more at http://www.boost.org/doc/libs/1_61_0/ + +There are many more header-only libraries supported by Boost. +See more at http://www.boost.org/doc/libs/1_62_0/ endef BOOST_LIBS = @@ -109,143 +123,147 @@ define Package/boost endef define Package/boost/config - menu "Select Boost Options" - depends on PACKAGE_boost - comment "Boost compilation options." - - choice - prompt "Compile Boost libraries." - default boost-static-and-shared-libs - help - Choose which version to compile. - -> Shared: - - Only Shared libs will be compiled. - -> Static: - - Only Static libs will be compiled. - -> Both: - - Both Static and Shared libs will be compiled. - - config boost-shared-libs - bool "Shared" + menu "Select Boost Options" + depends on PACKAGE_boost + comment "Boost compilation options." + + choice + prompt "Compile Boost libraries." + default boost-static-and-shared-libs + help + Choose which version to compile. + -> Shared: + - Only Shared libs will be compiled. + -> Static: + - Only Static libs will be compiled. + -> Both: + - Both Static and Shared libs will be compiled. + + config boost-shared-libs + bool "Shared" config boost-static-libs - bool "Static" + bool "Static" config boost-static-and-shared-libs - bool "Both" - endchoice - - choice - prompt "Selects Boost Runtime linkage." - default boost-runtime-shared - help - Choose which C and C++ runtimes to use: - -> Use Shared runtimes. - -> Use Static runtimes. - - Not available if Shared libs are to be built. - -> Use both runtimes. - - Not available if Shared libs are to be built. - - Two separate versions of Boost are built, linking each to a different runtime. - - This option requires "Use tagged names" option to be active. - - config boost-runtime-shared - bool "Shared" - - config boost-runtime-static - depends on @(!boost-shared-libs&&!boost-static-and-shared-libs) - bool "Static" - - config boost-runtime-static-and-shared - depends on @(boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs) - bool "Both" - endchoice - - choice - prompt "Select a Variant." - default boost-variant-release - help - Chooses which boost variant should be selected: - -> Release: Optimizes Boost for release. - - Optimization: Speed; Debug Symbols: Off; Inlining: Full; Runtime Debugging: Off. - -> Debug: - - Optimization: Off; Debug Symbols: On; Inlining: Off; Runtime Debugging: On. - -> Profile: - - Profiling: On; Debug Symbols: On. - - config boost-variant-release - bool "Release" - - config boost-variant-debug - bool "Debug" - - config boost-variant-profile - bool "Profile" - endchoice - - config boost-use-name-tags - bool "Use tagged names." - help - Add name tags the lib files, to diferentiate each library version: - "-mt" for multi-threading. - "-d" for debugging. - "-s" for runtime static link". - Might break compatibility with libraries that expect boost libs with default names. - default n - - config boost-single-thread - depends on @boost-use-name-tags - bool "Single thread Support." - help - Compile Boost libraries in single-thread mode. - default n + bool "Both" + endchoice + + choice + prompt "Selects Boost Runtime linkage." + default boost-runtime-shared + help + Choose which C and C++ runtimes to use: + -> Use Shared runtimes. + -> Use Static runtimes. + - Not available if Shared libs are to be built. + -> Use both runtimes. + - Not available if Shared libs are to be built. + - Two separate versions of Boost are built, linking each to a different runtime. + - This option requires "Use tagged names" option to be active. + + config boost-runtime-shared + bool "Shared" + + config boost-runtime-static + depends on @(!boost-shared-libs&&!boost-static-and-shared-libs) + bool "Static" + + config boost-runtime-static-and-shared + depends on @(boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs) + bool "Both" + endchoice + + choice + prompt "Select a Variant." + default boost-variant-release + help + Chooses which boost variant should be selected: + -> Release: Optimizes Boost for release. + - Optimization: Speed; Debug Symbols: Off; Inlining: Full; Runtime Debugging: Off. + -> Debug: + - Optimization: Off; Debug Symbols: On; Inlining: Off; Runtime Debugging: On. + -> Profile: + - Profiling: On; Debug Symbols: On. + + config boost-variant-release + bool "Release" + + config boost-variant-debug + bool "Debug" + + config boost-variant-profile + bool "Profile" + endchoice + + config boost-use-name-tags + bool "Use tagged names." + help + Add name tags the lib files, to diferentiate each library version: + "-mt" for multi-threading. + "-d" for debugging. + "-s" for runtime static link". + Might break compatibility with libraries that expect boost libs with default names. + default n + + config boost-single-thread + depends on @boost-use-name-tags + bool "Single thread Support." + help + Compile Boost libraries in single-thread mode. + default n - config boost-build-type-complete - depends on @boost-use-name-tags - bool "Complete Boost Build." - help - Builds both release and debug libs. It will take much longer to compile. - default n - endmenu - - menu "Select Boost libraries" - depends on PACKAGE_boost + config boost-build-type-complete + depends on @boost-use-name-tags + bool "Complete Boost Build." + help + Builds both release and debug libs. It will take much longer to compile. + default n + endmenu + + menu "Select Boost libraries" + depends on PACKAGE_boost comment "Libraries" config boost-libs-all - bool "Include all Boost libraries." - select PACKAGE_boost-libs + bool "Include all Boost libraries." + select PACKAGE_boost-libs + select boost-test-pkg + select boost-coroutine2 + select boost-graph-parallel config boost-test-pkg - bool "Boost test package." - select PACKAGE_boost-test - + bool "Boost test package." + select PACKAGE_boost-test + config boost-coroutine2 - depends on @(GCC_VERSION_5 || GCC_VERSION_6) - bool "Boost couroutine2 support." - select PACKAGE_boost-coroutine - default n + depends on !@GCC_VERSION_4_8 + bool "Boost couroutine2 support." + select PACKAGE_boost-coroutine + default n config boost-graph-parallel - bool "Boost parallel graph support." - select PACKAGE_boost-graph - default n + bool "Boost parallel graph support." + select PACKAGE_boost-graph + default n $(foreach lib,$(BOOST_LIBS), \ - config PACKAGE_boost-$(lib) - prompt "Boost $(lib) library." - $(if $(findstring locale,$(lib)),depends on @BUILD_NLS,) + config PACKAGE_boost-$(lib) + prompt "Boost $(lib) library." + $(if $(findstring locale,$(lib)),depends on @BUILD_NLS,) + $(if $(findstring fiber,$(lib)),depends on BROKEN,) ) - endmenu + endmenu endef PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_boost-test define Package/boost-test - $(call Package/boost/Default) - TITLE+= (test) - HIDDEN:=1 - DEPENDS+=+boost-system +boost-timer + $(call Package/boost/Default) + TITLE+= (test) + HIDDEN:=1 + DEPENDS+=+boost-system +boost-timer endef define Build/Configure @@ -281,6 +299,7 @@ $(eval $(call DefineBoostLibrary,context,chrono system thread,)) $(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,)) $(eval $(call DefineBoostLibrary,date_time,,)) #$(eval $(call DefineBoostLibrary,exception,,)) +$(eval $(call DefineBoostLibrary,fiber,coroutine,)) $(eval $(call DefineBoostLibrary,filesystem,system,)) $(eval $(call DefineBoostLibrary,graph,regex,)) $(eval $(call DefineBoostLibrary,iostreams,,+PACKAGE_boost-iostreams:zlib)) @@ -365,8 +384,8 @@ define Build/Compile $(if $(CONFIG_PACKAGE_boost-test),,--without-test) \ $(foreach lib,$(BOOST_LIBS), \ $(if $(findstring python,$(lib)), \ - $(if $(or $(CONFIG_PACKAGE_boost-python),$(CONFIG_PACKAGE_boost-python3)),,--without-python), \ - $(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib))) \ + $(if $(or $(CONFIG_PACKAGE_boost-python),$(CONFIG_PACKAGE_boost-python3)),,--without-python), \ + $(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib))) \ ) \ $(if $(CONFIG_PACKAGE_boost-locale),boost.locale.iconv=on -sICONV_PATH=$(ICONV_PREFIX) boost.locale.posix=$(if $(USE_MUSL),on,off), \ boost.locale.iconv=off) \ @@ -408,7 +427,7 @@ define Package/boost/Default/install $(PKG_INSTALL_DIR)/lib/ -name 'libboost_$(2)*.so*' -exec $(CP) {} $(1)/usr/lib/ \; endef -define Package/boost-test/install +define Package/boost-test/install $(INSTALL_DIR) \ $(1)/usr/lib @@ -421,7 +440,7 @@ endef define BuildBoostLibrary define Package/boost-$(1)/install - $(call Package/boost/Default/install,$$(1),$(1)) + $(call Package/boost/Default/install,$$(1),$(1)) endef $$(eval $$(call BuildPackage,boost-$(1))) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index f09ef7f69..818d4663d 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -63,6 +63,7 @@ define Package/certtool $(call Package/gnutls/Default) SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Encryption TITLE+= (certool utility) DEPENDS+= +libgnutls endef @@ -77,6 +78,7 @@ define Package/gnutls-utils $(call Package/gnutls/Default) SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Encryption TITLE+= (utilities) DEPENDS+= +libgnutls endef diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 26869ed74..cd090a7a9 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=2.0.2 +PKG_VERSION:=2.0.3 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/warmcat/libwebsockets.git +PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? +PKG_MD5SUM:=a025156d606d90579e65d53ccd062a94 + + PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) @@ -60,6 +62,13 @@ define Package/libwebsockets-cyassl VARIANT:=cyassl endef +define Package/libwebsockets-full + $(call Package/$(PKG_NAME)/Default) + TITLE += (Full - OpenSSL, libuv, plugins, CGI) + DEPENDS += +libopenssl +libuv + VARIANT:=full +endef + ifeq ($(BUILD_VARIANT),openssl) CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON @@ -77,6 +86,17 @@ ifeq ($(BUILD_VARIANT),cyassl) CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include endif +ifeq ($(BUILD_VARIANT),full) + CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs + CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON + CMAKE_OPTIONS += -DLWS_WITH_SSL=ON + CMAKE_OPTIONS += -DLWS_WITH_LIBUV=ON + CMAKE_OPTIONS += -DLWS_WITH_PLUGINS=ON + CMAKE_OPTIONS += -DLWS_WITH_SERVER_STATUS=ON + CMAKE_OPTIONS += -DLWS_WITH_ACCESS_LOG=ON + CMAKE_OPTIONS += -DLWS_WITH_CGI=ON +endif + define Package/libwebsockets/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/ @@ -84,6 +104,8 @@ endef Package/$(PKG_NAME)-cyassl/install = $(Package/$(PKG_NAME)/install) Package/$(PKG_NAME)-openssl/install = $(Package/$(PKG_NAME)/install) +Package/$(PKG_NAME)-full/install = $(Package/$(PKG_NAME)/install) $(eval $(call BuildPackage,libwebsockets-openssl)) $(eval $(call BuildPackage,libwebsockets-cyassl)) +$(eval $(call BuildPackage,libwebsockets-full)) diff --git a/libs/loudmouth/Makefile b/libs/loudmouth/Makefile new file mode 100644 index 000000000..1f062093d --- /dev/null +++ b/libs/loudmouth/Makefile @@ -0,0 +1,73 @@ +# +# Copyright (C) 2007-2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=loudmouth +PKG_VERSION:=1.5.3 +PKG_RELEASE:=1 + +PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> + +PKG_LICENSE:=LGPLv2.1 +PKG_LICENSE_FILES:=COPYING + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/mcabber/loudmouth.git +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_MD5SUM:=7616cf124a8d72d007e7475b5aeb20ad + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/loudmouth + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+glib2 +libopenssl + TITLE:=loudmouth + URL:=https://github.com/mcabber/loudmouth +endef + +define Package/loudmouth/description + Lightweight and easy-to-use C library for programming with the Jabber protocol +endef + +CONFIGURE_ARGS += \ + --with-ssl=openssl + +define Build/Configure + ( cd $(PKG_BUILD_DIR); ./autogen.sh ) + $(call Build/Configure/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/loudmouth-1.0/ \ + $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/loudmouth/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,loudmouth)) diff --git a/net/aria2/Makefile b/net/aria2/Makefile index 4026e52d5..81acf83a4 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aria2 -PKG_VERSION:=1.27.1 +PKG_VERSION:=1.28.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/ -PKG_MD5SUM:=eb17bec0cd3ecd56003ff89457b53951 +PKG_MD5SUM:=f649ab30f3b09d0c0ebb816ce0c0205d PKG_INSTALL:=1 PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>, Hsing-Wang Liao <kuoruan@gmail.com> diff --git a/net/git/Makefile b/net/git/Makefile index 6c4593436..80b377ef2 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.10.0 +PKG_VERSION:=2.10.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_MD5SUM:=d99fdf256e7c7bc5d2cb428b48d4e038 +PKG_MD5SUM:=a9e1bf842497fc3a23e86424018b3499 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/net/git/patches/400-imapsend_without_curl.patch b/net/git/patches/400-imapsend_without_curl.patch index 35069419b..06d32a9d5 100644 --- a/net/git/patches/400-imapsend_without_curl.patch +++ b/net/git/patches/400-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1111,7 +1111,7 @@ else +@@ -1117,7 +1117,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 7cb1e1461..c5bf285ce 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_SOURCE_VERSION:=38151 +PKG_SOURCE_VERSION:=38231 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 diff --git a/net/lcdringer/Makefile b/net/lcdringer/Makefile new file mode 100644 index 000000000..f5a982c64 --- /dev/null +++ b/net/lcdringer/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2009-2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=lcdringer +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 + +PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.flyn.org/projects/lcdringer +PKG_MD5SUM:=ff3fe82593792c9111f957dd533369fb +PKG_BUILD_DEPENDS:=+vala + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/lcdringer + SECTION:=network + CATEGORY:=Network + DEPENDS:=+libgee +libgstreamer1 +loudmouth @TARGET_brcm2708 + TITLE:=lcdringer + URL:=http://www.flyn.org/projects/lcdringer/ +endef + +define Package/lcdringer/decription + A simple Jabber-initiated ringer meant to run on a Raspberry Pi with a PiFace CAD +endef + +define Package/lcdringer/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc/init.d + $(CP) \ + $(PKG_INSTALL_DIR)/usr/bin/lcdringer \ + $(1)/usr/bin/ + $(INSTALL_BIN) ./files/lcdringer.init $(1)/etc/init.d/lcdringer + $(INSTALL_DIR) $(1)/usr/share/lcdringer + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/lcdringer/* \ + $(1)/usr/share/lcdringer +endef + +$(eval $(call BuildPackage,lcdringer)) diff --git a/net/lcdringer/files/lcdringer.init b/net/lcdringer/files/lcdringer.init new file mode 100644 index 000000000..1781c1003 --- /dev/null +++ b/net/lcdringer/files/lcdringer.init @@ -0,0 +1,16 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2009-2012 OpenWrt.org + +START=60 + +start() { + /usr/bin/lcdringer & + echo $! > /var/run/lcdringer.pid +} + +stop() { + if [ ! -f /var/run/lcdringer.pid ]; then + return + fi + /bin/kill -9 `cat /var/run/lcdringer.pid` +} diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 6a813160c..7d3bb5c02 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd -PKG_VERSION:=1.4.41 +PKG_VERSION:=1.4.42 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x -PKG_MD5SUM:=1df2e4dbc965cfe6f99f008ac3db4d8d +PKG_MD5SUM:=53c55d7e1dac7adec161cd5490491f6d PKG_LICENSE:=BSD-3c PKG_LICENSE_FILES:=COPYING diff --git a/net/nmap/Makefile b/net/nmap/Makefile index aad8ebdb0..6fa208b5c 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -13,13 +13,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nmap -PKG_VERSION:=7.30 +PKG_VERSION:=7.31 PKG_RELEASE:=1 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://nmap.org/dist/ -PKG_MD5SUM:=8d86797d5c9e56de571f9630c0e6b5f8 +PKG_MD5SUM:=f2f6660142a777862342a58cc54258ea PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -90,7 +90,9 @@ CONFIGURE_ARGS += \ --without-liblua \ --without-zenmap -CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin" +CONFIGURE_VARS += \ + ac_cv_dnet_bsd_bpf=no \ + CXXFLAGS="$$$$CXXFLAGS -fno-builtin" ifeq ($(BUILD_VARIANT),ssl) CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index 111f9a07b..87cb014ed 100644 --- a/net/openconnect/Makefile +++ b/net/openconnect/Makefile @@ -31,7 +31,7 @@ endef define Package/openconnect SECTION:=net CATEGORY:=Network - DEPENDS:=+libxml2 +kmod-tun +resolveip +vpnc-scripts +OPENCONNECT_OPENSSL:libopenssl +OPENCONNECT_GNUTLS:libgnutls +OPENCONNECT_STOKEN:libstoken + DEPENDS:=+libxml2 +kmod-tun +resolveip +vpnc-scripts +OPENCONNECT_OPENSSL:libopenssl +OPENCONNECT_OPENSSL:p11-kit +OPENCONNECT_OPENSSL:libp11 +OPENCONNECT_GNUTLS:libgnutls +OPENCONNECT_STOKEN:libstoken TITLE:=OpenConnect VPN client (Cisco AnyConnect compatible) MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> URL:=http://www.infradead.org/openconnect/ diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 10eb434f5..73e7e6765 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=7.3p1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch b/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch new file mode 100644 index 000000000..f7b41dc49 --- /dev/null +++ b/net/openssh/patches/101-Unregister-the-KEXINIT-handler-after-receive.patch @@ -0,0 +1,18 @@ +diff --git a/kex.c b/kex.c +index 50c7a0f..d09c27b 100644 +--- a/kex.c ++++ b/kex.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: kex.c,v 1.118 2016/05/02 10:26:04 djm Exp $ */ ++/* $OpenBSD: kex.c,v 1.127 2016/10/10 19:28:48 markus Exp $ */ + /* + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. + * +@@ -472,6 +472,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt) + if (kex == NULL) + return SSH_ERR_INVALID_ARGUMENT; + ++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); + ptr = sshpkt_ptr(ssh, &dlen); + if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) + return r; diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index 2effdff56..8d482089b 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=privoxy PKG_VERSION:=3.0.26 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=privoxy-$(PKG_VERSION)-stable-src.tar.gz PKG_SOURCE_URL:=@SF/ijbswa @@ -151,7 +151,7 @@ define Package/$(PKG_NAME)/install $(1)/etc/config $(INSTALL_DATA) ./files/privoxy.upgrade $(1)/lib/upgrade/keep.d/privoxy $(INSTALL_BIN) ./files/privoxy.init $(1)/etc/init.d/privoxy - $(INSTALL_BIN) ./files/privoxy.hotplug $(1)/etc/hotplug.d/iface/80-privoxy + $(INSTALL_BIN) ./files/privoxy.hotplug $(1)/etc/hotplug.d/iface/95-privoxy $(INSTALL_CONF) ./files/privoxy.config $(1)/etc/config/privoxy endef diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init index 124fb858d..b2592b35a 100644 --- a/net/privoxy/files/privoxy.init +++ b/net/privoxy/files/privoxy.init @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common -START=80 -STOP=20 +START=95 +STOP=10 PIDFILE=/var/run/privoxy.pid CFGFILE=/var/etc/privoxy.conf @@ -9,32 +9,38 @@ CFGTEMP=/var/etc/privoxy.conf.tmp _uci2conf() { # redefined callback for options when calling config_load - option_cb() - { - # $1 name of variable - # $2 value - local __OPT="$1" - local __VAL="$2" - case $__OPT in - confdir|templdir|temporary_directory|logdir|logfile) - # needs to be handled separately because we need to set permissions - # AND needs to be defined first because of a BUG inside privoxy - # require directories to be defined first inside config - ;; - debug_*) - [ $__VAL -eq 0 ] && return # not set ignore - echo -e "debug\t$(echo $__OPT | sed -e 's#debug_##g')" >> $CFGTEMP ;; - *) - # detect list options (LENGTH) and ignore - echo $__OPT | grep -i "_LENGTH" >/dev/null 2>&1 && return - # detect list options (ITEM) and ignore - echo $__OPT | grep -i "_ITEM" >/dev/null 2>&1 && __OPT=$(echo $__OPT | sed -e "s#_ITEM.*##g") - # uci only accept "_" but we need "-" - local __OPT=$(echo $__OPT | sed -e "s#_#-#g") - # write to config - echo -e "$__OPT\t$__VAL" >> $CFGTEMP - ;; - esac + config_cb() { + if [ ."$2" != ."privoxy" ]; then + option_cb() { return 0; } + else + option_cb() + { + # $1 name of variable + # $2 value + local __OPT="$1" + local __VAL="$2" + case $__OPT in + confdir|templdir|temporary_directory|logdir|logfile) + # needs to be handled separately because we need to set permissions + # AND needs to be defined first because of a BUG inside privoxy + # require directories to be defined first inside config + ;; + debug_*) + [ $__VAL -eq 0 ] && return # not set ignore + echo -e "debug\t$(echo $__OPT | sed -e 's#debug_##g')" >> $CFGTEMP ;; + *) + # detect list options (LENGTH) and ignore + echo $__OPT | grep -i "_LENGTH" >/dev/null 2>&1 && return + # detect list options (ITEM) and ignore + echo $__OPT | grep -i "_ITEM" >/dev/null 2>&1 && __OPT=$(echo $__OPT | sed -e "s#_ITEM.*##g") + # uci only accept "_" but we need "-" + local __OPT=$(echo $__OPT | sed -e "s#_#-#g") + # write to config + echo -e "$__OPT\t$__VAL" >> $CFGTEMP + ;; + esac + } + fi } # temporary config file @@ -92,7 +98,7 @@ _uci2conf() { echo -e "temporary-directory\t$_TMP_DIR" >> $CFGTEMP fi - config_load privoxy # calling above option_cb() and write the rest into $CFGTEMP + config_load "privoxy" # calling above option_cb() and write the rest into $CFGTEMP # move temp to final privoxy readable configuration mv -f $CFGTEMP $CFGFILE diff --git a/net/rsyslog/files/rsyslog.init b/net/rsyslog/files/rsyslog.init index 5fc88499f..20eb2a41f 100644 --- a/net/rsyslog/files/rsyslog.init +++ b/net/rsyslog/files/rsyslog.init @@ -7,6 +7,6 @@ USE_PROCD=1 start_service() { procd_open_instance - procd_set_param command /usr/sbin/rsyslogd + procd_set_param command /usr/sbin/rsyslogd -n procd_close_instance } diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile index 49c9774ed..2e38ac803 100644 --- a/net/ser2net/Makefile +++ b/net/ser2net/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ser2net -PKG_VERSION:=2.10.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/ser2net -PKG_MD5SUM:=cd937041144de83d41d811521e72158c +PKG_MD5SUM:=bf8af8cfacd35828a9778d69972f6345 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org> +PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch b/net/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch deleted file mode 100644 index 370d0b9b0..000000000 --- a/net/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch +++ /dev/null @@ -1,59 +0,0 @@ -ser2net: Fix compilation failures due to missing TIOCSRS485 macro - -Patch sent upstream: - https://sourceforge.net/p/ser2net/mailman/message/32905302/ - -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> - -From: Yegor Yefremov <yegorslists@googlemail.com> - -include <asm-generic/ioctls.h> fixes compilations for systems, -where <asm-generic/ioctls.h> won't be included automatically. - -Move special Linux includes to dataxfer.h. - -Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> ---- - dataxfer.h | 5 +++-- - devcfg.c | 2 -- - 2 files changed, 3 insertions(+), 4 deletions(-) - ---- a/dataxfer.h -+++ b/dataxfer.h -@@ -20,8 +20,6 @@ - #ifndef DATAXFER - #define DATAXFER - --#include <linux/serial.h> -- - #include "controller.h" - - #ifdef USE_UUCP_LOCKING -@@ -30,6 +28,9 @@ extern int uucp_locking_enabled; - - #ifdef linux - -+#include <linux/serial.h> -+#include <asm-generic/ioctls.h> -+ - #define USE_RS485_FEATURE - - /* Check, if the toolchain provides serial_rs485 structure and macros */ ---- a/devcfg.c -+++ b/devcfg.c -@@ -18,7 +18,6 @@ - */ - - /* This code handles generating the configuration for the serial port. */ -- - #include <unistd.h> - #include <termios.h> - #include <sys/ioctl.h> -@@ -31,7 +30,6 @@ - #include <signal.h> - #include <errno.h> - #include <syslog.h> --#include <linux/serial.h> - - #include "ser2net.h" - #include "selector.h" diff --git a/net/ser2net/patches/002-LED-trigger.patch b/net/ser2net/patches/002-LED-trigger.patch deleted file mode 100644 index bfc2734f9..000000000 --- a/net/ser2net/patches/002-LED-trigger.patch +++ /dev/null @@ -1,418 +0,0 @@ -From fa68debd94d40299dd2a69abd0a820ccfaadcbe8 Mon Sep 17 00:00:00 2001 -From: Michael Heimpold <michael.heimpold@i2se.com> -Date: Wed, 22 Apr 2015 13:35:43 +0200 -Subject: [PATCH] Add support for triggering LEDs during serial traffic - -Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com> ---- - -Patch sent upstream: - http://sourceforge.net/p/ser2net/mailman/message/34064847/ - - Makefile.am | 4 +-- - dataxfer.c | 20 ++++++++++++ - readconfig.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - ser2net.conf | 13 ++++++++ - sysfs-led.c | 43 +++++++++++++++++++++++++ - sysfs-led.h | 11 +++++++ - utils.c | 30 ++++++++++++++++++ - utils.h | 9 ++++++ - 8 files changed, 228 insertions(+), 2 deletions(-) - create mode 100644 sysfs-led.c - create mode 100644 sysfs-led.h - -diff --git a/Makefile.am b/Makefile.am -index d56179f..866eb89 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,9 @@ sbin_PROGRAMS = ser2net - ACLOCAL_AMFLAGS = -I m4 - AM_CFLAGS=-Wall - ser2net_SOURCES = controller.c dataxfer.c devcfg.c readconfig.c selector.c \ -- ser2net.c utils.c telnet.c buffer.c -+ ser2net.c utils.c telnet.c buffer.c sysfs-led.c - noinst_HEADERS = controller.h dataxfer.h devio.h readconfig.h selector.h \ -- utils.h telnet.h buffer.h ser2net.h -+ utils.h telnet.h buffer.h sysfs-led.h ser2net.h - man_MANS = ser2net.8 - EXTRA_DIST = $(man_MANS) ser2net.conf ser2net.spec ser2net.init - -diff --git a/dataxfer.c b/dataxfer.c -index 646a71b..b99cabf 100644 ---- a/dataxfer.c -+++ b/dataxfer.c -@@ -42,6 +42,7 @@ - #include "telnet.h" - #include "devio.h" - #include "buffer.h" -+#include "sysfs-led.h" - - #define SERIAL "term" - #define NET "tcp " -@@ -230,6 +231,12 @@ typedef struct port_info - #ifdef USE_RS485_FEATURE - struct serial_rs485 *rs485conf; - #endif -+ -+ /* -+ * LED names to flash for serial traffic -+ */ -+ char *led_tx; -+ char *led_rx; - } port_info_t; - - port_info_t *ports = NULL; /* Linked list of ports. */ -@@ -311,6 +318,8 @@ init_port_data(port_info_t *port) - #ifdef USE_RS485_FEATURE - port->rs485conf = NULL; - #endif -+ port->led_tx = NULL; -+ port->led_rx = NULL; - } - - static void -@@ -530,6 +539,9 @@ handle_dev_fd_read(struct devio *io) - /* Do both tracing, ignore errors. */ - do_trace(port, port->tb, port->dev_to_tcp.buf, count, SERIAL); - -+ if (port->led_rx) -+ led_blink_kick(port->led_rx); -+ - port->dev_bytes_received += count; - - if (port->enabled == PORT_TELNET) { -@@ -759,6 +771,8 @@ handle_tcp_fd_read(int fd, void *data) - return; - } - } else { -+ if (port->led_tx) -+ led_blink_kick(port->led_tx); - port->dev_bytes_sent += count; - port->tcp_to_dev.cursize -= count; - if (port->tcp_to_dev.cursize != 0) { -@@ -1854,6 +1868,12 @@ myconfig(void *data, struct absout *eout, const char *pos) - } else if (strncmp(pos, "tb=", 3) == 0) { - /* trace both directions. */ - port->trace_both.filename = find_tracefile(pos + 3); -+ } else if (strncmp(pos, "led-rx=", 7) == 0) { -+ /* LED for UART RX traffic */ -+ port->led_rx = find_led(pos + 7); -+ } else if (strncmp(pos, "led-tx=", 7) == 0) { -+ /* LED for UART TX traffic */ -+ port->led_tx = find_led(pos + 7); - #ifdef USE_RS485_FEATURE - } else if (strncmp(pos, "rs485=", 6) == 0) { - /* get RS485 configuration. */ -diff --git a/readconfig.c b/readconfig.c -index d4ca0d4..62cff5c 100644 ---- a/readconfig.c -+++ b/readconfig.c -@@ -31,6 +31,7 @@ - #include "readconfig.h" - #include "utils.h" - #include "telnet.h" -+#include "sysfs-led.h" - - #define MAX_LINE_SIZE 256 /* Maximum line length in the config file. */ - -@@ -361,6 +362,89 @@ free_rs485confs(void) - } - #endif - -+struct led_s -+{ -+ char *name; -+ char *device; -+ unsigned int duration; -+ struct led_s *next; -+}; -+ -+/* all LEDs in the system. */ -+struct led_s *leds = NULL; -+ -+static void -+handle_led(char *name, char *cfg) -+{ -+ struct led_s *new_led; -+ char devicename[256]; -+ -+ new_led = malloc(sizeof(*new_led)); -+ if (!new_led) { -+ syslog(LOG_ERR, "Out of memory handling LED on %d", lineno); -+ return; -+ } -+ -+ new_led->name = strdup(name); -+ if (!new_led->name) { -+ syslog(LOG_ERR, "Out of memory handling LED on %d", lineno); -+ free(new_led); -+ return; -+ } -+ -+ if (sscanf(cfg, "%256s %u", devicename, &new_led->duration) != 2) { -+ syslog(LOG_ERR, "Couldn't parse LED config on %d", lineno); -+ free(new_led->name); -+ free(new_led); -+ return; -+ } -+ -+ new_led->device = strdup(devicename); -+ if (!new_led->device) { -+ syslog(LOG_ERR, "Out of memory handling LED on %d", lineno); -+ free(new_led->name); -+ free(new_led); -+ return; -+ } -+ -+ /* setup the led */ -+ led_blink_prepare(new_led->device, new_led->duration); -+ -+ new_led->next = leds; -+ leds = new_led; -+} -+ -+char * -+find_led(const char *name) -+{ -+ struct led_s *led = leds; -+ -+ while (led) { -+ if (strcmp(name, led->name) == 0) -+ return strdup(led->device); -+ led = led->next; -+ } -+ syslog(LOG_ERR, "LED %s not found, it will be ignored", name); -+ return NULL; -+} -+ -+static void -+free_leds(void) -+{ -+ struct led_s *led; -+ -+ while (leds) { -+ led = leds; -+ leds = leds->next; -+ -+ led_off(led->device); -+ -+ free(led->name); -+ free(led->device); -+ free(led); -+ } -+} -+ - static int - startswith(char *str, const char *test, char **strtok_data) - { -@@ -503,6 +587,21 @@ handle_config_line(char *inbuf) - return; - } - -+ if (startswith(inbuf, "LED", &strtok_data)) { -+ char *name = strtok_r(NULL, ":", &strtok_data); -+ char *str = strtok_r(NULL, "\n", &strtok_data); -+ if (name == NULL) { -+ syslog(LOG_ERR, "No LED name given on line %d", lineno); -+ return; -+ } -+ if ((str == NULL) || (strlen(str) == 0)) { -+ syslog(LOG_ERR, "No LED given on line %d", lineno); -+ return; -+ } -+ handle_led(name, str); -+ return; -+ } -+ - comma = strchr(inbuf, ','); - if (comma) { - if (!strtok_r(comma, ":", &strtok_data)) { -@@ -568,6 +667,7 @@ readconfig(char *filename) - #ifdef USE_RS485_FEATURE - free_rs485confs(); - #endif -+ free_leds(); - - config_num++; - -diff --git a/ser2net.conf b/ser2net.conf -index 870926c..dc2ba19 100644 ---- a/ser2net.conf -+++ b/ser2net.conf -@@ -53,6 +53,8 @@ - # specified in TRACEFILE that will take all traced data. - # tw is data written to the device, tr is data read from - # the device, and tb is both. -+# The "led-tx" and "led-rx" options allow to specify -+# a LED defined above to trigger for traffic. - # - # or... - -@@ -79,6 +81,12 @@ - # This specifies a filename to trace output into, as tw=/tmp/trace1. - # This takes the same escape sequences as banners. - # -+# LED:<name>:sysfs-filename duration -+# This specifies a LED which will be configured to use linux's transient trigger. -+# The LED is always kicked when traffic is detected on serial side. The duration -+# is given in milliseconds. See Linux's documentation for transient trigger for -+# details. -+# - # OPENSTR:<name>:str - # This specifies a string to be transmitted to the device when the - # port is opened. This takes the same escape sequences as banners. -@@ -108,6 +116,9 @@ SIGNATURE:signature1:ser2net port ttyS2 - - RS485CONF:rs485port1:0:0:0:0 - -+LED:rx:duckbill:green:rs485 10 -+LED:tx:duckbill:red:rs485 10 -+ - TRACEFILE:tw1:/tmp/tw-\p-\Y-\M-\D-\H:\i:\s.\U - TRACEFILE:tr1:/tmp/tr-\p-\Y-\M-\D-\H:\i:\s.\U - -@@ -138,3 +149,5 @@ CLOSESTR:close1:close str\r\n - - 3020:telnet:0:/dev/ttyUSB0:9600 banner1 remctl asdfasd - 3021:telnet:0:/dev/ttyUSB1:9600 banner2 open1 close1 remctl -+ -+5000:telnet:0:/dev/ttyAPP0:9600 NONE 1STOPBIT 8DATABITS -XONXOFF LOCAL -RTSCTS led-tx=tx led-rx=rx -diff --git a/sysfs-led.c b/sysfs-led.c -new file mode 100644 -index 0000000..efe0b29 ---- /dev/null -+++ b/sysfs-led.c -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (C) 2015 I2SE GmbH -+ */ -+#include <stdio.h> -+#include <string.h> -+ -+#include "utils.h" -+#include "sysfs-led.h" -+ -+#define SYSFS_LED_BASE "/sys/class/leds" -+ -+static int led_write(char *led, char *property, char *buf) -+{ -+ char fn[255]; -+ -+ snprintf(fn, sizeof(fn), "%s/%s/%s", SYSFS_LED_BASE, led, property); -+ -+ return file_store(fn, buf, strlen(buf)); -+} -+ -+int led_off(char *led) -+{ -+ led_write(led, "trigger", "none"); -+ led_write(led, "brightness", "0"); -+ return 0; -+} -+ -+int led_blink_prepare(char *led, unsigned int duration) -+{ -+ char buffer[10]; -+ -+ snprintf(buffer, sizeof(buffer), "%u", duration); -+ led_write(led, "trigger", "transient"); -+ msleep(10); -+ led_write(led, "state", "1"); -+ led_write(led, "duration", buffer); -+ return 0; -+} -+ -+int led_blink_kick(char *led) -+{ -+ return led_write(led, "activate", "1"); -+} -diff --git a/sysfs-led.h b/sysfs-led.h -new file mode 100644 -index 0000000..00b21b6 ---- /dev/null -+++ b/sysfs-led.h -@@ -0,0 +1,11 @@ -+/* -+ * Copyright (C) 2015 I2SE GmbH -+ */ -+#ifndef SYSFS_LED_H -+#define SYSFS_LED_H -+ -+int led_off(char *led); -+int led_blink_prepare(char *led, unsigned int duration); -+int led_blink_kick(char *led); -+ -+#endif /* SYSFS_LED_H */ -diff --git a/utils.c b/utils.c -index c194c4c..c96cedb 100644 ---- a/utils.c -+++ b/utils.c -@@ -25,6 +25,9 @@ - #include <errno.h> - #include <unistd.h> - #include <fcntl.h> -+#include <time.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #include "ser2net.h" - #include "utils.h" -@@ -205,3 +208,30 @@ write_ignore_fail(int fd, const char *data, size_t count) - count -= written; - } - } -+ -+int -+msleep(int msec) -+{ -+ struct timespec req; -+ -+ req.tv_sec = 0; -+ req.tv_nsec = msec * 1000000; -+ -+ return nanosleep(&req, NULL); -+} -+ -+int -+file_store(const char *filename, const char *buf, size_t count) -+{ -+ int fd; -+ -+ if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) == -1) -+ return -1; -+ -+ if (write(fd, buf, count) != count) { -+ close(fd); -+ return -1; -+ } -+ -+ return close(fd); -+} -diff --git a/utils.h b/utils.h -index 582ea88..8af65ec 100644 ---- a/utils.h -+++ b/utils.h -@@ -64,6 +64,9 @@ char *find_tracefile(const char *name); - /* Search for RS485 configuration by name. */ - struct serial_rs485 *find_rs485conf(const char *name); - -+/* Search for a LED by name */ -+char *find_led(const char *name); -+ - void check_ipv6_only(int family, struct sockaddr *addr, int fd); - - /* Make sure the full contents get written, return an error if it occurs. */ -@@ -72,4 +75,10 @@ int write_full(int fd, char *data, size_t count); - /* Write the data completely out, return without comment on error. */ - void write_ignore_fail(int fd, const char *data, size_t count); - -+/* Helper to sleep a given amount of milli-seconds */ -+int msleep(int msec); -+ -+/* Store the given data to a file */ -+int file_store(const char *filename, const char *buf, size_t count); -+ - #endif /* UTILS */ --- -1.7.10.4 - diff --git a/net/tinc/Makefile b/net/tinc/Makefile index 738c25f63..1beee5854 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinc -PKG_VERSION:=1.0.28 +PKG_VERSION:=1.0.29 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages -PKG_MD5SUM:=9ca14c9902fb4011b5df6a09ffd40ea9 +PKG_MD5SUM:=bb7d2a672dd6958372da23fd764ba067 PKG_INSTALL:=1 diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile new file mode 100644 index 000000000..a1ff7c6e4 --- /dev/null +++ b/net/travelmate/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v3. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=travelmate +PKG_VERSION:=0.2.3 +PKG_RELEASE:=1 +PKG_LICENSE:=GPL-3.0+ +PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=A wlan connection manager for travel router + PKGARCH:=all +endef + +define Package/$(PKG_NAME)/description +A wlan connection manager for travel router. +Please see https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md for further information. + +endef + +define Package/$(PKG_NAME)/conffiles +/etc/config/travelmate +endef + +define Build/Prepare +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/travelmate.sh $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/travelmate.init $(1)/etc/init.d/travelmate + + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_CONF) ./files/travelmate.conf $(1)/etc/config/travelmate +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/net/travelmate/files/README.md b/net/travelmate/files/README.md new file mode 100644 index 000000000..6842dc7e3 --- /dev/null +++ b/net/travelmate/files/README.md @@ -0,0 +1,121 @@ +# travelmate, a wlan connection manager for travel router + +## Description +If you’re planning an upcoming vacation or a business trip, taking your laptop, tablet or smartphone give you the ability to connect with friends or complete work on the go. But many hotels don’t have a secure wireless network setup or you’re limited on using a single device at once. Investing in a portable, mini travel router is a great way to connect all of your devices at once while having total control over your own personalized wireless network. +A logical combination of AP+STA mode on one physical radio allows most of OpenWrt/LEDE supported router devices to connect to a wireless hotspot/station (STA) and provide a wireless access point (AP) from that hotspot at the same time. Downside of this solution: whenever the STA interface looses the connection it will go into an active scan cycle which renders the radio unusable for AP mode operation, therefore the AP is taken down if the STA looses its association. +To avoid these kind of deadlocks, travelmate set all station interfaces in an "always off" mode, connects automatically to available hotspots and monitor & change these uplink connections automatically if required. + +## Main Features +* STA interfaces operating in an "always off" mode, to make sure that the AP is always accessible +* fast uplink connections +* reliable connection tracking +* easy setup within normal OpenWrt/LEDE environment +* status & debug logging to syslog +* procd init system support + +## Prerequisites +* [OpenWrt](https://openwrt.org) or [LEDE](https://www.lede-project.org) trunk +* iw (default) or iwinfo for wlan scanning + +## OpenWrt / LEDE trunk Installation & Usage +* install 'travelmate' (_opkg install travelmate_) +* configure your network to support (multiple) wlan uplinks and set travelmate config options (details see below) +* set 'trm\_enabled' option in travelmate config to '1' +* travelmate starts automatically during boot, triggered by procd as soon as the wireless subsystem is up & running + +## Chaos Calmer installation notes +* 'travelmate' is _not_ available as an ipk package in the Chaos Calmer download repository +* download the package from a development snapshot package directory, i.e. look [here](https://downloads.lede-project.org/snapshots/packages/x86_64/packages/) +* manually transfer the package to your routers temp directory (with tools like _sshfs_ or _winscp_) +* install the package as described above + +## Travelmate config options +* mandatory config options: + * trm\_enabled => main switch to enable/disable the travelmate service (default: '0', disabled) + * trm\_loop => loop timeout in seconds for wlan monitoring (default: '30') + * trm\_maxretry => how many times should travelmate try to connect to a certain uplink (default: '3') +* optional config options: + * trm\_debug => enable/disable debug logging (default: '0', disabled) + * trm\_device => limit travelmate to a dedicated radio, i.e 'radio0' (default: '', use all radios) + * trm\_iw => force travelmate to use iwinfo (even if iw is installed) set this option to 'none' (default: '', use iw if found) + +## Setup +**1. configure a wwan interface in /etc/config/network:** +<pre><code> +[...] +config interface 'wwan' + option proto 'dhcp' +[...] +</code></pre> + +**2. add this interface to your firewall configuration in /etc/config/firewall:** +<pre><code> +[...] +config zone + option name 'wan' + option input 'REJECT' + option output 'ACCEPT' + option forward 'REJECT' + option masq '1' + option mtu_fix '1' + option network 'wan wan6 wwan' +[...] +</code></pre> + +**3. add required wwan stations to your wireless configuration in etc/config/wireless:** +<pre><code> +[...] +config wifi-iface + option device 'radio0' + option network 'wwan' + option mode 'sta' + option ssid 'example_01' + option ifname 'wwan01' + option encryption 'psk2+ccmp' + option key 'abc' + option disabled '1' +config wifi-iface + option device 'radio0' + option network 'wwan' + option mode 'sta' + option ssid 'example_02' + option ifname 'wwan02' + option encryption 'psk2+ccmp' + option key 'xyz' + option disabled '1' +config wifi-iface + option device 'radio0' + option network 'wwan' + option mode 'sta' + option ssid 'example_03' + option ifname 'wwan03' + option encryption 'none' + option disabled '1' +[...] +</code></pre> + +**4. reload network configuration & start travelmate:** +<pre><code> +/etc/init.d/network reload +/etc/init.d/travelmate start +</code></pre> + +**Common runtime outputs (visible via logread)** + +**Success:** Sun Oct 9 17:02:21 2016 user.notice root: travelmate-0.2.1[712] info : wlan interface "wwan06" connected to uplink "blackhole.nl" + +**Disabled service:** Sun Oct 9 18:06:32 2016 user.notice root: travelmate-0.2.1[2379] info : travelmate is currently disabled, please set 'trm_enabled' to use this service + +**Misconfigured/broken uplink:** Sun Oct 9 18:56:42 2016 user.notice root: travelmate-0.2.1[2435] info : uplink "blackhole.nl" disabled due to permanent connection failures + +**Uplink disappeared:** Sun Oct 9 19:00:28 2016 user.notice root: travelmate-0.2.1[3876] info : uplink "Neffos C5L" get lost + +## Support +Please join the travelmate discussion in this [forum thread](https://forum.openwrt.org/viewtopic.php?id=67697) or contact me by [mail](mailto:dev@brenken.org) + +## Removal +* stop the travelmate daemon with _/etc/init.d/travelmate stop_ +* optional: remove the travelmate package (_opkg remove travelmate_) + +Have fun! +Dirk diff --git a/net/travelmate/files/travelmate.conf b/net/travelmate/files/travelmate.conf new file mode 100644 index 000000000..e413a8cfe --- /dev/null +++ b/net/travelmate/files/travelmate.conf @@ -0,0 +1,7 @@ +# travelmate configuration, for further information +# see 'https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md' + +config travelmate 'global' + option trm_enabled '0' + option trm_loop '30' + option trm_maxretry '3' diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init new file mode 100755 index 000000000..fc3e9ed9e --- /dev/null +++ b/net/travelmate/files/travelmate.init @@ -0,0 +1,25 @@ +#!/bin/sh /etc/rc.common + +START=85 +USE_PROCD=1 + +exec 2>/dev/null +trm_script="/usr/bin/travelmate.sh" + +start_service() +{ + ubus -t 30 wait_for network.wireless + if [ $(($?)) -eq 0 ] + then + procd_open_instance + procd_set_param command "${trm_script}" + procd_close_instance + else + logger -s "travelmate [procd]:" "no wlan devices found, travelmate startup canceled" + fi +} + +service_triggers() +{ + procd_add_reload_trigger "travelmate" +} diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh new file mode 100755 index 000000000..b3d160b32 --- /dev/null +++ b/net/travelmate/files/travelmate.sh @@ -0,0 +1,247 @@ +#!/bin/sh +# travelmate, a wlan connection manager for travel router +# written by Dirk Brenken (dev@brenken.org) + +# This is free software, licensed under the GNU General Public License v3. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# prepare environment +# +LC_ALL=C +PATH="/usr/sbin:/usr/bin:/sbin:/bin" +trm_debug="0" +trm_pid="${$}" +trm_ver="0.2.3" +trm_loop=30 +trm_maxretry=3 +trm_device="" +trm_iw="$(which iw)" + +# function to prepare all relevant AP and STA interfaces +# +trm_prepare() +{ + local config="${1}" + local mode="$(uci -q get wireless."${config}".mode)" + local device="$(uci -q get wireless."${config}".device)" + local network="$(uci -q get wireless."${config}".network)" + local ifname="$(uci -q get wireless."${config}".ifname)" + local disabled="$(uci -q get wireless."${config}".disabled)" + + if [ "${mode}" = "ap" ] && + ([ -z "${trm_device}" ] || [ "${trm_device}" = "${device}" ]) + then + trm_aplist="${trm_aplist} ${ifname}" + if [ -z "${disabled}" ] || [ "${disabled}" = "1" ] + then + trm_set "none" "${config}" "${network}" "up" + fi + elif [ "${mode}" = "sta" ] + then + trm_stalist="${trm_stalist} ${config}_${network}" + if [ -z "${disabled}" ] || [ "${disabled}" = "0" ] + then + trm_set "none" "${config}" "${network}" "down" + fi + fi +} + +# function to set different wlan interface status +# +trm_set() +{ + local change="${1}" + local config="${2}" + local interface="${3}" + local command="${4}" + + if [ "${command}" = "up" ] + then + uci -q set wireless."${config}".disabled=0 + ubus call network.interface."${interface}" "${command}" + trm_checklist="${trm_checklist} ${interface}" + elif [ "${command}" = "down" ] + then + uci -q set wireless."${config}".disabled=1 + ubus call network.interface."${interface}" "${command}" + fi + + trm_log "debug" "set ::: change: ${change}, config: ${config}, interface: ${interface}, command: ${command}, checklist: ${trm_checklist}, uci-changes: $(uci -q changes wireless)" + if [ -n "$(uci -q changes wireless)" ] + then + if [ "${change}" = "commit" ] + then + uci -q commit wireless + ubus call network reload + trm_check + elif [ "${change}" = "partial" ] + then + ubus call network reload + trm_check + elif [ "${change}" = "defer" ] + then + uci -q revert wireless + elif [ "${change}" = "revert" ] + then + uci -q revert wireless + ubus call network reload + trm_check + fi + fi +} + +# function to check interface status on "up" event +# +trm_check() +{ + local interface value + local cnt=0 + + for interface in ${trm_checklist} + do + while [ $((cnt)) -lt 15 ] + do + json_load "$(ubus -S call network.interface."${interface}" status)" + json_get_var trm_status up + if [ "${trm_status}" = "1" ] || [ -n "${trm_uplink}" ] + then + trm_log "debug" "check::: interface: ${interface}, status: ${trm_status}, uplink: ${trm_uplink}, ssid: ${trm_ssid} count: ${cnt}" + json_cleanup + break + fi + cnt=$((cnt+1)) + sleep 1 + done + done + if [ -n "${trm_uplink}" ] && [ "${trm_status}" = "0" ] + then + ubus call network reload + eval "trm_count_${trm_uplink}=\$((trm_count_${trm_uplink}+1))" + trm_checklist="" + trm_log "info" "uplink ${trm_ssid} get lost" + elif [ -z "${trm_uplink}" ] && [ -n "${trm_checklist}" ] + then + trm_checklist="" + fi +} + +# function to write to syslog +# +trm_log() +{ + local class="${1}" + local log_msg="${2}" + + if [ -n "${log_msg}" ] && ([ "${class}" != "debug" ] || ([ "${class}" = "debug" ] && [ "${trm_debug}" = "1" ])) + then + logger -t "travelmate-${trm_ver}[${trm_pid}] ${class}" "${log_msg}" 2>&1 + fi +} + +# source required system libraries +# +if [ -r "/lib/functions.sh" ] && [ -r "/usr/share/libubox/jshn.sh" ] +then + . "/lib/functions.sh" + . "/usr/share/libubox/jshn.sh" + json_init +else + trm_log "error" "required system libraries not found" + exit 255 +fi + +# load uci config and check 'enabled' option +# +option_cb() +{ + local option="${1}" + local value="${2}" + eval "${option}=\"${value}\"" +} + +config_load travelmate + +if [ "${trm_enabled}" != "1" ] +then + trm_log "info" "travelmate is currently disabled, please set 'trm_enabled' to '1' to use this service" + exit 0 +fi + +# check for preferred wireless tool +# +if [ ! -f "${trm_iw}" ] +then + trm_iwinfo="$(which iwinfo)" + if [ ! -f "${trm_iwinfo}" ] + then + trm_log "error" "no wireless tool for wlan scanning found, please install 'iw' or 'iwinfo'" + exit 255 + fi +fi + +# infinitive loop to establish and track STA uplink connections +# +while true +do + if [ -z "${trm_uplink}" ] || [ "${trm_status}" = "0" ] + then + trm_uplink="" + trm_aplist="" + trm_stalist="" + config_load wireless + config_foreach trm_prepare wifi-iface + trm_set "commit" + for ap in ${trm_aplist} + do + ubus -t 10 wait_for hostapd."${ap}" + if [ -f "${trm_iw}" ] + then + trm_ssidlist="$(${trm_iw} dev "${ap}" scan 2>/dev/null | awk '/SSID: /{if(!seen[$0]++){printf "\"";for(i=2; i<=NF; i++)if(i==2)printf $i;else printf " "$i;printf "\" "}}')" + else + trm_ssidlist="$(${trm_iwinfo} "${ap}" scan | awk '/ESSID: ".*"/{ORS=" ";if (!seen[$0]++) for(i=2; i<=NF; i++) print $i}')" + fi + trm_log "debug" "main ::: iw: ${trm_iw}, iwinfo: ${trm_iwinfo}, ssidlist: ${trm_ssidlist}" + if [ -n "${trm_ssidlist}" ] + then + for sta in ${trm_stalist} + do + trm_config="${sta%%_*}" + trm_network="${sta##*_}" + trm_ifname="$(uci -q get wireless."${trm_config}".ifname)" + trm_ssid="\"$(uci -q get wireless."${trm_config}".ssid)\"" + if [ $((trm_count_${trm_config}_${trm_network})) -lt $((trm_maxretry)) ] + then + if [ -n "$(printf "${trm_ssidlist}" | grep -Fo "${trm_ssid}")" ] + then + trm_set "partial" "${trm_config}" "${trm_network}" "up" + if [ "${trm_status}" = "1" ] + then + trm_checklist="${trm_network}" + trm_uplink="${trm_config}_${trm_network}" + trm_set "defer" + trm_log "info" "wwan interface \"${trm_ifname}\" connected to uplink ${trm_ssid}" + break 2 + else + trm_set "revert" + eval "trm_count_${trm_config}_${trm_network}=\$((trm_count_${trm_config}_${trm_network}+1))" + fi + fi + elif [ $((trm_count_${trm_config}_${trm_network})) -eq $((trm_maxretry)) ] + then + eval "trm_count_${trm_config}_${trm_network}=\$((trm_count_${trm_config}_${trm_network}+1))" + trm_log "info" "uplink ${trm_ssid} disabled due to permanent connection failures" + fi + done + fi + sleep 5 + done + sleep 5 + else + trm_check + if [ -n "${trm_checklist}" ] + then + sleep ${trm_loop} + fi + fi +done diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 235185da9..b9ee19f36 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound -PKG_VERSION:=1.5.9 -PKG_RELEASE:=4 +PKG_VERSION:=1.5.10 +PKG_RELEASE:=2 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Michael Hanselmann <public@hansmi.ch> +PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@hotmail.com> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.unbound.net/downloads -PKG_MD5SUM:=0cefa62c1690b4db18583db84bff00e3 +PKG_MD5SUM:=0a3a236811f1ab5c1dc31974fa74e047 PKG_BUILD_DEPENDS:=libexpat PKG_BUILD_PARALLEL:=1 @@ -27,7 +27,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/unbound/Default - TITLE:=A validating, recursive & caching DNS resolver + TITLE:=Unbound is a validating, recursive, and caching DNS resolver. URL:=http://www.unbound.net/ DEPENDS:=+libopenssl endef @@ -37,9 +37,9 @@ define Package/unbound SECTION:=net CATEGORY:=Network SUBMENU:=IP Addresses and Names + USERID:=unbound=553:unbound=553 TITLE+= (daemon) DEPENDS+= +libunbound - USERID:=unbound:unbound endef define Package/unbound/description diff --git a/net/unbound/patches/001-conf.patch b/net/unbound/patches/001-conf.patch index 3b612bcd1..a318f6092 100644 --- a/net/unbound/patches/001-conf.patch +++ b/net/unbound/patches/001-conf.patch @@ -1,135 +1,94 @@ diff --git a/doc/example.conf.in b/doc/example.conf.in -index ff90e3b..5c20fdf 100644 +index c520c88..af92a87 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in -@@ -38,6 +38,8 @@ server: - # interface: 192.0.2.154 - # interface: 192.0.2.154@5003 - # interface: 2001:DB8::5 +@@ -1,20 +1,81 @@ +-# +-# Example configuration file. +-# +-# See unbound.conf(5) man page, version 1.5.10. +-# +-# this is a comment. ++############################################################################## ++# MEMORY CONTROL EXAMPLE ++# In the example config settings below memory usage is reduced. Some ser- ++# vice levels are lower, notable very large data and a high TCP load are ++# no longer supported ... are exceptional for the DNS. ++# (http://unbound.net/documentation/unbound.conf.html) ++############################################################################## + + #Use this to include other text into the file. + #include: "otherfile.conf" + + # The server clause sets the main parameters. + server: +- # whitespace is not necessary, but looks cleaner. + +- # verbosity number, 0 is least verbose. 1 is default. ++ # verbosity 1 is default + verbosity: 1 + ++ # prevent any upstream core surprises (OpenWrt assumptions) ++ username: "unbound" ++ pidfile: "/var/run/unbound.pid" ++ directory: "/etc/unbound" ++ chroot: "" ++ ++ # no threads and no memory slabs for threads ++ num-threads: 1 ++ msg-cache-slabs: 1 ++ rrset-cache-slabs: 1 ++ infra-cache-slabs: 1 ++ key-cache-slabs: 1 ++ ++ # don't be picky about interfaces but consider your firewall + interface: 0.0.0.0 + interface: ::0 - - # enable this feature to copy the source address of queries to reply. - # Socket options are not supported on all platforms. experimental. -@@ -57,6 +59,7 @@ server: - # port range that can be open simultaneously. About double the - # num-queries-per-thread, or, use as many as the OS will allow you. - # outgoing-range: 4096 -+ outgoing-range: 60 - - # permit unbound to use this port number or port range for - # making outgoing queries, using an outgoing interface. -@@ -73,9 +76,11 @@ server: - - # number of outgoing simultaneous tcp buffers to hold per thread. - # outgoing-num-tcp: 10 -+ outgoing-num-tcp: 1 - - # number of incoming simultaneous tcp buffers to hold per thread. - # incoming-num-tcp: 10 ++ access-control: 0.0.0.0/0 allow ++ access-control: ::0/0 allow ++ ++ # this limits TCP service but uses less buffers ++ outgoing-num-tcp: 1 + incoming-num-tcp: 1 - - # buffer size for UDP port 53 incoming (SO_RCVBUF socket option). - # 0 is system default. Use 4m to catch query spikes for busy servers. -@@ -103,18 +108,22 @@ server: - # buffer size for handling DNS data. No messages larger than this - # size can be sent or received, by UDP or TCP. In bytes. - # msg-buffer-size: 65552 ++ ++ # use somewhat higher port numbers versus possible NAT issue ++ outgoing-port-permit: "10240-65335" ++ ++ # uses less memory, but less performance ++ outgoing-range: 60 ++ num-queries-per-thread: 30 ++ ++ # exclude large responses + msg-buffer-size: 8192 - - # the amount of memory to use for the message cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # msg-cache-size: 4m ++ ++ # tiny memory cache ++ infra-cache-numhosts: 200 + msg-cache-size: 100k - - # the number of slabs to use for the message cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # msg-cache-slabs: 4 -+ msg-cache-slabs: 1 - - # the number of queries that a thread gets to service. - # num-queries-per-thread: 1024 -+ num-queries-per-thread: 30 - - # if very busy, 50% queries run to completion, 50% get timeout in msec - # jostle-timeout: 200 -@@ -125,11 +134,13 @@ server: - # the amount of memory to use for the RRset cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # rrset-cache-size: 4m + rrset-cache-size: 100k - - # the number of slabs to use for the RRset cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # rrset-cache-slabs: 4 -+ rrset-cache-slabs: 1 - - # the time to live (TTL) value lower bound, in seconds. Default 0. - # If more than an hour could easily give trouble due to stale data. -@@ -153,9 +164,11 @@ server: - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # infra-cache-slabs: 4 -+ infra-cache-slabs: 1 - - # the maximum number of hosts that are cached (roundtrip, EDNS, lame). - # infra-cache-numhosts: 10000 -+ infra-cache-numhosts: 200 - - # Enable IPv4, "yes" or "no". - # do-ip4: yes -@@ -188,6 +201,8 @@ server: - # access-control: ::0/0 refuse - # access-control: ::1 allow - # access-control: ::ffff:127.0.0.1 allow -+ access-control: 0.0.0.0/0 allow -+ access-control: ::0/0 allow - - # if given, a chroot(2) is done to the given directory. - # i.e. you can chroot to the working directory, for example, -@@ -266,12 +284,15 @@ server: - # positive value: fetch that many targets opportunistically. - # Enclose the list of numbers between quotes (""). - # target-fetch-policy: "3 2 1 0 0" -+ target-fetch-policy: "2 1 0 0 0 0" - - # Harden against very small EDNS buffer sizes. - # harden-short-bufsize: no -+ harden-short-bufsize: yes - - # Harden against unseemly large queries. - # harden-large-queries: no -+ harden-large-queries: yes - - # Harden against out of zone rrsets, to avoid spoofing attempts. - # harden-glue: yes -@@ -367,7 +388,7 @@ server: - # you start unbound (i.e. in the system boot scripts). And enable: - # Please note usage of unbound-anchor root anchor is at your own risk - # and under the terms of our LICENSE (see that file in the source). -- # auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" -+ auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" - - # File with DLV trusted keys. Same format as trust-anchor-file. - # There can be only one DLV configured, it is trusted from root down. -@@ -456,15 +477,18 @@ server: - # the amount of memory to use for the key cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # key-cache-size: 4m + key-cache-size: 100k - - # the number of slabs to use for the key cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # key-cache-slabs: 4 -+ key-cache-slabs: 1 - - # the amount of memory to use for the negative cache (used for DLV). - # plain value in bytes or you can append k, m or G. default is "1Mb". - # neg-cache-size: 1m + neg-cache-size: 10k - - # By default, for a number of zones a small default 'nothing here' - # reply is built-in. Query traffic is thus blocked. If you ++ ++ # gentle on recursion ++ target-fetch-policy: "2 1 0 0 0 0" ++ harden-large-queries: yes ++ harden-short-bufsize: yes ++ ++ # Enable a trust anchor and modules "validator iterator." However, Unbound ++ # RFC5011 "auto-trust-anchor-" activity can be busy and harmful to flash ROM. ++ # "/etc/unbound" (directory & files) needs chown for write access. Else, use ++ # plain "trust-anchor-" to treat the key file as static. ++ #module-config: "validator iterator" ++ #auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" ++ #trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" ++ ++ # DNSSEC needs real time to validate signatures. If your device does not ++ # have power off clock (reboot), then you may need this work around. ++ #domain-insecure: "pool.ntp.org" ++ ++############################################################################## ++# Resume Stock example.conf.in ++############################################################################## ++ + # print statistics to the log (for every thread) every N seconds. + # Set to "" or 0 to disable. Default is disabled. + # statistics-interval: 0 diff --git a/net/webui-aria2/Makefile b/net/webui-aria2/Makefile index 02ec30e7a..514ad1832 100644 --- a/net/webui-aria2/Makefile +++ b/net/webui-aria2/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=webui-aria2 -PKG_VERSION:=2016-05-30 +PKG_VERSION:=2016-10-11 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ziahamza/webui-aria2.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=a4b1e954f15a2cc69dd0cb2092c44a549715b2e7 +PKG_SOURCE_VERSION:=6a29c1b1d0224e1daa88906e88bc2e177ca2ad76 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_LICENSE:=MIT diff --git a/utils/alsa-utils/Makefile b/sound/alsa-utils/Makefile index 5e8d2bc2a..0c01a6e4f 100644 --- a/utils/alsa-utils/Makefile +++ b/sound/alsa-utils/Makefile @@ -21,27 +21,27 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> include $(INCLUDE_DIR)/package.mk define Package/alsa-utils - SECTION:=utils - CATEGORY:=Utilities + SECTION:=sound + CATEGORY:=Sound DEPENDS:=+alsa-lib +libncursesw +libpthread TITLE:=ALSA (Advanced Linux Sound Architecture) utilities URL:=http://www.alsa-project.org/ endef define Package/alsa-utils-seq - SECTION:=utils - CATEGORY:=Utilities + SECTION:=sound + CATEGORY:=Sound DEPENDS:=+alsa-lib +libpthread TITLE:=ALSA sequencer utilities URL:=http://www.alsa-project.org/ endef define Package/alsa-utils-tests - $(call Package/alsa-utils/Default) - SECTION:=utils - CATEGORY:=Utilities + SECTION:=sound + CATEGORY:=Sound TITLE:=ALSA utilities test data (adds ~1.3M to image) DEPENDS:=+alsa-lib +libpthread + URL:=http://www.alsa-project.org/ endef CONFIGURE_ARGS+= \ diff --git a/utils/alsa-utils/patches/100-uClibc-compat.patch b/sound/alsa-utils/patches/100-uClibc-compat.patch index 987c9b8b7..987c9b8b7 100644 --- a/utils/alsa-utils/patches/100-uClibc-compat.patch +++ b/sound/alsa-utils/patches/100-uClibc-compat.patch diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile new file mode 100644 index 000000000..a30fa5d52 --- /dev/null +++ b/utils/ap51-flash/Makefile @@ -0,0 +1,58 @@ +# +# Copyright (C) 2010-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=ap51-flash +PKG_VERSION:=2016-10-16 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://dev.cloudtrax.com/ap51-flash.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=48b3fbac1c30c5968b2608eb09b53ea37c310a24 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz +PKG_MAINTAINER:=Russell Senior <russell@personaltelco.net> + +include $(INCLUDE_DIR)/package.mk + +ifeq ($(CONFIG_BIG_ENDIAN),y) + STAMP_BUILT:=$(STAMP_BUILT)_big +endif + +define Package/ap51-flash + SECTION:=utils + CATEGORY:=Utilities + TITLE:=A tool for flashing (nearly) all ap51/ap61 based routers + URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station +endef + +TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP -D_GNU_SOURCE -DIPPORT_TFTP=69 +ifeq ($(CONFIG_BIG_ENDIAN),y) + TARGET_EXTRA_CFLAGS:=$(TARGET_EXTRA_CFLAGS) -DUIP_CONF_BYTE_ORDER=1234 +endif + +# pass optimization flags +MAKE_FLAGS += \ + OFLAGS="$(TARGET_CFLAGS)" \ + EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \ + REVISION="$(PKG_VERSION)" \ + ap51-flash + +define Package/ap51-flash/install + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin \ + $(1)/usr/lib/ap51-flash + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ap51-flash $(1)/usr/sbin/ + $(INSTALL_BIN) ./files/ap51-flash.init $(1)/etc/init.d/ap51-flash + $(INSTALL_BIN) ./files/ap51-flash.sh $(1)/usr/lib/ap51-flash/ap51-flash.sh + $(INSTALL_DATA) ./files/ap51-flash.config $(1)/etc/config/ap51-flash +endef + +define Package/ap51-flash/conffiles +/etc/config/ap51-flash +endef + +$(eval $(call BuildPackage,ap51-flash)) diff --git a/utils/ap51-flash/files/ap51-flash.config b/utils/ap51-flash/files/ap51-flash.config new file mode 100644 index 000000000..f66973f4b --- /dev/null +++ b/utils/ap51-flash/files/ap51-flash.config @@ -0,0 +1,6 @@ +#config flash +# option ifname eth0.1 +# option rootfs /tmp/images/openwrt-atheros-root.squashfs +# option kernel /tmp/images/openwrt-atheros-vmlinux.lzma +# option ubnt /tmp/images/openwrt-atheros-ubnt5-squashfs.bin +## option loop '1' diff --git a/utils/ap51-flash/files/ap51-flash.init b/utils/ap51-flash/files/ap51-flash.init new file mode 100644 index 000000000..1633ac403 --- /dev/null +++ b/utils/ap51-flash/files/ap51-flash.init @@ -0,0 +1,50 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010 OpenWrt.org + +START=20 + +NAME=ap51-flash + +start_daemon() { + local cfg="$1" + + config_get_bool loop "$cfg" loop + config_get ifname "$cfg" ifname + config_get rootfs "$cfg" rootfs + config_get kernel "$cfg" kernel + config_get ubnt "$cfg" ubnt + [ "$loop" != "1" ] && loop=0 + if [ -n "$ifname" -a -n "$rootfs" -a -n "$kernel" ] || \ + [ -n "$ifname" -a -n "$ubnt" ]; then + PID="`cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" + [ -z "`ps | grep "^.[ ]*$PID "`" ] && \ + rm /var/run/$NAME.sh-$ifname.pid + [ -n "`ls /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ] && { + echo "Can't start more than one ap51-flash for interface $ifname!" + return 0 + } + start-stop-daemon -S -b -m -p /var/run/$NAME.sh-$ifname.pid -n $NAME.sh \ + -x /usr/lib/ap51-flash/$NAME.sh -- "$loop" "$ifname" "$rootfs" "$kernel" "$ubnt" + fi +} + +start() { + config_load ap51-flash + config_foreach start_daemon flash +} + +stop() { + # Terminating all ap51-flash processes + echo "WARNING: Going to teminate all ap51-flash processes! (hope you made sure that they're not flashing right now)" + echo "OR you can stop this with Ctrl+c within 10 seconds" + sleep 10 + local pidfile + for pidfile in `ls /var/run/${NAME}.sh-*.pid 2> /dev/null`; do + start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}.sh" >/dev/null + rm -f "${pidfile}" + done + for pidfile in `ls /var/run/${NAME}-*.pid 2> /dev/null`; do + start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}" >/dev/null + rm -f "${pidfile}" + done +} diff --git a/utils/ap51-flash/files/ap51-flash.sh b/utils/ap51-flash/files/ap51-flash.sh new file mode 100755 index 000000000..9ac33ee00 --- /dev/null +++ b/utils/ap51-flash/files/ap51-flash.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +NAME=ap51-flash +rootfs="" +kernel="" +ubnt="" + +[ $1 -eq "1" ] && loop="1" +ifname="$2" +[ -n "$3" ] && rootfs="--rootfs $3" +[ -n "$4" ] && kernel="--kernel $4" +[ -n "$5" ] && ubnt="--ubnt $5" + +while [ 1 ]; do + start-stop-daemon -S -m -p /var/run/$NAME-$ifname.pid -n $NAME \ + -x /usr/sbin/$NAME -- --flash-from-file $rootfs $kernel $ubnt $ifname + + rm /var/run/$NAME-$ifname.pid + [ "$loop" != "1" ] && break + sleep 15 +done diff --git a/utils/ccrypt/Makefile b/utils/ccrypt/Makefile index 0e8973b85..1e25305a7 100644 --- a/utils/ccrypt/Makefile +++ b/utils/ccrypt/Makefile @@ -24,6 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ccrypt SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Encryption TITLE:=ccrypt is a utility for encrypting and decrypting files and streams URL:=http://ccrypt.sourceforge.net/ endef diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index c012bef69..67cc2a820 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.5.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://collectd.org/files/ @@ -31,7 +31,6 @@ COLLECTD_PLUGINS_DISABLED:= \ battery \ ceph \ cgroups \ - cpufreq \ curl_json \ curl_xml \ dbi \ @@ -101,6 +100,7 @@ COLLECTD_PLUGINS_SELECTED:= \ conntrack \ contextswitch \ cpu \ + cpufreq \ csv \ curl \ df \ @@ -312,6 +312,7 @@ $(eval $(call BuildPlugin,bind,BIND server/zone input,bind,+PACKAGE_collectd-mod $(eval $(call BuildPlugin,conntrack,connection tracking table size input,conntrack,)) $(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,)) $(eval $(call BuildPlugin,cpu,CPU input,cpu,)) +$(eval $(call BuildPlugin,cpufreq,CPU Freq input,cpufreq,@(TARGET_x86||TARGET_x86_64||TARGET_mvebu))) # Only enable on x86 and mvebu $(eval $(call BuildPlugin,csv,CSV output,csv,)) $(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl)) #$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi)) diff --git a/utils/dvtm/Makefile b/utils/dvtm/Makefile index 8d2ae3985..471b0e5f9 100644 --- a/utils/dvtm/Makefile +++ b/utils/dvtm/Makefile @@ -24,6 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/dvtm SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Terminal DEPENDS:=+libncursesw TITLE:=dynamic virtual terminal manager URL:=http://www.brain-dump.org/projects/dvtm/ diff --git a/utils/gdisk/Makefile b/utils/gdisk/Makefile deleted file mode 100644 index 8797a5793..000000000 --- a/utils/gdisk/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2016 Daniel Engberg <daniel.engberg.lists@pyret.net> -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gdisk -PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 - -PKG_SOURCE:=gptfdisk-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/gptfdisk -PKG_MD5SUM:=d7f3d306b083123bcc6f5941efade586 -PKG_SOURCE_SUBDIR:=gptfdisk-$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) - -include $(INCLUDE_DIR)/package.mk - -define Package/gdisk - SECTION:=utils - CATEGORY:=Utilities - SUBMENU:=disc - DEPENDS:=+libstdcpp +popt +libuuid - TITLE:=Partition utility that supports GPT - URL:=http://www.rodsbooks.com/gdisk - MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net> -endef - -define Package/gdisk/description - Partition table manipulation utility with GPT support -endef - -define Package/gdisk/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/gdisk $(1)/sbin/ -endef - -$(eval $(call BuildPackage,gdisk)) diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile new file mode 100644 index 000000000..900a9dc38 --- /dev/null +++ b/utils/gptfdisk/Makefile @@ -0,0 +1,87 @@ +# +# Copyright (C) 2016 Daniel Engberg <daniel.engberg.lists@pyret.net> +# +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gptfdisk +PKG_VERSION:=1.0.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/gptfdisk +PKG_MD5SUM:=d7f3d306b083123bcc6f5941efade586 + +include $(INCLUDE_DIR)/package.mk + +define Package/gptfdisk/default + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=disc + URL:=http://www.rodsbooks.com/gdisk + MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net> +endef + +define Package/gdisk + $(call Package/gptfdisk/default) + TITLE:=GPT partition table manipulation utility + DEPENDS:=+libstdcpp +libuuid +libpopt +endef + +define Package/gdisk/description + GPT partition table manipulation utility with an interface + similar to fdisk. It can read and convert MBR partitions in GPT + but is otherwise unable to generate or modify MBR partitions. +endef + +define Package/sgdisk + $(call Package/gptfdisk/default) + TITLE:=script-friendly GPT partition table manipulation utility + DEPENDS:=+libstdcpp +libuuid +libpopt +endef + +define Package/sgdisk/description + Script-friendly GPT partition table manipulation utility. + It can read and convert MBR partitions in GPT but is otherwise + unable to generate or modify MBR partitions. + To the contrary of gdisk, its interface is geared towards scripts, + so it takes command line arguments instead of being interactive. + It will NOT ask confirmation before carrying out the operations. + It has a slightly smaller footprint than gdisk tool. +endef + +define Package/cgdisk + $(call Package/gptfdisk/default) + TITLE:=ncurses-based GPT partition table manipulation utility + DEPENDS:=+libstdcpp +libuuid +libncurses +libpopt +endef + +define Package/cgdisk/description +ncurses-based partition table manipulation utility with GPT support. +Similar to sfdisk, but works with GPT partitions. Shares the same limitations +of the gdisk partition utility. While it can read and convert MBR partitions +in GPT, it cannot modify MBR partitions on its own. +endef + +define Package/gdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/gdisk $(1)/usr/sbin +endef + +define Package/sgdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sgdisk $(1)/usr/sbin +endef + +define Package/cgdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cgdisk $(1)/usr/sbin +endef + +$(eval $(call BuildPackage,gdisk)) +$(eval $(call BuildPackage,sgdisk)) +$(eval $(call BuildPackage,cgdisk)) diff --git a/utils/gzip/Makefile b/utils/gzip/Makefile index d1236f212..83f3e384b 100644 --- a/utils/gzip/Makefile +++ b/utils/gzip/Makefile @@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/gzip SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Compression TITLE:=gzip (GNU zip) is a compression utility. URL:=https://www.gnu.org/software/gzip/ MAINTAINER:=Christian Beier <dontmind@freeshell.org> diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile index f02038478..78a8552fc 100644 --- a/utils/haveged/Makefile +++ b/utils/haveged/Makefile @@ -23,21 +23,18 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -define Package/haveged/template +define Package/haveged SECTION:=utils CATEGORY:=Utilities + DEPENDS:=+libhavege TITLE:=Feeds the kernel entropy pool by timing CPU loops. URL:=http://www.issihosts.com/haveged/ endef -define Package/haveged - $(call Package/haveged/template) - DEPENDS:=+libhavege -endef - define Package/libhavege - $(call Package/haveged/template) + CATEGORY:=Libraries TITLE:=Library for haveged + URL:=http://www.issihosts.com/haveged/ endef CONFIGURE_ARGS+= \ diff --git a/utils/klish/Makefile b/utils/klish/Makefile index 01a99d7e9..4374e276b 100644 --- a/utils/klish/Makefile +++ b/utils/klish/Makefile @@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/package.mk define Package/klish/default SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Shells TITLE:=Kommand Line Interface SHell ($(1)) URL:=http://libcode.org/projects/klish/ endef diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile index 07708c629..a68747e26 100644 --- a/utils/ntfs-3g/Makefile +++ b/utils/ntfs-3g/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2015 OpenWrt.org +# Copyright (C) 2007-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntfs-3g PKG_RELEASE:=1 -PKG_VERSION:=2015.3.14 +PKG_VERSION:=2016.2.22 PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://www.tuxera.com/opensource/ -PKG_MD5SUM:=8cd57768310e3b2be39b3191d808e241 +PKG_MD5SUM:=ccbe8672d0f757bd0c975b50aa4c512e PKG_LICENSE:=GPL-2.0 LGPL-2.0 PKG_LICENSE_FILES:=COPYING COPYING.LIB @@ -169,6 +169,7 @@ define Package/ntfs-3g/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/sbin $(CP) $(PKG_INSTALL_DIR)/sbin/mount.ntfs-3g $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mount.ntfs-3g $(1)/sbin/mount.ntfs endef define Package/ntfs-3g/postinst diff --git a/utils/screen/Makefile b/utils/screen/Makefile index 80524d30f..09e0ef9e7 100644 --- a/utils/screen/Makefile +++ b/utils/screen/Makefile @@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/screen SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Terminal DEPENDS:=+libncurses TITLE:=Full-screen terminal window manager URL:=http://www.gnu.org/software/screen/ diff --git a/utils/serialconsole/Makefile b/utils/serialconsole/Makefile index fa336ac63..fbf648e29 100644 --- a/utils/serialconsole/Makefile +++ b/utils/serialconsole/Makefile @@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/serialconsole SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Terminal TITLE:=Serial Console - minimal terminal program URL:=http://sourceforge.net/projects/serialconsole/ endef diff --git a/utils/tcsh/Makefile b/utils/tcsh/Makefile index 317b28d21..5d7e4a1d6 100644 --- a/utils/tcsh/Makefile +++ b/utils/tcsh/Makefile @@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/package.mk define Package/tcsh SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Shells TITLE:=Enhanced Berkeley UNIX C shell DEPENDS:=+libncurses URL:=http://www.tcsh.org/ diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile index 16dabf59a..a66db4bf5 100644 --- a/utils/tmux/Makefile +++ b/utils/tmux/Makefile @@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/tmux SECTION:=utils CATEGORY:=Utilities + SUBMENU:=Terminal TITLE:=Terminal multiplexer DEPENDS:=+libncurses +libevent2 +libpthread +librt URL:=http://tmux.sourceforge.net/ diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile index 5fcd1e140..45ee8fddd 100644 --- a/utils/zoneinfo/Makefile +++ b/utils/zoneinfo/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zoneinfo -PKG_VERSION:=2016g -PKG_VERSION_CODE:=2016g +PKG_VERSION:=2016h +PKG_VERSION_CODE:=2016h PKG_RELEASE:=1 #As i couldn't find real license used "Public Domain" @@ -20,14 +20,14 @@ PKG_LICENSE:=Public Domain PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz PKG_SOURCE_CODE:=tzcode$(PKG_VERSION_CODE).tar.gz PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases -PKG_MD5SUM:=3c7e97ec8527211104d27cc1d97a23de +PKG_MD5SUM:=878f0ec3fd9e4026ea11dd1b649a315a include $(INCLUDE_DIR)/package.mk define Download/tzcode FILE=$(PKG_SOURCE_CODE) URL=$(PKG_SOURCE_URL) - MD5SUM:=f89867013676e3cb9544be2df7d36a91 + MD5SUM:=00c20689d996dea4cf5b45504724ce8f endef $(eval $(call Download,tzcode)) |