From 379dcc39b31a0d9781c6e561f8ea142a8f26a7a3 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 6 Sep 2016 21:17:33 +0100 Subject: flx/init-ntp: Move patch here Package-Manager: portage-2.2.28 --- flx/init-ntp/Manifest | 10 +- flx/init-ntp/files/4.2-Fix-indent.patch | 152 +++++++++++++++++++++ .../files/4.2-Remove-handling-ntptimeset.patch | 84 ++++++++++++ flx/init-ntp/files/4.2-Reuse-do_update.patch | 25 ++++ ...4.2-ntpdate-should-be-present-in-usr-sbin.patch | 22 +++ .../files/absolute-path-reuse-do-update.diff | 29 ---- flx/init-ntp/files/indent.diff | 63 --------- flx/init-ntp/files/path.diff | 30 ---- flx/init-ntp/files/remove-ntptimeset.diff | 71 ---------- flx/init-ntp/init-ntp-4.2.ebuild | 8 +- 10 files changed, 292 insertions(+), 202 deletions(-) create mode 100644 flx/init-ntp/files/4.2-Fix-indent.patch create mode 100644 flx/init-ntp/files/4.2-Remove-handling-ntptimeset.patch create mode 100644 flx/init-ntp/files/4.2-Reuse-do_update.patch create mode 100644 flx/init-ntp/files/4.2-ntpdate-should-be-present-in-usr-sbin.patch delete mode 100644 flx/init-ntp/files/absolute-path-reuse-do-update.diff delete mode 100644 flx/init-ntp/files/indent.diff delete mode 100644 flx/init-ntp/files/path.diff delete mode 100644 flx/init-ntp/files/remove-ntptimeset.diff (limited to 'flx') diff --git a/flx/init-ntp/Manifest b/flx/init-ntp/Manifest index b8f0d8c2..286d4942 100644 --- a/flx/init-ntp/Manifest +++ b/flx/init-ntp/Manifest @@ -1,6 +1,6 @@ -AUX absolute-path-reuse-do-update.diff 927 SHA256 8a8e7f3f8a1bf677bb51bdb8a15da389d117608c4fc4ff8ffd765591b9eab7d8 WHIRLPOOL 9aba493c006c9b096b5d9934a788372d048fcc395a680368f042c2298c3ec6cec02710dee5e2fcbc5dbb87bb593c51b92a2a1d2552dbd3c52c09cc6bf5d95905 -AUX indent.diff 2048 SHA256 b351deca5737c5618b2149da2051bce284e43217d9812de62348927f600985fb WHIRLPOOL 9bd3bfbef98612ddc2f1d3b7f4614cb48bb9f1d72102d6fba2e84ff8bd992aed8d728276c72b2bf51070a8a747c9811eac668c98202d6eaa2e95b1b8217c8fdb -AUX path.diff 1337 SHA256 7753a9eb741fab1116b19f7e1d0e3fd05007ed12c5e868ba45942ea74b8c9498 WHIRLPOOL 3038064ccf5f4c875ef913624aaf9898b307ccd9f3fdbf8fe1adabb1b0735324bfa04f3a36a6648876d5f31903a7400541c0ad413ef9c68a8013f7269d00c8b2 -AUX remove-ntptimeset.diff 2322 SHA256 30c723b919d7884c05c1fa9fc34bd0a0265d81f8d0f1075a9e823df39a108e90 WHIRLPOOL 3490668064a165f795c2ecc624ca80c65c8c48d693ab9078778aa9c05293951826f2356e3d05e4fb8a611d597b2ca8cbc8b4a587c50d99e1b4ae41161526acd6 -EBUILD init-ntp-4.2.ebuild 451 SHA256 3dadb02fe5568fdb1a00646a325a9dc44986cafa212a939c0d4b84a80a0a7352 WHIRLPOOL b8afe451a9d78071139fee2058690936c2c0dd60753d2a73ddac8e809e87c9d2b30d73eeecc5d2c833939da38a9fc7571a3bb4ea576c44e48f01613aff1e008e +AUX 4.2-Fix-indent.patch 5524 SHA256 62902430ea588d78309b9c2d9cbc8d4678c9ba5f43e7f7ccd74c93f39f2400ad WHIRLPOOL 5e9dbde10c0973d863ac35255e79e4cd1bbb80ae5e0fd2a0796aebe7c9e8c0b3c6ab7688a4d0fb22bc126952a71b34d9ab887699d3225057b834767e7ddf6e2c +AUX 4.2-Remove-handling-ntptimeset.patch 3246 SHA256 901f3f11ea0cacf5f65b093f12a04e3aff3e028ac04bef4c2780581300821779 WHIRLPOOL aef1a7a9121ef7be5554fb1d71ac08de997bfaaaf16807fa9002f97e6f01fcc9ea115a64d616eee0938e730a46de58b1a331dbcfff71ca3cd7cd715acb139e5c +AUX 4.2-Reuse-do_update.patch 786 SHA256 8044f93c5c988fcbe68bd774f2970e8c28ca42716af4c0f97eab60bb427197cd WHIRLPOOL cf31e3b98ea6a6dfa2a00f47bc85b965aa0995da5a179cbbfe09b13e2f8ed3ca455dd6d2c33a570d91005f1c0218f5ff3a80a89889402cc249fe7a92cbfd61a3 +AUX 4.2-ntpdate-should-be-present-in-usr-sbin.patch 768 SHA256 46ad4d959402507a30453e2fe1f38807bb0d3cc5102e4885329e28f08d6510c4 WHIRLPOOL 5bb27c910a0b59e7700a3b6c88c0999d69d8a07b6d66faa2beafab22641c15e444923a77d6007ffe120811845a90f95cc38ec80afde476496505f7ac3c02cb42 +EBUILD init-ntp-4.2.ebuild 511 SHA256 4820936875015ab0c0c221d385ef9eee35470575534264ee763397199bac03b7 WHIRLPOOL d98a3981c085f0224b109f6d00d050a093d5ae3ade841b7eb9f9a10412cee63264d2545bd2e62e6d28f78d07f667bf8e1650f1151d04824a6e37f519e6b1ebd2 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b diff --git a/flx/init-ntp/files/4.2-Fix-indent.patch b/flx/init-ntp/files/4.2-Fix-indent.patch new file mode 100644 index 00000000..c60f76a9 --- /dev/null +++ b/flx/init-ntp/files/4.2-Fix-indent.patch @@ -0,0 +1,152 @@ +From b84961dbd18887862aa3ea640b9fdce9f0bb7875 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 27 May 2013 22:36:39 +0200 +Subject: [PATCH 1/4] Fix indent + +--- + add-ons/ntp | 99 ++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 49 insertions(+), 50 deletions(-) + +diff --git a/add-ons/ntp b/add-ons/ntp +index f6b1990..88c43f8 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -2,18 +2,18 @@ + + . `dirname $0`/functions + +-option config standard_option /etc/ntp/ntp.conf +-option keys standard_option /etc/ntp/ntp.keys +-option pidfile reserved_option /var/run/ntp.pid +-option hard_sync boolean_option # not used anymore +-option min_servers standard_option 1 +-option force_sync boolean_option +-option unpriv_port boolean_option 1 +-option sync_servers long_option ++option config standard_option /etc/ntp/ntp.conf ++option keys standard_option /etc/ntp/ntp.keys ++option pidfile reserved_option /var/run/ntp.pid ++option hard_sync boolean_option # not used anymore ++option min_servers standard_option 1 ++option force_sync boolean_option ++option unpriv_port boolean_option 1 ++option sync_servers long_option + +-option procname reserved_option ntpd +-option bin reserved_option /usr/sbin/ntpd +-option cmdline reserved_option '$bin -c $opt_config -p $pidfile -k $opt_keys' ++option procname reserved_option ntpd ++option bin reserved_option /usr/sbin/ntpd ++option cmdline reserved_option '$bin -c $opt_config -p $pidfile -k $opt_keys' + + function do_help { + echo "Usage: ${0##*/} " +@@ -32,9 +32,9 @@ function do_help { + # assign values after all the options have been read + function fct_end_section { + if [ -z "$opt_sync_servers" ]; then +- valueof $opt_config server > /dev/null +- opt_sync_servers=( $REPLY ) +- opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) ++ valueof $opt_config server > /dev/null ++ opt_sync_servers=( $REPLY ) ++ opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) + fi + } + +@@ -48,28 +48,28 @@ function fct_pre_start { + mkdir -p ${driftfile%/*} + fi + if [ "$opt_force_sync" = "1" ]; then +- if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi +- fi +- +- if [ $synced -eq 0 ]; then +- if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Not forcing sync." ++ if [ -x /usr/bin/ntptimeset ]; then ++ echo " Using ntptimeset to sync with servers..." ++ if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ ++ -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then ++ synced=1 + else +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else +- echo " --> sync failed, starting unsynced." +- fi ++ echo " --> sync failed." + fi +- fi ++ fi ++ ++ if [ $synced -eq 0 ]; then ++ if [ -z "$opt_sync_servers" ]; then ++ echo " --> sync_servers not set, and ntptimeset not installed. Not forcing sync." ++ else ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ synced=1 ++ else ++ echo " --> sync failed, starting unsynced." ++ fi ++ fi ++ fi + fi + return 0 + } +@@ -78,26 +78,26 @@ function fct_pre_start { + function do_update { + local synced=0 + if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi ++ echo " Using ntptimeset to sync with servers..." ++ if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ ++ -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then ++ synced=1 ++ else ++ echo " --> sync failed." ++ fi + fi + + if [ $synced -eq 0 ]; then + if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Aborting." ++ echo " --> sync_servers not set, and ntptimeset not installed. Aborting." + else +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else +- echo " --> sync failed. Aborting." +- fi +- fi ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ synced=1 ++ else ++ echo " --> sync failed. Aborting." ++ fi ++ fi + fi + + test $synced -eq 1 +@@ -109,4 +109,3 @@ function do_query { + } + + load_config +- diff --git a/flx/init-ntp/files/4.2-Remove-handling-ntptimeset.patch b/flx/init-ntp/files/4.2-Remove-handling-ntptimeset.patch new file mode 100644 index 00000000..d1133cf2 --- /dev/null +++ b/flx/init-ntp/files/4.2-Remove-handling-ntptimeset.patch @@ -0,0 +1,84 @@ +From 56259fe1916b4b177d570c1eac7ec6b367763c7b Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 27 May 2013 22:36:39 +0200 +Subject: [PATCH 2/4] Remove handling ntptimeset + +--- + add-ons/ntp | 50 ++++++++------------------------------------------ + 1 file changed, 8 insertions(+), 42 deletions(-) + +diff --git a/add-ons/ntp b/add-ons/ntp +index 88c43f8..830274d 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -41,34 +41,15 @@ function fct_end_section { + # perform a forced synchronisation before starting the daemon + function fct_pre_start { + local driftfile +- local synced=0 + + valueof $opt_config driftfile > /dev/null 2>&1 ; driftfile=$REPLY + if [ -n "$driftfile" -a ! -e "${driftfile%/*}" ] ; then + mkdir -p ${driftfile%/*} + fi + if [ "$opt_force_sync" = "1" ]; then +- if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi +- fi +- +- if [ $synced -eq 0 ]; then +- if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Not forcing sync." +- else +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else +- echo " --> sync failed, starting unsynced." +- fi +- fi ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ echo " --> sync failed, starting unsynced." + fi + fi + return 0 +@@ -77,27 +58,12 @@ function fct_pre_start { + # execute a forced resynchronisation to sync servers + function do_update { + local synced=0 +- if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi +- fi + +- if [ $synced -eq 0 ]; then +- if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Aborting." +- else +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else +- echo " --> sync failed. Aborting." +- fi +- fi ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ synced=1 ++ else ++ echo " --> sync failed. Aborting." + fi + + test $synced -eq 1 diff --git a/flx/init-ntp/files/4.2-Reuse-do_update.patch b/flx/init-ntp/files/4.2-Reuse-do_update.patch new file mode 100644 index 00000000..f2a39a95 --- /dev/null +++ b/flx/init-ntp/files/4.2-Reuse-do_update.patch @@ -0,0 +1,25 @@ +From 914e3a9d428d6ecec86feadb9e94660a025864ca Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 27 May 2013 22:36:39 +0200 +Subject: [PATCH 3/4] Reuse do_update + +--- + add-ons/ntp | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/add-ons/ntp b/add-ons/ntp +index 830274d..3e86023 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -47,10 +47,7 @@ function fct_pre_start { + mkdir -p ${driftfile%/*} + fi + if [ "$opt_force_sync" = "1" ]; then +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- echo " --> sync failed, starting unsynced." +- fi ++ do_update + fi + return 0 + } diff --git a/flx/init-ntp/files/4.2-ntpdate-should-be-present-in-usr-sbin.patch b/flx/init-ntp/files/4.2-ntpdate-should-be-present-in-usr-sbin.patch new file mode 100644 index 00000000..034b405a --- /dev/null +++ b/flx/init-ntp/files/4.2-ntpdate-should-be-present-in-usr-sbin.patch @@ -0,0 +1,22 @@ +From 268589e5d8396d896259646887694458d4b12480 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 3 Dec 2011 14:17:18 +0100 +Subject: [PATCH 4/4] ntpdate should be present in /usr/sbin + +--- + add-ons/ntp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/add-ons/ntp b/add-ons/ntp +index 3e86023..91f5469 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -57,7 +57,7 @@ function do_update { + local synced=0 + + echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ if /usr/sbin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then + synced=1 + else + echo " --> sync failed. Aborting." diff --git a/flx/init-ntp/files/absolute-path-reuse-do-update.diff b/flx/init-ntp/files/absolute-path-reuse-do-update.diff deleted file mode 100644 index ff8d1211..00000000 --- a/flx/init-ntp/files/absolute-path-reuse-do-update.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/add-ons/ntp b/add-ons/ntp -index 73554be..81ddabd 100644 ---- a/add-ons/ntp -+++ b/add-ons/ntp -@@ -47,12 +47,9 @@ function fct_pre_start { - mkdir -p ${driftfile%/*} - fi - -- if [ "$opt_force_sync" = "1" ]; then -- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -- if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -- echo " --> sync failed, starting unsynced." -- fi -- fi -+ [ "$opt_force_sync" = "1" ] \ -+ && do_update -+ - return 0 - } - -@@ -61,7 +58,7 @@ function do_update { - local synced=0 - - echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -+ if ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then - synced=1 - else - echo " --> sync failed. Aborting." diff --git a/flx/init-ntp/files/indent.diff b/flx/init-ntp/files/indent.diff deleted file mode 100644 index f6fb5e90..00000000 --- a/flx/init-ntp/files/indent.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/add-ons/ntp b/add-ons/ntp -index 9777a3b..73554be 100644 ---- a/add-ons/ntp -+++ b/add-ons/ntp -@@ -26,15 +26,15 @@ function do_help { - echo " - unpriv_port : boolean ; def=1 ; cur=$opt_unpriv_port" - echo " - sync_servers : IP list ; def= ; cur='${opt_sync_servers[@]}'" - echo -- exit 1 -+ exit 1 - } - - # assign values after all the options have been read - function fct_end_section { - if [ -z "$opt_sync_servers" ]; then -- valueof $opt_config server > /dev/null -- opt_sync_servers=( $REPLY ) -- opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) -+ valueof $opt_config server > /dev/null -+ opt_sync_servers=( $REPLY ) -+ opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) - fi - } - -@@ -48,10 +48,10 @@ function fct_pre_start { - fi - - if [ "$opt_force_sync" = "1" ]; then -- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -- if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -- echo " --> sync failed, starting unsynced." -- fi -+ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -+ if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -+ echo " --> sync failed, starting unsynced." -+ fi - fi - return 0 - } -@@ -60,12 +60,12 @@ function fct_pre_start { - function do_update { - local synced=0 - -- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -- synced=1 -- else -- echo " --> sync failed. Aborting." -- fi -+ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -+ if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -+ synced=1 -+ else -+ echo " --> sync failed. Aborting." -+ fi - - test $synced -eq 1 - return $? -@@ -76,4 +76,3 @@ function do_query { - } - - load_config -- diff --git a/flx/init-ntp/files/path.diff b/flx/init-ntp/files/path.diff deleted file mode 100644 index 6517aa86..00000000 --- a/flx/init-ntp/files/path.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/add-ons/ntp b/add-ons/ntp -index 384e845..1db7311 100644 ---- a/add-ons/ntp -+++ b/add-ons/ntp -@@ -2,8 +2,7 @@ - - . `dirname $0`/functions - --option config standard_option /etc/ntp/ntp.conf --option keys standard_option /etc/ntp/ntp.keys -+option config standard_option /etc/ntp.conf - option pidfile reserved_option /var/run/ntp.pid - option hard_sync boolean_option # not used anymore - option min_servers standard_option 1 -@@ -13,14 +12,13 @@ option sync_servers long_option - - option procname reserved_option ntpd - option bin reserved_option /usr/sbin/ntpd --option cmdline reserved_option '$bin -c $opt_config -p $pidfile -k $opt_keys' -+option cmdline reserved_option '$bin -c $opt_config -p $pidfile' - - function do_help { - echo "Usage: ${0##*/} " - echo "List of config.rc options (name, type, default value, current value) :" - echo - echo " - config : file ; def='/etc/ntp/ntp.conf' ; cur=$opt_config" -- echo " - keys : file ; def='/etc/ntp/ntp.keys' ; cur=$opt_keys" - echo " - min_servers : integer ; def=1 ; cur=$opt_min_servers" - echo " - force_sync : boolean ; def=0 ; cur=$opt_force_sync" - echo " - unpriv_port : boolean ; def=1 ; cur=$opt_unpriv_port" diff --git a/flx/init-ntp/files/remove-ntptimeset.diff b/flx/init-ntp/files/remove-ntptimeset.diff deleted file mode 100644 index 836611cd..00000000 --- a/flx/init-ntp/files/remove-ntptimeset.diff +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/add-ons/ntp b/add-ons/ntp -index f6b1990..9777a3b 100644 ---- a/add-ons/ntp -+++ b/add-ons/ntp -@@ -41,35 +41,17 @@ function fct_end_section { - # perform a forced synchronisation before starting the daemon - function fct_pre_start { - local driftfile -- local synced=0 - - valueof $opt_config driftfile > /dev/null 2>&1 ; driftfile=$REPLY - if [ -n "$driftfile" -a ! -e "${driftfile%/*}" ] ; then - mkdir -p ${driftfile%/*} - fi -- if [ "$opt_force_sync" = "1" ]; then -- if [ -x /usr/bin/ntptimeset ]; then -- echo " Using ntptimeset to sync with servers..." -- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ -- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then -- synced=1 -- else -- echo " --> sync failed." -- fi -- fi - -- if [ $synced -eq 0 ]; then -- if [ -z "$opt_sync_servers" ]; then -- echo " --> sync_servers not set, and ntptimeset not installed. Not forcing sync." -- else -+ if [ "$opt_force_sync" = "1" ]; then - echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." -- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then -- synced=1 -- else -+ if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then - echo " --> sync failed, starting unsynced." - fi -- fi -- fi - fi - return 0 - } -@@ -77,28 +59,13 @@ function fct_pre_start { - # execute a forced resynchronisation to sync servers - function do_update { - local synced=0 -- if [ -x /usr/bin/ntptimeset ]; then -- echo " Using ntptimeset to sync with servers..." -- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ -- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then -- synced=1 -- else -- echo " --> sync failed." -- fi -- fi - -- if [ $synced -eq 0 ]; then -- if [ -z "$opt_sync_servers" ]; then -- echo " --> sync_servers not set, and ntptimeset not installed. Aborting." -- else - echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." - if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then - synced=1 - else - echo " --> sync failed. Aborting." - fi -- fi -- fi - - test $synced -eq 1 - return $? diff --git a/flx/init-ntp/init-ntp-4.2.ebuild b/flx/init-ntp/init-ntp-4.2.ebuild index e86af982..8b9a6ab5 100644 --- a/flx/init-ntp/init-ntp-4.2.ebuild +++ b/flx/init-ntp/init-ntp-4.2.ebuild @@ -14,8 +14,8 @@ RDEPEND=">=net-misc/ntp-${PV}" src_prepare() { default - epatch "${FILESDIR}/remove-ntptimeset.diff" - epatch "${FILESDIR}/indent.diff" - epatch "${FILESDIR}/absolute-path-reuse-do-update.diff" - epatch "${FILESDIR}/path.diff" + epatch "${FILESDIR}/${PV}-Fix-indent.patch" + epatch "${FILESDIR}/${PV}-Remove-handling-ntptimeset.patch" + epatch "${FILESDIR}/${PV}-Reuse-do_update.patch" + epatch "${FILESDIR}/${PV}-ntpdate-should-be-present-in-usr-sbin.patch" } -- cgit v1.2.3