From 3e376f6be4b47f56b38a5b827bbe85c3e8ebdfdc Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Tue, 6 Sep 2016 23:02:55 +0100
Subject: flx/init-vixie-cron: Move patch here

Package-Manager: portage-2.2.28
---
 flx/init-vixie-cron/Manifest                       |  4 ++-
 ...0.1-procname-is-cron-while-pname-is-crond.patch | 30 ++++++++++++++++++++++
 ....1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch | 25 ++++++++++++++++++
 flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild   | 10 ++++++--
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 flx/init-vixie-cron/files/3.0.1-procname-is-cron-while-pname-is-crond.patch
 create mode 100644 flx/init-vixie-cron/files/3.0.1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch

(limited to 'flx')

diff --git a/flx/init-vixie-cron/Manifest b/flx/init-vixie-cron/Manifest
index 307f87d6..e7b7fe10 100644
--- a/flx/init-vixie-cron/Manifest
+++ b/flx/init-vixie-cron/Manifest
@@ -1,2 +1,4 @@
-EBUILD init-vixie-cron-3.0.1.ebuild 359 SHA256 a65dc647640239d7a965466ff4fa62e467c99544280b26a44cb941d6ac5f28a0 WHIRLPOOL 2e5e25b6f454bd9429ceb039f46a94f99293c851236ee499e45d4bd42a78c7844087f9f2a6ba9b963292162e2735a5d59fcc7b99d54fcac26c9964cc2e15a192
+AUX 3.0.1-procname-is-cron-while-pname-is-crond.patch 983 SHA256 286eff74feedb1365d5517f97f6005a46050915d03440fe620570f8708b8aed5 WHIRLPOOL 69c5aee35fbc34325b76ca16b8b7028ad220bb928756288de8fcfb68980a01bb24fedf98efc907838f95521a4505eaa07ce23aea19aecc657a4d2531a192022a
+AUX 3.0.1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch 791 SHA256 745d51c36365665e9e1b303bcceb88d55dfae837cc3f6b1ae0387a8d5dd703b4 WHIRLPOOL 6950b166be71e91d7d32a159441427330fcdd3e88916ad44eee622b666356132343b9793d7e11f774926b304b6f65f6177bfee246cd15aea66374f25972185b2
+EBUILD init-vixie-cron-3.0.1.ebuild 453 SHA256 d51e3d2a6433a4263fff51660a47a1f7e6ee277aa82ea8d77543cdd6a4f0639d WHIRLPOOL 71feeadfdfa16379d70ca92110bba9d931a5d37c14790635cd6bd0a4b60801bf05f2e173a4ae7f37078e326c45d86492dd21ce17da5a37a108ae453477ac1507
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-vixie-cron/files/3.0.1-procname-is-cron-while-pname-is-crond.patch b/flx/init-vixie-cron/files/3.0.1-procname-is-cron-while-pname-is-crond.patch
new file mode 100644
index 00000000..4b72828c
--- /dev/null
+++ b/flx/init-vixie-cron/files/3.0.1-procname-is-cron-while-pname-is-crond.patch
@@ -0,0 +1,30 @@
+From 40567b193c6ce7766761e2b861703b4dbd835f62 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Tue, 27 Dec 2011 12:29:13 +0100
+Subject: [PATCH 2/2] procname is cron while pname is crond
+
+---
+ add-ons/crond | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/add-ons/crond b/add-ons/crond
+index ae76db3..357800e 100644
+--- a/add-ons/crond
++++ b/add-ons/crond
+@@ -5,12 +5,14 @@
+ 
+ . `dirname $0`/functions
+ 
+-option	bin		reserved_option	/usr/sbin/cron
+-option	cmdline		reserved_option	'daemon $bin'
+ option	pidfile		reserved_option	/var/run/cron.pid
+ option	crontab		standard_option /etc/crontab
+ option	crontabdir	standard_option /var/spool/cron
+ 
++option	procname	reserved_option	cron
++option	bin		reserved_option	/usr/sbin/cron
++option	cmdline		reserved_option	'daemon $bin'
++
+ function fct_pre_start {
+     if [ ! -d "$opt_crontabdir" ] ; then
+ 	if ! ( mkdir -p -m 750 "$opt_crontabdir" && chown root:adm "$opt_crontabdir" ); then
diff --git a/flx/init-vixie-cron/files/3.0.1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch b/flx/init-vixie-cron/files/3.0.1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch
new file mode 100644
index 00000000..5e5c1347
--- /dev/null
+++ b/flx/init-vixie-cron/files/3.0.1-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch
@@ -0,0 +1,25 @@
+From c2df7adabe6b0157e58d4ef8904facf58a0256ec Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 3 Dec 2011 23:51:45 +0100
+Subject: [PATCH 1/2] vixie-cron 4.1 daemon is /usr/sbin/cron
+
+---
+ add-ons/crond | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/add-ons/crond b/add-ons/crond
+index a5a2403..ae76db3 100644
+--- a/add-ons/crond
++++ b/add-ons/crond
+@@ -5,9 +5,9 @@
+ 
+ . `dirname $0`/functions
+ 
+-option	bin		reserved_option	/usr/sbin/crond
++option	bin		reserved_option	/usr/sbin/cron
+ option	cmdline		reserved_option	'daemon $bin'
+-option	pidfile		reserved_option	/var/run/crond.pid
++option	pidfile		reserved_option	/var/run/cron.pid
+ option	crontab		standard_option /etc/crontab
+ option	crontabdir	standard_option /var/spool/cron
+ 
diff --git a/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
index 18ea1c63..2a0bb129 100644
--- a/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
+++ b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
@@ -5,11 +5,17 @@
 EAPI=6
 inherit flx-init-scripts
 
-EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/vixie-cron.git"
 EGIT_BRANCH="3.0-flx0"
-#EGIT_COMMIT="v3.0.1-flx0.5"
+EGIT_COMMIT="v3.0.1-flx0.5"
 
 KEYWORDS="amd64 x86"
 RDEPEND=">=sys-process/vixie-cron-${PV}"
 
 SVCNAME="crond"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${PV}-vixie-cron-4.1-daemon-is-usr-sbin-cron.patch"
+	epatch "${FILESDIR}/${PV}-procname-is-cron-while-pname-is-crond.patch"
+}
-- 
cgit v1.2.3