| 1 |
commit: 542ea24d025c589074ca91c1d71c75a93f9b278e |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 5 22:53:01 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 5 22:53:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ea24d |
| 7 |
|
| 8 |
sys-process/fcron: make check_system_crontabs musl friendly |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
...fcron-3.2.1-r2.ebuild => fcron-3.2.1-r3.ebuild} | 3 ++- |
| 13 |
sys-process/fcron/fcron-3.3.0_beta-r1.ebuild | 3 ++- |
| 14 |
.../files/fcron-3.2.1-musl-getopt-order.patch | 24 ++++++++++++++++++++++ |
| 15 |
3 files changed, 28 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild |
| 18 |
similarity index 98% |
| 19 |
rename from sys-process/fcron/fcron-3.2.1-r2.ebuild |
| 20 |
rename to sys-process/fcron/fcron-3.2.1-r3.ebuild |
| 21 |
index 604e9afb710..fe5f30de4ec 100644 |
| 22 |
--- a/sys-process/fcron/fcron-3.2.1-r2.ebuild |
| 23 |
+++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI="6" |
| 30 |
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND} |
| 31 |
PATCHES=( |
| 32 |
"${FILESDIR}"/${PN}-3.1.1-noreadline.patch |
| 33 |
"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch |
| 34 |
+ "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch |
| 35 |
) |
| 36 |
|
| 37 |
pkg_setup() { |
| 38 |
|
| 39 |
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild |
| 40 |
index 10f03c92f51..f842946849e 100644 |
| 41 |
--- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild |
| 42 |
+++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2017 Gentoo Foundation |
| 45 |
+# Copyright 1999-2018 Gentoo Foundation |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI="6" |
| 49 |
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND} |
| 50 |
PATCHES=( |
| 51 |
"${FILESDIR}"/${PN}-3.1.1-noreadline.patch |
| 52 |
"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch |
| 53 |
+ "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch |
| 54 |
) |
| 55 |
|
| 56 |
S="${WORKDIR}/${MY_P}" |
| 57 |
|
| 58 |
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 |
| 59 |
new file mode 100644 |
| 60 |
index 00000000000..801baad9171 |
| 61 |
--- /dev/null |
| 62 |
+++ b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch |
| 63 |
@@ -0,0 +1,24 @@ |
| 64 |
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.bash fcron-3.2.1/script/check_system_crontabs.bash |
| 65 |
+--- fcron-3.2.1.orig/script/check_system_crontabs.bash 2015-03-28 04:45:42.000000000 -0400 |
| 66 |
++++ fcron-3.2.1/script/check_system_crontabs.bash 2018-02-05 17:47:04.735425134 -0500 |
| 67 |
+@@ -256,7 +256,7 @@ |
| 68 |
+ 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 |
| 69 |
+ |
| 70 |
+ # notify fcron about the updated file |
| 71 |
+- $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab |
| 72 |
++ $FCRONTAB_PROG -u systab $FCRONTAB_FILE_TMP |
| 73 |
+ } |
| 74 |
+ |
| 75 |
+ NEED_REBUILD=0 |
| 76 |
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.sh fcron-3.2.1/script/check_system_crontabs.sh |
| 77 |
+--- fcron-3.2.1.orig/script/check_system_crontabs.sh 2015-03-28 04:45:42.000000000 -0400 |
| 78 |
++++ fcron-3.2.1/script/check_system_crontabs.sh 2018-02-05 17:45:48.673612299 -0500 |
| 79 |
+@@ -265,7 +265,7 @@ |
| 80 |
+ 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" |
| 81 |
+ |
| 82 |
+ # notify fcron about the updated file |
| 83 |
+- "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" "$FCRONTAB_FILE_TMP" -u systab |
| 84 |
++ "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" -u systab "$FCRONTAB_FILE_TMP" |
| 85 |
+ } |
| 86 |
+ |
| 87 |
+ NEED_REBUILD=0 |
Archives