This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 9826ac9bc299360a89c7f3f5bf3df0b9dfc05217 (commit) via c480cb54f00ff60e4c55898f67bfb5276db7a961 (commit) via eee65ac34f16babf3ca47274df7c31da5c6ad955 (commit) from c153f735529a7a9b766e523b26bb578c520e2862 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 9826ac9bc299360a89c7f3f5bf3df0b9dfc05217 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 3 10:21:24 2022 +0000

modules.d: Drop orphaned blacklist statements

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit c480cb54f00ff60e4c55898f67bfb5276db7a961 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 3 10:07:49 2022 +0000

Update contributor list

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit eee65ac34f16babf3ca47274df7c31da5c6ad955 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Oct 3 09:22:57 2022 +0000

backup: Fix file permissions of in-/exclude files, again

Signed-off-by: Peter Müller peter.mueller@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/etc/modprobe.d/cfg80211.conf | 1 - config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/core/171/update.sh | 1 + config/udev/blacklist.conf | 4 ---- html/cgi-bin/credits.cgi | 2 +- lfs/backup | 1 + 8 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 config/etc/modprobe.d/cfg80211.conf

Difference in files: diff --git a/config/etc/modprobe.d/cfg80211.conf b/config/etc/modprobe.d/cfg80211.conf deleted file mode 100644 index e72bedde8..000000000 --- a/config/etc/modprobe.d/cfg80211.conf +++ /dev/null @@ -1 +0,0 @@ -blacklist ieee80211 diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 9911bb0d5..e8cdeab9f 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -21,7 +21,6 @@ etc/logrotate.conf etc/mime.types etc/modprobe.d etc/modprobe.d/btmrvl_sdio.conf -etc/modprobe.d/cfg80211.conf etc/modprobe.d/nf_conntrack.conf etc/modprobe.d/pcspeaker.conf etc/modules.conf diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2 index 634b843c2..b23999544 100644 --- a/config/rootfiles/common/armv6l/stage2 +++ b/config/rootfiles/common/armv6l/stage2 @@ -21,7 +21,6 @@ etc/logrotate.conf etc/mime.types etc/modprobe.d etc/modprobe.d/btmrvl_sdio.conf -etc/modprobe.d/cfg80211.conf etc/modprobe.d/nf_conntrack.conf etc/modprobe.d/pcspeaker.conf etc/modules.conf diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index c54fccc20..f6678fc40 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -21,7 +21,6 @@ etc/logrotate.conf etc/mime.types etc/modprobe.d etc/modprobe.d/btmrvl_sdio.conf -etc/modprobe.d/cfg80211.conf etc/modprobe.d/nf_conntrack.conf etc/modprobe.d/pcspeaker.conf etc/modules.conf diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh index 6c04955bb..3174122ba 100644 --- a/config/rootfiles/core/171/update.sh +++ b/config/rootfiles/core/171/update.sh @@ -93,6 +93,7 @@ rm -rvf \

# Remove files rm -rvf \ + /etc/modprobe.d/cfg80211.conf \ /lib/firmware/3com/3C359.bin \ /lib/firmware/TDA7706_OM_v2.5.1_boot.txt \ /lib/firmware/TDA7706_OM_v3.0.2_boot.txt \ diff --git a/config/udev/blacklist.conf b/config/udev/blacklist.conf index 6b763666b..5e470a9ca 100644 --- a/config/udev/blacklist.conf +++ b/config/udev/blacklist.conf @@ -1,6 +1,2 @@ blacklist crc_ccitt blacklist slhc - -# Intel MEI controllers -# makes some systems hang on reboot -blacklist mei diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 15e969028..f4a7fee9f 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -89,8 +89,8 @@ Jan Lentfer, Marcus Scholz, Ersan Yildirim, Jörn-Ingo Weigert, -Alexander Koch, Jon Murphy, +Alexander Koch, Wolfgang Apolinarski, Alfred Haas, Lars Schuhmacher, diff --git a/lfs/backup b/lfs/backup index 43a2d8e08..f468152cb 100644 --- a/lfs/backup +++ b/lfs/backup @@ -63,6 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 755 -o root $(DIR_SRC)/config/backup/backup.pl /var/ipfire/backup/bin chown nobody:nobody -Rv /var/ipfire/backup/ chown root:root -Rv /var/ipfire/backup/bin/ + chown root:root -v /var/ipfire/backup/{in,ex}clude* install -v -m 644 $(DIR_SRC)/config/backup/include /var/ipfire/backup/ install -v -m 644 $(DIR_SRC)/config/backup/exclude /var/ipfire/backup/ -mkdir -p /var/ipfire/backup/addons

hooks/post-receive -- IPFire 2.x development tree