From patchwork Tue Feb 21 14:45:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6587 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PLhtM6sNQz3x1v for ; Tue, 21 Feb 2023 14:46:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PLhtK3LG3zRR; Tue, 21 Feb 2023 14:46:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PLhtK1wGyz2xRr; Tue, 21 Feb 2023 14:46:01 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PLhtH2QmLz2xPW for ; Tue, 21 Feb 2023 14:45:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PLhtG4WjlzRR; Tue, 21 Feb 2023 14:45:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676990758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6vhbUZzvk+Wi4kDfkpzbzCIYqEuCfJ8NoRmu8a4xpsQ=; b=vYas65mAXsUxlJzBvZHEJpys87DIu+4Qjx9m5J7yDRjMH6NPbauea7wfLRIEEj5FOtcv/P cVtrbYFvI+SPmACQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676990758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6vhbUZzvk+Wi4kDfkpzbzCIYqEuCfJ8NoRmu8a4xpsQ=; b=Po6vOLOaz8W5drqpGIEBY5kM9/Xg2aoSz9NI+6vn98jlj66MjbcxCjJGKjaHHfnQ/uMT2G grYuGpn9fkjo9fyJpqYIaM5uS8qOST5AtO4NdGJ12YAnad9fnAzEnle/qiANhpoJdhpxXw qaBUUIWxdwASXpQ9mfTNQDxmX0YPZoOJkc6LYYaH0pN1f/x1+WUnJG+RpvNuIsasE1chfN qQwyP3Lz5G9waouu6ZDMAe393qhwgbGC+fxbo/WJoCJcpBeAyxqdkBI3FCD3nqrGjkVv36 oS+kf3LSWY0o2R7jNb9QyQ7LHwHZY1L3uf4Gt4K99gcQ8rWWzGjWNa7PjsMpPQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/3] keyutils: New package Date: Tue, 21 Feb 2023 15:45:50 +0100 Message-Id: <20230221144552.857087-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- keyutils/keyutils.nm | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 keyutils/keyutils.nm diff --git a/keyutils/keyutils.nm b/keyutils/keyutils.nm new file mode 100644 index 000000000..2fec320d1 --- /dev/null +++ b/keyutils/keyutils.nm @@ -0,0 +1,76 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = keyutils +version = 1.6.1 +release = 1 + +groups = System/Tools +url = http://people.redhat.com/~dhowells/keyutils/ +license = GPLv2+ and LGPLv2+ +summary = Linux Key Management Utilities + +description + Utilities to control the kernel key management facility and to provide + a mechanism by which the kernel call back to user space to get a key + instantiated. +end + +source_dl = http://people.redhat.com/~dhowells/keyutils/ +sources = %{thisapp}.tar.bz2 + +build + requires + kernel-headers + end + + make_build_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} \ + NO_GLIBC_KEYERR=1 \ + CFLAGS="-Wall %{CFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + + make_install_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} + + install_cmds + # Fix broken symlink. + ln -svf libkeyutils.so.1 %{BUILDROOT}%{libdir}/libkeyutils.so + end +end + +packages + package %{name} + + package libkeyutils + template LIBS + end + + package libkeyutils-devel + template DEVEL + + requires += libkeyutils = %{thisver} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end From patchwork Tue Feb 21 14:45:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6588 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PLhtN5Qc4z3xDP for ; Tue, 21 Feb 2023 14:46:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PLhtK5YZTz1xS; Tue, 21 Feb 2023 14:46:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PLhtK2nJ4z2xfN; Tue, 21 Feb 2023 14:46:01 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PLhtH6Ctcz2xPW for ; Tue, 21 Feb 2023 14:45:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PLhtH1tWMzkT; Tue, 21 Feb 2023 14:45:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676990759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mKg+gFlptam/dII/N40J8v3sLWbdwyBUJ0MTfI5jU8Y=; b=AgC596xAndTTBpSQVK/JtV2kfvTP1SbDR2QPR0TkFhnLv50CsaawAJuzmGhEq0US+lAeHy 4Xxk7Elm+I7vIXAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676990759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mKg+gFlptam/dII/N40J8v3sLWbdwyBUJ0MTfI5jU8Y=; b=crsaaabSiAuTuAah+d5Dy55bJIchHDELCj1q6TgAmGDrxrLr4vgd/cVGKhOesTV1DgXrE8 CyuUhWuVlRsNdTWltPxyCONTEG7hx4jNMXdyjCsmco/N4gD6yjZVVcKcSNO35uqeLMZ0XB jutCgI6XktppufsQtsKoEMtg+5Eay7zPS6oSckTBtLGiKNBSWpJFqxxptYj+HeQcStAeUl ydYIV/UIxdY83ppV/ZPtMVrUVHNXYksS5PtviGLPzT47C32y3xbvXogEEo4bt3FY5pj6Ub /yodLxpBuSCDeuuQVJ7sBYdGsSTY4UjgOw1IJLnLC904ryZhT0dffRxy1mg0Iw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/3] nfs-utils: Update to 2.6.2 Date: Tue, 21 Feb 2023 15:45:51 +0100 Message-Id: <20230221144552.857087-2-stefan.schantl@ipfire.org> In-Reply-To: <20230221144552.857087-1-stefan.schantl@ipfire.org> References: <20230221144552.857087-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" * Provides libnfsidmap packages from now * Drop systemd files because the package contains their own Signed-off-by: Stefan Schantl --- nfs-utils/nfs-utils.nm | 25 +++++++++++++++---- nfs-utils/systemd/nfs-blkmap.service | 12 --------- nfs-utils/systemd/nfs-idmap.service | 12 --------- nfs-utils/systemd/nfs-lock.service | 14 ----------- nfs-utils/systemd/nfs-mountd.service | 12 --------- nfs-utils/systemd/nfs-rquotad.service | 12 --------- nfs-utils/systemd/nfs-secure-server.service | 13 ---------- nfs-utils/systemd/nfs-secure.service | 12 --------- nfs-utils/systemd/nfs-server.service | 18 ------------- nfs-utils/systemd/nfs.target | 7 ------ nfs-utils/systemd/proc-fs-nfsd.mount | 8 ------ .../systemd/var-lib-nfs-rpc_pipefs.mount | 8 ------ 12 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 nfs-utils/systemd/nfs-blkmap.service delete mode 100644 nfs-utils/systemd/nfs-idmap.service delete mode 100644 nfs-utils/systemd/nfs-lock.service delete mode 100644 nfs-utils/systemd/nfs-mountd.service delete mode 100644 nfs-utils/systemd/nfs-rquotad.service delete mode 100644 nfs-utils/systemd/nfs-secure-server.service delete mode 100644 nfs-utils/systemd/nfs-secure.service delete mode 100644 nfs-utils/systemd/nfs-server.service delete mode 100644 nfs-utils/systemd/nfs.target delete mode 100644 nfs-utils/systemd/proc-fs-nfsd.mount delete mode 100644 nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index 07ac64ce1..f703bf53a 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -4,7 +4,7 @@ ############################################################################### name = nfs-utils -version = 1.3.3 +version = 2.6.2 release = 1 groups = Networking/Tools @@ -36,13 +36,14 @@ build libcap-devel libevent-devel libgssglue-devel >= 0.3 + libkeyutils-devel libmount-devel - libnfsidmap-devel libtirpc-devel libtool + rpcsvc-proto shadow-utils sqlite-devel - systemd-units + systemd-devel end configure_options += \ @@ -50,9 +51,16 @@ build --enable-libmount-mount \ --enable-mountconfig \ --enable-ipv6 \ - --with-statdpath=/var/lib/nfs/statd + --enable-gss \ + --with-statedir=/var/lib/nfs \ + --with-statdpath=/var/lib/nfs/statd \ + --with-start-statd=/usr/bin/start-statd \ + --with-systemd prepare_cmds + # Install utils into correct place. + sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am + sh autogen.sh %{create_user} @@ -96,7 +104,6 @@ packages end requires - libnfsidmap >= 0.25 quota rpcbind util-linux @@ -126,6 +133,14 @@ packages end end + package libnfsidmap + template LIBS + end + + package libnfsidmap-devel + template DEVEL + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/nfs-utils/systemd/nfs-blkmap.service b/nfs-utils/systemd/nfs-blkmap.service deleted file mode 100644 index 6b5127ba5..000000000 --- a/nfs-utils/systemd/nfs-blkmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=pNFS block layout mapping daemon -Wants=var-lib-nfs-rpc_pipefs.mount -Requires=var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/blkmapd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-idmap.service b/nfs-utils/systemd/nfs-idmap.service deleted file mode 100644 index e0c18037d..000000000 --- a/nfs-utils/systemd/nfs-idmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFSv4 ID-name mapping daemon -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.idmapd - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-lock.service b/nfs-utils/systemd/nfs-lock.service deleted file mode 100644 index fa991e5c1..000000000 --- a/nfs-utils/systemd/nfs-lock.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=NFS file locking service. -Requires=rpcbind.service network.target -After=network.target named.service rpcbind.service -Before=remote-fs-pre.target - -[Service] -Type=forking -StandardError=syslog+console -ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig -ExecStart=/sbin/rpc.statd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-mountd.service b/nfs-utils/systemd/nfs-mountd.service deleted file mode 100644 index 32e1638c7..000000000 --- a/nfs-utils/systemd/nfs-mountd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Mount Daemon -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -ExecStart=/usr/sbin/rpc.mountd -StandardError=syslog+console - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-rquotad.service b/nfs-utils/systemd/nfs-rquotad.service deleted file mode 100644 index ab1d2078e..000000000 --- a/nfs-utils/systemd/nfs-rquotad.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Remote Quota Server -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=-/usr/sbin/rpc.rquotad - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-secure-server.service b/nfs-utils/systemd/nfs-secure-server.service deleted file mode 100644 index b88bab55c..000000000 --- a/nfs-utils/systemd/nfs-secure-server.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Secure NFS Server -Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service -After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.svcgssd - -[Install] -WantedBy=multi-user.target - diff --git a/nfs-utils/systemd/nfs-secure.service b/nfs-utils/systemd/nfs-secure.service deleted file mode 100644 index 2a7dfb678..000000000 --- a/nfs-utils/systemd/nfs-secure.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Secure NFS -Requires=var-lib-nfs-rpc_pipefs.mount -After=syslog.target var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.gssd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-server.service b/nfs-utils/systemd/nfs-server.service deleted file mode 100644 index 79d114e0d..000000000 --- a/nfs-utils/systemd/nfs-server.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=NFS Server -Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service -Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service -After=network.target named.service - -[Service] -Type=oneshot -RemainAfterExit=yes -StandardError=syslog+console -ExecStartPre=/usr/sbin/exportfs -r -ExecStart=/usr/sbin/rpc.nfsd -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -f - -[Install] -WantedBy=multi-user.target - diff --git a/nfs-utils/systemd/nfs.target b/nfs-utils/systemd/nfs.target deleted file mode 100644 index 6c3262a76..000000000 --- a/nfs-utils/systemd/nfs.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Network File System Server -Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service -After=network.target named.service - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/proc-fs-nfsd.mount b/nfs-utils/systemd/proc-fs-nfsd.mount deleted file mode 100644 index e5ee6fbf6..000000000 --- a/nfs-utils/systemd/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=nfsd diff --git a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount b/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index d27e1a26a..000000000 --- a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs