From df630eaccfa03c5f693bf2dd3e4306124206bf1c Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Wed, 17 Apr 2013 16:29:14 +0200 Subject: [PATCH] don't use GPLv3 versions of config.{sub,guess} --- openssh-6.2p1-aarch64.patch | 326 ++++++++++++------------------------ 1 file changed, 107 insertions(+), 219 deletions(-) diff --git a/openssh-6.2p1-aarch64.patch b/openssh-6.2p1-aarch64.patch index eeedb5e..5224fbd 100644 --- a/openssh-6.2p1-aarch64.patch +++ b/openssh-6.2p1-aarch64.patch @@ -1,25 +1,20 @@ -diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess ---- openssh-6.2p1/config.guess.aarch64 2013-04-16 17:56:50.213887042 +0200 -+++ openssh-6.2p1/config.guess 2013-04-16 17:57:03.380828155 +0200 -@@ -1,14 +1,12 @@ - #! /bin/sh +diff --git a/config.guess b/config.guess +index 78553c4..b94cde8 100755 +--- a/config.guess ++++ b/config.guess +@@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. ++# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2011-01-23' -+timestamp='2013-02-12' ++timestamp='2012-12-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +15,22 @@ timestamp='2011-01-23' +@@ -17,9 +17,7 @@ timestamp='2011-01-23' # General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -30,42 +25,18 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,9 +50,7 @@ version="\ - GNU config.guess ($timestamp) +@@ -57,8 +55,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -145,7 +137,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | +@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or @@ -74,7 +45,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward -@@ -181,7 +173,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) @@ -83,7 +54,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess ;; esac # The OS release -@@ -202,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; @@ -94,7 +65,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -224,7 +220,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -224,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) @@ -103,7 +74,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -299,12 +295,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -299,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) @@ -118,7 +89,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -398,23 +394,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -398,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) @@ -151,7 +122,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; -@@ -484,8 +480,8 @@ EOF +@@ -484,8 +486,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) @@ -162,7 +133,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -498,7 +494,7 @@ EOF +@@ -498,7 +500,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi @@ -171,7 +142,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; -@@ -598,52 +594,52 @@ EOF +@@ -598,52 +600,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` @@ -201,22 +172,27 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include - #define _HPUX_SOURCE - #include - #include -- ++ #define _HPUX_SOURCE ++ #include ++ #include + - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); -- ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; @@ -236,13 +212,6 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess - } - exit (0); - } -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; @@ -265,7 +234,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -734,22 +730,22 @@ EOF +@@ -734,22 +736,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd @@ -293,7 +262,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; -@@ -773,14 +769,14 @@ EOF +@@ -773,14 +775,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -315,7 +284,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -792,30 +788,35 @@ EOF +@@ -792,30 +794,35 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) @@ -358,7 +327,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; -@@ -861,6 +862,13 @@ EOF +@@ -861,6 +868,13 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; @@ -372,7 +341,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; -@@ -870,7 +878,7 @@ EOF +@@ -870,7 +884,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; @@ -381,7 +350,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -@@ -882,20 +890,29 @@ EOF +@@ -882,20 +896,29 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else @@ -415,20 +384,16 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess exit ;; i*86:Linux:*:*) LIBC=gnu -@@ -936,8 +953,11 @@ EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +@@ -937,7 +960,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu -@@ -963,7 +983,7 @@ EOF +@@ -963,7 +986,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) @@ -437,7 +402,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -972,16 +992,16 @@ EOF +@@ -972,16 +995,16 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) @@ -457,7 +422,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -990,11 +1010,11 @@ EOF +@@ -990,11 +1013,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) @@ -473,7 +438,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) -@@ -1026,7 +1046,7 @@ EOF +@@ -1026,7 +1049,7 @@ EOF fi exit ;; i*86:*:5:[678]*) @@ -482,7 +447,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; -@@ -1054,13 +1074,13 @@ EOF +@@ -1054,13 +1077,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: @@ -499,7 +464,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; -@@ -1095,8 +1115,8 @@ EOF +@@ -1095,8 +1118,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) @@ -510,7 +475,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ -@@ -1139,10 +1159,10 @@ EOF +@@ -1139,10 +1162,10 @@ EOF echo ns32k-sni-sysv fi exit ;; @@ -525,7 +490,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm -@@ -1168,11 +1188,11 @@ EOF +@@ -1168,11 +1191,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then @@ -540,7 +505,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; -@@ -1185,6 +1205,9 @@ EOF +@@ -1185,6 +1208,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; @@ -550,7 +515,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; -@@ -1240,7 +1263,7 @@ EOF +@@ -1240,7 +1266,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; @@ -559,7 +524,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) -@@ -1285,13 +1308,13 @@ EOF +@@ -1285,13 +1311,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) @@ -575,7 +540,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; -@@ -1309,11 +1332,11 @@ EOF +@@ -1309,11 +1335,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; @@ -590,7 +555,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 @@ -605,42 +570,24 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess #endif #endif -diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub ---- openssh-6.2p1/config.sub.aarch64 2013-04-16 17:56:38.981937275 +0200 -+++ openssh-6.2p1/config.sub 2013-04-16 17:57:03.379828159 +0200 -@@ -1,38 +1,31 @@ - #! /bin/sh +diff --git a/config.sub b/config.sub +index 2d81696..eee8dcc 100755 +--- a/config.sub ++++ b/config.sub +@@ -2,9 +2,9 @@ # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. -- ++# 2011, 2012, 2013 Free Software Foundation, Inc. + -timestamp='2011-01-01' -- --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# This file is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# Copyright 1992-2013 Free Software Foundation, Inc. -+ -+timestamp='2013-02-12' -+ -+# This file is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. ++timestamp='2012-12-23' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ timestamp='2011-01-01' + # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software @@ -650,31 +597,18 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -75,9 +68,7 @@ Report bugs and patches to