public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dbf3bb1e55b5a48813a4a787eb236e6a7e54e00c
@ 2025-12-09 11:24 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-12-09 11:24 UTC (permalink / raw)
  To: ipfire-scm

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  dbf3bb1e55b5a48813a4a787eb236e6a7e54e00c (commit)
       via  20cc7695523790910152108b4822908e524f505a (commit)
       via  d2a63a43a82e9bf38675a9407d40053a4ffea50a (commit)
      from  3b9bedc91abae7e446bb9007dcad972bb4ebe880 (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 dbf3bb1e55b5a48813a4a787eb236e6a7e54e00c
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Dec 8 14:00:05 2025 +0100

    libmicrohttpd: New package installed for fort-validator
    
    - fort-validator-1.6.7 requires libmicrohttpd as a runtime dependency
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 20cc7695523790910152108b4822908e524f505a
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Dec 8 14:00:04 2025 +0100

    fort-validator: Update to version 1.6.7
    
    - Update from version 1.6.6 to 1.6.7
    - Change from the Github created tarball to the fort created tarball, which is the one
       they specify to use in their compile and install documentation.
    - Version 1.6.7 requires libmicrohttpd as a runtime dependency. This has been provided
       in this patch set.
    - No change to the rootfile
    - Changelog
        1.6.7
    	    bug #50: Add simple Prometheus
    	    bug #159: Validate PrintableString character set
    	    bug #160: Add HTTP proxy
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d2a63a43a82e9bf38675a9407d40053a4ffea50a
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Fri Dec 5 20:24:42 2025 +0100

    core200: Ship openvpn
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 .../{oldcore/100 => core/200}/filelists/openvpn    |  0
 config/rootfiles/packages/libmicrohttpd            |  6 ++++++
 lfs/fort-validator                                 | 17 +++++++--------
 lfs/{bwm-ng => libmicrohttpd}                      | 24 ++++++++++++----------
 make.sh                                            |  1 +
 5 files changed, 27 insertions(+), 21 deletions(-)
 copy config/rootfiles/{oldcore/100 => core/200}/filelists/openvpn (100%)
 create mode 100644 config/rootfiles/packages/libmicrohttpd
 copy lfs/{bwm-ng => libmicrohttpd} (85%)

Difference in files:
diff --git a/config/rootfiles/core/200/filelists/openvpn b/config/rootfiles/core/200/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/packages/libmicrohttpd b/config/rootfiles/packages/libmicrohttpd
new file mode 100644
index 000000000..6864f054e
--- /dev/null
+++ b/config/rootfiles/packages/libmicrohttpd
@@ -0,0 +1,6 @@
+#usr/include/microhttpd.h
+#usr/lib/libmicrohttpd.la
+#usr/lib/libmicrohttpd.so
+usr/lib/libmicrohttpd.so.12
+usr/lib/libmicrohttpd.so.12.62.2
+#usr/lib/pkgconfig/libmicrohttpd.pc
diff --git a/lfs/fort-validator b/lfs/fort-validator
index 1f9ae5499..b314fa34f 100644
--- a/lfs/fort-validator
+++ b/lfs/fort-validator
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  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        #
@@ -26,15 +26,15 @@ include Config
 
 SUMMARY    = Fort RPKI validator
 
-VER        = 1.6.6
+VER        = 1.6.7
 
-THISAPP    = FORT-validator-$(VER)
+THISAPP    = fort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fort-validator
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = rsync
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = c62a0e41e2a2fea60383ae87ff92d9cd68945c459b0ccaa4d0a3fc6d8c0796cb0dc0fde7305023e4ddcf476b4043ac73d8213638a8f319862a3c39e3381f43da
+$(DL_FILE)_BLAKE2 = 95273f7fb8a7f57eee28e1dd2cef558f9bbae96106394651a1d092fa64c8953f55797c91a23c0c108133114699cb04fca2ae137795a3378ec03a2fc627e2efde
 
 install : $(TARGET)
 
@@ -80,12 +80,9 @@ $(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) && ./autogen.sh
 	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc
-
+				--prefix=/usr \
+				--sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/libmicrohttpd b/lfs/libmicrohttpd
new file mode 100644
index 000000000..8aac72cd0
--- /dev/null
+++ b/lfs/libmicrohttpd
@@ -0,0 +1,93 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2025-2025  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    = Small C library to easily run an HTTP server as part of an application
+
+VER        = 1.0.2
+
+THISAPP    = libmicrohttpd-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libmicrohttpd
+PAK_VER    = 1
+
+DEPS       =
+
+SERVICES   =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = fc9562cb6064d928f311ad0afd1930d46902f31ce3fb11811cbeb7ec7ef2591693855f6e167732b8743a525b6684f68ffdbeb67ad3b2b2f11dc0296f77aa2d64
+
+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) && ./configure \
+				--prefix=/usr \
+				--disable-static \
+				--disable-doc \
+				--disable-examples \
+				--disable-tools
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 40d09997c..220006c89 100755
--- a/make.sh
+++ b/make.sh
@@ -2124,6 +2124,7 @@ build_system() {
 	lfsmake2 btrfs-progs
 	lfsmake2 inotify-tools
 	lfsmake2 grub-btrfs
+	lfsmake2 libmicrohttpd
 	lfsmake2 fort-validator
 	lfsmake2 arpwatch
 	lfsmake2 suricata-reporter


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2025-12-09 11:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-09 11:24 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dbf3bb1e55b5a48813a4a787eb236e6a7e54e00c Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox