Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove closes 3 & 4 from my licence. Lots of thanks to Soren...



details:   https://anonhg.NetBSD.org/src/rev/6aab360f992b
branches:  trunk
changeset: 748292:6aab360f992b
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Oct 19 18:41:07 2009 +0000

description:
Remove closes 3 & 4 from my licence. Lots of thanks to Soren Jacobsen
for the booring work !

diffstat:

 sbin/amrctl/amrctl.8                   |   7 +------
 sbin/fsck_ext2fs/dir.c                 |   9 ++-------
 sbin/fsck_ext2fs/fsck.h                |   7 +------
 sbin/fsck_ext2fs/fsck_ext2fs.8         |   7 +------
 sbin/fsck_ext2fs/inode.c               |   9 ++-------
 sbin/fsck_ext2fs/main.c                |   9 ++-------
 sbin/fsck_ext2fs/pass1.c               |   9 ++-------
 sbin/fsck_ext2fs/pass1b.c              |   9 ++-------
 sbin/fsck_ext2fs/pass2.c               |   9 ++-------
 sbin/fsck_ext2fs/pass3.c               |   9 ++-------
 sbin/fsck_ext2fs/pass4.c               |   9 ++-------
 sbin/fsck_ext2fs/pass5.c               |   9 ++-------
 sbin/fsck_ext2fs/setup.c               |   9 ++-------
 sbin/fsck_ext2fs/utilities.c           |   9 ++-------
 sbin/newfs_ext2fs/mke2fs.c             |   9 ++-------
 share/man/man4/acardide.4              |   7 +------
 share/man/man4/aceride.4               |   7 +------
 share/man/man4/ahcisata.4              |   7 +------
 share/man/man4/artsata.4               |   7 +------
 share/man/man4/ata.4                   |   7 +------
 share/man/man4/cmdide.4                |   7 +------
 share/man/man4/cypide.4                |   7 +------
 share/man/man4/esiop.4                 |   7 +------
 share/man/man4/geodeide.4              |   7 +------
 share/man/man4/hptide.4                |   7 +------
 share/man/man4/ipmi.4                  |   7 +------
 share/man/man4/ixpide.4                |   7 +------
 share/man/man4/jme.4                   |   7 +------
 share/man/man4/jmide.4                 |   7 +------
 share/man/man4/man4.i386/gcscide.4     |   7 +------
 share/man/man4/optiide.4               |   7 +------
 share/man/man4/pciide.4                |   7 +------
 share/man/man4/pdcide.4                |   7 +------
 share/man/man4/pdcsata.4               |   7 +------
 share/man/man4/piixide.4               |   7 +------
 share/man/man4/rtk.4                   |   7 +------
 share/man/man4/satalink.4              |   7 +------
 share/man/man4/siop.4                  |   7 +------
 share/man/man4/siside.4                |   7 +------
 share/man/man4/slide.4                 |   7 +------
 share/man/man4/svwsata.4               |   7 +------
 share/man/man4/tl.4                    |   7 +------
 share/man/man4/viaide.4                |   7 +------
 share/man/man4/vr.4                    |   7 +------
 share/man/man4/wdc.4                   |   7 +------
 share/man/man9/mstohz.9                |   7 +------
 share/man/man9/pmatch.9                |   7 +------
 share/man/man9/scsipi.9                |   7 +------
 share/man/man9/wdc.9                   |   7 +------
 sys/arch/amd64/amd64/locore.S          |   7 +------
 sys/arch/amd64/amd64/machdep.c         |   9 ++-------
 sys/arch/i386/i386/locore.S            |   9 ++-------
 sys/arch/x86/x86/ipmi.c                |   9 ++-------
 sys/arch/x86/x86/pmap.c                |   9 ++-------
 sys/arch/xen/include/granttables.h     |   7 +------
 sys/arch/xen/include/hypervisor.h      |   7 +------
 sys/arch/xen/include/i386/hypercalls.h |   7 +------
 sys/arch/xen/include/pci_machdep.h     |   7 +------
 sys/arch/xen/include/xen_shm.h         |   7 +------
 sys/arch/xen/x86/x86_xpmap.c           |   9 ++-------
 sys/arch/xen/x86/xen_shm_machdep.c     |   9 ++-------
 sys/arch/xen/xen/evtchn.c              |   9 ++-------
 sys/arch/xen/xen/hypervisor.c          |   9 ++-------
 sys/arch/xen/xen/if_xennet_xenbus.c    |   9 ++-------
 sys/arch/xen/xen/pci_intr_machdep.c    |   9 ++-------
 sys/arch/xen/xen/pciback.c             |   9 ++-------
 sys/arch/xen/xen/shutdown_xenbus.c     |   9 ++-------
 sys/arch/xen/xen/xbd_xenbus.c          |   9 ++-------
 sys/arch/xen/xen/xbdback_xenbus.c      |   9 ++-------
 sys/arch/xen/xen/xen_machdep.c         |   9 ++-------
 sys/arch/xen/xen/xencons.c             |   9 ++-------
 sys/arch/xen/xen/xenevt.c              |   9 ++-------
 sys/arch/xen/xen/xengnt.c              |   9 ++-------
 sys/arch/xen/xen/xennetback_xenbus.c   |   7 +------
 sys/arch/xen/xen/xpci_xenbus.c         |   9 ++-------
 sys/dev/ata/ata.c                      |   9 ++-------
 sys/dev/ata/ata_wdc.c                  |   9 ++-------
 sys/dev/ata/atareg.h                   |   7 +------
 sys/dev/ata/atavar.h                   |   7 +------
 sys/dev/ata/satafis_subr.c             |   9 ++-------
 sys/dev/ata/wd.c                       |   9 ++-------
 sys/dev/ata/wdvar.h                    |   7 +------
 sys/dev/cardbus/siisata_cardbus.c      |   7 +------
 sys/dev/ic/ahcisata_core.c             |   9 ++-------
 sys/dev/ic/ahcisatareg.h               |   7 +------
 sys/dev/ic/ahcisatavar.h               |   7 +------
 sys/dev/ic/esiop.c                     |   9 ++-------
 sys/dev/ic/esiopvar.h                  |   7 +------
 sys/dev/ic/siisata.c                   |  12 +-----------
 sys/dev/ic/siisatavar.h                |   7 +------
 sys/dev/ic/siop.c                      |   9 ++-------
 sys/dev/ic/siop_common.c               |   9 ++-------
 sys/dev/ic/siopreg.h                   |   7 +------
 sys/dev/ic/siopvar.h                   |   7 +------
 sys/dev/ic/siopvar_common.h            |   7 +------
 sys/dev/ic/wdc.c                       |   9 ++-------
 sys/dev/microcode/siop/esiop.ss        |   7 +------
 sys/dev/microcode/siop/siop.ss         |   7 +------
 sys/dev/mii/bmtphy.c                   |   9 ++-------
 sys/dev/mii/brgphy.c                   |   9 ++-------
 sys/dev/mii/dmphy.c                    |   9 ++-------
 sys/dev/mii/exphy.c                    |   9 ++-------
 sys/dev/mii/gentbi.c                   |   9 ++-------
 sys/dev/mii/glxtphy.c                  |   9 ++-------
 sys/dev/mii/gphyter.c                  |   9 ++-------
 sys/dev/mii/icsphy.c                   |   9 ++-------
 sys/dev/mii/ikphy.c                    |   9 ++-------
 sys/dev/mii/inphy.c                    |   9 ++-------
 sys/dev/mii/iophy.c                    |   9 ++-------
 sys/dev/mii/lxtphy.c                   |   9 ++-------
 sys/dev/mii/makphy.c                   |   9 ++-------
 sys/dev/mii/mii.h                      |   7 +------
 sys/dev/mii/nsphy.c                    |   9 ++-------
 sys/dev/mii/nsphyter.c                 |   9 ++-------
 sys/dev/mii/qsphy.c                    |   9 ++-------
 sys/dev/mii/sqphy.c                    |   9 ++-------
 sys/dev/mii/tlphy.c                    |   9 ++-------
 sys/dev/mii/tlphyreg.h                 |   7 +------
 sys/dev/mii/tqphy.c                    |   9 ++-------
 sys/dev/mii/ukphy.c                    |   9 ++-------
 sys/dev/pci/aceride.c                  |   9 ++-------
 sys/dev/pci/ahcisata_pci.c             |   9 ++-------
 sys/dev/pci/cmdide.c                   |   9 ++-------
 sys/dev/pci/cypide.c                   |   9 ++-------
 sys/dev/pci/esiop_pci.c                |   9 ++-------
 sys/dev/pci/geodeide.c                 |   9 ++-------
 sys/dev/pci/hptide.c                   |   9 ++-------
 sys/dev/pci/if_jme.c                   |   9 ++-------
 sys/dev/pci/if_tl.c                    |   9 ++-------
 sys/dev/pci/if_tlregs.h                |   7 +------
 sys/dev/pci/if_tlvar.h                 |   7 +------
 sys/dev/pci/jmide.c                    |   9 ++-------
 sys/dev/pci/jmide_reg.h                |   8 ++------
 sys/dev/pci/pciide.c                   |   9 ++-------
 sys/dev/pci/pciide_acer_reg.h          |   7 +------
 sys/dev/pci/pciide_apollo_reg.h        |   7 +------
 sys/dev/pci/pciide_cmd_reg.h           |   7 +------
 sys/dev/pci/pciide_common.c            |  10 ++--------
 sys/dev/pci/pciide_cy693_reg.h         |   7 +------
 sys/dev/pci/pciide_geode_reg.h         |   7 +------
 sys/dev/pci/pciide_hpt_reg.h           |   7 +------
 sys/dev/pci/pciide_pdc202xx_reg.h      |   7 +------
 sys/dev/pci/pciide_piix_reg.h          |   7 +------
 sys/dev/pci/pciide_sis_reg.h           |   7 +------
 sys/dev/pci/pdcide.c                   |   9 ++-------
 sys/dev/pci/pdcsata.c                  |   9 ++-------
 sys/dev/pci/piixide.c                  |   9 ++-------
 sys/dev/pci/siisata_pci.c              |   7 +------
 sys/dev/pci/siop_pci.c                 |   9 ++-------
 sys/dev/pci/siop_pci_common.c          |   9 ++-------
 sys/dev/pci/siop_pci_common.h          |   7 +------
 sys/dev/pci/siside.c                   |   9 ++-------
 sys/dev/pci/viaide.c                   |   9 ++-------
 sys/dev/scsipi/atapi_wdc.c             |   9 ++-------
 sys/dev/scsipi/atapiconf.c             |   9 ++-------
 sys/dev/scsipi/atapiconf.h             |   7 +------
 sys/dev/scsipi/cdvar.h                 |   7 +------
 sys/dev/scsipi/st_atapi.c              |   9 ++-------
 sys/lib/libsa/ext2fs.c                 |   7 +------
 sys/ufs/ext2fs/ext2fs.h                |   7 +------
 sys/ufs/ext2fs/ext2fs_alloc.c          |   9 ++-------
 sys/ufs/ext2fs/ext2fs_balloc.c         |   9 ++-------
 sys/ufs/ext2fs/ext2fs_bmap.c           |   9 ++-------
 sys/ufs/ext2fs/ext2fs_bswap.c          |   9 ++-------
 sys/ufs/ext2fs/ext2fs_dinode.h         |   7 +------
 sys/ufs/ext2fs/ext2fs_dir.h            |   7 +------
 sys/ufs/ext2fs/ext2fs_extern.h         |   7 +------
 sys/ufs/ext2fs/ext2fs_inode.c          |   9 ++-------
 sys/ufs/ext2fs/ext2fs_readwrite.c      |   9 ++-------
 sys/ufs/ext2fs/ext2fs_subr.c           |   9 ++-------
 sys/ufs/ext2fs/ext2fs_vfsops.c         |   9 ++-------
 sys/ufs/ext2fs/ext2fs_vnops.c          |   9 ++-------
 sys/ufs/ffs/ffs_bswap.c                |   9 ++-------
 sys/ufs/ufs/ufs_bswap.h                |   7 +------
 usr.sbin/installboot/ext2fs.c          |   9 ++-------
 usr.sbin/rpc.lockd/lockd_lock.c        |   7 +------
 176 files changed, 270 insertions(+), 1155 deletions(-)

diffs (truncated from 4547 to 300 lines):

diff -r 34c3c172a92b -r 6aab360f992b sbin/amrctl/amrctl.8
--- a/sbin/amrctl/amrctl.8      Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/amrctl/amrctl.8      Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: amrctl.8,v 1.2 2006/07/23 13:23:12 wiz Exp $
+.\"    $NetBSD: amrctl.8,v 1.3 2009/10/19 18:41:07 bouyer Exp $
 .\"
 .\" Copyright (c) 2006 Manuel Bouyer.
 .\"
@@ -10,11 +10,6 @@
 .\" 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 acknowledgement:
-.\"      This product includes software developed by Manuel Bouyer.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/dir.c
--- a/sbin/fsck_ext2fs/dir.c    Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/dir.c    Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.22 2008/03/16 23:17:55 lukem Exp $   */
+/*     $NetBSD: dir.c,v 1.23 2009/10/19 18:41:07 bouyer Exp $  */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c      8.5 (Berkeley) 12/8/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.22 2008/03/16 23:17:55 lukem Exp $");
+__RCSID("$NetBSD: dir.c,v 1.23 2009/10/19 18:41:07 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/fsck.h
--- a/sbin/fsck_ext2fs/fsck.h   Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/fsck.h   Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsck.h,v 1.14 2008/10/09 16:56:23 christos Exp $       */
+/*     $NetBSD: fsck.h,v 1.15 2009/10/19 18:41:08 bouyer Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -42,11 +42,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/fsck_ext2fs.8
--- a/sbin/fsck_ext2fs/fsck_ext2fs.8    Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/fsck_ext2fs.8    Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: fsck_ext2fs.8,v 1.17 2009/03/15 10:01:47 joerg Exp $
+.\"    $NetBSD: fsck_ext2fs.8,v 1.18 2009/10/19 18:41:08 bouyer Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -37,11 +37,6 @@
 .\" 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 acknowledgement:
-.\"    This product includes software developed by Manuel Bouyer.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/inode.c
--- a/sbin/fsck_ext2fs/inode.c  Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/inode.c  Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inode.c,v 1.29 2009/04/06 12:50:36 lukem Exp $ */
+/*     $NetBSD: inode.c,v 1.30 2009/10/19 18:41:08 bouyer Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)inode.c    8.5 (Berkeley) 2/8/95";
 #else
-__RCSID("$NetBSD: inode.c,v 1.29 2009/04/06 12:50:36 lukem Exp $");
+__RCSID("$NetBSD: inode.c,v 1.30 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/main.c
--- a/sbin/fsck_ext2fs/main.c   Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/main.c   Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.33 2009/08/16 13:50:54 tron Exp $   */
+/*     $NetBSD: main.c,v 1.34 2009/10/19 18:41:08 bouyer Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -68,7 +63,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 1/23/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.33 2009/08/16 13:50:54 tron Exp $");
+__RCSID("$NetBSD: main.c,v 1.34 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/pass1.c
--- a/sbin/fsck_ext2fs/pass1.c  Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/pass1.c  Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass1.c,v 1.19 2009/04/06 12:50:37 lukem Exp $ */
+/*     $NetBSD: pass1.c,v 1.20 2009/10/19 18:41:08 bouyer Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: pass1.c,v 1.19 2009/04/06 12:50:37 lukem Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.20 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/pass1b.c
--- a/sbin/fsck_ext2fs/pass1b.c Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/pass1b.c Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass1b.c,v 1.7 2009/04/06 12:50:37 lukem Exp $ */
+/*     $NetBSD: pass1b.c,v 1.8 2009/10/19 18:41:08 bouyer Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1b.c   8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: pass1b.c,v 1.7 2009/04/06 12:50:37 lukem Exp $");
+__RCSID("$NetBSD: pass1b.c,v 1.8 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/pass2.c
--- a/sbin/fsck_ext2fs/pass2.c  Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/pass2.c  Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass2.c,v 1.14 2008/03/16 23:17:55 lukem Exp $ */
+/*     $NetBSD: pass2.c,v 1.15 2009/10/19 18:41:08 bouyer Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass2.c    8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: pass2.c,v 1.14 2008/03/16 23:17:55 lukem Exp $");
+__RCSID("$NetBSD: pass2.c,v 1.15 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/pass3.c
--- a/sbin/fsck_ext2fs/pass3.c  Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/pass3.c  Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass3.c,v 1.6 2005/01/19 19:31:28 xtraeme Exp $        */
+/*     $NetBSD: pass3.c,v 1.7 2009/10/19 18:41:08 bouyer Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass3.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: pass3.c,v 1.6 2005/01/19 19:31:28 xtraeme Exp $");
+__RCSID("$NetBSD: pass3.c,v 1.7 2009/10/19 18:41:08 bouyer Exp $");
 #endif
 #endif /* not lint */
 
diff -r 34c3c172a92b -r 6aab360f992b sbin/fsck_ext2fs/pass4.c
--- a/sbin/fsck_ext2fs/pass4.c  Mon Oct 19 18:23:28 2009 +0000
+++ b/sbin/fsck_ext2fs/pass4.c  Mon Oct 19 18:41:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass4.c,v 1.9 2008/03/16 23:17:55 lukem Exp $  */
+/*     $NetBSD: pass4.c,v 1.10 2009/10/19 18:41:08 bouyer Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -40,11 +40,6 @@
  * 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 acknowledgement:
- *     This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -63,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass4.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: pass4.c,v 1.9 2008/03/16 23:17:55 lukem Exp $");
+__RCSID("$NetBSD: pass4.c,v 1.10 2009/10/19 18:41:08 bouyer Exp $");



Home | Main Index | Thread Index | Old Index