httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src Configure buildmark.c
Date Mon, 15 Jan 2001 16:30:32 GMT
martin      01/01/15 08:30:32

  Modified:    src      Configure buildmark.c
  Log:
  Change everything to The Apache Software License 1.1
  
  Revision  Changes    Path
  1.413     +44 -39    apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.412
  retrieving revision 1.413
  diff -u -u -r1.412 -r1.413
  --- Configure	2000/11/28 15:49:35	1.412
  +++ Configure	2001/01/15 16:30:30	1.413
  @@ -1,58 +1,63 @@
   #!/bin/sh
   ## ====================================================================
  -## Copyright (c) 1995-2000 The Apache Group.  All rights reserved.
  +## The Apache Software License, Version 1.1
   ##
  +## Copyright (c) 2000 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. 
  +##    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. All advertising materials mentioning features or use of this
  -##    software must display the following acknowledgment:
  -##    "This product includes software developed by the Apache Group
  -##    for use in the Apache HTTP server project (http://httpd.apache.org/)."
  -##
  -## 4. The names "Apache Server" and "Apache Group" 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 names without prior written
  -##    permission of the Apache Group.
  -##
  -## 6. Redistributions of any form whatsoever must retain the following
  -##    acknowledgment:
  -##    "This product includes software developed by the Apache Group
  -##    for use in the Apache HTTP server project (http://httpd.apache.org/)."
  -##
  -## THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP OR
  +## 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.
  +## 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 Group and was originally based
  -## on public domain software written at the National Center for
  -## Supercomputing Applications, University of Illinois, Urbana-Champaign.
  -## For more information on the Apache Group and the Apache HTTP server
  -## project, please see <http://www.apache.org/>.
  +## 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.
  +##
  +
  +
   
   # Uses 6 supplemental scripts located in ./helpers:
   #	CutRule: Determines the value for a specified Rule
  @@ -844,7 +849,7 @@
   	uname -X
   	echo Ideally, read the file PORTING, do what it says, and send the
   	echo resulting patches to The Apache Group by filling out a report
  -	echo form at http://www.apache.org/bug_report.html. If you don\'t 
  +	echo form at http://bugs.apache.org/.  If you don\'t 
   	echo wish to do the port yourself, please submit this output rather 
   	echo than the patches. Thank you.
   	echo
  @@ -1408,7 +1413,7 @@
   		    echo "** for creating shared objects from your Perl installation."
   		    echo "** If they actually work, please send the following information"
   		    echo "** for inclusion into later releases to new-httpd@apache.org or make"
  -		    echo "** a suggestion report at http://www.apache.org/bug_report.html:"
  +		    echo "** a suggestion report at http://bugs.apache.org/:"
   		    echo "**     PLATFORM=$PLAT"
   		    echo "**     CFLAGS_SHLIB=$CFLAGS_SHLIB"
   		    echo "**     LDFLAGS_SHLIB=$LDFLAGS_SHLIB"
  
  
  
  1.13      +39 -38    apache-1.3/src/buildmark.c
  
  Index: buildmark.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/buildmark.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- buildmark.c	2000/11/14 09:56:51	1.12
  +++ buildmark.c	2001/01/15 16:30:30	1.13
  @@ -1,58 +1,59 @@
   /* ====================================================================
  - * Copyright (c) 1995-2000 The Apache Group.  All rights reserved.
  + * The Apache Software License, Version 1.1
    *
  + * Copyright (c) 2000 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. 
  + *    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. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Apache Group
  - *    for use in the Apache HTTP server project (http://httpd.apache.org/)."
  - *
  - * 4. The names "Apache Server" and "Apache Group" 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 names without prior written
  - *    permission of the Apache Group.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Apache Group
  - *    for use in the Apache HTTP server project (http://httpd.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP OR
  + * 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.
  + * 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 Group and was originally based
  - * on public domain software written at the National Center for
  - * Supercomputing Applications, University of Illinois, Urbana-Champaign.
  - * For more information on the Apache Group and the Apache HTTP server
  - * project, please see <http://www.apache.org/>.
  - *
  + * 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.
    */
   
   #include "ap_config.h"
  
  
  

Mime
View raw message