Attachment 148966 Details for Bug 230458 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 11.73 KB, created by Nathan Kinder on 2007-02-28 21:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-02-28 21:54:42 UTC

Size: 11.73 KB

patch

obsolete

>Index: ldap/docs/dirhlp/Makefile
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/Makefile,v
>retrieving revision 1.4
>diff -u -5 -t -w -r1.4 Makefile
>--- ldap/docs/dirhlp/Makefile	5 Apr 2005 00:57:43 -0000	1.4
>+++ ldap/docs/dirhlp/Makefile	28 Feb 2007 21:52:38 -0000
>@@ -1,13 +1,44 @@
>+# BEGIN COPYRIGHT BLOCK
>+# This Program is free software; you can redistribute it and/or modify it under
>+# the terms of the GNU General Public License as published by the Free Software
>+# Foundation; version 2 of the License.
> #
>-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
>-# license terms.
>-# Copyright 2001 Sun Microsystems, Inc.
>-# Portions copyright 1999, 2002-2003 Netscape Communications Corporation.
>-# All rights reserved.
>+# This Program is distributed in the hope that it will be useful, but WITHOUT
>+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
>+# 
>+# You should have received a copy of the GNU General Public License along with
>+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
>+# Place, Suite 330, Boston, MA 02111-1307 USA.
>+# 
>+# In addition, as a special exception, Red Hat, Inc. gives You the additional
>+# right to link the code of this Program with code not covered under the GNU
>+# General Public License ("Non-GPL Code") and to distribute linked combinations
>+# including the two, subject to the limitations in this paragraph. Non-GPL Code
>+# permitted under this exception must only link to the code of this Program
>+# through those well defined interfaces identified in the file named EXCEPTION
>+# found in the source code files (the "Approved Interfaces"). The files of
>+# Non-GPL Code may instantiate templates or use macros or inline functions from
>+# the Approved Interfaces without causing the resulting work to be covered by
>+# the GNU General Public License. Only Red Hat, Inc. may make changes or
>+# additions to the list of Approved Interfaces. You must obey the GNU General
>+# Public License in all respects for all of the Program code and other code used
>+# in conjunction with the Program except the Non-GPL Code covered by this
>+# exception. If you modify this file, you may extend this exception to your
>+# version of the file, but you are not obligated to do so. If you do not wish to
>+# provide this exception without modification, you must delete this exception
>+# statement from your version and license this file solely under the GPL without
>+# exception. 
> #
> # 
>+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
>+# Copyright (C) 2007 Red Hat, Inc.
>+# All rights reserved.
>+# END COPYRIGHT BLOCK
>+
>+# 
> # GNU Makefile for Directory Server Console Help 
> #
> 
> BUILD_ROOT = ../../..
> LDAP_SRC = ../..
>Index: ldap/docs/dirhlp/index.map
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/index.map,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -w -r1.1.1.1 index.map
>--- ldap/docs/dirhlp/index.map	21 Jan 2005 00:40:49 -0000	1.1.1.1
>+++ ldap/docs/dirhlp/index.map	28 Feb 2007 21:52:38 -0000
>@@ -1,12 +1,43 @@
>-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
>-; license terms. Copyright 2001 Sun Microsystems, Inc. 
>-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
>-; All rights reserved. 
>+; --- BEGIN COPYRIGHT BLOCK ---
>+; This Program is free software; you can redistribute it and/or modify it under
>+; the terms of the GNU General Public License as published by the Free Software
>+; Foundation; version 2 of the License.
>+; 
>+; This Program is distributed in the hope that it will be useful, but WITHOUT
>+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
>+; 
>+; You should have received a copy of the GNU General Public License along with
>+; this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
>+; Place, Suite 330, Boston, MA 02111-1307 USA.
>+; 
>+; In addition, as a special exception, Red Hat, Inc. gives You the additional
>+; right to link the code of this Program with code not covered under the GNU
>+; General Public License ("Non-GPL Code") and to distribute linked combinations
>+; including the two, subject to the limitations in this paragraph. Non-GPL Code
>+; permitted under this exception must only link to the code of this Program
>+; through those well defined interfaces identified in the file named EXCEPTION
>+; found in the source code files (the "Approved Interfaces"). The files of
>+; Non-GPL Code may instantiate templates or use macros or inline functions from
>+; the Approved Interfaces without causing the resulting work to be covered by
>+; the GNU General Public License. Only Red Hat, Inc. may make changes or
>+; additions to the list of Approved Interfaces. You must obey the GNU General
>+; Public License in all respects for all of the Program code and other code used
>+; in conjunction with the Program except the Non-GPL Code covered by this
>+; exception. If you modify this file, you may extend this exception to your
>+; version of the file, but you are not obligated to do so. If you do not wish to
>+; provide this exception without modification, you must delete this exception
>+; statement from your version and license this file solely under the GPL without
>+; exception. 
> ;
>-;----------------------------------------------------------------------
>-; Last update: 22 October 2001 by Tech Pubs
>+; 
>+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
>+; Copyright (C) 2007 Red Hat, Inc.
>+; All rights reserved.
>+; --- END COPYRIGHT BLOCK ---
>+
> ;-------------------------------------------MAPPINGS
> ; UI Reference Token = help/filename.htm
> ;-------------------------------------------PROGRAMS
> ;
> ;MENU BAR
>Index: ldap/docs/dirhlp/tokens.map
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/tokens.map,v
>retrieving revision 1.2
>diff -u -5 -t -w -r1.2 tokens.map
>--- ldap/docs/dirhlp/tokens.map	5 Apr 2005 00:57:43 -0000	1.2
>+++ ldap/docs/dirhlp/tokens.map	28 Feb 2007 21:52:38 -0000
>@@ -1,13 +1,43 @@
>-;-------------------------------------------------------------------------
>-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
>-; license terms. Copyright © 2001 Sun Microsystems, Inc. 
>-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
>-; All rights reserved. 
>+; --- BEGIN COPYRIGHT BLOCK ---
>+; This Program is free software; you can redistribute it and/or modify it under
>+; the terms of the GNU General Public License as published by the Free Software
>+; Foundation; version 2 of the License.
>+;
>+; This Program is distributed in the hope that it will be useful, but WITHOUT
>+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
>+;
>+; You should have received a copy of the GNU General Public License along with
>+; this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
>+; Place, Suite 330, Boston, MA 02111-1307 USA.
>+;
>+; In addition, as a special exception, Red Hat, Inc. gives You the additional
>+; right to link the code of this Program with code not covered under the GNU
>+; General Public License ("Non-GPL Code") and to distribute linked combinations
>+; including the two, subject to the limitations in this paragraph. Non-GPL Code
>+; permitted under this exception must only link to the code of this Program
>+; through those well defined interfaces identified in the file named EXCEPTION
>+; found in the source code files (the "Approved Interfaces"). The files of
>+; Non-GPL Code may instantiate templates or use macros or inline functions from
>+; the Approved Interfaces without causing the resulting work to be covered by
>+; the GNU General Public License. Only Red Hat, Inc. may make changes or
>+; additions to the list of Approved Interfaces. You must obey the GNU General
>+; Public License in all respects for all of the Program code and other code used
>+; in conjunction with the Program except the Non-GPL Code covered by this
>+; exception. If you modify this file, you may extend this exception to your
>+; version of the file, but you are not obligated to do so. If you do not wish to
>+; provide this exception without modification, you must delete this exception
>+; statement from your version and license this file solely under the GPL without
>+; exception.
> ;
>-;-------------------------------------------------------------------------
>-; Last update: 10 July 2003 by Tech Pubs
>+;
>+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
>+; Copyright (C) 2007 Red Hat, Inc.
>+; All rights reserved.
>+; --- END COPYRIGHT BLOCK ---
>+
> ;-------------------------------------------MAPPINGS
> ; UI Reference Token = help/filename.htm
> ;-------------------------------------------PROGRAMS
> ;
> ;MENU BAR
>Index: ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl,v
>retrieving revision 1.1
>diff -u -5 -t -w -r1.1 dbgen.pl
>--- ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl	6 Jan 2006 00:53:29 -0000	1.1
>+++ ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl	28 Feb 2007 21:52:39 -0000
>@@ -1,10 +1,44 @@
> #!/usr/bin/perl
>+# BEGIN COPYRIGHT BLOCK
>+# This Program is free software; you can redistribute it and/or modify it under
>+# the terms of the GNU General Public License as published by the Free Software
>+# Foundation; version 2 of the License.
>+# 
>+# This Program is distributed in the hope that it will be useful, but WITHOUT
>+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
>+# 
>+# You should have received a copy of the GNU General Public License along with
>+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
>+# Place, Suite 330, Boston, MA 02111-1307 USA.
>+# 
>+# In addition, as a special exception, Red Hat, Inc. gives You the additional
>+# right to link the code of this Program with code not covered under the GNU
>+# General Public License ("Non-GPL Code") and to distribute linked combinations
>+# including the two, subject to the limitations in this paragraph. Non-GPL Code
>+# permitted under this exception must only link to the code of this Program
>+# through those well defined interfaces identified in the file named EXCEPTION
>+# found in the source code files (the "Approved Interfaces"). The files of
>+# Non-GPL Code may instantiate templates or use macros or inline functions from
>+# the Approved Interfaces without causing the resulting work to be covered by
>+# the GNU General Public License. Only Red Hat, Inc. may make changes or
>+# additions to the list of Approved Interfaces. You must obey the GNU General
>+# Public License in all respects for all of the Program code and other code used
>+# in conjunction with the Program except the Non-GPL Code covered by this
>+# exception. If you modify this file, you may extend this exception to your
>+# version of the file, but you are not obligated to do so. If you do not wish to
>+# provide this exception without modification, you must delete this exception
>+# statement from your version and license this file solely under the GPL without
>+# exception. 
>+# 
>+# 
>+# Copyright (C) 2007 Red Hat, Inc.
>+# All rights reserved.
>+# END COPYRIGHT BLOCK
> 
> #------------------------------------------------------------------------
>-## Copyright 1997 - Netscape Communications Corporation
>-##
> ## NAME
> ##  dbgen
> ##
> ## DESCRIPTION
> ##  Random LDIF database creator, specially modified from DirectoryMark

Actions: View | Diff

Attachments on bug 230458: 148966 | 148971