From 094344ef0ed0c38308ef32e79a3e8a947ef08eb5 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 12 Sep 2019 13:51:45 +0200 Subject: [PATCH 1/4] be0ify --- inetutils-1.9.4-0.bee => inetutils.be0 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename inetutils-1.9.4-0.bee => inetutils.be0 (100%) diff --git a/inetutils-1.9.4-0.bee b/inetutils.be0 similarity index 100% rename from inetutils-1.9.4-0.bee rename to inetutils.be0 From 5714f2203b2a972a93ca9dd8e5a83b656389a95e Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 12 Sep 2019 13:57:16 +0200 Subject: [PATCH 2/4] inetutils: tidy up bee file --- inetutils.be0 | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/inetutils.be0 b/inetutils.be0 index aeee99004..d7613b095 100755 --- a/inetutils.be0 +++ b/inetutils.be0 @@ -1,11 +1,5 @@ #!/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://ftp.gnu.org/gnu/inetutils/inetutils-${PKGVERSION}.tar.gz" @@ -56,7 +50,7 @@ mee_configure() { --disable-logger \ --disable-syslogd \ --disable-whois \ - --disable-traceroute + --disable-traceroute } #mee_build() { @@ -68,20 +62,4 @@ mee_configure() { #} ## 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/ -## +## by default this may be 'make install DESTDIR="${D}"' From fadad3728f67bc6a459f39e87ade47784be597dd Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 12 Sep 2019 13:58:27 +0200 Subject: [PATCH 3/4] inetutils: BEE_VERSION and https --- inetutils.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inetutils.be0 b/inetutils.be0 index d7613b095..5d13e2bae 100755 --- a/inetutils.be0 +++ b/inetutils.be0 @@ -1,7 +1,8 @@ #!/usr/bin/env beesh +# BEE_VERSION inetutils-1.9.4-1 -SRCURL[0]="http://ftp.gnu.org/gnu/inetutils/inetutils-${PKGVERSION}.tar.gz" +SRCURL[0]="https://ftp.gnu.org/gnu/inetutils/inetutils-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 9ec4615dc97cd7fc0d0baf6013d055291a5f2364 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 12 Sep 2019 15:03:59 +0200 Subject: [PATCH 4/4] inetutils: prevent chown root --- inetutils.be0 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/inetutils.be0 b/inetutils.be0 index 5d13e2bae..4b7b6eb3e 100755 --- a/inetutils.be0 +++ b/inetutils.be0 @@ -46,6 +46,12 @@ SRCURL[0]="https://ftp.gnu.org/gnu/inetutils/inetutils-${PKGVERSION}.tar.gz" # bee_patch "${@}" #} +mee_patch_post() { + sed -i -e 's/SUIDMODE = -o root/SUIDMODE =/' src/Makefile.am + sed -i -e 's/SUIDMODE = -o root/SUIDMODE =/' ping/Makefile.am + automake +} + mee_configure() { bee_configure \ --disable-logger \ @@ -61,6 +67,5 @@ mee_configure() { #mee_install() { # bee_install #} -## by default this may be 'make install DESTDIR="${D}"' ## by default this may be 'make install DESTDIR="${D}"'