From b3571c864ad9ac5d7c6a51ca188cb90b76c2035b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 20 Mar 2016 00:07:11 +0100
Subject: [PATCH] testing/dcron: rename pid file for consistency
Besides busybox cron already uses /run/crond.pid
---
testing/dcron/APKBUILD | 24 +++++++-----------------
testing/dcron/dcron.initd | 2 +-
testing/dcron/pidfile.patch | 36 +++++++++++-------------------------
3 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/testing/dcron/APKBUILD b/testing/dcron/APKBUILD
index 458bcd474ccc..9ff0d964b300 100644
--- a/testing/dcron/APKBUILD
+++ b/testing/dcron/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=dcron
pkgver=4.5
-pkgrel=2
+pkgrel=3
pkgdesc="dillon's lightweight cron daemon"
url="http://www.jimpryor.net/linux/dcron.html"
arch="all"
@@ -18,16 +18,6 @@ source="http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz
ldflags.patch"
_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
- cd "$_builddir"
- local i
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
- esac
- done
-}
-
build() {
cd "$_builddir"
make PREFIX=/usr \
@@ -49,14 +39,14 @@ package() {
}
md5sums="078833f3281f96944fc30392b1888326 dcron-4.5.tar.gz
-7e0075315366e5312221f68de4de6961 dcron.initd
-1e40cbf27604072f147ec8b131988eaf pidfile.patch
+36fb725b46f815dc6692a269ef22dc47 dcron.initd
+c6761a07945edbeecc5726bb0ba92d40 pidfile.patch
646b16f31abbea4c215512f58f421abc ldflags.patch"
sha256sums="9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824 dcron-4.5.tar.gz
-a1a58b4ab6c570244f4eb3db3cc0414ee183a7b2627e26f43fd43061c4caf3c2 dcron.initd
-4272467e432eab948f6770ea639f38817123eac2c87fc76f3fcb2b2d4cecbbb6 pidfile.patch
+dd36b83cd4fa2694119fe046a2432b702ce42c8dc0e87a252cae25a904560acf dcron.initd
+f6c5adf109350eee543549ea63e03d1ac4ca8131d8c8ac1ac7074b222883cfa0 pidfile.patch
69b907a89d22bcff5ded7ebd749c4e8df87106e290c75110630031e75631ee3a ldflags.patch"
sha512sums="08521391d16ba5adf80278ec2a734319c26c48841fd94b119c0b27d744c2cfb3562b1a3630135a03d1c43b1668d49262713abb20ff5f7ecd397a2a19a2f6105a dcron-4.5.tar.gz
-cad27486519f812dfffbf0c463f7f0d25ddaf5ce517fb48445d23b8eee1cb480fa3a2d4ee1ef2df9efc65a8f58ddf683db21ef7503367cc1d6c2c8e60fd3a911 dcron.initd
-08bd8d7445b597a5c7d66d3e768c943388db44e0ae43a0cec2be3b0c83c510f00f808b02d52b86cb663e79ea66584b16f92eaa02d40489e5f4124206ae17378d pidfile.patch
+0513fc6795988c68f2d552c7754383c6db1f51507686c25cf5205a8491679626118a4bab22c8d5e58017f58cc01ab21af8931fdef806a80f3d27cba2f53831cd dcron.initd
+04fdd3059d6b1df8132944e2eefa932e640db8b4a5ac85dd1ca833adf1d0013ad33f40021624e12a4203b08003d6c79f0a5da4e29b057004fb849f388c7178f2 pidfile.patch
8a07ccfae80468a555e8f5ea60f88dd444a3aacb6baa6f747a6a02bcdce78baaa8aaf799ae9d2684a518bfff537dc0cdcf0b53bb6fc0017fa52228f1f0a16e49 ldflags.patch"
diff --git a/testing/dcron/dcron.initd b/testing/dcron/dcron.initd
index 5639a666d02b..65b631b9a53b 100644
--- a/testing/dcron/dcron.initd
+++ b/testing/dcron/dcron.initd
@@ -3,7 +3,7 @@
name="$SVCNAME"
command="/usr/sbin/crond"
command_args="$DCRON_OPTS"
-pidfile="/var/run/crond.pid"
+pidfile="/var/run/$SVCNAME.pid"
description="Dillon's lightweight cron daemon"
depend() {
diff --git a/testing/dcron/pidfile.patch b/testing/dcron/pidfile.patch
index 6004c4c4b4d2..28a0e27fa149 100644
--- a/testing/dcron/pidfile.patch
+++ b/testing/dcron/pidfile.patch
@@ -1,19 +1,7 @@
-From 14b0f33ebf33d3d08427fd4d9fd4bda3cc107bd0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 26 Oct 2010 01:42:32 -0400
-Subject: [PATCH] crond: write a pid file
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 2 +-
- main.c | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index dc5b78f..e278312 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,7 +38,7 @@ DEFS = -DVERSION='"$(VERSION)"' \
+diff -upr dcron-4.5.orig/Makefile dcron-4.5/Makefile
+--- dcron-4.5.orig/Makefile 2016-03-20 00:03:45.043674778 +0100
++++ dcron-4.5/Makefile 2016-03-20 00:04:01.640164147 +0100
+@@ -39,7 +39,7 @@ DEFS = -DVERSION='"$(VERSION)"' \
-DTIMESTAMP_FMT='"$(TIMESTAMP_FMT)"'
# save variables needed for `make install` in config
@@ -22,22 +10,20 @@ index dc5b78f..e278312 100644
rm -f config
echo "PREFIX = $(PREFIX)" >> config
echo "SBINDIR = $(SBINDIR)" >> config
-diff --git a/main.c b/main.c
-index e4a742e..6313213 100644
---- a/main.c
-+++ b/main.c
-@@ -227,6 +227,11 @@ main(int ac, char **av)
+Only in dcron-4.5: Makefile.orig
+diff -upr dcron-4.5.orig/main.c dcron-4.5/main.c
+--- dcron-4.5.orig/main.c 2016-03-20 00:03:45.043674778 +0100
++++ dcron-4.5/main.c 2016-03-20 00:04:14.933355472 +0100
+@@ -226,6 +226,11 @@ main(int ac, char **av)
exit(1);
} else if (pid > 0) {
/* parent */
+ FILE *fp;
-+ if ((fp = fopen("/var/run/crond.pid", "w")) != NULL) {
++ if ((fp = fopen("/var/run/dcron.pid", "w")) != NULL) {
+ fprintf(fp, "%d\n", pid);
+ fclose(fp);
+ }
exit(0);
}
/* child continues */
---
-1.7.3.1
-
+Only in dcron-4.5: main.c.orig
--
GitLab