From: Russ Allbery Date: Thu, 12 Apr 2007 18:22:20 +0000 (+0000) Subject: * Repackage upstream source to remove two additional files covered under X-Git-Tag: debian/1.4.4.dfsg1-1~5 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e2821eefbe88a49e4ea4f5f8d83ab93d8ca60a55;p=packages%2Fo%2Fopenafs.git * Repackage upstream source to remove two additional files covered under the APSL. (Closes: #416685) --- diff --git a/debian/changelog b/debian/changelog index b85bb555d..b3d153467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openafs (1.4.4.dfsg1-1) unstable; urgency=low + + * Repackage upstream source to remove two additional files covered under + the APSL. (Closes: #416685) + + -- + openafs (1.4.4-1) experimental; urgency=low * New upstream release. (Closes: #415699) diff --git a/debian/copyright b/debian/copyright index c6a8e25cd..55e7ed16f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,11 +11,15 @@ Upstream Maintainers: openafs-gatekeepers@openafs.org The upstream source has been repackaged to remove the src/packaging/MacOS -and src/platform/DARWIN directories, which contained a file -(afssettings.m) that was covered under the Apple Public Source License -2.0. This license is not considered DFSG-free. Since the repackaging was -needed anyway, the WINNT directory was also dropped, reducing the size of -the upstream tarball by 8MB. +and src/platform/DARWIN directories and the files src/afs/sysctl.h and +src/util/fstab.c. These directories and files are only used for building +on MacOS X and contained content covered by the Apple Public Source +License 2.0. This license is not considered DFSG-free. Since the +repackaging was needed anyway, the WINNT directory was also dropped, +reducing the size of the upstream tarball by 8MB. + +The upstream openafs-src and openafs-doc tarballs have been combined into +one source tarball. The openafs-doc package contains the OpenAFS documentation as distributed by the OpenAFS project, which does not include the original source. These diff --git a/debian/rules b/debian/rules index 072bccf3e..f03a84f5e 100755 --- a/debian/rules +++ b/debian/rules @@ -62,7 +62,7 @@ DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-fileserver \ # These variable is used only by get-orig-source, which will normally only be # run by maintainers. VERSION = 1.4.4 -DEBVERS = 1.4.4 +DEBVERS = 1.4.4.dfsg1 UPSTREAM = /afs/grand.central.org/software/openafs/$(VERSION) # Download the upstream source, merge in the doc tarball, and do the @@ -78,8 +78,11 @@ get-orig-source: rm -r openafs-$(VERSION)/src/packaging/MacOS rm -r openafs-$(VERSION)/src/platform/DARWIN rm -r openafs-$(VERSION)/src/WINNT - tar cf openafs_$(DEBVERS).orig.tar openafs-$(VERSION) - rm -r openafs-$(VERSION) + rm openafs-$(VERSION)/src/afs/sysctl.h + rm openafs-$(VERSION)/src/util/fstab.c + mv openafs-$(VERSION) openafs_$(DEBVERS).orig + tar cf openafs_$(DEBVERS).orig.tar openafs_$(DEBVERS).orig + rm -r openafs_$(DEBVERS).orig gzip -9 openafs_$(DEBVERS).orig.tar configure: configure-stamp diff --git a/src/afs/sysctl.h b/src/afs/sysctl.h deleted file mode 100644 index 720b6085f..000000000 --- a/src/afs/sysctl.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2003 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. - * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. - * - * @APPLE_LICENSE_HEADER_END@ - */ - -#ifndef AFS_SYSCTL_H -#define AFS_SYSCTL_H - -/* top level AFS names */ -#define AFS_SC_ALL 0 -#define AFS_SC_DARWIN 1 - -/* AFS_SC_ALL: platform-independent sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN: darwin-specific sysctls */ -#define AFS_SC_DARWIN_ALL 0 -#define AFS_SC_DARWIN_12 1 -#define AFS_SC_DARWIN_13 2 -#define AFS_SC_DARWIN_14 3 -#define AFS_SC_DARWIN_60 4 -#define AFS_SC_DARWIN_70 5 -#define AFS_SC_DARWIN_80 6 -#define AFS_SC_DARWIN_90 7 - -/* AFS_SC_DARWIN_ALL: darwin version-independent sysctls */ -#define AFS_SC_DARWIN_ALL_REALMODES 1 - -/* AFS_SC_DARWIN_12: darwin 1.2 sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_13: darwin 1.3 sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_14: darwin 1.4 sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_60: darwin 6.x sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_70: darwin 7.x sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_80: darwin 8.x sysctls */ - /* nothing defined */ - -/* AFS_SC_DARWIN_90: darwin 9.x sysctls */ - /* nothing defined */ - -#endif /* AFS_SYSCTL_H */ diff --git a/src/util/fstab.c b/src/util/fstab.c deleted file mode 100644 index 6b6a67c1c..000000000 --- a/src/util/fstab.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. - * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. - * - * @APPLE_LICENSE_HEADER_END@ - */ -/* - * Copyright (c) 1980, 1988, 1993 - * The Regents of the University of California. 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. - * 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 the University of - * California, Berkeley and its contributors. - * 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 REGENTS 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 - * 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. - */ - -#include - -#if defined(AFS_DARWIN_ENV) -/*----------------------------------------------------------------------- - * This version of fstab.c is intended to be used on Darwin systems to - * replace getfsent() and family. It has been modified so that rather - * than read /etc/fstab, it calls getfsstat() to get the real list of - * mounted volumes. - *-----------------------------------------------------------------------*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define STDERR_FILENO 2 - -static struct fstab _fs_fstab; -static struct statfs *_fs_buf; -static struct statfs *_fs_ptr; -static int _fs_count; - -static error __P((int)); -static fstabscan __P((void)); - -static -fstabscan() -{ - if (_fs_count <= 0) - return (0); - _fs_fstab.fs_spec = _fs_ptr->f_mntfromname; - _fs_fstab.fs_file = _fs_ptr->f_mntonname; - _fs_fstab.fs_vfstype = _fs_ptr->f_fstypename; - _fs_fstab.fs_mntops = _fs_ptr->f_fstypename; // no mount options given - _fs_fstab.fs_type = (_fs_ptr->f_flags & MNT_RDONLY) ? FSTAB_RO : FSTAB_RW; - _fs_fstab.fs_freq = 0; - _fs_fstab.fs_passno = 0; - - _fs_ptr++; - _fs_count--; - return (1); -} - -struct fstab * -getfsent() -{ - if (!_fs_buf && !setfsent() || !fstabscan()) - return ((struct fstab *)NULL); - return (&_fs_fstab); -} - -struct fstab * -getfsspec(name) - register const char *name; -{ - if (setfsent()) - while (fstabscan()) - if (!strcmp(_fs_fstab.fs_spec, name)) - return (&_fs_fstab); - return ((struct fstab *)NULL); -} - -struct fstab * -getfsfile(name) - register const char *name; -{ - if (setfsent()) - while (fstabscan()) - if (!strcmp(_fs_fstab.fs_file, name)) - return (&_fs_fstab); - return ((struct fstab *)NULL); -} - -setfsent() -{ - long bufsize; - - if (_fs_buf) { - free(_fs_buf); - _fs_buf = NULL; - } - if ((_fs_count = getfsstat(NULL, 0, MNT_WAIT)) < 0) { - error(errno); - return (0); - } - bufsize = (long)_fs_count *sizeof(struct statfs); - if ((_fs_buf = malloc(bufsize)) == NULL) { - error(errno); - return (0); - } - if (getfsstat(_fs_buf, bufsize, MNT_WAIT) < 0) { - error(errno); - return (0); - } - _fs_ptr = _fs_buf; - return (1); -} - -void -endfsent() -{ - if (_fs_buf) { - free(_fs_buf); - _fs_buf = NULL; - } - _fs_count = 0; -} - -static -error(err) - int err; -{ - char *p; - - (void)write(STDERR_FILENO, "fstab: ", 7); - (void)write(STDERR_FILENO, _PATH_FSTAB, sizeof(_PATH_FSTAB) - 1); - (void)write(STDERR_FILENO, ": ", 1); - p = strerror(err); - (void)write(STDERR_FILENO, p, strlen(p)); - (void)write(STDERR_FILENO, "\n", 1); -} -#endif /* defined(AFS_DARWIN_ENV) */