X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 93188DC28C5 for ; Tue, 19 Jan 2016 12:04:31 +0000 (UTC) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 2B51CDC0268 for ; Tue, 19 Jan 2016 12:04:30 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id b14so167374281wmb.1 for ; Tue, 19 Jan 2016 04:04:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AIwfbR4ICkxR9lz2udNveH+l5CEyHkgivejWmzZ52ck=; b=0s6tfY7U+FmyBbQvHe12zyYxUiTG9MfSfh1jBtsHm/kN7MAEtO/ZR4Y6I6tUCCGwIr 2sZLSqcAwas0gzwrYOQ3mweosF2Acoy2f4Ya9mcJTRrBei676c5vwlUnrjfDutvq58GX amwfwUg5gTuggYRb7H1HCy5fENTK5VMg4/oaIudLbnfmynrovBp/nfJmQS/YbgJX5Rme gWDojRDFPUtvZPO6JVWxLjS7p1MRhocz7gyCRDoclPcMYjK5yk9QxTCk4g4cDbKtxlV7 6EGdU1d916QFLl8Ba3idqvbrZdHmgbNGITDoxZUC5scieeGENPJlB1AHMRpBjB4NGiLU OYlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AIwfbR4ICkxR9lz2udNveH+l5CEyHkgivejWmzZ52ck=; b=WSjRb229gdZvbUb9xMxLFRolKWwAwoVozmZ9vS9IGo2Picfl4DdDlXIEafJUVm+1aJ A00iab2MHelNxDY6ZXf0oIcIzhFdvMTXXLZv3LbSs/COOVOPDLjTx0OS0amjpXUCx0RZ gmyPxkw0B/69aFxBgwBFVx5OgQ3XqxO/78B1v0vIdOfyQUQcq5K7XXsiRx73MGPM/XyE POBCvBkL3hrPuOQWTG7Wl62zBbrfJ5sP18uwp3+SteXQ2g4oB3z3d723/dcOfGpAvgU2 cN+09BfLm+QU+Ff3PvbfYSDXdZ+mfdE+LBST1fp2UUbOEirTHZTgYGXdVdAbAE6y1U78 VZag== X-Gm-Message-State: ALoCoQmUjKhD48IRCwRvvLrS6OxlbkvTEZwPy/37QAAkzMvo3uE/28/jOCpig5AOAfUL1JDY5GkOS+kcmNBODsI6/o3MHgwZaw== X-Received: by 10.195.12.226 with SMTP id et2mr28380028wjd.34.1453205069889; Tue, 19 Jan 2016 04:04:29 -0800 (PST) Received: from localhost (89-156-8-192.rev.numericable.fr. [89.156.8.192]) by smtp.gmail.com with ESMTPSA id c203sm20136270wmd.5.2016.01.19.04.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jan 2016 04:04:29 -0800 (PST) From: Corentin Henry To: alpine-aports@lists.alpinelinux.org Cc: Corentin Henry Subject: [alpine-aports] [PATCH 2/4] testing/hping: add tcl 8.5 and 8.6 Date: Tue, 19 Jan 2016 11:50:39 +0000 Message-Id: <1453204241-6685-3-git-send-email-corentinhenry@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453204241-6685-1-git-send-email-corentinhenry@gmail.com> References: <1453204241-6685-1-git-send-email-corentinhenry@gmail.com> X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/hping/10-add_tcl_version.patch | 72 ++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 testing/hping/10-add_tcl_version.patch diff --git a/testing/hping/10-add_tcl_version.patch b/testing/hping/10-add_tcl_version.patch new file mode 100644 index 0000000..9e6eae2 --- /dev/null +++ b/testing/hping/10-add_tcl_version.patch @@ -0,0 +1,72 @@ +From ab6a1f2d7d0b064514ee7cbf575b8ef4dd039d73 Mon Sep 17 00:00:00 2001 +From: Carsten Grohmann +Date: Tue, 19 May 2015 17:55:42 +0200 +Subject: [PATCH] Quote variables and add new TCL versions "8.5" and "8.6" + +--- + configure | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index dab04ab..047712d 100755 +--- a/configure ++++ b/configure +@@ -44,11 +44,11 @@ if [ ! "$CONFIGOSTYPE" ]; then + fi + + # for BSD/OS use the historical name as it doesn't include '/' +-if [ $CONFIGOSTYPE = "BSD/OS" ]; then ++if [ "$CONFIGOSTYPE" = "BSD/OS" ]; then + CONFIGOSTYPE=BSDI + fi + +-case $CONFIGOSTYPE in ++case "$CONFIGOSTYPE" in + SUNOS) + SOLARISLIB="-lsocket -lresolv -lnsl" + BUG='/* #define STUPID_SOLARIS_CHECKSUM_BUG */' +@@ -63,31 +63,31 @@ esac + # + for TCLPATH_TRY in "/usr/bin/" "/usr/local/bin/" "/bin/" + do +- for TCLVER_TRY in "8.4" "8.3" "8.2" "8.1" "8.0" ++ for TCLVER_TRY in "8.6" "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" + do +- if [ -z $TCLSH ] ++ if [ -z "$TCLSH" ] + then +- TCLSH_TRY=${TCLPATH_TRY}tclsh${TCLVER_TRY} +- if [ -f $TCLSH_TRY ] ++ TCLSH_TRY="${TCLPATH_TRY}tclsh${TCLVER_TRY}" ++ if [ -f "$TCLSH_TRY" ] + then +- TCLSH=$TCLSH_TRY ++ TCLSH="$TCLSH_TRY" + echo "===> Found Tclsh in: $TCLSH" + fi + fi + done + done +-if [ -f $TCLSH ] ++if [ -f "$TCLSH" ] + then + TCL_VER=`echo puts \\$tcl_version | $TCLSH -` +- USE_TCL='-DUSE_TCL' ++ USE_TCL="-DUSE_TCL" + TCL_LIB="-ltcl${TCL_VER}" +- if [ -e /usr/include/tcl${TCL_VER} ] ++ if [ -e "/usr/include/tcl${TCL_VER}" ] + then + TCL_INC="-I/usr/include/tcl${TCL_VER}" +- elif [ -e /usr/include/tcl.h ] ++ elif [ -e "/usr/include/tcl.h" ] + then + TCL_INC="" +- elif [ -e /usr/local/include/tcl${TCL_VER} ] ++ elif [ -e "/usr/local/include/tcl${TCL_VER}" ] + then + TCL_INC="-I/usr/local/include/tcl${TCL_VER}" + else +-- +2.7.0 + -- 2.7.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---