Merge "refactor ntp"
This commit is contained in:
commit
15c9ab7548
|
@ -1 +0,0 @@
|
||||||
TIS_PATCH_VER=3
|
|
|
@ -1,27 +0,0 @@
|
||||||
From 30615fcee3c857e0bb2900a64e14b807adff5495 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Scott Little <scott.little@windriver.com>
|
|
||||||
Date: Mon, 2 Oct 2017 16:29:01 -0400
|
|
||||||
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
SPECS/ntp.spec
|
|
||||||
---
|
|
||||||
SPECS/ntp.spec | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
|
|
||||||
index 73ab0f7..bf9c32b 100644
|
|
||||||
--- a/SPECS/ntp.spec
|
|
||||||
+++ b/SPECS/ntp.spec
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
Summary: The NTP daemon and utilities
|
|
||||||
Name: ntp
|
|
||||||
Version: 4.2.6p5
|
|
||||||
-Release: 28%{?dist}
|
|
||||||
+Release: 28.el7.centos%{?_tis_dist}.%{tis_patch_ver}
|
|
||||||
# primary license (COPYRIGHT) : MIT
|
|
||||||
# ElectricFence/ (not used) : GPLv2
|
|
||||||
# kernel/sys/ppsclock.h (not used) : BSD with advertising
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
ntp-spec-add-TiS-custom-config-files.patch
|
|
||||||
ntpd-started-no-g-option.patch
|
|
||||||
0001-Update-package-versioning-for-TIS-format.patch
|
|
|
@ -1,32 +0,0 @@
|
||||||
From a24ad7ed432352f238f51429e3c24c600c726a8a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Scott Little <scott.little@windriver.com>
|
|
||||||
Date: Mon, 2 Oct 2017 16:29:00 -0400
|
|
||||||
Subject: WRS: ntp-spec-add-TiS-custom-config-files.patch
|
|
||||||
|
|
||||||
---
|
|
||||||
SPECS/ntp.spec | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
|
|
||||||
index 52ad9aa..73ab0f7 100644
|
|
||||||
--- a/SPECS/ntp.spec
|
|
||||||
+++ b/SPECS/ntp.spec
|
|
||||||
@@ -46,6 +46,7 @@ Source13: ntpdate.service
|
|
||||||
Source14: ntp-wait.service
|
|
||||||
Source15: sntp.service
|
|
||||||
Source16: sntp.sysconfig
|
|
||||||
+Source17: ntp-cgcs.conf
|
|
||||||
|
|
||||||
# ntpbz #802
|
|
||||||
Patch1: ntp-4.2.6p1-sleep.patch
|
|
||||||
@@ -462,6 +463,7 @@ sed -e 's|VENDORZONE\.|%{vendorzone}|' \
|
|
||||||
touch -r %{SOURCE16} .%{_sysconfdir}/sysconfig/sntp
|
|
||||||
install -p -m600 %{SOURCE8} .%{_sysconfdir}/ntp/crypto/pw
|
|
||||||
install -p -m755 %{SOURCE10} .%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
|
|
||||||
+install -p -m644 %{SOURCE17} .%{_sysconfdir}/ntp.conf
|
|
||||||
install -p -m644 %{SOURCE12} .%{_unitdir}/ntpd.service
|
|
||||||
install -p -m644 %{SOURCE13} .%{_unitdir}/ntpdate.service
|
|
||||||
install -p -m644 %{SOURCE14} .%{_unitdir}/ntp-wait.service
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
From 20b00ae04480db94b1bb93ddc2cdbbf5cbafd001 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Scott Little <scott.little@windriver.com>
|
|
||||||
Date: Mon, 2 Oct 2017 16:29:01 -0400
|
|
||||||
Subject: [PATCH 2/3] WRS: ntpd-started-no-g-option.patch
|
|
||||||
|
|
||||||
---
|
|
||||||
SOURCES/ntpd.sysconfig | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/SOURCES/ntpd.sysconfig b/SOURCES/ntpd.sysconfig
|
|
||||||
index 49394c7..c783890 100644
|
|
||||||
--- a/SOURCES/ntpd.sysconfig
|
|
||||||
+++ b/SOURCES/ntpd.sysconfig
|
|
||||||
@@ -1,2 +1,2 @@
|
|
||||||
# Command line options for ntpd
|
|
||||||
-OPTIONS="-g"
|
|
||||||
+OPTIONS="-p /var/run/ntp.pid"
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm
|
|
|
@ -209,11 +209,6 @@ lighttpd-mod_mysql_vhost
|
||||||
# logrotate
|
# logrotate
|
||||||
logrotate
|
logrotate
|
||||||
|
|
||||||
# ntp
|
|
||||||
ntp
|
|
||||||
ntp-perl
|
|
||||||
ntpdate
|
|
||||||
|
|
||||||
# pam
|
# pam
|
||||||
pam
|
pam
|
||||||
|
|
||||||
|
@ -230,6 +225,7 @@ sudo
|
||||||
# config files
|
# config files
|
||||||
sudo-config
|
sudo-config
|
||||||
shadow-utils-config
|
shadow-utils-config
|
||||||
|
ntp-config
|
||||||
|
|
||||||
# net-snmp
|
# net-snmp
|
||||||
net-snmp-utils
|
net-snmp-utils
|
||||||
|
|
|
@ -27,7 +27,6 @@ python/python-voluptuous
|
||||||
networking/lldpd
|
networking/lldpd
|
||||||
logging/logrotate
|
logging/logrotate
|
||||||
utilities/nova-utils
|
utilities/nova-utils
|
||||||
base/ntp
|
|
||||||
base/pam
|
base/pam
|
||||||
security/shim-unsigned
|
security/shim-unsigned
|
||||||
security/shim-signed
|
security/shim-signed
|
||||||
|
@ -106,6 +105,7 @@ config-files/io-scheduler
|
||||||
config-files/sudo-config
|
config-files/sudo-config
|
||||||
config-files/memcached-custom
|
config-files/memcached-custom
|
||||||
config-files/shadow-utils-config
|
config-files/shadow-utils-config
|
||||||
|
config-files/ntp-config
|
||||||
tools/collector
|
tools/collector
|
||||||
grub/grubby
|
grub/grubby
|
||||||
utilities/platform-util
|
utilities/platform-util
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
COPY_LIST="files/*"
|
||||||
|
TIS_PATCH_VER=0
|
|
@ -0,0 +1,45 @@
|
||||||
|
Summary: StarlingX ntp Configuration File
|
||||||
|
Name: ntp-config
|
||||||
|
Version: 1.0
|
||||||
|
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: config-files
|
||||||
|
Packager: StarlingX
|
||||||
|
URL: unknown
|
||||||
|
|
||||||
|
Source0: LICENSE
|
||||||
|
Source1: ntpd.sysconfig
|
||||||
|
Source2: ntp.conf
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: ntp
|
||||||
|
Requires: ntpdate
|
||||||
|
Requires: ntp-perl
|
||||||
|
|
||||||
|
%define debug_package %{nil}
|
||||||
|
|
||||||
|
%description
|
||||||
|
StarlingX ntp configuration file
|
||||||
|
|
||||||
|
%install
|
||||||
|
install -d %{buildroot}%{_datadir}/starlingx
|
||||||
|
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/starlingx/ntpd.sysconfig
|
||||||
|
install -D -m644 %{SOURCE2} %{buildroot}%{_datadir}/starlingx/ntp.conf
|
||||||
|
|
||||||
|
%post
|
||||||
|
if [ $1 -eq 1 ] ; then
|
||||||
|
cp -f %{_datadir}/starlingx/ntpd.sysconfig %{_sysconfdir}/sysconfig/ntpd
|
||||||
|
cp -f %{_datadir}/starlingx/ntp.conf %{_sysconfdir}/ntp.conf
|
||||||
|
chmod 644 %{_sysconfdir}/sysconfig/ntpd
|
||||||
|
chmod 644 %{_sysconfdir}/ntp.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
%preun
|
||||||
|
|
||||||
|
%postun
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%license ../SOURCES/LICENSE
|
||||||
|
%{_datadir}/starlingx/ntpd.sysconfig
|
||||||
|
%{_datadir}/starlingx/ntp.conf
|
|
@ -0,0 +1,202 @@
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Command line options for ntpd
|
||||||
|
OPTIONS="-p /var/run/ntp.pid"
|
Loading…
Reference in New Issue