Skip to content

Commit 9783428

Browse files
ntprelengntpreleng
committed
cleanup github-specific files
bk: 676f90eaqY2pqiwUfyGBCRWUyUQsLg
1 parent a47b7fa commit 9783428

File tree

4 files changed

+28
-50
lines changed

4 files changed

+28
-50
lines changed

‎.well-known/funding-manifest-urls‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://www.nwtime.org/funding.json

‎COPYRIGHT.md‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
# NTP Copyright Notice
2-
__________________________________________________________________
3-
4-
The following copyright notice applies to all files collectively called
5-
The Network Time Protocol Version 4 Distribution. Unless specifically
6-
declared otherwise in an individual file, this entire notice applies as
7-
if the text was explicitly included in the file.
8-
9-
See the LICENSE file for licensing information.
10-
11-
***********************************************************************
12-
* *
13-
* Copyright (c) University of Delaware 1992-2015 *
14-
* *
15-
* All Rights Reserved *
16-
***********************************************************************
17-
18-
Content starting in 2011 from Harlan Stenn, Juergen Perlinger, Dave
19-
Hart, Danny Mayer, Martin Burnicki, and possibly others is:
20-
***********************************************************************
21-
* *
22-
* Copyright (c) Network Time Foundation 2011-2024 *
23-
* *
24-
* All Rights Reserved *
25-
* *
26-
***********************************************************************
272

3+
The following copyright notice applies to all files collectively called The Network Time Protocol Version 4 Distribution. Unless specifically declared otherwise in an individual file, this entire notice applies as if the text was explicitly included in the file.
4+
5+
See the [LICENSE](LICENSE.md) file for licensing information.
6+
7+
***
8+
9+
Copyright (c) University of Delaware 1992-2015
10+
11+
All Rights Reserved
12+
13+
***
14+
15+
Content starting in 2011 from Harlan Stenn, Juergen Perlinger, Dave Hart, Danny Mayer, Martin Burnicki, and possibly others is:
16+
17+
Copyright (c) Network Time Foundation 2011-2024
18+
19+
All Rights Reserved
20+
21+
***

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
* [Bug 3960] Remove duplicate ntp.conf.def content, reported by
33
Ulrich Windl. <stenn@ntp.org>
4+
* cleanup github-specific files. <stenn@ntp.org>
45
* Add COPYRIGHT.md and LICENSE.md. <stenn@ntp.org>
56
* Makefile.am: Fix distcheck problem with check-local. <stenn@ntp.org>
67
* Add .github to the top-level tree. <dlavigne@nwtime.org>

‎LICENSE.md‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
# NTP License
22

3-
See the COPYRIGHT file for the copyright notice.
3+
See the [COPYRIGHT](COPYRIGHT.md) file for the copyright notice.
44

55
All Rights Reserved
66

7-
Redistribution and use in source and binary forms, with or without
8-
modification, are permitted provided that the following conditions
9-
are met:
10-
1. Redistributions of source code must retain the above copyright
11-
notice, this list of conditions and the following disclaimer.
12-
2. Redistributions in binary form must reproduce the above
13-
copyright notice, this list of conditions and the following
14-
disclaimer in the documentation and/or other materials provided
15-
with the distribution.
7+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
168

17-
THIS SOFTWARE IS PROVIDED BY THE AUTHORS \`\`AS IS'' AND ANY EXPRESS
18-
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20-
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
21-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
23-
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
24-
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25-
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
27-
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
28-
DAMAGE.
9+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
2911

30-
“The University of Delaware” must not be used in advertising or
31-
publicity pertaining to the distribution or use of the software
32-
without specific, written prior permission.
12+
THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13+
14+
"The University of Delaware" must not be used in advertising or publicity pertaining to the distribution or use of the software without specific, written prior permission.

0 commit comments

Comments
 (0)