From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] miniupnpc: Required for build of transmission to replace
 bundled version
Date: Tue, 24 Sep 2024 11:43:01 +0200
Message-ID: <20240924094301.2130-2-adolf.belka@ipfire.org>
In-Reply-To: <20240924094301.2130-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5661535875817861649=="
List-Id: <development.lists.ipfire.org>

--===============5661535875817861649==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- miniupnpc is required for the build of transmiossion but the bundled versio=
n was not
   working properly with version 4.0.6 and we prefer to not use bundled versi=
ons.
- Only used for the build so rootfile is 100% commented out. No miniupnpc ins=
talled
   on IPFire.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/miniupnpc | 19 ++++++++
 lfs/miniupnpc                     | 77 +++++++++++++++++++++++++++++++
 make.sh                           |  1 +
 3 files changed, 97 insertions(+)
 create mode 100644 config/rootfiles/common/miniupnpc
 create mode 100644 lfs/miniupnpc

diff --git a/config/rootfiles/common/miniupnpc b/config/rootfiles/common/mini=
upnpc
new file mode 100644
index 000000000..616ea6131
--- /dev/null
+++ b/config/rootfiles/common/miniupnpc
@@ -0,0 +1,19 @@
+#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
new file mode 100644
index 000000000..7907bb5b9
--- /dev/null
+++ b/lfs/miniupnpc
@@ -0,0 +1,77 @@
+############################################################################=
###
+#                                                                           =
  #
+# IPFire.org - A linux based firewall                                       =
  #
+# Copyright (C) 2024  IPFire Team  <info(a)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
+
+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)
+
+############################################################################=
###
+# 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))
+
+############################################################################=
###
+# 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/make.sh b/make.sh
index 42970b0c1..5199ca7c1 100755
--- a/make.sh
+++ b/make.sh
@@ -1984,6 +1984,7 @@ build_system() {
 	lfsmake2 aws-cli
 	lfsmake2 oci-python-sdk
 	lfsmake2 oci-cli
+	lfsmake2 miniupnpc
 	lfsmake2 transmission
 	lfsmake2 mtr
 	lfsmake2 minidlna
--=20
2.46.0


--===============5661535875817861649==--