[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 829f4ceac2643e59b966d225014d37fe7d46c08c - IPFire-SCM

28 Feb 2023

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 3.x development tree".
The branch, master has been updated
       via  829f4ceac2643e59b966d225014d37fe7d46c08c (commit)
       via  15f907e92703d0c1ea42b2ad35a506ec157a18a3 (commit)
       via  888723e00e0c07dfc7c598743996433807f971b7 (commit)
       via  20f53c675b5cbed9fb859dc3bafc295c8e625589 (commit)
       via  fe9a39f784a19a513a43ba0a026c70b311aece9d (commit)
      from  6d8de48dc362c66728983fbdcf837cade512eb81 (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 829f4ceac2643e59b966d225014d37fe7d46c08c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Tue Feb 28 11:23:47 2023 +0100
kea: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 15f907e92703d0c1ea42b2ad35a506ec157a18a3
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Tue Feb 28 11:23:46 2023 +0100
log4cplus: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 888723e00e0c07dfc7c598743996433807f971b7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Feb 27 19:46:09 2023 +0100
compat-icu: Update to 56.1
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 20f53c675b5cbed9fb859dc3bafc295c8e625589
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Feb 27 19:03:25 2023 +0100
icu: Update to 72.1
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fe9a39f784a19a513a43ba0a026c70b311aece9d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Feb 27 17:31:47 2023 +0100
python3-sdbus: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 compat-icu/compat-icu.nm                           |   8 +-
 compat-icu/patches/icu-test-twodigityear.patch2    |  13 ---
 icu/icu.nm                                         |   4 +-
 kea/kea.nm                                         | 113 +++++++++++++++++++++
 kea/kea.tmpfiles                                   |   1 +
 .../kea-2.2.0-configure-fix-python3-version.patch  |  12 +++
 kea/systemd/kea-ctrl-agent.service                 |  13 +++
 kea/systemd/kea-dhcp-ddns.service                  |  13 +++
 kea/systemd/kea-dhcp4.service                      |  13 +++
 kea/systemd/kea-dhcp6.service                      |  13 +++
 apr/apr.nm => log4cplus/log4cplus.nm               |  22 ++--
 .../python3-sdbus.nm                               |  24 ++---
 12 files changed, 205 insertions(+), 44 deletions(-)
 delete mode 100644 compat-icu/patches/icu-test-twodigityear.patch2
 create mode 100644 kea/kea.nm
 create mode 100644 kea/kea.tmpfiles
 create mode 100644 kea/patches/kea-2.2.0-configure-fix-python3-version.patch
 create mode 100644 kea/systemd/kea-ctrl-agent.service
 create mode 100644 kea/systemd/kea-dhcp-ddns.service
 create mode 100644 kea/systemd/kea-dhcp4.service
 create mode 100644 kea/systemd/kea-dhcp6.service
 copy apr/apr.nm => log4cplus/log4cplus.nm (56%)
 copy python3-parted/python3-parted.nm => python3-sdbus/python3-sdbus.nm (59%)
Difference in files:

diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm
index 47e24d4f4..8ca0f6ac5 100644
--- a/compat-icu/compat-icu.nm
+++ b/compat-icu/compat-icu.nm
@@ -5,9 +5,9 @@
name       = compat-icu
 version    = %{ver_major}.%{ver_minor}.%{ver_plevel}
-ver_major  = 50
+ver_major  = 56
 ver_minor  = 1
-ver_plevel = 2
+ver_plevel = 
 release    = 1
 thisapp    = icu-%{version}
@@ -20,8 +20,8 @@ description
    Tools and utilities for developing with icu.
 end
-source_dl  = http://download.icu-project.org/files/icu4c/%%7Bversion%7D/
-sources    = icu4c-%{ver_major}_%{ver_minor}_%{ver_plevel}-src.tgz
+source_dl  = https://github.com/unicode-org/icu/releases/download/release-%%7Bver_major%7...
+sources    = icu4c-%{ver_major}_%{ver_minor}-src.tgz
build
    DIR_APP = %{DIR_SRC}/icu/source
diff --git a/compat-icu/patches/icu-test-twodigityear.patch2 b/compat-icu/patches/icu-test-twodigityear.patch2
deleted file mode 100644
index fba90b5d3..000000000
--- a/compat-icu/patches/icu-test-twodigityear.patch2
+++ /dev/null
@@ -1,13 +0,0 @@
-In the year 2034 ...
-http://sourceforge.net/p/icu/mailman/message/32443311/
---- icu.orig/source/test/intltest/dtfmttst.cpp	2013-10-04 22:48:00.000000000 +0200
-+++ icu/source/test/intltest/dtfmttst.cpp	2014-06-13 19:34:40.611299572 +0200
-@@ -1129,7 +1129,7 @@
-         return;
-     }
-     parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5));
--    parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4));
-+    parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4));
- }
-
- // -------------------------------------
diff --git a/icu/icu.nm b/icu/icu.nm
index 39b7b8339..dea5445b3 100644
--- a/icu/icu.nm
+++ b/icu/icu.nm
@@ -5,7 +5,7 @@
name       = icu
 version    = %{ver_major}.%{ver_minor}
-ver_major  = 56
+ver_major  = 72
 ver_minor  = 1
 ver_plevel =
 release    = 1
@@ -19,7 +19,7 @@ description
    Tools and utilities for developing with icu.
 end
-source_dl  = http://download.icu-project.org/files/icu4c/%%7Bversion%7D/
+source_dl  = https://github.com/unicode-org/icu/releases/download/release-%%7Bver_major%7...
 sources    = icu4c-%{ver_major}_%{ver_minor}-src.tgz
build
diff --git a/kea/kea.nm b/kea/kea.nm
new file mode 100644
index 000000000..c4e23a23f
--- /dev/null
+++ b/kea/kea.nm
@@ -0,0 +1,113 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = kea
+version    = 2.3.5
+release    = 1
+
+groups     = System/Daemons
+url        = http://kea.isc.org
+license    = MPLv2.0 and Boost
+summary    = DHCPv4, DHCPv6 and DDNS server from ISC
+
+description
+	DHCP implementation from Internet Systems Consortium, Inc. that features
+	fully functional DHCPv4, DHCPv6 and Dynamic DNS servers.
+	
+	Both DHCP servers fully support server discovery, address assignment,
+	renewal, rebinding and release. The DHCPv6 server supports prefix delegation.
+	Both servers support DNS Update mechanism, using stand-alone DDNS daemon.
+end
+
+source_dl  = https://ftp.isc.org/isc/kea/%%7Bversion%7D/
+sources    = %{thisapp}.tar.gz
+
+build
+	requires
+		gcc-c++
+		bison
+		boost-devel
+		flex
+		log4cplus-devel
+		openssl-devel
+	end
+
+	configure_options += \
+		--disable-dependency-tracking \
+		--disable-rpath \
+		--disable-silent-rules \
+		--disable-static \
+		--enable-generate-parser \
+		--enable-shell \
+		--with-openssl \
+		--with-log4cplus
+
+	install_cmds
+		# Start empty lease databases
+		mkdir -pv %{BUILDROOT}%{sharedstatedir}/kea/
+		touch %{BUILDROOT}%{sharedstatedir}/kea/kea-leases4.csv
+		touch %{BUILDROOT}%{sharedstatedir}/kea/kea-leases6.csv
+	end
+end
+
+packages
+	package %{name}
+		prerequires
+			systemd
+		end
+
+		configfiles
+			%{sysconfdir}/kea/kea-ctrl-agent.conf
+			%{sysconfdir}/kea/kea-dhcp-ddns.conf
+			%{sysconfdir}/kea/kea-dhcp4.conf
+			%{sysconfdir}//kea/kea-dhcp6.conf
+			%{sysconfdir}/kea/keactrl.conf
+		end
+
+		datafiles
+			%{sharedstatedir}/kea/kea-leases4.csv
+			%{sharedstatedir}/kea/kea-leases6.csv
+		end
+
+		script postin
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			/usr/bin/systemctl --no-reload disable kea-ctrl-agent.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl --no-reload disable kea-dhcp4.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl --no-reload disable kea-dhcp6.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl --no-reload disable kea-dhcp-ddns.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl stop kea-ctrl-agent.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl stop kea-dhcp4.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl stop kea-dhcp6.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl stop kea-dhcp-ddns.service >/dev/null 2>&1 || :
+		end
+
+		script postun
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			/usr/bin/systemctl try-restart kea-ctrl-agent.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl try-restart kea-dhcp4.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl try-restart kea-dhcp6.service >/dev/null 2>&1 || :
+			/usr/bin/systemctl try-restart kea-dhcp-ddns.service >/dev/null 2>&1 || :
+		end
+	end
+
+	package %{name}-libs
+		template LIBS
+	end
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/kea/kea.tmpfiles b/kea/kea.tmpfiles
new file mode 100644
index 000000000..0b3abeb75
--- /dev/null
+++ b/kea/kea.tmpfiles
@@ -0,0 +1 @@
+d /run/kea 0755 root root -
diff --git a/kea/patches/kea-2.2.0-configure-fix-python3-version.patch b/kea/patches/kea-2.2.0-configure-fix-python3-version.patch
new file mode 100644
index 000000000..97a3f3aa1
--- /dev/null
+++ b/kea/patches/kea-2.2.0-configure-fix-python3-version.patch
@@ -0,0 +1,12 @@
+diff -Nur a/configure b/configure
+--- a/configure	2023-02-28 07:56:13.629233758 +0000
++++ b/configure	2023-02-28 07:53:19.994816726 +0000
+@@ -22765,7 +22765,7 @@
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
diff --git a/kea/systemd/kea-ctrl-agent.service b/kea/systemd/kea-ctrl-agent.service
new file mode 100644
index 000000000..b5c860ca7
--- /dev/null
+++ b/kea/systemd/kea-ctrl-agent.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea Control Agent
+Documentation=man:kea-ctrl-agent(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp-ddns.service b/kea/systemd/kea-dhcp-ddns.service
new file mode 100644
index 000000000..5fdbe0bbf
--- /dev/null
+++ b/kea/systemd/kea-dhcp-ddns.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCP-DDNS Server
+Documentation=man:kea-dhcp-ddns(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp-ddns -c /etc/kea/kea-dhcp-ddns.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp4.service b/kea/systemd/kea-dhcp4.service
new file mode 100644
index 000000000..0a72768f3
--- /dev/null
+++ b/kea/systemd/kea-dhcp4.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv4 Server
+Documentation=man:kea-dhcp4(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp6.service b/kea/systemd/kea-dhcp6.service
new file mode 100644
index 000000000..e1fc05a34
--- /dev/null
+++ b/kea/systemd/kea-dhcp6.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv6 Server
+Documentation=man:kea-dhcp6(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/log4cplus/log4cplus.nm b/log4cplus/log4cplus.nm
new file mode 100644
index 000000000..5bcec4f3f
--- /dev/null
+++ b/log4cplus/log4cplus.nm
@@ -0,0 +1,40 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = log4cplus
+version    = 2.0.8
+release    = 1
+
+groups     = System/Libraries
+url        = http://sourceforge.net/projects/log4cplus
+license    = ASL 2.0
+summary    = Logging Framework for C++
+
+description
+	log4cplus is a simple to use C++ logging API providing thread-safe, flexible,
+	and arbitrarily granular control over log management and configuration. It is
+	modeled after the Java log4j API.
+end
+
+source_dl  = http://downloads.sourceforge.net/%%7Bname%7D/
+sources    = %{thisapp}.tar.xz
+
+build
+	requires
+		gcc-c++
+	end
+end
+
+packages
+	package %{name}
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/python3-sdbus/python3-sdbus.nm b/python3-sdbus/python3-sdbus.nm
new file mode 100644
index 000000000..5411a16ea
--- /dev/null
+++ b/python3-sdbus/python3-sdbus.nm
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = python3-sdbus
+version    = 0.11.0
+release    = 1
+thisapp    = python-sdbus-%{version}
+
+groups     = System/Libraries
+url        = https://github.com/python-sdbus/python-sdbus
+license    = LGPL2.1 and GPL2
+summary    = Modern Python bindings for D-Bus
+
+description
+	A modern python library for D-Bus, based on the fast sd-bus
+	from systemd.
+end
+
+source_dl  = https://github.com/python-sdbus/python-sdbus/archive/refs/tags/%%7Bversion%7...
+
+build
+	requires
+		python3-devel
+		python3-setuptools
+		systemd-devel
+	end
+
+	build
+		%{python3} setup.py build
+	end
+
+	install
+		%{python3} setup.py install --root=%{BUILDROOT}
+	end
+end
+
+packages
+	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
hooks/post-receive
--
IPFire 3.x development tree

    