diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22d1be10db03318d3309ea2af0ae3673d1ea2715..49245956689996707faf769cbfb5b03ef96b5532 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ set (VERSION ${CMAKE_PROJECT_VERSION})
option(DHTNET_PUPNP "Enable UPnP support" ON)
option(DHTNET_NATPMP "Enable NAT-PMP support" ON)
+option(BUILD_DEPS_STATIC "Enable to force building dependencies as static" OFF)
+option(TRIM_PREFIX_PATH "Used for some RPM build, trim INSTALL_PREFIX from absolute path" OFF)
option(BUILD_TOOLS "Build tools" ON)
option(BUILD_BENCHMARKS "Build benchmarks" ON)
option(BUILD_DEPENDENCIES "Build dependencies" ON)
@@ -77,7 +79,7 @@ if (NOT MSVC)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_PATH})
find_package (PkgConfig REQUIRED)
- if(NOT BUILD_SHARED_LIBS)
+ if(BUILD_DEPS_STATIC OR NOT BUILD_SHARED_LIBS)
list(APPEND PKG_CONFIG_EXECUTABLE "--static")
endif()
@@ -160,6 +162,12 @@ if (DNC_SYSTEMD AND BUILD_TOOLS AND NOT MSVC)
systemd/dnc.service
@ONLY
)
+ if (TRIM_PREFIX_PATH)
+ file(READ ${CMAKE_CURRENT_BINARY_DIR}/systemd/dnc.service FILE_CONTENTS)
+ string(REPLACE "${CMAKE_INSTALL_PREFIX}" "" FILE_CONTENTS "${FILE_CONTENTS}")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/systemd/dnc.service "${FILE_CONTENTS}")
+ endif()
+
if (SYSTEMD_UNIT_INSTALL_DIR)
string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_UNIT_INSTALL_DIR "${SYSTEMD_UNIT_INSTALL_DIR}")
set (systemdunitdir "${SYSTEMD_UNIT_INSTALL_DIR}")
@@ -311,6 +319,11 @@ if (BUILD_TESTING AND NOT MSVC)
endif()
configure_file(dhtnet.pc.in dhtnet.pc @ONLY)
+if (TRIM_PREFIX_PATH)
+ file(READ ${CMAKE_CURRENT_BINARY_DIR}/dhtnet.pc FILE_CONTENTS)
+ string(REPLACE "${CMAKE_INSTALL_PREFIX}" "" FILE_CONTENTS "${FILE_CONTENTS}")
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dhtnet.pc "${FILE_CONTENTS}")
+endif()
# Install targets
install(TARGETS dhtnet)
diff --git a/extras/packaging/.gitignore b/extras/packaging/.gitignore
index 043509b87de3b644c096807ee78502faf12694e4..cd9ae2be5d305bdf7e1a8d2195e004ff88e23b79 100644
--- a/extras/packaging/.gitignore
+++ b/extras/packaging/.gitignore
@@ -1,9 +1,8 @@
gnu-linux/debian/dhtnet
gnu-linux/debian/.debhelper
-ubuntu-*/*.deb
-ubuntu-*/build-at-*
+**/*.deb
+**/*.rpm
+**/build-at-*
**/build.log
-debian-*/*.deb
-debian-*/build-at-*
*dhtnet-*.tar.gz
diff --git a/extras/packaging/Jenkinsfile b/extras/packaging/Jenkinsfile
index 9f14524c255a6f4644ff577ac5d8e40feb072c5d..2252cc69b07043f88972db66450ce503dd6a0934 100644
--- a/extras/packaging/Jenkinsfile
+++ b/extras/packaging/Jenkinsfile
@@ -86,6 +86,9 @@ pipeline {
cp -Rf "./gnu-linux/debian" "$FOLDER_NAME/debian"
tar -czf "deb-${FOLDER_NAME}.tar.gz" "$FOLDER_NAME"
rm -Rf "$FOLDER_NAME/debian"
+
+ # create archive for rpm-based distro like fedora
+ tar -czf "rpm-${FOLDER_NAME}.tar.gz" "${FOLDER_NAME}"
"""
}
}
@@ -95,7 +98,7 @@ pipeline {
axes {
axis {
name 'TARGET'
- values 'ubuntu_22.04', 'ubuntu_24.04', 'debian_12'/*, 'fedora_39', 'fedora_40', 'almalinux_9'*/
+ values 'ubuntu_22.04', 'ubuntu_24.04', 'debian_12', 'fedora_39', 'fedora_40'/*, 'almalinux_9'*/
}
}
stages {
@@ -124,7 +127,7 @@ pipeline {
mkdir -p publish
cp -R --parents ubuntu_*/dhtnet_*.deb publish/
cp -R --parents debian_*/dhtnet_*.deb publish/
- # cp -R --parents fedora_*/dhtnet-*.rpm publish/
+ cp -R --parents fedora_*/dhtnet-*.rpm publish/
# cp -R --parents almalinux_*/dhtnet-*.rpm publish/
rm -Rf publish/**/*debug*
diff --git a/extras/packaging/build_packages.sh b/extras/packaging/build_packages.sh
index 95588ca50df1b1fcd8e3d2a3add89a873a36fc44..b23ab982081a6c8ad3c9b43df73e9a52de4728b1 100755
--- a/extras/packaging/build_packages.sh
+++ b/extras/packaging/build_packages.sh
@@ -28,6 +28,9 @@ build_debian=false
build_debian10=false
build_debian11=false
build_debian12=false
+build_fedora=false
+build_fedora39=false
+build_fedora40=false
parse_args() {
while [ "$1" != "" ]; do
@@ -60,6 +63,16 @@ parse_args() {
-d12 | --debian12 ) build_debian12=true
build_debian=true
;;
+ -f | --fedora ) build_fedora=true
+ build_fedora39=true
+ build_fedora40=true
+ ;;
+ -f40 | --fedora40 ) build_fedora40=true
+ build_fedora=true
+ ;;
+ -f39 | --fedora39 ) build_fedora39=true
+ build_fedora=true
+ ;;
-a | --all ) build_ubuntu=true
# not working: build_ubuntu20=true
build_ubuntu22_04=true
@@ -68,6 +81,9 @@ parse_args() {
# not working: build_debian10=true
# not working: build_debian11=true
build_debian12=true
+ build_fedora=true
+ build_fedora39=true
+ build_fedora40=true
;;
* ) echo "Argument '$1' is not recognized"
;;
@@ -97,6 +113,10 @@ if [ "$build_ubuntu" == true ] || [ "$build_debian" == true ]; then
rm -Rf "${FOLDER_NAME}/debian"
fi
+if [ "$build_fedora" == true ]; then
+ tar -czf "rpm-${PKG_NAME}-${PKG_VERSION}.tar.gz" "${FOLDER_NAME}"
+fi
+
rm -Rf "${FOLDER_NAME}"
echo "Archives <os>-${PKG_NAME}-${PKG_VERSION}.tar.gz are ready, starting builds... (will take few minutes)"
@@ -153,6 +173,14 @@ if [ "$build_debian10" == true ]; then
build_target "debian_10"
fi
+if [ "$build_fedora40" == true ]; then
+ build_target "fedora_40"
+fi
+
+if [ "$build_fedora39" == true ]; then
+ build_target "fedora_39"
+fi
+
while [ $remainning_builds -gt 0 ]; do
time="$(date +%T)"
diff --git a/extras/packaging/gnu-linux/debian/rules b/extras/packaging/gnu-linux/debian/rules
index 05695450ef678a1bcf508dc6f6f9e58fbd2e1259..76b2cb0d4734ae3b98036cc3cf3ea451d936e53f 100755
--- a/extras/packaging/gnu-linux/debian/rules
+++ b/extras/packaging/gnu-linux/debian/rules
@@ -17,4 +17,6 @@ override_dh_auto_configure:
-DBUILD_TESTING=OFF \
-DBUILD_BENCHMARKS=OFF \
-DBUILD_SHARED_LIBS=ON \
+ -DBUILD_DEPS_STATIC=ON \
+ -DTRIM_PREFIX_PATH=ON \
-DDNC_SYSTEMD=ON
diff --git a/extras/packaging/gnu-linux/fedora/dhtnet.spec b/extras/packaging/gnu-linux/fedora/dhtnet.spec
new file mode 100644
index 0000000000000000000000000000000000000000..f5e1d2756c697b6ec95369d044d54103e42ef288
--- /dev/null
+++ b/extras/packaging/gnu-linux/fedora/dhtnet.spec
@@ -0,0 +1,77 @@
+Name: dhtnet
+Version: 0.3.0
+Release: %autorelease
+Summary: DHTNet, a Lightweight Peer-to-Peer Communication Library
+License: GPL-2.0+ AND BSL-1.0 AND GPL-3.0+ AND BSD-3-Clause AND Apache-2.0 AND Expat AND LGPL-2.0+
+URL: https://git.jami.net/savoirfairelinux/dhtnet
+Source: ./dhtnet-%{version}.tar.gz
+BuildRequires: gcc
+BuildRequires: g++
+BuildRequires: make
+BuildRequires: cmake
+%global __requires_exclude pkgconfig\\((libpjproject|opendht)\\)
+
+%description
+DHTNet, a Lightweight Peer-to-Peer Communication Library,
+allows you to connect with a device simply by knowing its public key and
+efficiently manages peer discovery and connectivity establishment, including NAT traversal.
+
+%prep
+%autosetup
+
+%build
+mkdir build
+cd build
+cmake .. -DBUILD_TESTING=OFF \
+ -DBUILD_BENCHMARKS=OFF \
+ -DBUILD_SHARED_LIBS=ON \
+ -DBUILD_DEPS_STATIC=ON \
+ -DTRIM_PREFIX_PATH=ON \
+ -DDNC_SYSTEMD=ON \
+ -DCMAKE_INSTALL_PREFIX=%{buildroot} \
+ -DCMAKE_INSTALL_BINDIR=%{buildroot}%{_bindir} \
+ -DCMAKE_INSTALL_MANDIR=%{buildroot}%{_mandir} \
+ -DCMAKE_INSTALL_DOCDIR=%{buildroot}%{_docdir}/dhtnet \
+ -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir} \
+ -DCMAKE_INSTALL_INCLUDEDIR=%{buildroot}%{_includedir} \
+ -DCMAKE_INSTALL_SYSCONFDIR=%{buildroot}%{_sysconfdir} \
+ -DDNC_SYSTEMD_UNIT_FILE_LOCATION=%{buildroot}/usr/lib/systemd/system \
+ -DDNC_SYSTEMD_PRESET_FILE_LOCATION=%{buildroot}/usr/lib/systemd/system-preset
+
+%install
+cd build
+make -j
+sudo make install
+
+%files
+%{_bindir}/dnc
+%{_bindir}/dvpn
+%{_bindir}/dsh
+%{_bindir}/peerDiscovery
+%{_bindir}/upnpctrl
+%{_bindir}/dhtnet-crtmgr
+%{_mandir}/man1/dnc.1.*
+%{_mandir}/man1/dsh.1.*
+%{_mandir}/man1/dvpn.1.*
+%{_mandir}/man1/dhtnet-crtmgr.1.*
+%{_docdir}/dhtnet/*
+%{_libdir}/*
+%{_includedir}/dhtnet/*
+%{_sysconfdir}/dhtnet/*
+/usr/lib/systemd/system/dnc.service
+/usr/lib/systemd/system-preset/dhtnet-dnc.preset
+
+%post
+mkdir -p /etc/dhtnet
+echo "===================="
+echo "dnc server installed."
+echo "To configure your dnc client and/or server, run:"
+echo " dhtnet-crtmgr --interactive"
+echo "Server configuration is in /etc/dhtnet/dnc.yaml"
+echo "After configuration, enable and start server with:"
+echo " systemctl enable dnc.service"
+echo " systemctl start dnc.service"
+echo "===================="
+
+%changelog
+%autochangelog
diff --git a/extras/packaging/gnu-linux/fedora_39.Dockerfile b/extras/packaging/gnu-linux/fedora_39.Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..493cebd0aaf0b8ac0ff162cfd0290673abfb29f9
--- /dev/null
+++ b/extras/packaging/gnu-linux/fedora_39.Dockerfile
@@ -0,0 +1,24 @@
+FROM fedora:39
+
+WORKDIR /build
+
+RUN mkdir -p /build/artifacts && \
+ dnf install -y fedora-packager fedora-review git gcc g++ make cmake wget \
+ pkg-config dpkg-dev libtool autoconf automake systemd \
+ python3-devel python3-setuptools python3-build python3-virtualenv \
+ ncurses-devel readline-devel nettle-devel cppunit-devel \
+ gnutls-devel libuv-devel jsoncpp-devel libargon2-devel libunistring-devel \
+ openssl-devel fmt-devel asio-devel msgpack-devel yaml-cpp-devel \
+ http-parser-devel zlib-devel llhttp-devel \
+ libupnp-devel libnatpmp-devel
+
+COPY gnu-linux/fedora /build/fedora
+
+ARG PKG_NAME
+COPY rpm-${PKG_NAME}.tar.gz /build/fedora/${PKG_NAME}.tar.gz
+
+CMD cd /build/fedora && \
+ fedpkg --release f39 local && \
+ (fedpkg --release f39 lint || true) && \
+ cp /build/fedora/*.rpm /build/artifacts/ && \
+ cp /build/fedora/$(uname -m)/*.rpm /build/artifacts/
diff --git a/extras/packaging/gnu-linux/fedora_40.Dockerfile b/extras/packaging/gnu-linux/fedora_40.Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..6f198bfc7cd4cba6c3de684b95ce172fc935549d
--- /dev/null
+++ b/extras/packaging/gnu-linux/fedora_40.Dockerfile
@@ -0,0 +1,24 @@
+FROM fedora:40
+
+WORKDIR /build
+
+RUN mkdir -p /build/artifacts && \
+ dnf install -y fedora-packager fedora-review git gcc g++ make cmake wget \
+ pkg-config dpkg-dev libtool autoconf automake systemd \
+ python3-devel python3-setuptools python3-build python3-virtualenv \
+ ncurses-devel readline-devel nettle-devel cppunit-devel \
+ gnutls-devel libuv-devel jsoncpp-devel libargon2-devel libunistring-devel \
+ openssl-devel fmt-devel asio-devel msgpack-devel yaml-cpp-devel \
+ http-parser-devel zlib-devel llhttp-devel \
+ libupnp-devel libnatpmp-devel
+
+COPY gnu-linux/fedora /build/fedora
+
+ARG PKG_NAME
+COPY rpm-${PKG_NAME}.tar.gz /build/fedora/${PKG_NAME}.tar.gz
+
+CMD cd /build/fedora && \
+ fedpkg --release f40 local && \
+ (fedpkg --release f40 lint || true) && \
+ cp /build/fedora/*.rpm /build/artifacts/ && \
+ cp /build/fedora/$(uname -m)/*.rpm /build/artifacts/