You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/02/06 22:48:40 UTC
cvs commit: httpd-2.0 NOTICE LICENSE buildconf
nd 2004/02/06 13:48:40
Modified: . LICENSE buildconf
Added: . NOTICE
Log:
begin relicensing httpd-2.1 to Apache License, Version 2.0
Revision Changes Path
1.10 +12 -56 httpd-2.0/LICENSE
Index: LICENSE
===================================================================
RCS file: /home/cvs/httpd-2.0/LICENSE,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- LICENSE 1 Jan 2004 13:26:16 -0000 1.9
+++ LICENSE 6 Feb 2004 21:48:40 -0000 1.10
@@ -1,61 +1,17 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/* Copyright 2000-2004 Apache Software Foundation
*
- * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
+ * 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.
*/
-
APACHE HTTP SERVER SUBCOMPONENTS:
1.41 +13 -51 httpd-2.0/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/httpd-2.0/buildconf,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -u -r1.40 -r1.41
--- buildconf 5 Feb 2004 09:11:45 -0000 1.40
+++ buildconf 6 Feb 2004 21:48:40 -0000 1.41
@@ -1,58 +1,20 @@
#!/bin/sh
-# ====================================================================
-# The Apache Software License, Version 1.1
#
-# Copyright (c) 2000-2004 The Apache Software Foundation. All rights
-# reserved.
+# Copyright 2000-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.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 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.
-#
-# 3. The end-user documentation included with the redistribution,
-# if any, must include the following acknowledgment:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself,
-# if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-# not be used to endorse or promote products derived from this
-# software without prior written permission. For written
-# permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-# nor may "Apache" appear in their name, without prior written
-# permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
-# ITS 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.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
#
-
# buildconf: Build the support scripts needed to compile from a
# checked-out version of the source code.
1.1 httpd-2.0/NOTICE
Index: NOTICE
===================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at the National Center
for Supercomputing Applications (NCSA) at the University of
Illinois at Urbana-Champaign.
This software contains code derived from the RSA Data Security
Inc. MD5 Message-Digest Algorithm, including various
modifications by Spyglass Inc., Carnegie Mellon University, and
Bell Communications Research, Inc (Bellcore).
Regular expression support is provided by the PCRE library package,
which is open source software, written by Philip Hazel, and copyright
by the University of Cambridge, England. The original software is
available from
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
Re: cvs commit: httpd-2.0 NOTICE LICENSE buildconf
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Friday, February 6, 2004 10:55 PM +0100 André Malo <nd...@perlig.de>
wrote:
> Doh! I'll fix it :-)
>
> Thanks, nd
Thank *you* for taking this on! ;-) -- justin
Re: cvs commit: httpd-2.0 NOTICE LICENSE buildconf
Posted by André Malo <nd...@perlig.de>.
* Justin Erenkrantz <ju...@erenkrantz.com> wrote:
> --On Friday, February 6, 2004 9:48 PM +0000 nd@apache.org wrote:
>
> > nd 2004/02/06 13:48:40
> >
> > Modified: . LICENSE buildconf
> > Added: . NOTICE
> > Log:
> > begin relicensing httpd-2.1 to Apache License, Version 2.0
> >
> > Revision Changes Path
> > 1.10 +12 -56 httpd-2.0/LICENSE
>
> If I understand <http://www.apache.org/dev/apply-license.html> correctly,
> isn't LICENSE supposed to be the *full* license not the boilerplate?
>
> Or, am I missing something? -- justin
Doh! I'll fix it :-)
Thanks, nd
Re: cvs commit: httpd-2.0 NOTICE LICENSE buildconf
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Friday, February 6, 2004 9:48 PM +0000 nd@apache.org wrote:
> nd 2004/02/06 13:48:40
>
> Modified: . LICENSE buildconf
> Added: . NOTICE
> Log:
> begin relicensing httpd-2.1 to Apache License, Version 2.0
>
> Revision Changes Path
> 1.10 +12 -56 httpd-2.0/LICENSE
If I understand <http://www.apache.org/dev/apply-license.html> correctly,
isn't LICENSE supposed to be the *full* license not the boilerplate?
Or, am I missing something? -- justin