From 83d35ebefd30aa1a4c66de4d884a0437d6da3686 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 3 Sep 2023 08:31:39 +0000
Subject: [PATCH] cronie, bump version (#9343)

---
 sys-process/cronie/cronie-1.5.1.recipe        | 49 -------------------
 ...ronie-1.5.2.recipe => cronie-1.6.1.recipe} | 31 +++++++-----
 .../cronie/patches/cronie-1.5.2.patchset      | 29 -----------
 3 files changed, 20 insertions(+), 89 deletions(-)
 delete mode 100644 sys-process/cronie/cronie-1.5.1.recipe
 rename sys-process/cronie/{cronie-1.5.2.recipe => cronie-1.6.1.recipe} (60%)
 delete mode 100644 sys-process/cronie/patches/cronie-1.5.2.patchset

diff --git a/sys-process/cronie/cronie-1.5.1.recipe b/sys-process/cronie/cronie-1.5.1.recipe
deleted file mode 100644
index c4bc363e1..000000000
--- a/sys-process/cronie/cronie-1.5.1.recipe
+++ /dev/null
@@ -1,49 +0,0 @@
-SUMMARY="A cron daemon"
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-HOMEPAGE="https://github.com/cronie-crond/cronie/"
-COPYRIGHT="2004-2016 Paul Vixie"
-LICENSE="BSD (2-clause)
-	BSD (3-clause)
-	GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://github.com/cronie-crond/cronie/archive/cronie-$portVersion.tar.gz"
-CHECKSUM_SHA256="14701a1b952d3cf730ac73db626a6becd049c2d44dde43cd53e00643c573e0b6"
-SOURCE_DIR="cronie-cronie-$portVersion"
-
-ARCHITECTURES="all ?x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86"
-
-PROVIDES="
-	cronie$secondaryArchSuffix = $portVersion
-	cmd:crond$secondaryArchSuffix = $portVersion
-	cmd:crontab$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-#	lib:libpam$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-#	devel:libpam$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoreconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	autogen.sh
-
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
diff --git a/sys-process/cronie/cronie-1.5.2.recipe b/sys-process/cronie/cronie-1.6.1.recipe
similarity index 60%
rename from sys-process/cronie/cronie-1.5.2.recipe
rename to sys-process/cronie/cronie-1.6.1.recipe
index 7a9827643..17576ba0a 100644
--- a/sys-process/cronie/cronie-1.5.2.recipe
+++ b/sys-process/cronie/cronie-1.6.1.recipe
@@ -5,28 +5,35 @@ COPYRIGHT="2004-2018 Paul Vixie"
 LICENSE="BSD (2-clause)
 	BSD (3-clause)
 	GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/cronie-crond/cronie/archive/cronie-$portVersion.tar.gz"
-CHECKSUM_SHA256="28cfdc6cc7df304dced6d0d0543767d8d22926f669a28d650c0513c168183eb4"
+CHECKSUM_SHA256="1ddbc8f8d07dfe1d45998b0a0cbd9a216cd4d7bc64d1626b2bc8b3a69e4641d1"
 SOURCE_DIR="cronie-cronie-$portVersion"
 
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-PATCHES="cronie-$portVersion.patchset"
-fi
-
-ARCHITECTURES="all"
+ARCHITECTURES="all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	cronie$secondaryArchSuffix = $portVersion
-	cmd:crond$secondaryArchSuffix = $portVersion
-	cmd:cronnext$secondaryArchSuffix = $portVersion
-	cmd:crontab$secondaryArchSuffix = $portVersion
+	cmd:anacron$commandSuffix = $portVersion
+	cmd:crond$commandSuffix = $portVersion
+	cmd:cronnext$commandSuffix = $portVersion
+	cmd:crontab$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 #	lib:libpam$secondaryArchSuffix
 	"
+CONFLICTS="
+	dcron
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -45,7 +52,9 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autogen.sh
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-anacron
 	make $jobArgs
 }
 
diff --git a/sys-process/cronie/patches/cronie-1.5.2.patchset b/sys-process/cronie/patches/cronie-1.5.2.patchset
deleted file mode 100644
index 602d2d049..000000000
--- a/sys-process/cronie/patches/cronie-1.5.2.patchset
+++ /dev/null
@@ -1,29 +0,0 @@
-From 53395387e99f9dd76fc2150ceae7960e00dcb8c6 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 13 Feb 2019 15:41:12 +0100
-Subject: fix parse error for gcc2
-
-
-diff --git a/src/security.c b/src/security.c
-index 703733a..c973463 100644
---- a/src/security.c
-+++ b/src/security.c
-@@ -169,6 +169,7 @@ int cron_set_job_security_context(entry *e, user *u ATTRIBUTE_UNUSED,
- 
- 	*jobenv = build_env(e->envp);
- 
-+	{
- 	time_t job_run_time = time(0L);
- 
- 	if ((minutely_time > 0) && ((job_run_time / 60) != (minutely_time / 60))) {
-@@ -189,6 +190,7 @@ int cron_set_job_security_context(entry *e, user *u ATTRIBUTE_UNUSED,
- 		return -1;
- 	}
- 	return 0;
-+	}
- }
- 
- #if defined(WITH_PAM)
--- 
-2.19.1
-