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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Tremer
2023-08-02 09:11:40 +00:00
parent 833b9bc1d1 c649a19441
commit 6ed00db36f
8 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/udev
View File

@@ -81,7 +81,6 @@ lib/udev/rules.d/75-probe_mtd.rules
lib/udev/rules.d/78-sound-card.rules
lib/udev/rules.d/80-drivers.rules
lib/udev/rules.d/81-net-dhcp.rules
lib/udev/rules.d/90-hwrng.rules
lib/udev/rules.d/99-aqm.rules
lib/udev/rules.d/99-offloading.rules
lib/udev/scsi_id

1
config/rootfiles/oldcore/177/filelists/files
View File

@@ -238,3 +238,4 @@ lib/firmware/rtw89/rtw8851b_fw.bin
lib/firmware/rtw89/rtw8852b_fw-1.bin
lib/firmware/rtw89/rtw8852c_fw.bin
usr/sbin/unbound-dhcp-leases-bridge
var/ipfire/suricata/ruleset-sources

1
config/rootfiles/oldcore/177/update.sh
View File

@@ -105,6 +105,7 @@ if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
/etc/rc.d/init.d/rngd \
/etc/rc.d/rc*.d/*rngd
fi
rm -vf /lib/udev/rules.d/90-hwrng.rules
# Extract files
extract_files

2
config/suricata/ruleset-sources
View File

@@ -43,7 +43,7 @@ our %Providers = (
website => "https://www.snort.org",
tr_string => "community rules",
requires_subscription => "False",
dl_url => "https://www.snort.org/rules/community",
dl_url => "https://www.snort.org/downloads/community/community-rules.tar.gz",
dl_type => "archive",
},

16
config/udev/90-hwrng.rules
View File

@@ -1,16 +0,0 @@
# do not edit this file, it will be overwritten on update
SUBSYSTEM!="tty", GOTO="ipfire_hwrng_end"
KERNEL!="ttyACM[0-9]*", GOTO="ipfire_hwrng_end"
SUBSYSTEMS=="usb-serial", ENV{.ID_PORT}="$attr{port_number}"
IMPORT{builtin}="usb_id"
ENV{ID_SERIAL}=="", GOTO="ipfire_hwrng_end"
SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACE_NUM}="$attr{bInterfaceNumber}"
ENV{ID_USB_INTERFACE_NUM}=="", GOTO="ipfire_hwrng_end"
ATTRS{manufacturer}=="IPFire.org", ATTRS{product}=="Random Number Generator*", ENV{.ID_PORT}=="", SYMLINK+="hwrngtty" RUN+="/bin/stty raw -echo -ixoff -F /dev/hwrngtty 115200" RUN+="/etc/rc.d/init.d/rngd udev-event"
LABEL="ipfire_hwrng_end"
ACTION=="add|remove", KERNEL=="hw_random", RUN+="/etc/rc.d/init.d/rngd udev-event"

2
lfs/rng-tools
View File

@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rng-tools
PAK_VER = 3
PAK_VER = 4
DEPS =

4
lfs/udev
View File

@@ -122,10 +122,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
/lib/udev/rules.d
# Install hwrng rules.
install -v -m 644 $(DIR_SRC)/config/udev/90-hwrng.rules \
/lib/udev/rules.d
# Install AQM rules
install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
/lib/udev/rules.d

16
src/initscripts/packages/rngd
View File

@@ -24,18 +24,8 @@
case "${1}" in
start)
if pidofproc -s /usr/sbin/rngd; then
boot_mesg "Random Number Generator Daemon is already running..."
echo_ok;
exit 0
fi
if [ -e /dev/hwrngtty ]; then
HWRNG=/dev/hwrngtty
else
HWRNG=/dev/hwrng
fi
boot_mesg "Starting Random Number Generator Daemon..."
loadproc /usr/sbin/rngd -r $HWRNG --quiet
loadproc /usr/sbin/rngd --quiet
;;
stop)
@@ -53,10 +43,6 @@ case "${1}" in
statusproc /usr/sbin/rngd
;;
udev-event)
$0 restart &>/dev/null
;;
*)
echo "Usage: ${0} {start|stop|restart|status}"
exit 1