Skip to content

Commit 748c9d8

Browse files
bimimicahbimimicah
committedMar 7, 2025
Standardize Copyright/Licensing information for consistency and to assist packagers with the legal obligation to distribute the LICENSE text with binary packages, not just source:
- mod_authz_unixgroup changes: - add Apache License 2.0 standard header (+ mini header for LICENSE) - add SPDX License Identifier for automated processing by anyone who uses our code - mod_authnz_external changes: - improvise our own standard header for Apache License 1.0 - move bulk of license text to LICENSE and include it in the makefile - add SPDX License Identifier for automated processing by anyone who uses our code
1 parent ef667c0 commit 748c9d8

File tree

5 files changed

+82
-53
lines changed

5 files changed

+82
-53
lines changed
 

‎mod_authnz_external/LICENSE

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
====================================================================
2+
Copyright (c) 1995 The Apache Group/Apache Software Foundation
3+
(http://www.apache.org/). All rights reserved.
4+
Copyright (c) Nathan Neulinger, Tyler Allison, Jan Wolter and
5+
other contributors. Please see CONTRIBUTORS.
6+
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+
11+
1. Redistributions of source code must retain the above copyright
12+
notice, this list of conditions and the following disclaimer.
13+
14+
2. Redistributions in binary form must reproduce the above copyright
15+
notice, this list of conditions and the following disclaimer in
16+
the documentation and/or other materials provided with the
17+
distribution.
18+
19+
3. All advertising materials mentioning features or use of this
20+
software must display the following acknowledgment:
21+
"This product includes software developed by the Apache Group
22+
for use in the Apache HTTP server project (http://www.apache.org/)."
23+
24+
4. The names "Apache Server" and "Apache Group" must not be used to
25+
endorse or promote products derived from this software without
26+
prior written permission.
27+
28+
5. Redistributions of any form whatsoever must retain the following
29+
acknowledgment:
30+
"This product includes software developed by the Apache Group
31+
for use in the Apache HTTP server project (http://www.apache.org/)."
32+
33+
THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
34+
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
35+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
36+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
37+
IT'S CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
38+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
39+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
40+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
41+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
42+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
43+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
44+
OF THE POSSIBILITY OF SUCH DAMAGE.
45+
====================================================================
46+
47+
This software consists of voluntary contributions made by many
48+
individuals on behalf of the Apache Group and was originally based
49+
on public domain software written at the National Center for
50+
Supercomputing Applications, University of Illinois, Urbana-Champaign.
51+
For more information on the Apache Group and the Apache HTTP server
52+
project, please see <http://www.apache.org/>.

‎mod_authnz_external/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#APXS=apxs2
33
APXS=apxs
44

5-
TAR= README INSTALL INSTALL.HARDCODE CHANGES CONTRIBUTORS AUTHENTICATORS UPGRADE TODO \
5+
TAR= README INSTALL INSTALL.HARDCODE CHANGES LICENSE CONTRIBUTORS AUTHENTICATORS UPGRADE TODO \
66
mod_authnz_external.c test/* Makefile
77

88
.DEFAULT_GOAL:= build

‎mod_authnz_external/mod_authnz_external.c

+7-51
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,11 @@
1-
/* ====================================================================
2-
* Copyright (c) 1995 The Apache Group. All rights reserved.
3-
* Copyright (c) Nathan Neulinger, Tyler Allison, Jan Wolter and
4-
* other contributors. Please see CONTRIBUTORS.
5-
*
6-
* Redistribution and use in source and binary forms, with or without
7-
* modification, are permitted provided that the following conditions
8-
* are met:
9-
*
10-
* 1. Redistributions of source code must retain the above copyright
11-
* notice, this list of conditions and the following disclaimer.
12-
*
13-
* 2. Redistributions in binary form must reproduce the above copyright
14-
* notice, this list of conditions and the following disclaimer in
15-
* the documentation and/or other materials provided with the
16-
* distribution.
17-
*
18-
* 3. All advertising materials mentioning features or use of this
19-
* software must display the following acknowledgment:
20-
* "This product includes software developed by the Apache Group
21-
* for use in the Apache HTTP server project (http://www.apache.org/)."
22-
*
23-
* 4. The names "Apache Server" and "Apache Group" must not be used to
24-
* endorse or promote products derived from this software without
25-
* prior written permission.
26-
*
27-
* 5. Redistributions of any form whatsoever must retain the following
28-
* acknowledgment:
29-
* "This product includes software developed by the Apache Group
30-
* for use in the Apache HTTP server project (http://www.apache.org/)."
31-
*
32-
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
33-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
34-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
35-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
36-
* IT'S CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
37-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
38-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
39-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
40-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
41-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
42-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
43-
* OF THE POSSIBILITY OF SUCH DAMAGE.
1+
/* SPDX-License-Identifier: Apache-1.0
2+
* ====================================================================
3+
* Copyright (c) 1995 The Apache Group/Apache Software Foundation
4+
* (http://www.apache.org/). All rights reserved.
5+
* Copyright (c) Nathan Neulinger, Tyler Allison, Jan Wolter, and
6+
* other contributors.
7+
* Please see LICENSE and CONTRIBUTORS for more information.
448
* ====================================================================
45-
*
46-
* This software consists of voluntary contributions made by many
47-
* individuals on behalf of the Apache Group and was originally based
48-
* on public domain software written at the National Center for
49-
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
50-
* For more information on the Apache Group and the Apache HTTP server
51-
* project, please see <http://www.apache.org/>.
52-
*
539
*/
5410

5511

‎mod_authz_unixgroup/LICENSE

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Copyright 2008 Jan Wolter and other contributors. Please see CONTRIBUTORS.
2+
Licensed under the Apache License, Version 2.0 (the "License");
3+
you may not use these files except in compliance with this License.
14

25
Apache License
36
Version 2.0, January 2004

‎mod_authz_unixgroup/mod_authz_unixgroup.c

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
/* Copyright 2008 Jan Wolter and other contributors. Please see LICENSE and CONTRIBUTORS */
1+
/* SPDX-License-Identifier: Apache-2.0
2+
* ====================================================================
3+
* Copyright 2008 Jan Wolter and other contributors.
4+
* Please see LICENSE and CONTRIBUTORS for more information.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
* ====================================================================
18+
*/
19+
220

321
#include "apr_lib.h"
422

0 commit comments

Comments
 (0)