[Glibc-bsd-commits] r2418 - in trunk/freebsd-libs/debian: . patches
Aurelien Jarno
aurel32 at alioth.debian.org
Tue Apr 7 16:44:32 UTC 2009
Author: aurel32
Date: 2009-04-07 16:44:31 +0000 (Tue, 07 Apr 2009)
New Revision: 2418
Modified:
trunk/freebsd-libs/debian/copyright
trunk/freebsd-libs/debian/patches/00_fbsdid.diff
trunk/freebsd-libs/debian/rules
Log:
Remove some more files from the sources
Modified: trunk/freebsd-libs/debian/copyright
===================================================================
--- trunk/freebsd-libs/debian/copyright 2009-04-07 16:25:41 UTC (rev 2417)
+++ trunk/freebsd-libs/debian/copyright 2009-04-07 16:44:31 UTC (rev 2418)
@@ -3,20 +3,82 @@
It was downloaded from http://www.freebsd.org/
src/lib/libcam
+ src/lib/libdevstat
+ src/lib/libgeom
+ src/lib/libipx
+ src/lib/libkiconv
+ src/lib/libkvm
src/lib/libsbuf
src/lib/libusbhid
+ src/sys/cam
+ src/sys/kern/subr_sbuf.c
-Upstream Author: The FreeBSD Project
+Copyrights:
+ Copyright (C) 1986, 1989, 1991, 1992, 1993 The Regents of the University of California.
+ Copyright (C) 1990 Open Software Foundation, Grenoble, FRANCE
+ Copyright (C) 1992 TRW Financial Systems
+ Copyright (C) 1994, 1995 Carnegie-Mellon University
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 NetBSD/pc98 porting staff
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Naofumi HONDA
+ Copyright (C) 1996 Wolfgang Solfrank
+ Copyright (C) 1996 TooLs GmbH
+ Copyright (C) 1996 Jason R. Thorpe <thorpej at and.com>
+ Copyright (C) 1997, 1998, 1999, 2001, 2002 Justin T. Gibbs
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry
+ Copyright (C) 1999 Matthew Dillon
+ Copyright (C) 1999 Lennart Augustsson <augustss at netbsd.org>
+ Copyright (C) 1999, 2000 Matthew Jacob
+ Copyright (C) 2000, 2001 MITSUNAGA Noriaki, NOKUBI Hirotaka and TAKAHASHI Yoshihiro.
+ Copyright (C) 2000, 2003 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
+ Copyright (C) 2000-2001 Boris Popov
+ Copyright (C) 2001 Thomas Moestl
+ Copyright (C) 2002 Nate Lawson
+ Copyright (C) 2003 Ryuichiro Imura
+ Copyright (C) 2005 Olivier Houchard
+ Copyright (C) 2006 Peter Wemm
+ Copyright (C) 2007 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+ Copyright (C) 2007 Scott Long
+ Copyright (C) 2008 Yahoo!, Inc.
-License:
+Licenses:
+ Files: lib/libcam/camlib.c
+ lib/libcam/camlib.h
+ lib/libcam/scsi_cmdparse.c
+ lib/libgeom/geom_ctl.c
+ lib/libgeom/geom_getxml.c
+ lib/libgeom/geom_stats.c
+ lib/libgeom/geom_util.c
+ lib/libgeom/geom_xml2tree.c
+ lib/libgeom/libgeom.h
+ lib/libkiconv/quirks.c
+ lib/libkiconv/quirks.h
+ lib/libkiconv/xlat16_iconv.c
+ lib/libkiconv/xlat16_sysctl.c
+ lib/libkvm/kvm_cptime.c
+ lib/libkvm/kvm_getswapinfo.c
+ lib/libkvm/kvm_minidump_amd64.c
+ lib/libkvm/kvm_minidump_i386.c
+ lib/libkvm/kvm_pcpu.c
+ lib/libusbhid/data.c
+ lib/libusbhid/descr.c
+ lib/libusbhid/parse.c
+ lib/libusbhid/usage.c
+ lib/libusbhid/usbhid.h
+ lib/libusbhid/usbvar.h
+
Redistribution and use in source and binary forms, with or without
- modification, are permitted under the terms of the BSD License.
+ 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. 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS 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 REGENTS OR CONTRIBUTORS BE LIABLE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR 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)
@@ -25,5 +87,109 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-On Debian GNU systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
+ -------------------------------------------------------------------
+
+ Files:
+ lib/libdevstat/devstat.c
+ lib/libdevstat/devstat.h
+ sys/cam/scsi/scsi_dvcfg.h
+ sys/cam/scsi/scsi_low.c
+ sys/cam/scsi/scsi_low.h
+ sys/cam/scsi/scsi_low_pisa.c
+ sys/cam/scsi/scsi_low_pisa.h
+ sys/kern/subr_sbuf.c
+
+ 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. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ 3. 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 AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS 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 AUTHOR OR 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.
+
+ -------------------------------------------------------------------
+
+ Files:
+
+ lib/libipx/ipx_addr.c
+ lib/libipx/ipx_ntoa.c
+ lib/libkvm/kvm_amd64.c
+ lib/libkvm/kvm_arm.c
+ lib/libkvm/kvm.c
+ lib/libkvm/kvm_file.c
+ lib/libkvm/kvm_getloadavg.c
+ lib/libkvm/kvm.h
+ lib/libkvm/kvm_i386.c
+ lib/libkvm/kvm_private.h
+ lib/libkvm/kvm_proc.c
+ lib/libkvm/kvm_sparc64.c
+ lib/libkvm/kvm_sparc.c
+ sys/cam/cam.c
+ sys/cam/cam_ccb.h
+ sys/cam/cam_debug.h
+ sys/cam/cam.h
+ sys/cam/cam_periph.c
+ sys/cam/cam_periph.h
+ sys/cam/cam_queue.c
+ sys/cam/cam_queue.h
+ sys/cam/cam_sim.c
+ sys/cam/cam_sim.h
+ sys/cam/cam_xpt.c
+ sys/cam/cam_xpt.h
+ sys/cam/cam_xpt_periph.h
+ sys/cam/cam_xpt_sim.h
+ sys/cam/scsi/scsi_all.c
+ sys/cam/scsi/scsi_cd.c
+ sys/cam/scsi/scsi_cd.h
+ sys/cam/scsi/scsi_da.c
+ sys/cam/scsi/scsi_pass.c
+ sys/cam/scsi/scsi_pass.h
+ sys/cam/scsi/scsi_pt.c
+ sys/cam/scsi/scsi_pt.h
+ sys/cam/scsi/scsi_sa.c
+ sys/cam/scsi/scsi_sa.h
+ sys/cam/scsi/scsi_ses.c
+ sys/cam/scsi/scsi_ses.h
+ sys/cam/scsi/scsi_sg.c
+ sys/cam/scsi/scsi_targ_bh.c
+ sys/cam/scsi/scsi_target.c
+ sys/cam/scsi/scsi_targetio.h
+
+ 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.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS 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 AUTHOR OR 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.
+
Modified: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-04-07 16:25:41 UTC (rev 2417)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-04-07 16:44:31 UTC (rev 2418)
@@ -16,7 +16,6 @@
lib/libkvm/kvm_minidump_amd64.c | 1 -
lib/libkvm/kvm_minidump_i386.c | 1 -
lib/libkvm/kvm_pcpu.c | 1 -
- lib/libkvm/kvm_powerpc.c | 1 -
lib/libkvm/kvm_proc.c | 1 -
lib/libkvm/kvm_sparc.c | 1 -
lib/libkvm/kvm_sparc64.c | 1 -
@@ -42,7 +41,7 @@
sys/cam/scsi/scsi_targ_bh.c | 1 -
sys/cam/scsi/scsi_target.c | 1 -
sys/kern/subr_sbuf.c | 1 -
- 43 files changed, 43 deletions(-)
+ 42 files changed, 42 deletions(-)
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -214,16 +213,6 @@
#include <sys/param.h>
#include <sys/pcpu.h>
---- a/lib/libkvm/kvm_powerpc.c
-+++ b/lib/libkvm/kvm_powerpc.c
-@@ -36,7 +36,6 @@
- */
-
- #include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_powerpc.c,v 1.3.18.1 2008/11/25 02:59:29 kensmith Exp $");
-
- #include <sys/param.h>
-
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -38,7 +38,6 @@
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2009-04-07 16:25:41 UTC (rev 2417)
+++ trunk/freebsd-libs/debian/rules 2009-04-07 16:44:31 UTC (rev 2418)
@@ -36,7 +36,10 @@
done
mv freebsd-libs-$(VERSION)/src/* freebsd-libs-$(VERSION)
rmdir freebsd-libs-$(VERSION)/src
+ # Remove unused files with non GPL compatible license (eg BSD 4 clauses)
rm -f freebsd-libs-$(VERSION)/sys/cam/scsi/scsi_ch.*
+ rm -f freebsd-libs-$(VERSION)/lib/libkvm/kvm_ia64.c
+ rm -f freebsd-libs-$(VERSION)/lib/libkvm/kvm_powerpc.c
tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz freebsd-libs-$(VERSION)
rm -rf freebsd-libs-$(VERSION)
More information about the Glibc-bsd-commits
mailing list