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/iana-etc-2.30-0.be0 b/iana-etc-2.30-0.be0 new file mode 100755 index 000000000..4d08ec865 --- /dev/null +++ b/iana-etc-2.30-0.be0 @@ -0,0 +1,98 @@ +#!/usr/bin/env beesh + +# BEE_VERSION iana-etc-2.30-1 + +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.) + +############################################################################### +## 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 '/ 111\/tcp/d' \ + -e '/ 111\/udp/d' \ + -e '/ 2000\/tcp/d' \ + -e '/ 2003\/tcp/d' \ + -e '/ 4201\/udp/d' \ + 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 + +} + +#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 -} diff --git a/libnfsidmap-0.25-0.bee b/keyutils.be0 similarity index 80% rename from libnfsidmap-0.25-0.bee rename to keyutils.be0 index 5e589df5b..ae13094c5 100755 --- a/libnfsidmap-0.25-0.bee +++ b/keyutils.be0 @@ -1,5 +1,7 @@ #!/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.) @@ -7,7 +9,7 @@ ## 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" +SRCURL[0]="https://people.redhat.com/~dhowells/keyutils/keyutils-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -16,14 +18,8 @@ SRCURL[0]="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidma # 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 +## 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 @@ -52,7 +48,7 @@ SRCURL[0]="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidma #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -71,7 +67,7 @@ SRCURL[0]="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidma ## 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. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## 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/ +## 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..bd3850c6f --- /dev/null +++ b/nfs-utils.be0 @@ -0,0 +1,80 @@ +#!/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 \ + --enable-svcgss +} + +#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/ +## 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} -} - diff --git a/rpcbind.be0 b/rpcbind.be0 new file mode 100755 index 000000000..d017b0fcc --- /dev/null +++ b/rpcbind.be0 @@ -0,0 +1,80 @@ +#!/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 \ + --enable-warmstarts +} + +#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/ +## 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 -} diff --git a/scripts/update-nfs-utils.sh b/scripts/update-nfs-utils.sh new file mode 100755 index 000000000..538fef259 --- /dev/null +++ b/scripts/update-nfs-utils.sh @@ -0,0 +1,111 @@ +#! /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 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 +# 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 +# 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/nfsd.service +[Unit] +Description=NFS Daemon +ConditionPathExists=/etc/exports +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 +ExecStartPre=/usr/sbin/exportfs -ra +ExecStart=/usr/sbin/rpc.mountd --foreground --manage-gids +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 + +[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 statd.service +systemctl stop nfsd.service +systemctl stop nis.service +systemctl stop portmap.service + +systemctl start rpcbind.socket +systemctl start nis.service +systemctl start nfsd.service