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-09-16 00:22:00 +05:30 committed by GitHub
commit 90cd3ae75d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
admin/syslog-ng/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=syslog-ng PKG_NAME:=syslog-ng
PKG_VERSION:=4.2.0 PKG_VERSION:=4.3.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com> PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
@ -11,7 +11,7 @@ PKG_CPE_ID:=cpe:/a:balabit:syslog-ng
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_HASH:=092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda PKG_HASH:=999dbab62982c3cffba02c0be22c596ee1ce81d6954689dc9b3a6afeb513cce3
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -33,7 +33,7 @@ define Package/syslog-ng
CATEGORY:=Administration CATEGORY:=Administration
TITLE:=A powerful syslog daemon TITLE:=A powerful syslog daemon
URL:=https://www.syslog-ng.com/products/open-source-log-management/ URL:=https://www.syslog-ng.com/products/open-source-log-management/
DEPENDS:=+libpcre +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid +SYSLOGNG_LOGROTATE:logrotate DEPENDS:=+libpcre2 +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid +SYSLOGNG_LOGROTATE:logrotate
endef endef
define Package/syslog-ng/description define Package/syslog-ng/description
@ -89,6 +89,7 @@ CONFIGURE_ARGS += \
--disable-sql \ --disable-sql \
--disable-linux-caps \ --disable-linux-caps \
--with-jsonc=system \ --with-jsonc=system \
--enable-cpp=no \
--enable-json=yes \ --enable-json=yes \
--enable-http=yes \ --enable-http=yes \
--disable-smtp \ --disable-smtp \

2
admin/syslog-ng/files/syslog-ng.conf
View file

@ -4,7 +4,7 @@
# More details about these settings can be found here: # More details about these settings can be found here:
# https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition # https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition
@version: 4.1 @version: 4.3
@include "scl.conf" @include "scl.conf"
options { options {

4
net/dnscrypt-proxy2/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnscrypt-proxy2 PKG_NAME:=dnscrypt-proxy2
PKG_VERSION:=2.1.4 PKG_VERSION:=2.1.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=dnscrypt-proxy-$(PKG_VERSION).tar.gz PKG_SOURCE:=dnscrypt-proxy-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG_VERSION)?
PKG_HASH:=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d PKG_HASH:=044c4db9a3c7bdcf886ff8f83c4b137d2fd37a65477a92bfe86bf69587ea7355
PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION)
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com> PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>

4
net/nextdns/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nextdns PKG_NAME:=nextdns
PKG_VERSION:=1.39.4 PKG_VERSION:=1.40.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=nextdns-$(PKG_VERSION).tar.gz PKG_SOURCE:=nextdns-$(PKG_VERSION).tar.gz
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://codeload.github.com/nextdns/nextdns/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/nextdns/nextdns/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac PKG_HASH:=5fec5ed5373d94dcaf8b17ddd78d05ccdfd0faa8b4695d9e926d8e71278ea08e
PKG_MAINTAINER:=Olivier Poitrey <rs@nextdns.io> PKG_MAINTAINER:=Olivier Poitrey <rs@nextdns.io>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT

4
net/sing-box/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box PKG_NAME:=sing-box
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.3
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/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ab6698545442e9197339f459553e241ff91396ba39a8e5d14e0a792e78d290a0 PKG_HASH:=baf7c87f2e5005bf268975b1a2511f30927210b1607f20451fec2de0044edfa8
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

4
net/snort3/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=snort3 PKG_NAME:=snort3
PKG_VERSION:=3.1.69.0 PKG_VERSION:=3.1.70.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
PKG_HASH:=97083cd33a6ba33bdaa133bf19138a3f6a24ce93b2a9e285dcbd89858534cb72 PKG_HASH:=4917f2631d033383ca553002f5688b61df507f5c809b9ba62abceca45a7554ad
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only

9
net/tailscale/README.md
View file

@ -8,6 +8,8 @@ To install them run
``` ```
opkg install tailscale tailscaled opkg install tailscale tailscaled
``` ```
> [!NOTE]
> By default this package will use nftables. If you wish to use iptables, the config file `/etc/config/tailscale` can be modfied, changing the line `fw_mode 'nftables'` to `fw_mode 'iptables'`. You can then run `/etc/init.d/tailscale restart` to restart tailscale using your chosen method
## First setup ## First setup
@ -25,9 +27,4 @@ Run command and finish device registration with the given URL.
tailscale up tailscale up
``` ```
If you are running with nftables, it is not supported by tailscale, See the [OpenWrt wiki](https://openwrt.org/docs/guide-user/services/vpn/tailscale/start) for more detailed setup instructions
so disable it and configure firewall by yourself and add argument
--netfilter-mode off
to tailscale up command to disable iptables use.
After that, you should see your router in tailscale admin page.

2
net/tailscale/files/tailscale.conf
View file

@ -3,3 +3,5 @@ config settings 'settings'
option log_stdout '1' option log_stdout '1'
option port '41641' option port '41641'
option state_file '/etc/tailscale/tailscaled.state' option state_file '/etc/tailscale/tailscaled.state'
# default to using nftables - change below to 'iptables' if still using iptables
option fw_mode 'nftables'

6
net/tailscale/files/tailscale.init
View file

@ -17,14 +17,16 @@ start_service() {
config_get_bool std_err "settings" log_stderr 1 config_get_bool std_err "settings" log_stderr 1
config_get port "settings" port 41641 config_get port "settings" port 41641
config_get state_file "settings" state_file /etc/tailscale/tailscaled.state config_get state_file "settings" state_file /etc/tailscale/tailscaled.state
config_get fw_mode "settings" fw_mode nftables
/usr/sbin/tailscaled --cleanup /usr/sbin/tailscaled --cleanup
procd_open_instance procd_open_instance
procd_set_param command /usr/sbin/tailscaled procd_set_param command /usr/sbin/tailscaled
# starting with v1.48.1 ENV variable is required to enable autodetection of iptables / nftables # Starting with v1.48.1 ENV variable is required to enable use of iptables / nftables.
procd_set_param env TS_DEBUG_FIREWALL_MODE=auto # Use nftables by default - can be changed to 'iptables' in tailscale config
procd_set_param env TS_DEBUG_FIREWALL_MODE="$fw_mode"
# Set the port to listen on for incoming VPN packets. # Set the port to listen on for incoming VPN packets.
# Remote nodes will automatically be informed about the new port number, # Remote nodes will automatically be informed about the new port number,

4
net/zerotier/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zerotier PKG_NAME:=zerotier
PKG_VERSION:=1.12.1 PKG_VERSION:=1.12.2
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/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
PKG_HASH:=c6758a04f161bba1c0ef11fce991029a645ede381ae3862a25a2f5145aaffca8 PKG_HASH:=7c6512cfc208374ea9dc9931110e35f71800c34890e0f35991ea485aae66e31c
PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de> PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>