webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 00:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next'

Browse Source
This commit is contained in:
Michael Tremer
2022-09-05 10:07:45 +00:00
parent ef7d41ef9e 763efaf672
commit 48a19ee575
10 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/ipblocklist/sources
View File

@@ -93,14 +93,14 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis
'parser' => 'ip-or-net-list',
'rate' => '15m',
'category' => 'reputation' },
'TOR_ALL' => { 'name' => 'Known TOR Nodes',
'TOR_ALL' => { 'name' => 'Known Tor Nodes',
'url' => 'https://www.dan.me.uk/torlist',
'info' => 'https://www.dan.me.uk/tornodes',
'parser' => 'ip-or-net-list',
'rate' => '1h',
'category' => 'application',
'disable' => 'TOR_EXIT' },
'TOR_EXIT' => { 'name' => 'Known TOR Exit Nodes',
'TOR_EXIT' => { 'name' => 'Known Tor Exit Nodes',
'url' => 'https://www.dan.me.uk/torlist/?exit',
'info' => 'https://www.dan.me.uk/tornodes',
'parser' => 'ip-or-net-list',,

1
config/rootfiles/common/configroot
View File

@@ -83,6 +83,7 @@ var/ipfire/location-functions.pl
var/ipfire/ids-functions.pl
var/ipfire/ipblocklist-functions.pl
var/ipfire/ipblocklist
#var/ipfire/ipblocklist/modified
#var/ipfire/ipblocklist/settings
var/ipfire/isdn
#var/ipfire/isdn/settings

1
config/rootfiles/core/170/filelists/files
View File

@@ -14,6 +14,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat
srv/web/ipfire/html/themes/ipfire/include/functions.pl
usr/lib/firewall/rules.pl
usr/local/bin/getipstat
usr/local/bin/setaliases
usr/local/bin/update-ipblocklists
usr/share/terminfo/t/tmux

4
config/rootfiles/core/170/update.sh
View File

@@ -164,6 +164,10 @@ ldconfig
mkdir -pv /var/lib/ipblocklist
chown nobody:nobody /var/lib/ipblocklist
# Create necessary files for IPBlocklist and set their ownership accordingly (#12917)
touch /var/ipfire/ipblocklist/{settings,modified}
chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified}
# Rebuild fcrontab from scratch
/usr/bin/fcrontab -z

6
lfs/configroot
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -65,8 +65,8 @@ $(TARGET) :
captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/settings \
isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \

4
lfs/dbus
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = dbus
PAK_VER = 5
PAK_VER = 6
DEPS =

6
lfs/netatalk
View File

@@ -26,7 +26,7 @@ include Config
SUMMARY = AppleShare file server
VER = 3.1.13
VER = 3.1.12
THISAPP = netatalk-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = netatalk
PAK_VER = 4
PAK_VER = 5
DEPS = avahi dbus
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_BLAKE2 = 2849e2a5b436f9965e0dd2aedf5078c560c78f45c1c86fbdea39228266b8fbcc096a3a62a08bd626b8b700fde4dd65d99f71f04478e129f6ec61c2ed7184780d
$(DL_FILE)_BLAKE2 = 912bb85045952202becc42899f87ada33427ded987de6c7a6b56c061c1eb6d1a96d95a1700522bfe2119c6db8bbec94eeb4c64c480f59ff7d406542390705efc
install : $(TARGET)

4
lfs/qemu
View File

@@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
PAK_VER = 33
PAK_VER = 34
DEPS = libusbredir spice libseccomp
DEPS = alsa libusbredir spice libseccomp
SERVICES =

2
src/initscripts/packages/messagebus
View File

@@ -50,7 +50,7 @@ case "$1" in
;;
status)
statusproc -p $pidfile /usr/bin/dbus-daemon
statusproc /usr/bin/dbus-daemon
;;
*)

2
src/misc-progs/getipstat.c
View File

@@ -29,7 +29,7 @@ int main(int argc, char** argv)
// argument.
char *args[] = {"--list", "--verbose", "--numeric", "--wait", "5", NULL, NULL, NULL, NULL};
char *usage = "getipstat [-x][-f|-n|-m]";
unsigned int pcount = 6;
unsigned int pcount = 5;
unsigned int table_set = 0;
int opt;