From f077bf82c9dbc54c6900ed75b8089feece00f3c1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:12:50 +0200 Subject: [PATCH 1/7] cronie: Convert to versionless bee file --- cronie-1.5.0-1.bee => cronie.be0 | 2 ++ 1 file changed, 2 insertions(+) rename cronie-1.5.0-1.bee => cronie.be0 (98%) diff --git a/cronie-1.5.0-1.bee b/cronie.be0 similarity index 98% rename from cronie-1.5.0-1.bee rename to cronie.be0 index cde7d6b50..2d42cc627 100755 --- a/cronie-1.5.0-1.bee +++ b/cronie.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION cronie-1.5.0-1 + ## 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 857c74591669c76cdca6106f02d5017c66ac9d20 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:14:50 +0200 Subject: [PATCH 2/7] cronie: Convert to current bee template --- cronie.be0 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cronie.be0 b/cronie.be0 index 2d42cc627..b87d64b08 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -18,14 +18,8 @@ SRCURL[0]="https://fedorahosted.org/releases/c/r/cronie/cronie-${PKGVERSION}.tar # 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 From 8726257353239c25706cc86f7e6c17de645a21ef Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:17:38 +0200 Subject: [PATCH 3/7] cronie: Change URL to github --- cronie.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronie.be0 b/cronie.be0 index b87d64b08..407151805 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -9,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]="https://fedorahosted.org/releases/c/r/cronie/cronie-${PKGVERSION}.tar.gz" +SRCURL[0]="https://github.com/cronie-crond/cronie/archive/cronie-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From cfcdc673446d2aab218727fc812ccf6949cfbca6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:18:03 +0200 Subject: [PATCH 4/7] cronie: Update version from 1.5.0 to 1.5.2 --- cronie.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronie.be0 b/cronie.be0 index 407151805..21cddf2bb 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION cronie-1.5.0-1 +# BEE_VERSION cronie-1.5.2-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.) From 3ac6306f94004dcf1092d5591f93016a61444d95 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:20:36 +0200 Subject: [PATCH 5/7] cronie: Build in sourcedir Fix "autogen.sh: You must run this script in the top-level cronie directory" error. --- cronie.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronie.be0 b/cronie.be0 index 21cddf2bb..7d0f95b5a 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -22,7 +22,7 @@ SRCURL[0]="https://github.com/cronie-crond/cronie/archive/cronie-${PKGVERSION}.t ## 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 490015b1688dbf9f63b42500aaf40a9ee1d36977 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 12:27:12 +0200 Subject: [PATCH 6/7] cronie: Run autoconf configure is not supplied by the package, so bee will use the build type autogen instead auf autotools. The autogen build type just runs autogen.sh with all the configuration options. It is assumed, that autogen.sh accept these options and runs all autoconf and configure steps as required, Generally this can't be expected and specifically this is not true for cronie. For one, some auxicliary files are missing (which can be created by autoreconf -i). Second, the config parameters need to be passed to configure not to autogen. Run `autoreconf -i` in bee_patch. Because this generates `configure`, the bee buildtype will be switched to autotools. --- cronie.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cronie.be0 b/cronie.be0 index 7d0f95b5a..047452dee 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -43,9 +43,10 @@ build_in_sourcedir # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + start_cmd autoreconf -i +} mee_configure() { bee_configure --with-pam From 1c9ccb4447b2cf29e76281766d67bb5fa36557d6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 24 May 2018 14:32:30 +0200 Subject: [PATCH 7/7] cronie: Add anacron --- cronie.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronie.be0 b/cronie.be0 index 047452dee..7d636afca 100755 --- a/cronie.be0 +++ b/cronie.be0 @@ -49,7 +49,7 @@ mee_patch() { } mee_configure() { - bee_configure --with-pam + bee_configure --with-pam --enable-anacron sed -i 's|/pam.d|/pam.d.sample|' Makefile }