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, master has been updated via 0ba187b4d391d02e3016cc44f313320e6481198b (commit) via 47b66afb31a82e239c94c18c9326294669df02ef (commit) via 275533dce4e4a8c35f73b665fab6787f64eeceda (commit) via b57bafa358ae77a3d4ac7e721b034ea21d3059a2 (commit) via 699abe572f8f4a56191d73d68ef1034b1174b576 (commit) from e3b5000b8318591a239125560b9e5fa101a3802e (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 0ba187b4d391d02e3016cc44f313320e6481198b Merge: 47b66afb31 b57bafa358 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 8 06:33:35 2025 +0100
Merge remote-tracking branch 'origin/core190'
commit 47b66afb31a82e239c94c18c9326294669df02ef Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 8 06:32:52 2025 +0100
core191: reship squid and dhcpcd
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 275533dce4e4a8c35f73b665fab6787f64eeceda Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 8 06:27:52 2025 +0100
core191: ship iplockslist/sources and inuitscript/functions
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: .../{oldcore/125 => core/191}/filelists/dhcpcd | 0 config/rootfiles/core/191/filelists/files | 2 + .../{oldcore/100 => core/191}/filelists/squid | 0 config/rootfiles/core/191/update.sh | 2 + config/rootfiles/packages/miniupnpc | 19 ----- lfs/miniupnpc | 87 ---------------------- lfs/transmission | 9 +-- make.sh | 1 - 8 files changed, 8 insertions(+), 112 deletions(-) copy config/rootfiles/{oldcore/125 => core/191}/filelists/dhcpcd (100%) copy config/rootfiles/{oldcore/100 => core/191}/filelists/squid (100%) delete mode 100644 config/rootfiles/packages/miniupnpc delete mode 100644 lfs/miniupnpc
Difference in files: diff --git a/config/rootfiles/core/191/filelists/dhcpcd b/config/rootfiles/core/191/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/191/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/files b/config/rootfiles/core/191/filelists/files index 0f03b7358..c1ac86999 100644 --- a/config/rootfiles/core/191/filelists/files +++ b/config/rootfiles/core/191/filelists/files @@ -1,5 +1,7 @@ +etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/backup/bin/backup.pl +var/ipfire/ipblocklist/sources diff --git a/config/rootfiles/core/191/filelists/squid b/config/rootfiles/core/191/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/191/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh index 85c9738f7..b496e932b 100644 --- a/config/rootfiles/core/191/update.sh +++ b/config/rootfiles/core/191/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done
# Stop services +/etci/init.d/squid stop
# Extract files extract_files @@ -77,6 +78,7 @@ telinit u /etc/init.d/sshd restart /etc/init.d/unbound restart /etc/init.d/suricata restart +/etc/init.d/squid start
# This update needs a reboot... touch /var/run/need_reboot diff --git a/config/rootfiles/packages/miniupnpc b/config/rootfiles/packages/miniupnpc deleted file mode 100644 index deee07ed4..000000000 --- a/config/rootfiles/packages/miniupnpc +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/external-ip -usr/bin/upnp-listdevices -usr/bin/upnpc -#usr/include/miniupnpc -#usr/include/miniupnpc/igd_desc_parse.h -#usr/include/miniupnpc/miniupnpc.h -#usr/include/miniupnpc/miniupnpc_declspec.h -#usr/include/miniupnpc/miniupnpctypes.h -#usr/include/miniupnpc/miniwget.h -#usr/include/miniupnpc/portlistingparse.h -#usr/include/miniupnpc/upnpcommands.h -#usr/include/miniupnpc/upnpdev.h -#usr/include/miniupnpc/upnperrors.h -#usr/include/miniupnpc/upnpreplyparse.h -#usr/lib/libminiupnpc.a -#usr/lib/libminiupnpc.so -usr/lib/libminiupnpc.so.18 -#usr/lib/pkgconfig/miniupnpc.pc -#usr/share/man/man3/miniupnpc.3.gz diff --git a/lfs/miniupnpc b/lfs/miniupnpc deleted file mode 100644 index ae6f0947e..000000000 --- a/lfs/miniupnpc +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2024 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = mini uPNP client (needed for transmission) - -VER = 2.2.8 - -THISAPP = miniupnpc-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = miniupnpc -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/lfs/transmission b/lfs/transmission index 49e024a13..c95c8b373 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -26,7 +26,7 @@ include Config
SUMMARY = A BitTorrent client with multiple UIs
-VER = 4.0.6 +VER = 4.0.5
THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 24 +PAK_VER = 25
-DEPS = miniupnpc +DEPS =
SERVICES = transmission
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a +$(DL_FILE)_BLAKE2 = 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997
install : $(TARGET)
@@ -81,7 +81,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/make.sh b/make.sh index 0a21b9489..7b7a2b9cf 100755 --- a/make.sh +++ b/make.sh @@ -1986,7 +1986,6 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli - lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna
hooks/post-receive -- IPFire 2.x development tree