[SCM] gmerlin-avdecoder/master: Add patch to strip unusued BSD-4 licensed code, to ensure no accidental GPL violation can occur.
js at users.alioth.debian.org
js at users.alioth.debian.org
Fri Dec 10 13:52:58 UTC 2010
The following commit has been merged in the master branch:
commit 2b1ec155fed631c42305232442ea5ac2b6a15606
Author: Jonas Smedegaard <dr at jones.dk>
Date: Fri Dec 10 13:17:17 2010 +0100
Add patch to strip unusued BSD-4 licensed code, to ensure no accidental GPL violation can occur.
diff --git a/debian/patches/series b/debian/patches/series
index c27173a..4d752bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix_dvdread_configure.patch
autoconf_removed_sources.patch
+strip_unused_BSD-4-licensed_code.patch
diff --git a/debian/patches/strip_unused_BSD-4-licensed_code.patch b/debian/patches/strip_unused_BSD-4-licensed_code.patch
new file mode 100644
index 0000000..4c1271c
--- /dev/null
+++ b/debian/patches/strip_unused_BSD-4-licensed_code.patch
@@ -0,0 +1,283 @@
+--- a/lib/os.c
++++ b/lib/os.c
+@@ -84,139 +84,3 @@
+ return rc;
+ }
+ #endif
+-
+-
+-/* inet_aton */
+-
+-#ifndef HAVE_INET_ATON
+-/*
+- * Copyright (c) 1983, 1990, 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. */
+-
+-int
+-bgav_inet_aton(const char *cp, struct in_addr * addr)
+-{
+- unsigned int val;
+- int base,
+- n;
+- char c;
+- u_int parts[4];
+- u_int *pp = parts;
+-
+- for (;;)
+- {
+- /*
+- * Collect number up to ``.''. Values are specified as for C:
+- * 0x=hex, 0=octal, other=decimal.
+- */
+- val = 0;
+- base = 10;
+- if (*cp == '0')
+- {
+- if (*++cp == 'x' || *cp == 'X')
+- base = 16, cp++;
+- else
+- base = 8;
+- }
+- while ((c = *cp) != '\0')
+- {
+- if (isdigit((unsigned char) c))
+- {
+- val = (val * base) + (c - '0');
+- cp++;
+- continue;
+- }
+- if (base == 16 && isxdigit((unsigned char) c))
+- {
+- val = (val << 4) +
+- (c + 10 - (islower((unsigned char) c) ? 'a' : 'A'));
+- cp++;
+- continue;
+- }
+- break;
+- }
+- if (*cp == '.')
+- {
+- /*
+- * Internet format: a.b.c.d a.b.c (with c treated as
+- * 16-bits) a.b (with b treated as 24 bits)
+- */
+- if (pp >= parts + 3 || val > 0xff)
+- return 0;
+- *pp++ = val, cp++;
+- }
+- else
+- break;
+- }
+-
+- /*
+- * Check for trailing junk.
+- */
+- while (*cp)
+- if (!isspace((unsigned char) *cp++))
+- return 0;
+-
+- /*
+- * Concoct the address according to the number of parts specified.
+- */
+- n = pp - parts + 1;
+- switch (n)
+- {
+-
+- case 1: /* a -- 32 bits */
+- break;
+-
+- case 2: /* a.b -- 8.24 bits */
+- if (val > 0xffffff)
+- return 0;
+- val |= parts[0] << 24;
+- break;
+-
+- case 3: /* a.b.c -- 8.8.16 bits */
+- if (val > 0xffff)
+- return 0;
+- val |= (parts[0] << 24) | (parts[1] << 16);
+- break;
+-
+- case 4: /* a.b.c.d -- 8.8.8.8 bits */
+- if (val > 0xff)
+- return 0;
+- val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+- break;
+- }
+- if (addr)
+- addr->s_addr = htonl(val);
+- return 1;
+-}
+-
+-#endif
+-
+-
+--- a/lib/os_inet_aton.c
++++ b/lib/os_inet_aton.c
+@@ -1,138 +1,3 @@
+ #include <config.h>
+ #include <os.h>
+ #include <bgavdefs.h>
+-
+-/* inet_aton */
+-
+-#ifndef HAVE_INET_ATON
+-/*
+- * Copyright (c) 1983, 1990, 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. */
+-
+-int
+-bgav_inet_aton(const char *cp, struct in_addr * addr)
+-{
+- unsigned int val;
+- int base,
+- n;
+- char c;
+- u_int parts[4];
+- u_int *pp = parts;
+-
+- for (;;)
+- {
+- /*
+- * Collect number up to ``.''. Values are specified as for C:
+- * 0x=hex, 0=octal, other=decimal.
+- */
+- val = 0;
+- base = 10;
+- if (*cp == '0')
+- {
+- if (*++cp == 'x' || *cp == 'X')
+- base = 16, cp++;
+- else
+- base = 8;
+- }
+- while ((c = *cp) != '\0')
+- {
+- if (isdigit((unsigned char) c))
+- {
+- val = (val * base) + (c - '0');
+- cp++;
+- continue;
+- }
+- if (base == 16 && isxdigit((unsigned char) c))
+- {
+- val = (val << 4) +
+- (c + 10 - (islower((unsigned char) c) ? 'a' : 'A'));
+- cp++;
+- continue;
+- }
+- break;
+- }
+- if (*cp == '.')
+- {
+- /*
+- * Internet format: a.b.c.d a.b.c (with c treated as
+- * 16-bits) a.b (with b treated as 24 bits)
+- */
+- if (pp >= parts + 3 || val > 0xff)
+- return 0;
+- *pp++ = val, cp++;
+- }
+- else
+- break;
+- }
+-
+- /*
+- * Check for trailing junk.
+- */
+- while (*cp)
+- if (!isspace((unsigned char) *cp++))
+- return 0;
+-
+- /*
+- * Concoct the address according to the number of parts specified.
+- */
+- n = pp - parts + 1;
+- switch (n)
+- {
+-
+- case 1: /* a -- 32 bits */
+- break;
+-
+- case 2: /* a.b -- 8.24 bits */
+- if (val > 0xffffff)
+- return 0;
+- val |= parts[0] << 24;
+- break;
+-
+- case 3: /* a.b.c -- 8.8.16 bits */
+- if (val > 0xffff)
+- return 0;
+- val |= (parts[0] << 24) | (parts[1] << 16);
+- break;
+-
+- case 4: /* a.b.c.d -- 8.8.8.8 bits */
+- if (val > 0xff)
+- return 0;
+- val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+- break;
+- }
+- if (addr)
+- addr->s_addr = htonl(val);
+- return 1;
+-}
+-
+-#endif
+-
+-
--
gmerlin-avdecoder packaging
More information about the pkg-multimedia-commits
mailing list