Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- 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 info@ipfire.org # +############################################################################### + +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
* Provides libnfsidmap packages from now * Drop systemd files because the package contains their own
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- 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
This package now will be provided by the nfs-utils package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- libnfsidmap/libnfsidmap.nm | 58 -------------- .../patches/libnfsidmap-0.26-rc1.patch | 77 ------------------- 2 files changed, 135 deletions(-) delete mode 100644 libnfsidmap/libnfsidmap.nm delete mode 100644 libnfsidmap/patches/libnfsidmap-0.26-rc1.patch
diff --git a/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm deleted file mode 100644 index 7cd1bd102..000000000 --- a/libnfsidmap/libnfsidmap.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libnfsidmap -version = 0.25 -release = 2 - -groups = System/Libraries -url = http://www.citi.umich.edu/projects/nfsv4/linux/ -license = BSD -summary = Library to help mapping id's, mainly for NFSv4. - -description - libnfsidmap provides functions to map between NFSv4 names - (which are of the form user@domain) and local uid's and gid's. -end - -source_dl = http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ - -build - requires - autoconf - automake - gcc-c++ - openldap-devel - end - - configure_options += \ - --with-pluginpath=%{libdir}/%{name} \ - --disable-static - - prepare_cmds - ./autogen.sh - end - - install_cmds - mkdir -pv %{BUILDROOT}%{sysconfdir} - install -m 644 idmapd.conf %{BUILDROOT}%{sysconfdir} - end -end - -packages - package %{name} - configfiles - %{sysconfdir}/idmapd.conf - end - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch b/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch deleted file mode 100644 index e01e3f441..000000000 --- a/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit ee3099dbc71c6190cc612e923506c7d634b4b3c9 -Author: Ville Skytt� ville.skytta@iki.fi -Date: Tue Jun 19 10:10:40 2012 -0400 - - idmapd.conf.5: Fixed some syntax typos - - Signed-off-by: Steve Dickson steved@redhat.com - -diff --git a/idmapd.conf.5 b/idmapd.conf.5 -index 9c7f1ae..7b9e762 100644 ---- a/idmapd.conf.5 -+++ b/idmapd.conf.5 -@@ -234,7 +234,6 @@ Number of seconds before timing out an LDAP request - ." ------------------------------------------------------------------- - ." - .SH EXAMPLES --." - An example - .I /etc/idmapd.conf - file: -@@ -266,7 +265,7 @@ johndoe@OTHER.DOMAIN.ORG = johnny - LDAP_server = ldap.domain.org - LDAP_base = dc=org,dc=domain - --.fo -+.fi - ." - ." ------------------------------------------------------------------- - ." Additional sections -@@ -275,11 +274,11 @@ LDAP_base = dc=org,dc=domain - .SH SEE ALSO - .BR idmapd (8) - .BR svcgssd (8) --.".SH COMPATIBILITY --.".SH STANDARDS --.".SH ACKNOWLEDGEMENTS --.".SH AUTHORS --.".SH HISTORY -+.".SH COMPATIBILITY -+.".SH STANDARDS -+.".SH ACKNOWLEDGEMENTS -+.".SH AUTHORS -+.".SH HISTORY - .SH BUGS - Report bugs to nfsv4@linux-nfs.org --.".SH CAVEATS -+.".SH CAVEATS - -commit f079113f90366f1965b9fd3b0fdbce77415f37a7 -Author: Juno Krahn Juno.Krahn@gmail.com -Date: Mon Mar 19 08:33:58 2012 -0400 - - idmapd: logging of Local-Realms only lists the last realm - - The list of local realms can be logged with a massage like the following: - rpc.idmapd: libnfsidmap: Realms list: 'EXAMPLE2.COM' - Instead of printing a list of realms, only the last realm in the list is shown. - - https://bugzilla.redhat.com/show_bug.cgi?id=804152 - - Signed-off-by: Steve Dickson steved@redhat.com - -diff --git a/libnfsidmap.c b/libnfsidmap.c -index 57bb6c3..641d766 100644 ---- a/libnfsidmap.c -+++ b/libnfsidmap.c -@@ -285,8 +285,9 @@ int nfs4_init_name_mapping(char *conffile) - } - buf = malloc(siz); - if (buf) { -+ *buf = 0; - TAILQ_FOREACH(r, &local_realms->fields, link) { -- sprintf(buf, "'%s' ", r->field); -+ sprintf(buf+strlen(buf), "'%s' ", r->field); - } - IDMAP_LOG(1, ("libnfsidmap: Realms list: %s", buf)); - free(buf);
-
Stefan Schantl