From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, core190, updated. b57bafa358ae77a3d4ac7e721b034ea21d3059a2 Date: Tue, 07 Jan 2025 10:31:04 +0000 Message-ID: <4YS6lX4d0Gz2xtH@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0859601447812832301==" List-Id: --===============0859601447812832301== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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, core190 has been updated via b57bafa358ae77a3d4ac7e721b034ea21d3059a2 (commit) via 699abe572f8f4a56191d73d68ef1034b1174b576 (commit) from c6febcc99646c39aeb2989ffd6fe43b5c876ca65 (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 b57bafa358ae77a3d4ac7e721b034ea21d3059a2 Author: Adolf Belka Date: Thu Jan 2 17:29:26 2025 +0100 miniupnpc: revert the addition of this package due to transmission revers= ion =20 - As transmission has been reverted back to version 4.0.5 then miniupnpc = is no longer needed for building or runtime. - This removes the minupnpc lfs and rootfile files. It also removes miniu= pnpc from the make.sh file. =20 Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 699abe572f8f4a56191d73d68ef1034b1174b576 Author: Adolf Belka Date: Thu Jan 2 17:29:25 2025 +0100 transmission: revert version back to 4.0.5 =20 - Revert back from 4.0.6 to 4.0.5 due to a bug in 4.0.6 that has resulted= in a variety of torrent mirrors banning transmission-4.0.6 - The update from 4.0.5 to 4.0.6 did not have any security fixes in it so= there is no issue in moving backward to 4.0.5 - A fix has been created but it is unclear when (and if) version 4.0.7 wi= ll be released. The fix has also been included in version 4.1.0 but this is still in b= eta development form. - Version 4.0.6 required minupnpc for building and run time. This reversi= on is also removing miniupnpc in an associated patch in this patch set. - No change required in the rootfile. =20 Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/miniupnpc | 19 -------- lfs/miniupnpc | 87 -----------------------------------= -- lfs/transmission | 9 ++-- make.sh | 1 - 4 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 config/rootfiles/packages/miniupnpc delete mode 100644 lfs/miniupnpc Difference in files: 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 = # -# = # -# 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 . = # -# = # -############################################################################= ### - -############################################################################= ### -# Definitions -############################################################################= ### - -include Config - -SUMMARY =3D mini uPNP client (needed for transmission) - -VER =3D 2.2.8 - -THISAPP =3D miniupnpc-$(VER) -DL_FILE =3D $(THISAPP).tar.gz -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -TARGET =3D $(DIR_INFO)/$(THISAPP) -PROG =3D miniupnpc -PAK_VER =3D 1 - -DEPS =3D=20 - -############################################################################= ### -# Top-level Rules -############################################################################= ### - -objects =3D $(DL_FILE) - -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 =3D eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e7= 35fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 - -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 =20 SUMMARY =3D A BitTorrent client with multiple UIs =20 -VER =3D 4.0.6 +VER =3D 4.0.5 =20 THISAPP =3D transmission-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -34,9 +34,9 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D transmission -PAK_VER =3D 24 +PAK_VER =3D 25 =20 -DEPS =3D miniupnpc +DEPS =3D =20 SERVICES =3D transmission =20 @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e165= 08ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a +$(DL_FILE)_BLAKE2 =3D 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea4548= 8ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997 =20 install : $(TARGET) =20 @@ -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-fi= x_for_miniupnpc-2.2.8.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX=3D/usr \ -DCMAKE_BUILD_TYPE=3DRelease \ diff --git a/make.sh b/make.sh index 35a602f62..f12fe8da6 100755 --- a/make.sh +++ b/make.sh @@ -1983,7 +1983,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 --===============0859601447812832301==--