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

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-04-19 22:00:22 +05:30 committed by GitHub
commit 93c8fdf26f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/newt/Makefile
View file

@ -1,7 +1,7 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
# Copyright (C) 2011 SMBPhone Inc. # Copyright (C) 2011 SMBPhone Inc.
# Copyright (C) 2019 Jeffery To # Copyright (C) 2019-2020, 2023 Jeffery To
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=newt PKG_NAME:=newt
PKG_VERSION:=0.52.21 PKG_VERSION:=0.52.23
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://releases.pagure.org/newt PKG_SOURCE_URL:=https://releases.pagure.org/newt
PKG_HASH:=265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 PKG_HASH:=caa372907b14ececfe298f0d512a62f41d33b290610244a58aed07bbc5ada12a
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=LGPL-2.0-only PKG_LICENSE:=LGPL-2.0-only

4
net/dnsproxy/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnsproxy PKG_NAME:=dnsproxy
PKG_VERSION:=0.49.0 PKG_VERSION:=0.49.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4a6a698d830195fd8c04dd32c67e872bfd304fc39dbdaa982935892566b3ae37 PKG_HASH:=c587a7e88660c879f738df1ffcbf0402928a0c04ec0f148e385017f176e8ba14
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org> PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

106
net/lighttpd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lighttpd PKG_NAME:=lighttpd
PKG_VERSION:=1.4.69 PKG_VERSION:=1.4.69
PKG_RELEASE:=1 PKG_RELEASE:=2
# release candidate ~rcX testing; remove for release # release candidate ~rcX testing; remove for release
#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) #PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -60,17 +60,17 @@ PKG_BUILD_DEPENDS:= \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk include $(INCLUDE_DIR)/meson.mk
# choose crypto lib for lighttpd to use for crypto algorithms # choose crypto lib for lighttpd to use for crypto algorithms (default: nettle)
# (separate from lighttpd TLS modules, which are each standalone) # (separate from lighttpd TLS modules, which are each standalone)
ifdef CONFIG_LIGHTTPD_CRYPTOLIB_NONE) cryptolibdep= \
cryptolib= +LIGHTTPD_CRYPTOLIB_NETTLE:libnettle \
else ifdef CONFIG_LIGHTTPD_CRYPTOLIB_NETTLE +LIGHTTPD_CRYPTOLIB_MBEDTLS:libmbedtls \
cryptolib=libnettle +LIGHTTPD_CRYPTOLIB_WOLFSSL:libwolfssl
else ifdef CONFIG_LIGHTTPD_CRYPTOLIB_MBEDTLS ifdef CONFIG_LIGHTTPD_CRYPTOLIB_MBEDTLS
cryptolib=libmbedtls
TARGET_CPPFLAGS += -DFORCE_MBEDTLS_CRYPTO TARGET_CPPFLAGS += -DFORCE_MBEDTLS_CRYPTO
else ifdef CONFIG_LIGHTTPD_CRYPTOLIB_WOLFSSL else ifdef CONFIG_LIGHTTPD_CRYPTOLIB_WOLFSSL
cryptolib=libwolfssl # (Note: if CONFIG_LIGHTTPD_CRYPTOLIB_WOLFSSL is set,
# then lighttpd-mod-mbedtls should not be selected to also be built)
TARGET_CPPFLAGS += -DFORCE_WOLFSSL_CRYPTO TARGET_CPPFLAGS += -DFORCE_WOLFSSL_CRYPTO
endif endif
@ -85,8 +85,8 @@ define Package/lighttpd
$(call Package/lighttpd/Default) $(call Package/lighttpd/Default)
MENU:=1 MENU:=1
DEPENDS:=+libpthread +LIGHTTPD_LOGROTATE:logrotate \ DEPENDS:=+libpthread +LIGHTTPD_LOGROTATE:logrotate \
$(if $(CONFIG_LIGHTTPD_PCRE2),+libpcre2,) \ +LIGHTTPD_PCRE2:libpcre2 \
$(if $(cryptolib),+$(cryptolib),) $(cryptolibdep)
TITLE:=A flexible and lightweight web server TITLE:=A flexible and lightweight web server
endef endef
@ -163,7 +163,7 @@ MESON_ARGS += \
-Dwith_maxminddb=$(if $(CONFIG_PACKAGE_lighttpd-mod-maxminddb),enabled,disabled) \ -Dwith_maxminddb=$(if $(CONFIG_PACKAGE_lighttpd-mod-maxminddb),enabled,disabled) \
-Dwith_mbedtls=$(if $(CONFIG_PACKAGE_lighttpd-mod-mbedtls),true,false) \ -Dwith_mbedtls=$(if $(CONFIG_PACKAGE_lighttpd-mod-mbedtls),true,false) \
-Dwith_mysql=$(if $(CONFIG_PACKAGE_lighttpd-mod-vhostdb_mysql),enabled,disabled) \ -Dwith_mysql=$(if $(CONFIG_PACKAGE_lighttpd-mod-vhostdb_mysql),enabled,disabled) \
-Dwith_nettle=$(if $(filter libnettle,$(cryptolib)),true,false) \ -Dwith_nettle=$(if $(CONFIG_LIGHTTPD_CRYPTOLIB_NETTLE),true,false) \
-Dwith_nss=$(if $(CONFIG_PACKAGE_lighttpd-mod-nss),true,false) \ -Dwith_nss=$(if $(CONFIG_PACKAGE_lighttpd-mod-nss),true,false) \
-Dwith_openssl=$(if $(CONFIG_PACKAGE_lighttpd-mod-openssl),true,false) \ -Dwith_openssl=$(if $(CONFIG_PACKAGE_lighttpd-mod-openssl),true,false) \
-Dwith_pam=$(if $(CONFIG_PACKAGE_lighttpd-mod-authn_pam),enabled,disabled) \ -Dwith_pam=$(if $(CONFIG_PACKAGE_lighttpd-mod-authn_pam),enabled,disabled) \
@ -177,7 +177,7 @@ MESON_ARGS += \
-Dwith_zlib=$(if $(CONFIG_PACKAGE_lighttpd-mod-deflate),enabled,disabled) \ -Dwith_zlib=$(if $(CONFIG_PACKAGE_lighttpd-mod-deflate),enabled,disabled) \
-Dwith_zstd=disabled -Dwith_zstd=disabled
BASE_MODULES:=dirlisting indexfile staticfile BASE_MODULES:=dirlisting
define Package/lighttpd/conffiles define Package/lighttpd/conffiles
/etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf
@ -239,13 +239,13 @@ endef
$(eval $(call BuildPackage,lighttpd)) $(eval $(call BuildPackage,lighttpd))
$(eval $(call BuildPlugin,auth,Authentication,$(if $(cryptolib),+PACKAGE_lighttpd-mod-auth:$(cryptolib),),20)) $(eval $(call BuildPlugin,auth,Authentication,$(cryptolibdep),20))
$(eval $(call BuildPlugin,authn_dbi,DBI-based authentication,lighttpd-mod-auth $(if $(cryptolib),+PACKAGE_lighttpd-mod-authn_dbi:$(cryptolib),) +PACKAGE_lighttpd-mod-authn_dbi:libdbi,20)) $(eval $(call BuildPlugin,authn_dbi,DBI-based authentication,lighttpd-mod-auth libdbi $(cryptolibdep),20))
$(eval $(call BuildPlugin,authn_file,File-based authentication,lighttpd-mod-auth $(if $(cryptolib),+PACKAGE_lighttpd-mod-authn_file:$(cryptolib),),20)) $(eval $(call BuildPlugin,authn_file,File-based authentication,lighttpd-mod-auth $(cryptolibdep),20))
$(eval $(call BuildPlugin,authn_gssapi,Kerberos-based authentication,lighttpd-mod-auth +PACKAGE_lighttpd-mod-authn_gssapi:krb5-libs,20)) $(eval $(call BuildPlugin,authn_gssapi,Kerberos-based authentication,lighttpd-mod-auth krb5-libs $(cryptolibdep),20))
$(eval $(call BuildPlugin,authn_ldap,LDAP-based authentication,lighttpd-mod-auth +PACKAGE_lighttpd-mod-authn_ldap:libopenldap,20)) $(eval $(call BuildPlugin,authn_ldap,LDAP-based authentication,lighttpd-mod-auth libopenldap,20))
$(eval $(call BuildPlugin,authn_pam,PAM-based authentication,lighttpd-mod-auth +PACKAGE_lighttpd-mod-authn_pam:libpam,20)) $(eval $(call BuildPlugin,authn_pam,PAM-based authentication,lighttpd-mod-auth libpam,20))
$(eval $(call BuildPlugin,authn_sasl,SASL-based authentication,lighttpd-mod-auth +PACKAGE_lighttpd-mod-authn_sasl:libsasl2,20)) $(eval $(call BuildPlugin,authn_sasl,SASL-based authentication,lighttpd-mod-auth libsasl2,20))
$(eval $(call BuildPlugin,accesslog,Access logging,,30)) $(eval $(call BuildPlugin,accesslog,Access logging,,30))
$(eval $(call BuildPlugin,ajp13,AJP13 Tomcat connector,,30)) $(eval $(call BuildPlugin,ajp13,AJP13 Tomcat connector,,30))
@ -272,22 +272,60 @@ $(eval $(call BuildPlugin,vhostdb_pgsql,Virtual Host Database (PostgreSQL),light
$(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,30)) $(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,30))
$(eval $(call BuildPlugin,webdav_min,WebDAV,,30)) $(eval $(call BuildPlugin,webdav_min,WebDAV,,30))
$(eval $(call BuildPlugin,wolfssl,TLS using wolfssl,@LIGHTTPD_SSL +PACKAGE_lighttpd-mod-wolfssl:libwolfssl,30)) $(eval $(call BuildPlugin,wolfssl,TLS using wolfssl,@LIGHTTPD_SSL +PACKAGE_lighttpd-mod-wolfssl:libwolfssl,30))
$(eval $(call BuildPlugin,wstunnel,Websocket tunneling,$(if $(cryptolib),+PACKAGE_lighttpd-mod-wstunnel:$(cryptolib),),30)) $(eval $(call BuildPlugin,wstunnel,Websocket tunneling,$(cryptolibdep),30))
# included in BASE_MODULES:=dirlisting indexfile staticfile # (similar to BuildPlugin, but without associated .so)
define BuiltinPlugin
define Package/lighttpd-mod-$(1)
$(call Package/lighttpd/Default)
DEPENDS:=lighttpd
ifneq ($(3),)
DEPENDS+= $(3)
endif
TITLE:=$(2) module
endef
define Package/lighttpd-mod-$(1)/conffiles
/etc/lighttpd/conf.d/$(4)-$(1).conf
endef
ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-$(1)),)
define Package/lighttpd-mod-$(1)/install
$(INSTALL_DIR) $$(1)/etc/lighttpd/conf.d
if [ -f $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf ]; then \
$(CP) $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
if ! grep -qF 'mod_$(1)' $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf; then \
sed -i "`sed '/^##/ !q' $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf | wc -l` i\
server.modules += ( \"mod_$(1)\" )" $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
fi \
else \
echo 'server.modules += ( "mod_$(1)" )' > $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
fi
endef
endif
$$(eval $$(call BuildPackage,lighttpd-mod-$(1)))
endef
# included in BASE_MODULES:=dirlisting
#$(eval $(call BuildPlugin,dirlisting,dirlisting,,30)) #$(eval $(call BuildPlugin,dirlisting,dirlisting,,30))
# included in base lighttpd executable; # included in base lighttpd executable;
# no longer loaded as separate dynamic modules # no longer loaded as separate dynamic modules
#$(eval $(call BuildPlugin,indexfile,indexfile,,30)) # no longer in BASE_MODULES
#$(eval $(call BuildPlugin,staticfile,staticfile,,30)) #$(eval $(call BuiltinPlugin,indexfile,indexfile,,30))
$(eval $(call BuildPlugin,access,Access restrictions,,30)) #$(eval $(call BuiltinPlugin,staticfile,staticfile,,30))
$(eval $(call BuildPlugin,alias,Directory alias,,30))
$(eval $(call BuildPlugin,evhost,Enhanced Virtual-Hosting,,30)) # included in base lighttpd executable;
$(eval $(call BuildPlugin,expire,Expire,,30)) # no longer loaded as separate dynamic modules
$(eval $(call BuildPlugin,fastcgi,FastCGI,,30)) # though still need to be enabled in config
$(eval $(call BuildPlugin,redirect,URL redirection,$(if $(CONFIG_LIGHTTPD_PCRE2),+PACKAGE_lighttpd-mod-redirect:libpcre2,),10)) $(eval $(call BuiltinPlugin,access,Access restrictions,,30))
$(eval $(call BuildPlugin,rewrite,URL rewriting,$(if $(CONFIG_LIGHTTPD_PCRE2),+PACKAGE_lighttpd-mod-rewrite:libpcre2,),30)) $(eval $(call BuiltinPlugin,alias,Directory alias,,30))
$(eval $(call BuildPlugin,scgi,SCGI,,30)) $(eval $(call BuiltinPlugin,evhost,Enhanced Virtual-Hosting,,30))
$(eval $(call BuildPlugin,setenv,Environment variable setting,,30)) $(eval $(call BuiltinPlugin,expire,Expire,,30))
$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,30)) $(eval $(call BuiltinPlugin,fastcgi,FastCGI,,30))
$(eval $(call BuiltinPlugin,redirect,URL redirection,+LIGHTTPD_PCRE2:libpcre2,10))
$(eval $(call BuiltinPlugin,rewrite,URL rewriting,+LIGHTTPD_PCRE2:libpcre2,30))
$(eval $(call BuiltinPlugin,scgi,SCGI,,30))
$(eval $(call BuiltinPlugin,setenv,Environment variable setting,,30))
$(eval $(call BuiltinPlugin,simple_vhost,Simple virtual hosting,,30))

4
net/pdns-recursor/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pdns-recursor PKG_NAME:=pdns-recursor
PKG_VERSION:=4.8.3 PKG_VERSION:=4.8.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
PKG_HASH:=37b91a5458c54411f4e38e2d1263ecf41e751e43c5fd66e813100d9978f02505 PKG_HASH:=f0a63fd08e03da82fa20d333ea5179d1b9259f4264546cf4995286677d9458c7
PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com> PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
PKG_LICENCE:=GPL-2.0-only PKG_LICENCE:=GPL-2.0-only

4
net/pdns/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pdns PKG_NAME:=pdns
PKG_VERSION:=4.7.3 PKG_VERSION:=4.7.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
PKG_HASH:=8bad351b2e09426f6d4fb0346881a5155fe555497c3d85071e531e7c7afe3e76 PKG_HASH:=7469dd81fb7df11197f49638fa49ceff9f973225fc8f9c7160b0bfc00a2e7471
PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com> PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
PKG_LICENCE:=GPL-2.0-only PKG_LICENCE:=GPL-2.0-only

4
net/xray-core/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core PKG_NAME:=xray-core
PKG_VERSION:=1.8.0 PKG_VERSION:=1.8.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=35339ee4c2ebd46cebd95ad7791d38a97db3a6afd97277a33e4ee7be35c9a3b2 PKG_HASH:=477ad92b80700b4742e59ad7848ca4726201841a57339e4c1bf9012e395622e2
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org> PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0 PKG_LICENSE:=MPL-2.0