This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
master - misc: cleanup copyright.... again
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 21 Oct 2008 09:34:35 +0000 (UTC)
- Subject: master - misc: cleanup copyright.... again
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6d2b43394557bdafd69cf9289fcc80ff48ab8d07
Commit: 6d2b43394557bdafd69cf9289fcc80ff48ab8d07
Parent: 334cb0157b6dda81ae199be327158cb22a849168
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Tue Oct 21 11:33:11 2008 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Oct 21 11:33:11 2008 +0200
misc: cleanup copyright.... again
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
config/plugins/ldap/configldap.c | 11 -----------
config/tools/ldap/confdb2ldif.c | 9 ---------
doc/COPYRIGHT | 9 ++++++---
fence/agents/bladecenter/Makefile | 13 -------------
fence/agents/bladecenter/fence_bladecenter.py | 3 +--
fence/agents/vmware/fence_vmware.py | 3 +--
fence/man/fence_alom.8 | 6 ------
fence/man/fence_vmware.8 | 6 ------
gfs-kernel/src/gfs/lm_interface.h | 9 ---------
gfs-kernel/src/gfs/lock_dlm.h | 9 ---------
gfs-kernel/src/gfs/lock_dlm_lock.c | 9 ---------
gfs-kernel/src/gfs/lock_dlm_main.c | 9 ---------
gfs-kernel/src/gfs/lock_dlm_mount.c | 9 ---------
gfs-kernel/src/gfs/lock_dlm_sysfs.c | 9 ---------
gfs-kernel/src/gfs/lock_dlm_thread.c | 9 ---------
gfs-kernel/src/gfs/lock_nolock_main.c | 9 ---------
gfs-kernel/src/gfs/locking.c | 9 ---------
gfs2/edit/hexedit.h | 4 +++-
group/gfs_controld/cpg-new.c | 12 ------------
group/gfs_controld/crc.c | 12 ------------
20 files changed, 11 insertions(+), 158 deletions(-)
diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c
index 1b78079..11a5250 100644
--- a/config/plugins/ldap/configldap.c
+++ b/config/plugins/ldap/configldap.c
@@ -1,14 +1,3 @@
-/******************************************************************************
-*******************************************************************************
-**
-** Copyright (C) 2008 Red Hat, Inc. All rights reserved.
-**
-** This copyrighted material is made available to anyone wishing to use,
-** modify, copy, or redistribute it subject to the terms and conditions
-** of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/config/tools/ldap/confdb2ldif.c b/config/tools/ldap/confdb2ldif.c
index 4bd00a0..0606d7e 100644
--- a/config/tools/ldap/confdb2ldif.c
+++ b/config/tools/ldap/confdb2ldif.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2008 Red Hat Inc
- *
- * All rights reserved.
- *
- * Author: Christine Caulfield <ccaulfie@redhat.com>
- *
- */
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index 18e37a3..3326e08 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -5,6 +5,12 @@ Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
Exceptions:
+contrib/askant:
+ Copyright (C) 2008 Andrew Price <andy@andrewprice.me.uk>
+
+contrib/libaislock:
+ Contributed by Stanley Wang of Intel.
+
cman/qdisk/crc32.c:
Copyright (C) 2000 Bryan Call <bc at fodder.org>
Modified by Lon H. Hohberger <lhh at redhat.com>
@@ -38,9 +44,6 @@ fence/agents/ifmib/fence_ifmib.py:
fence/agents/ipmilan/expect.{c,h}:
Copyright (C) 2000 Alan Robertson <alanr at unix.sh>
-fence/agents/vmware/fence_vmware.pl:
- Author: Zach Lowry <zach at zachlowry.net>
-
fence/agents/xvm/tcp.c:
Copyright (C) 2000 Mission Critical Linux
Copyright (C) 2002-2008 Red Hat, Inc. All rights reserved.
diff --git a/fence/agents/bladecenter/Makefile b/fence/agents/bladecenter/Makefile
index e0700c8..a123a15 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -1,16 +1,3 @@
-###############################################################################
-###############################################################################
-##
-## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-##
-## This copyrighted material is made available to anyone wishing to use,
-## modify, copy, or redistribute it subject to the terms and conditions
-## of the GNU General Public License v.2.
-##
-###############################################################################
-###############################################################################
-
include ../../../make/defines.mk
TARGET= fence_bladecenter
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
index 2707054..4144b63 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -1,7 +1,6 @@
#!/usr/bin/python
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+#####
##
## The Following Agent Has Been Tested On:
##
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index e9a061e..887b3bb 100755
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -1,7 +1,6 @@
#!/usr/bin/python
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+#####
##
## The Following Agent Has Been Tested On VMware ESX 3.5 and VMware Server 1.0.7
##
diff --git a/fence/man/fence_alom.8 b/fence/man/fence_alom.8
index 3f3f5f7..d569292 100644
--- a/fence/man/fence_alom.8
+++ b/fence/man/fence_alom.8
@@ -1,9 +1,3 @@
-.\" Copyright (C) 2008 Red Hat, Inc. All rights reserved.
-.\"
-.\" This copyrighted material is made available to anyone wishing to use,
-.\" modify, copy, or redistribute it subject to the terms and conditions
-.\" of the GNU General Public License v.2.
-
.TH fence_vmware 8
.SH NAME
diff --git a/fence/man/fence_vmware.8 b/fence/man/fence_vmware.8
index 31ea5f8..8c9e4c7 100644
--- a/fence/man/fence_vmware.8
+++ b/fence/man/fence_vmware.8
@@ -1,9 +1,3 @@
-.\" Copyright (C) 2008 Red Hat, Inc. All rights reserved.
-.\"
-.\" This copyrighted material is made available to anyone wishing to use,
-.\" modify, copy, or redistribute it subject to the terms and conditions
-.\" of the GNU General Public License v.2.
-
.TH fence_vmware 8
.SH NAME
diff --git a/gfs-kernel/src/gfs/lm_interface.h b/gfs-kernel/src/gfs/lm_interface.h
index f1d17ec..fd07379 100644
--- a/gfs-kernel/src/gfs/lm_interface.h
+++ b/gfs-kernel/src/gfs/lm_interface.h
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#ifndef __LM_INTERFACE_DOT_H__
#define __LM_INTERFACE_DOT_H__
diff --git a/gfs-kernel/src/gfs/lock_dlm.h b/gfs-kernel/src/gfs/lock_dlm.h
index 624614e..15908cd 100644
--- a/gfs-kernel/src/gfs/lock_dlm.h
+++ b/gfs-kernel/src/gfs/lock_dlm.h
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#ifndef LOCK_DLM_DOT_H
#define LOCK_DLM_DOT_H
diff --git a/gfs-kernel/src/gfs/lock_dlm_lock.c b/gfs-kernel/src/gfs/lock_dlm_lock.c
index bbc7308..65ef0bd 100644
--- a/gfs-kernel/src/gfs/lock_dlm_lock.c
+++ b/gfs-kernel/src/gfs/lock_dlm_lock.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include "lock_dlm.h"
static char junk_lvb[GDLM_LVB_SIZE];
diff --git a/gfs-kernel/src/gfs/lock_dlm_main.c b/gfs-kernel/src/gfs/lock_dlm_main.c
index e019177..be7c625 100644
--- a/gfs-kernel/src/gfs/lock_dlm_main.c
+++ b/gfs-kernel/src/gfs/lock_dlm_main.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include <linux/init.h>
#include "lock_dlm.h"
diff --git a/gfs-kernel/src/gfs/lock_dlm_mount.c b/gfs-kernel/src/gfs/lock_dlm_mount.c
index ed08bc2..de7cc2a 100644
--- a/gfs-kernel/src/gfs/lock_dlm_mount.c
+++ b/gfs-kernel/src/gfs/lock_dlm_mount.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include "lock_dlm.h"
const struct lm_lockops gdlm_ops;
diff --git a/gfs-kernel/src/gfs/lock_dlm_sysfs.c b/gfs-kernel/src/gfs/lock_dlm_sysfs.c
index 31fd6e1..98626fa 100644
--- a/gfs-kernel/src/gfs/lock_dlm_sysfs.c
+++ b/gfs-kernel/src/gfs/lock_dlm_sysfs.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include <linux/ctype.h>
#include <linux/stat.h>
diff --git a/gfs-kernel/src/gfs/lock_dlm_thread.c b/gfs-kernel/src/gfs/lock_dlm_thread.c
index 521694f..58641c7 100644
--- a/gfs-kernel/src/gfs/lock_dlm_thread.c
+++ b/gfs-kernel/src/gfs/lock_dlm_thread.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include "lock_dlm.h"
/* A lock placed on this queue is re-submitted to DLM as soon as the lock_dlm
diff --git a/gfs-kernel/src/gfs/lock_nolock_main.c b/gfs-kernel/src/gfs/lock_nolock_main.c
index c8ce5cc..18315ef 100644
--- a/gfs-kernel/src/gfs/lock_nolock_main.c
+++ b/gfs-kernel/src/gfs/lock_nolock_main.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/init.h>
diff --git a/gfs-kernel/src/gfs/locking.c b/gfs-kernel/src/gfs/locking.c
index 96da559..26c3c51 100644
--- a/gfs-kernel/src/gfs/locking.c
+++ b/gfs-kernel/src/gfs/locking.c
@@ -1,12 +1,3 @@
-/*
- * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License version 2.
- */
-
#include <linux/module.h>
#include <linux/init.h>
#include <linux/string.h>
diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h
index 2486b04..cbf256c 100644
--- a/gfs2/edit/hexedit.h
+++ b/gfs2/edit/hexedit.h
@@ -8,6 +8,8 @@
#include <linux/gfs2_ondisk.h>
#include <string.h>
+#include "copyright.cf"
+
#ifndef TRUE
#define TRUE 1
#endif
@@ -267,7 +269,7 @@ EXTERN enum dsp_mode dmode INIT(HEX_MODE);
#define DIV_RU(x, y) (((x) + (y) - 1) / (y))
#define TITLE1 "gfs2_edit - Global File System Editor (use with extreme caution)"
-#define TITLE2 "Copyright (C) 2006 Red Hat, Inc. - Press H for help"
+#define TITLE2 REDHAT_COPYRIGHT "- Press H for help"
#define COLOR_TITLE 1
#define COLOR_NORMAL 2
diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c
index 2730c9f..b1b7fef 100644
--- a/group/gfs_controld/cpg-new.c
+++ b/group/gfs_controld/cpg-new.c
@@ -1,15 +1,3 @@
-/******************************************************************************
-*******************************************************************************
-**
-** Copyright (C) 2008 Red Hat, Inc. All rights reserved.
-**
-** This copyrighted material is made available to anyone wishing to use,
-** modify, copy, or redistribute it subject to the terms and conditions
-** of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
#include "gfs_daemon.h"
#include "config.h"
#include "libdlmcontrol.h"
diff --git a/group/gfs_controld/crc.c b/group/gfs_controld/crc.c
index 5dd09c7..29bc096 100644
--- a/group/gfs_controld/crc.c
+++ b/group/gfs_controld/crc.c
@@ -1,15 +1,3 @@
-/******************************************************************************
-*******************************************************************************
-**
-** Copyright (C) 2008 Red Hat, Inc. All rights reserved.
-**
-** This copyrighted material is made available to anyone wishing to use,
-** modify, copy, or redistribute it subject to the terms and conditions
-** of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
#include "gfs_daemon.h"
static const uint32_t crc_32_tab[] = {