From a4d6a816f5bda5da0488b70073ed54ed3b239db1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:11 +0100 Subject: [PATCH 01/18] Remove rpcinfo The tool rpcinfo will be provided by package rpcbind. Remove this package. --- rpcinfo-1.0-0.x86_64.bee | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100755 rpcinfo-1.0-0.x86_64.bee diff --git a/rpcinfo-1.0-0.x86_64.bee b/rpcinfo-1.0-0.x86_64.bee deleted file mode 100755 index 11abd4cf0..000000000 --- a/rpcinfo-1.0-0.x86_64.bee +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env beesh - -SRCURL[0]="" - -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# BEE_BUILDTYPE= - -# EXCLUDE=() - -build_in_sourcedir - - -mee_extract() { - cp /src/mariux/download/rpcinfo/rpcinfo.c $S/ - cp /src/mariux/download/rpcinfo/rpcinfo.8 $S/ -} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -mee_build() { - cc -o rpcinfo rpcinfo.c -} - -mee_install() { - install -D rpcinfo $D/usr/bin/rpcinfo - install -D rpcinfo.8 $D/usr/man/man8/rpcinfo.8 -} From 0d372aed36849863ce202eae155a58a269bd88bc Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:11 +0100 Subject: [PATCH 02/18] Remove portmapper The portmapper service will be provided by the rpcbind daemon from the package rpcbind. Remove this package. --- portmap-6.0-0.bee | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100755 portmap-6.0-0.bee diff --git a/portmap-6.0-0.bee b/portmap-6.0-0.bee deleted file mode 100755 index 8b6dec414..000000000 --- a/portmap-6.0-0.bee +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/env beesh - -PGRP=( uncategorized ) - -SRCURL[0]="http://neil.brown.name/portmap/portmap-6.0.tgz" - -PATCHES[0]="" - -# EXCLUDE="" - -B=${S} - -SBINDIR=/sbin - -mee_patch() { - bee_patch -} - -mee_configure() { - /bin/true -} - -mee_build() { - bee_build -} - -mee_install() { - mkdir -pv ${D}{${SBINDIR},${MANDIR}/man8} - bee_install BASEDIR=${D} -} - From 16f500c52000dd72a83ee1635662a4809ee7b381 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 12:52:51 +0100 Subject: [PATCH 03/18] iana-etc: Convert to versionless bee file Create new be0 file from template. Import mee_build procedure from previous bee file. Ignore these special settings from the previous bee file: * `ARCH=noarch` (we don't currently care about ARCH) * `B=${S}` (not required) * definitions of mee_patch(), mee_configure() and mee-intall() (all noop) --- iana-etc-2.30-0.be0 | 92 +++++++++++++++++++++++++++++++++++++++++++++ iana-etc-2.30-0.bee | 42 --------------------- 2 files changed, 92 insertions(+), 42 deletions(-) create mode 100755 iana-etc-2.30-0.be0 delete mode 100755 iana-etc-2.30-0.bee diff --git a/iana-etc-2.30-0.be0 b/iana-etc-2.30-0.be0 new file mode 100755 index 000000000..0ec2116f9 --- /dev/null +++ b/iana-etc-2.30-0.be0 @@ -0,0 +1,92 @@ +#!/usr/bin/env beesh + +# BEE_VERSION iana-etc-2.30-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="http://sethwklein.net/iana-etc-${PKGVERSION}.tar.bz2" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +mee_build() { + bee_build + + sed -i \ + -e '/ 2000\/tcp/d' \ + -e '/ 2003\/tcp/d' \ + -e '/ 4201\/udp/d' \ + services + + echo "# mariux / imapd changes.." >>services + echo "# don't add lines here .. add changes to ${PF}.bee and reinstall.." >>services + echo "sieve 2000/tcp" >>services + echo "lmtp 2003/tcp" >>services + echo "fud 4201/udp" >>services + +} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## diff --git a/iana-etc-2.30-0.bee b/iana-etc-2.30-0.bee deleted file mode 100755 index af37dd383..000000000 --- a/iana-etc-2.30-0.bee +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/env beesh - -PGRP=( uncategorized ) - -SRCURL[0]="http://sethwklein.net/iana-etc-2.30.tar.bz2" - -PATCHES[0]="" - -# EXCLUDE="" - -B=${S} - -ARCH=noarch - -mee_patch() { - bee_patch -} - -mee_configure() { - true -} - -mee_build() { - bee_build - - sed -i \ - -e '/ 2000\/tcp/d' \ - -e '/ 2003\/tcp/d' \ - -e '/ 4201\/udp/d' \ - services - - echo "# mariux / imapd changes.." >>services - echo "# don't add lines here .. add changes to ${PF}.bee and reinstall.." >>services - echo "sieve 2000/tcp" >>services - echo "lmtp 2003/tcp" >>services - echo "fud 4201/udp" >>services - -} - -mee_install() { - bee_install -} From 71711b68c94fb4e998eb13049ffb999c9d4af793 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 13:03:34 +0100 Subject: [PATCH 04/18] iana-etc: Clear prefix The Makefile installs into $PREFIX/etc, which doesn't work well with our current default prefix of /usr. Set PREFIX to empty. --- iana-etc-2.30-0.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iana-etc-2.30-0.be0 b/iana-etc-2.30-0.be0 index 0ec2116f9..2235dcb3a 100755 --- a/iana-etc-2.30-0.be0 +++ b/iana-etc-2.30-0.be0 @@ -2,6 +2,8 @@ # BEE_VERSION iana-etc-2.30-0 +PREFIX= + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From b9050a5d530a3267fdc2de59c3b50b19928be389 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 13:07:32 +0100 Subject: [PATCH 05/18] iana-etc: Add service aliases "portmapper" and "rpcbind" rpcbind will be socket activated by default. However, if the daemon is started manually, it requires one of the aliases "portmapper" or "rpcbind" to be available in /etc/services. Add service aliases for udp/tcp port 111. --- iana-etc-2.30-0.be0 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/iana-etc-2.30-0.be0 b/iana-etc-2.30-0.be0 index 2235dcb3a..f18f1df9a 100755 --- a/iana-etc-2.30-0.be0 +++ b/iana-etc-2.30-0.be0 @@ -57,13 +57,17 @@ mee_build() { bee_build sed -i \ + -e '/ 111\/tcp/d' \ + -e '/ 111\/udp/d' \ -e '/ 2000\/tcp/d' \ -e '/ 2003\/tcp/d' \ -e '/ 4201\/udp/d' \ services - echo "# mariux / imapd changes.." >>services + echo "# mariux changes..." >>services echo "# don't add lines here .. add changes to ${PF}.bee and reinstall.." >>services + echo "sunrpc 111/tcp portmapper rpcbind" >>services + echo "sunrpc 111/udp portmapper rpcbind" >>services echo "sieve 2000/tcp" >>services echo "lmtp 2003/tcp" >>services echo "fud 4201/udp" >>services From fcecd60e387d3d0e1d568e0afa4159288023870e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 13:12:36 +0100 Subject: [PATCH 06/18] iana-etc: Increment build number --- iana-etc-2.30-0.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iana-etc-2.30-0.be0 b/iana-etc-2.30-0.be0 index f18f1df9a..4d08ec865 100755 --- a/iana-etc-2.30-0.be0 +++ b/iana-etc-2.30-0.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION iana-etc-2.30-0 +# BEE_VERSION iana-etc-2.30-1 PREFIX= From ea42fece2d33ec0fd30f183a9696626252566b57 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:12 +0100 Subject: [PATCH 07/18] Add rpcbind The package rpcbind is a replacement for the older portmapper and rpcinfo packages. It is required by current nfs-utils package (rpc.mountd). Homepage: https://linux-nfs.org/wiki/index.php/Main_Page Repository: git://linux-nfs.org/~steved/rpcbind This package installs systemd socket and unit files for socket activation. If the daemon is started manually, however, it requires the alias "portmapper" or "rpcbind" to be available in /etc/services, e.g.: sunrpc 111/tcp portmapper rpcbind # SUN Remote Procedure Call sunrpc 111/udp portmapper rpcbind # SUN Remote Procedure Call We don't need to add dependencies for the users of this service (nis.service,i nfsd.service) because these have an After= dependency on basic.target by DefaultDependencies. basic.target has an After= dependency on sockets.target. We don't need to start the service manually, because it is socket activated. The rpcbind.socket unit needs to be enabled, however. Create bee file from template without changes. --- rpcbind.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 rpcbind.be0 diff --git a/rpcbind.be0 b/rpcbind.be0 new file mode 100755 index 000000000..7d0cd7742 --- /dev/null +++ b/rpcbind.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION rpcbind-1.2.5-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://sourceforge.net/projects/rpcbind/files/rpcbind/${PKGVERSION}/rpcbind-${PKGVERSION}.tar.bz2/download" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 3209f396a5bbd03c9147f97e87dd217bb260b821 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:12 +0100 Subject: [PATCH 08/18] rpcbind: Add --enable-warmstarts This enables the -w option, which is used in the systemd service file supplied by this package. --- rpcbind.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpcbind.be0 b/rpcbind.be0 index 7d0cd7742..d017b0fcc 100755 --- a/rpcbind.be0 +++ b/rpcbind.be0 @@ -47,9 +47,10 @@ SRCURL[0]="https://sourceforge.net/projects/rpcbind/files/rpcbind/${PKGVERSION}/ # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --enable-warmstarts +} #mee_build() { # bee_build From e4e00530d6d1a0b7daa80f70ecf0933424e0b25e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:12 +0100 Subject: [PATCH 09/18] Add libtirpc The libtirpc package contains libraries that support programs that use the Remote Procedure Call (RPC) API. It replaces the RPC, but not the NIS library entries that used to be in glibc. Required by nfs-utils. Create bee file from template without changes. --- libtirpc.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 libtirpc.be0 diff --git a/libtirpc.be0 b/libtirpc.be0 new file mode 100755 index 000000000..24c154773 --- /dev/null +++ b/libtirpc.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libtirpc-1.1.4-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://sourceforge.net/projects/libtirpc/files/libtirpc/${PKGVERSION}/libtirpc-${PKGVERSION}.tar.bz2/download" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From c0e941965fb4c7315fe0a02a0cd3332b84162058 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:12 +0100 Subject: [PATCH 10/18] Add keyutils Keyutils is a set of utilities for managing the key retention facility in the kernel, which can be used by filesystems, block devices and more to gain and retain the authorization and encryption keys required to perform secure operations. Required by nfs-utils. Create bee file from template without changes. --- keyutils.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 keyutils.be0 diff --git a/keyutils.be0 b/keyutils.be0 new file mode 100755 index 000000000..ae13094c5 --- /dev/null +++ b/keyutils.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION keyutils-1.5.11-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://people.redhat.com/~dhowells/keyutils/keyutils-${PKGVERSION}.tar.bz2" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 6510517a75f462a8913d8a7dc492ac1e8c70efa5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:13 +0100 Subject: [PATCH 11/18] Remove libnfsidmap The library /usr/lib/libnfsidmap.so will be provided by the nfs-utils package. Remove this package. --- libnfsidmap-0.25-0.bee | 83 ------------------------------------------ 1 file changed, 83 deletions(-) delete mode 100755 libnfsidmap-0.25-0.bee diff --git a/libnfsidmap-0.25-0.bee b/libnfsidmap-0.25-0.bee deleted file mode 100755 index 5e589df5b..000000000 --- a/libnfsidmap-0.25-0.bee +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env beesh - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -SRCURL[0]="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-${PKGVERSION}.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - -# build_in_sourcedir - -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - -# sourcesubdir_append src - - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0]="" is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From 6c10372ab7948de4ad5b843cb65d6ba66791c697 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:13 +0100 Subject: [PATCH 12/18] nfs-utils: Update version from 1.2.9 to 2.3.3 We need newer versions of the tools (mountd, exportfs) to support kerberos authentication. Create bee file for new version from template without changes. Requires libtirpc and keyutils. --- nfs-utils-1.2.9-2.bee | 31 ----------------- nfs-utils.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 31 deletions(-) delete mode 100755 nfs-utils-1.2.9-2.bee create mode 100755 nfs-utils.be0 diff --git a/nfs-utils-1.2.9-2.bee b/nfs-utils-1.2.9-2.bee deleted file mode 100755 index 9b18e7af1..000000000 --- a/nfs-utils-1.2.9-2.bee +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/env beesh - -PGRP=( uncategorized ) - -SRCURL[0]="http://downloads.sourceforge.net/nfs/nfs-utils-${PV}.tar.bz2" - -PATCHURL[0]="http://bugs.gentoo.org/attachment.cgi?id=261534 test-client-fix.patch" - -EXCLUDE+=(/var) - -B=${S} - -mee_patch() { - bee_patch -} - -mee_configure() { - bee_configure \ - --disable-gss \ - --disable-tirpc -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install - ln -s ../usr/sbin/nfsdcltrack $D/sbin/nfsdcltrack -} - diff --git a/nfs-utils.be0 b/nfs-utils.be0 new file mode 100755 index 000000000..e22928cda --- /dev/null +++ b/nfs-utils.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION nfs-utils-2.3.3-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://sourceforge.net/projects/nfs/files/nfs-utils/${PKGVERSION}/nfs-utils-${PKGVERSION}.tar.gz/download" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From b54c906db48313089a056a23fb45a87a986e8cf0 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:13 +0100 Subject: [PATCH 13/18] nfs-utils: Add build_in_sourcedir Without build_in_sourcedir the build fails, because -I is used with relative paths ( `-I../../support/include` ) : gcc -DHAVE_CONFIG_H -I. -I/scratch/local/bee-root/nfs-utils/nfs-utils-2.3.3-0/source/support/export -I../../support/include -I/usr/include/tirpc -D_GNU_SOURCE -pipe -Wall -Wextra -Werror=strict-prototypes -Werror=missing-prototypes -Werror=missing-declarations -Werror=format=2 -Werror=undef -Werror=missing-include-dirs -Werror=strict-aliasing=2 -Werror=init-self -Werror=implicit-function-declaration -Werror=return-type -Werror=switch -Werror=overflow -Werror=parentheses -Werror=aggregate-return -Werror=unused-result -fno-strict-aliasing -Werror=format-overflow=2 -Werror=int-conversion -Werror=incompatible-pointer-types -Werror=misleading-indentation -g -O2 -MT client.o -MD -MP -MF .deps/client.Tpo -c -o client.o /scratch/local/bee-root/nfs-utils/nfs-utils-2.3.3-0/source/support/export/client.c /scratch/local/bee-root/nfs-utils/nfs-utils-2.3.3-0/source/support/export/client.c:22:10: fatal error: sockaddr.h: No such file or directory #include "sockaddr.h" ^~~~~~~~~~~~ compilation terminated. Add build_in_sourcedir. --- nfs-utils.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.be0 b/nfs-utils.be0 index e22928cda..21604faeb 100755 --- a/nfs-utils.be0 +++ b/nfs-utils.be0 @@ -22,7 +22,7 @@ SRCURL[0]="https://sourceforge.net/projects/nfs/files/nfs-utils/${PKGVERSION}/nf ## outside the source directory and needs to be built inside the source ## directory. -# build_in_sourcedir +build_in_sourcedir ############################################################################### ## bee cannot detect buildtypes specified in subdirectories. From a57f532d9b0f1ae41e7b5ee3f87cc931b08a1f9c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:13 +0100 Subject: [PATCH 14/18] nfs-utils: Enable svcgss (rpc.svcgssd) The daemon rpc.svcgssd for server-side kerberos authentication is only build on request. Add configure flag to build the daemon. --- nfs-utils.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nfs-utils.be0 b/nfs-utils.be0 index 21604faeb..bd3850c6f 100755 --- a/nfs-utils.be0 +++ b/nfs-utils.be0 @@ -47,9 +47,10 @@ build_in_sourcedir # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --enable-svcgss +} #mee_build() { # bee_build From fda90c86502c0227509547d8fd3190ab7b5aa0a6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 27 Dec 2018 13:58:14 +0100 Subject: [PATCH 15/18] Add scripts/update-nfs-utils --- scripts/update-nfs-utils.sh | 105 ++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100755 scripts/update-nfs-utils.sh diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh new file mode 100755 index 000000000..eb9494cd3 --- /dev/null +++ b/scripts/update-nfs-utils.sh @@ -0,0 +1,105 @@ +#! /bin/bash + +# Note, you are doing this to a live nfs server, writes will be blocked +# for 90 seconds. +# + +set -v + +bee remove portmap-6.0-0.x86_64 +bee remove rpcinfo-1.0-0.x86_64 +bee update iana-etc-2.30-1 +bee install rpcbind-1.2.5-0.x86_64 +bee remove libnfsidmap-0.25-0.x86_64 +bee install keyutils-1.5.11-0.x86_64 +bee install libtirpc-1.1.4-0.x86_64 +bee update nfs-utils-2.3.3-0.x86_64 + +# Remove portmap.service dependencies from nis,stats,nfsd service unit files. +# These three files are currently neither installed with bee nor +# part of mxtools, so just replace. +# +# 'portmap.service' is removed from Requires= and After= lines. +# +# We don't need new dependencies for rpcbind, because this is socket +# activated (if socket unit is enabled) and the service units order +# after sockets.target via DefaultDependencies. +# +# Additionally, for nfsd.serviced, we remove the '--descriptors 64' limit, which +# is to low for the mountd of nfs-utils 2.3 when serving ipv4,ipv6 and +# named sockets. +# +cat << '_EOF_' >/etc/systemd/system/nis.service +[Unit] +Description=Network information Service (NIS) +Requires=network.target +After=network.target + +[Service] +ExecStartPre=/usr/bin/domainname molgen +ExecStart=/usr/sbin/ypbind -foreground +Restart=always + +[Install] +WantedBy=multi-user.target +_EOF_ +cat << '_EOF_' >/etc/systemd/system/statd.service +[Unit] +Description=NSM Daemon +Requires=network.target local-fs.target +After=network.target local-fs.target + +[Service] +ExecStart=/usr/sbin/rpc.statd --foreground +Restart=always + +[Install] +WantedBy=multi-user.target +_EOF_ +cat << '_EOF_' >/etc/systemd/system/nfsd.service +[Unit] +Description=NFS Daemon +ConditionPathExists=/etc/exports +Requires=statd.service local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount +After=statd.service local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount + +[Service] +ExecStartPre=/bin/mkdir -p /var/lib/nfs/v4recovery +ExecStartPre=/usr/sbin/exportfs -ra +ExecStart=/usr/sbin/rpc.mountd --foreground --manage-gids +ExecStartPost=/usr/sbin/rpc.nfsd 64 ; /usr/sbin/sm-notify +ExecReload=/usr/sbin/exportfs -ra +ExecStopPost=/usr/sbin/rpc.nfsd 0 ; /usr/sbin/exportfs -ua +Restart=always + +[Install] +WantedBy=multi-user.target +_EOF_ + +# +# Remove portmap unit file, enable rpcbind socket activation +# +systemctl disable portmap +rm /etc/systemd/system/portmap.service +systemctl enable rpcbind.socket + +# on-disk changes done. +# +# Note, we can't just stop here and leave the old daemon running until +# reboot, because any new invocation of exportfs would create entries in +# /var/lib/nfs/etab with options, which the old mountd doesn't understand +# (nopnfs). +# +# This implies, we can't just push the changes around from the distmaster, +# but have to execute this script on every node. +# + +systemctl daemon-reload + +systemctl stop nfsd.service +systemctl stop nis.service +systemctl stop portmap.service + +systemctl start rpcbind.socket +systemctl start nis.service +systemctl start nfsd.service From f6f172b8c91907f84bd02af545a82fd693ff7679 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 17:50:55 +0100 Subject: [PATCH 16/18] update-nfs-utils: Disable nfs version 3 We use nfs version 4 only. Disable unused version 3, to make things simpler. --- scripts/update-nfs-utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh index eb9494cd3..d022ff02a 100755 --- a/scripts/update-nfs-utils.sh +++ b/scripts/update-nfs-utils.sh @@ -67,7 +67,7 @@ After=statd.service local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mo ExecStartPre=/bin/mkdir -p /var/lib/nfs/v4recovery ExecStartPre=/usr/sbin/exportfs -ra ExecStart=/usr/sbin/rpc.mountd --foreground --manage-gids -ExecStartPost=/usr/sbin/rpc.nfsd 64 ; /usr/sbin/sm-notify +ExecStartPost=/usr/sbin/rpc.nfsd -N 3 64 ; /usr/sbin/sm-notify ExecReload=/usr/sbin/exportfs -ra ExecStopPost=/usr/sbin/rpc.nfsd 0 ; /usr/sbin/exportfs -ua Restart=always From d2a4e76cbc0e94a27222acc65db63b823705d5fc Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 29 Dec 2018 18:18:49 +0100 Subject: [PATCH 17/18] Remove statd --- scripts/update-nfs-utils.sh | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh index d022ff02a..3215fe9bb 100755 --- a/scripts/update-nfs-utils.sh +++ b/scripts/update-nfs-utils.sh @@ -15,10 +15,20 @@ bee install keyutils-1.5.11-0.x86_64 bee install libtirpc-1.1.4-0.x86_64 bee update nfs-utils-2.3.3-0.x86_64 -# Remove portmap.service dependencies from nis,stats,nfsd service unit files. -# These three files are currently neither installed with bee nor +# Remove statd.service +# This service is not required for nfsv4 +# The service file is currently neither installed with bee nor +# part of mxtools, so just remove it. +# +systemctl disable statd.service +rm /etc/systemd/system/statd.service + +# Remove portmap.service dependencies from nis and nfsd service unit files. +# These files are currently neither installed with bee nor # part of mxtools, so just replace. # +# Also remove dependency on statd.service. +# # 'portmap.service' is removed from Requires= and After= lines. # # We don't need new dependencies for rpcbind, because this is socket @@ -40,19 +50,6 @@ ExecStartPre=/usr/bin/domainname molgen ExecStart=/usr/sbin/ypbind -foreground Restart=always -[Install] -WantedBy=multi-user.target -_EOF_ -cat << '_EOF_' >/etc/systemd/system/statd.service -[Unit] -Description=NSM Daemon -Requires=network.target local-fs.target -After=network.target local-fs.target - -[Service] -ExecStart=/usr/sbin/rpc.statd --foreground -Restart=always - [Install] WantedBy=multi-user.target _EOF_ @@ -60,8 +57,8 @@ cat << '_EOF_' >/etc/systemd/system/nfsd.service [Unit] Description=NFS Daemon ConditionPathExists=/etc/exports -Requires=statd.service local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount -After=statd.service local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount +Requires=local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount +After=local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount [Service] ExecStartPre=/bin/mkdir -p /var/lib/nfs/v4recovery @@ -96,6 +93,7 @@ systemctl enable rpcbind.socket systemctl daemon-reload +systemctl stop statd.service systemctl stop nfsd.service systemctl stop nis.service systemctl stop portmap.service From 6fe1acc325a095871b80d86e319d9fae8f7a558c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 30 Dec 2018 12:32:55 +0100 Subject: [PATCH 18/18] Remove am-utils This is the amd automounter. We will not be using it again and it might not even work if we restrict ourself to nfs4. Remove this package. If we find scripts using `pawd` from this package, they need to be fixed to use just `pwd`. --- am-utils-6.1.5-3.x86_64.bee | 18 ------------------ scripts/update-nfs-utils.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100755 am-utils-6.1.5-3.x86_64.bee diff --git a/am-utils-6.1.5-3.x86_64.bee b/am-utils-6.1.5-3.x86_64.bee deleted file mode 100755 index fdc66501b..000000000 --- a/am-utils-6.1.5-3.x86_64.bee +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/env beesh - -PGRP=( uncategorized ) - -SRCURL[0]="ftp://ftp.am-utils.org/pub/am-utils/am-utils-6.1.5.tar.gz" - -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-linux-kernel-version.patch") -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mk-amd-map_tmpfile.patch") -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-nfs-mount-version.patch") -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-nolock-toplvl.patch") -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mariux-nfs_mount_version.patch") -PATCHURL+=("/src/mariux/download/am-utils-6.1.5-mariux-nfs_mnttab.patch") - -BEE_CONFIGURE="compat" - -mee_configure() { - bee_configure --enable-debug -} diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh index 3215fe9bb..538fef259 100755 --- a/scripts/update-nfs-utils.sh +++ b/scripts/update-nfs-utils.sh @@ -15,6 +15,14 @@ bee install keyutils-1.5.11-0.x86_64 bee install libtirpc-1.1.4-0.x86_64 bee update nfs-utils-2.3.3-0.x86_64 +# remove amd +# +# The service file is currently neither installed with bee nor +# part of mxtools, so just remove it. +# +bee remove am-utils-6.1.5-3.x86_64 +rm /etc/systemd/system/amd.service + # Remove statd.service # This service is not required for nfsv4 # The service file is currently neither installed with bee nor