Update to 1.4.0 upstream release

- Resolves: rhbz#2427015 Upstream tag: 1.4.0 Upstream commit: 5f5ac6fe Commit authored by Packit automation (https://packit.dev/)
Merge #26 Update ocserv-genkey
2026-01-04 15:15:35 +00:00 · 2025-08-16 14:31:39 +00:00 · 2025-07-24 23:23:30 +00:00 · 2025-07-23 11:13:11 +00:00 · 2025-05-18 07:09:54 -04:00 · 2025-02-11 15:53:26 +01:00
2 changed files with 26 additions and 7 deletions
--- a/20
+++ b/20
@ -1,9 +1,25 @@
 #!/bin/sh
+#default key type:rsa
+KEY_TYPE="rsa"
+
+#check key type 'rsa', 'rsa-pss', 'dsa', 'ecdsa', 'ed25519, 'ed448', 'x25519', and 'x448'
+if [ $# -gt 0 ]; then
+    case "$1" in
+        rsa|rsa-pss|dsa|ecdsa|ed25519|ed448|x25519|x448)
+            KEY_TYPE="$1"
+            ;;
+        *)
+            echo "Usage: $0 [rsa|rsa-pss|dsa|ecdsa|ed25519|ed448|x25519|x448]"
+            echo "Default key type: rsa"
+            exit 1
+            ;;
+    esac
+fi

 #generate CA certificate/key
 if test ! -f /etc/pki/ocserv/private/ca.key;then
 mkdir -p /etc/pki/ocserv/private
-certtool --generate-privkey --outfile /etc/pki/ocserv/private/ca.key >/dev/null 2>&1
+certtool --generate-privkey --key-type=$KEY_TYPE --outfile /etc/pki/ocserv/private/ca.key >/dev/null 2>&1
 echo "cn=`hostname -f` CA" >/etc/pki/ocserv/ca.tmpl
 echo "expiration_days=-1" >>/etc/pki/ocserv/ca.tmpl
 echo "serial=1" >>/etc/pki/ocserv/ca.tmpl
@ -17,7 +33,7 @@ fi

 #generate server certificate/key
 if test ! -f /etc/pki/ocserv/private/server.key;then
-certtool --generate-privkey --outfile /etc/pki/ocserv/private/server.key >/dev/null 2>&1
+certtool --generate-privkey --key-type=$KEY_TYPE --outfile /etc/pki/ocserv/private/server.key >/dev/null 2>&1
 echo "cn=`hostname -f`" >/etc/pki/ocserv/server.tmpl
 echo "serial=2" >>/etc/pki/ocserv/server.tmpl
 echo "expiration_days=-1" >>/etc/pki/ocserv/server.tmpl
--- a/ocserv.spec
+++ b/ocserv.spec
@ -101,7 +101,6 @@ BuildRequires:	rubygem-ronn-ng
 Recommends:		gnutls-utils
 Recommends:		iproute
 Recommends:		pam
-Requires(pre):		shadow-utils
 %if %{use_systemd}
 Requires(post):		systemd
 Requires(preun):	systemd
@ -142,6 +141,11 @@ sed -i 's/run-as-group = nogroup/run-as-group = nobody/g' tests/data/*.config
 echo "int main() { return 77; }" > tests/valid-hostname.c
 %endif

+# Create a sysusers.d config file
+cat >ocserv.sysusers.conf <<EOF
+u ocserv - 'ocserv' %{_localstatedir}/lib/ocserv -
+EOF
+
 %build

 %if 0%{?rhel} && 0%{?rhel} <= 6
@ -172,10 +176,6 @@ autoreconf -fvi
 make %{?_smp_mflags}

 %pre
-getent group ocserv &>/dev/null || groupadd -r ocserv
-getent passwd ocserv &>/dev/null || \
-	/usr/sbin/useradd -r -g ocserv -s /sbin/nologin -c ocserv \
-		-d %{_localstatedir}/lib/ocserv ocserv
 mkdir -p %{_sysconfdir}/pki/ocserv/public
 mkdir -p -m 700 %{_sysconfdir}/pki/ocserv/private
 mkdir -p %{_sysconfdir}/pki/ocserv/cacerts
@ -226,6 +226,8 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}

 %make_install

+install -m0644 -D ocserv.sysusers.conf %{buildroot}%{_sysusersdir}/ocserv.conf
+
 %files
 %defattr(-,root,root,-)

@ -256,6 +258,7 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %else
 %{_initrddir}/%{name}
 %endif
+%{_sysusersdir}/ocserv.conf

 %changelog
 %autochangelog
Author	SHA1	Message	Date
Packit	26e4189551	Update to 1.4.0 upstream release - Resolves: rhbz#2427015 Upstream tag: 1.4.0 Upstream commit: 5f5ac6fe Commit authored by Packit automation (https://packit.dev/)	2026-01-04 15:15:35 +00:00
Nikos Mavrogiannopoulos	f0efb943d8	Merge #26 `Update ocserv-genkey`	2025-08-16 14:31:39 +00:00
Fedora Release Engineering	f7c89057b3	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-24 23:23:30 +00:00
indeo mail	32d376716d	Update ocserv-genkey OCServ genkey is a good tool in OCServ The default key type of certtool is rsa, but rsa may not be a good choice I tried to add a logic to the ocserv genkey. The key type can be determined according to the parameters. If there is no input parameter, it will be generated according to the default rsa, which does not conflict with the previous use logic. After installing OCSERV, I can directly run `ocserv-genkey ecdsa` to generate ecdsa based certificates.	2025-07-23 11:13:11 +00:00
Benjamin A. Beasley	ae84a30d03	Rebuilt for llhttp 9.3.0	2025-05-18 07:09:54 -04:00
Zbigniew Jędrzejewski-Szmek	470ea11ba7	Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.	2025-02-11 15:53:26 +01:00