[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     542ea24d025c589074ca91c1d71c75a93f9b278e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 22:53:01 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 22:53:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ea24d

sys-process/fcron: make check_system_crontabs musl friendly

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...fcron-3.2.1-r2.ebuild => fcron-3.2.1-r3.ebuild} |  3 ++-
 sys-process/fcron/fcron-3.3.0_beta-r1.ebuild       |  3 ++-
 .../files/fcron-3.2.1-musl-getopt-order.patch      | 24 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.2.1-r2.ebuild
rename to sys-process/fcron/fcron-3.2.1-r3.ebuild
index 604e9afb710..fe5f30de4ec 100644
--- a/sys-process/fcron/fcron-3.2.1-r2.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
 	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
 )
 
 pkg_setup() {

diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
index 10f03c92f51..f842946849e 100644
--- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
 	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
 )
 
 S="${WORKDIR}/${MY_P}"

diff --git a/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch
new file mode 100644
index 00000000000..801baad9171
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch
@@ -0,0 +1,24 @@
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.bash fcron-3.2.1/script/check_system_crontabs.bash
+--- fcron-3.2.1.orig/script/check_system_crontabs.bash	2015-03-28 04:45:42.000000000 -0400
++++ fcron-3.2.1/script/check_system_crontabs.bash	2018-02-05 17:47:04.735425134 -0500
+@@ -256,7 +256,7 @@
+   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP
+ 
+   # notify fcron about the updated file
+-  $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab
++  $FCRONTAB_PROG -u systab $FCRONTAB_FILE_TMP
+ }
+ 
+ NEED_REBUILD=0
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.sh fcron-3.2.1/script/check_system_crontabs.sh
+--- fcron-3.2.1.orig/script/check_system_crontabs.sh	2015-03-28 04:45:42.000000000 -0400
++++ fcron-3.2.1/script/check_system_crontabs.sh	2018-02-05 17:45:48.673612299 -0500
+@@ -265,7 +265,7 @@
+   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" "$FCRONTAB_FILE_TMP"
+ 
+   # notify fcron about the updated file
+-  "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" "$FCRONTAB_FILE_TMP" -u systab
++  "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" -u systab "$FCRONTAB_FILE_TMP"
+ }
+ 
+ NEED_REBUILD=0