From: André Malo <nd@apache.org>
Date: Sat, 7 Feb 2004 18:46:46 +0000 (+0000)
Subject: apply Apache License, Version 2.0
X-Git-Tag: 2.0.49~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c113e2f91f4c1a13add83daa1665da903adca970;p=thirdparty%2Fapache%2Fhttpd.git

apply Apache License, Version 2.0


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102545 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/rpm/httpd.init b/build/rpm/httpd.init
index d6c3f2564ee..8ff4a6be088 100755
--- a/build/rpm/httpd.init
+++ b/build/rpm/httpd.init
@@ -1,5 +1,20 @@
 #!/bin/bash
 #
+# Copyright 2003-2004 Apache Software Foundation
+#
+# 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.
+#
+#
 # Startup script for the Apache Web Server
 #
 # chkconfig: - 85 15
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 7651443e2c8..ae1ebfcec0e 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -14,7 +14,7 @@ Release: APACHE_RELEASE
 URL: http://httpd.apache.org/
 Vendor: Apache Software Foundation
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-License: Apache Software License
+License: Apache License, Version 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: openldap-devel, db3-devel, expat-devel, findutils, perl, pkgconfig
diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk
index f83ad5b0894..85a81bbfa8f 100644
--- a/build/win32/win32ver.awk
+++ b/build/win32/win32ver.awk
@@ -1,3 +1,17 @@
+# Copyright 2001-2004 Apache Software Foundation
+#
+# 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.
+
 BEGIN {
 
   # ff bits: 1(debug), 2(prerelease), 4(patched), 8(vendor) and 32(special)
@@ -86,13 +100,14 @@ BEGIN {
   print "    BLOCK \"040904b0\"";
   print "    BEGIN";
   print "      VALUE \"Comments\", \"All rights reserved.  The license "\
-        "is available at <http://www.apache.org/LICENSE.txt>.  The Apache "\
-        "HTTP Server project pages are at <http://httpd.apache.org/>.\\0\"";
+        "is available at <http://www.apache.org/licenses/LICENSE-2.0.txt>. "\
+        "The Apache HTTP Server project pages are at "\
+        "<http://httpd.apache.org/>.\\0\"";
   print "      VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
   print "      VALUE \"FileDescription\", \"" desc "\\0\"";
   print "      VALUE \"FileVersion\", \"" ver "\\0\"";
   print "      VALUE \"InternalName\", \"" file "\\0\"";
-  print "      VALUE \"LegalCopyright\", \"Copyright © 2000-2002 "\
+  print "      VALUE \"LegalCopyright\", \"Copyright © 2000-2004 "\
         "The Apache Software Foundation.\\0\"";
   print "      VALUE \"OriginalFilename\", \"" file ".exe\\0\"";
   if (vendor) {