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 35399DC7EB2 for ; Sun, 25 Oct 2015 22:22:14 +0000 (UTC) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id D6805DC15DB for ; Sun, 25 Oct 2015 22:22:13 +0000 (UTC) Received: by wicll6 with SMTP id ll6so91163315wic.1 for ; Sun, 25 Oct 2015 15:22:12 -0700 (PDT) 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; bh=gGBZRBSjm+YqrpzQX+JR4qDnYV0oULGYCyOI/DE9w64=; b=O0B5I+COYWZcO9ZbIKu8xflzMI4ltcl+TrBxN182Inl5UrUvselJWUpJ4QEJOrwB5x t2ivIiY0SV6cOEmQBwXhWayI6nOW/zwlfqTgL0ocVmYegUXRwsCSy+Nfk62rrUJk7PoU 7DV8mcKam2xDu9oXCSPalPuL3a2Gko4qE+Kf5Y9GnKeGjEVsiYmbe4yK6CMJzfY5U91r k4Y1R6CNv3yteOTyiVv/9nraREmcI6394xWfcI9+KF5z7EMjjZeGtmyKmoBfcm0QToQ2 gUsY3xdPxihisyGBOQCUTyWCidL8jCwoI0qTGrZgdF0wDd9Vn48hXV0jlwmMBkQx46LS keiA== X-Gm-Message-State: ALoCoQlv/0Km1vZhNxPxhk/cDCF9voWVBGZDMGZAyOxQBYgX/O796NRkUiF+AZVgzdfHGqphNlqj X-Received: by 10.194.142.45 with SMTP id rt13mr18425353wjb.45.1445811731833; Sun, 25 Oct 2015 15:22:11 -0700 (PDT) Received: from localhost (pD9579E77.dip0.t-ipconnect.de. [217.87.158.119]) by smtp.gmail.com with ESMTPSA id w9sm14058675wjf.20.2015.10.25.15.22.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Oct 2015 15:22:10 -0700 (PDT) From: Christian Kampka To: alpine-aports@lists.alpinelinux.org Cc: Christian Kampka Subject: [alpine-aports] [PATCH] main/task: new upstream version 2.5.0 Date: Sun, 25 Oct 2015 23:22:06 +0100 Message-Id: <1445811726-24213-1-git-send-email-christian@kampka.net> X-Mailer: git-send-email 2.6.1 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/task/APKBUILD | 14 +++++++------- main/task/musl-fix.patch | 36 ++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/main/task/APKBUILD b/main/task/APKBUILD index cfc24a6..56ace83 100644 --- a/main/task/APKBUILD +++ b/main/task/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=task -pkgver=2.4.4 +pkgver=2.5.0 pkgrel=0 pkgdesc="A command-line to do list manager" url="http://taskwarrior.org" @@ -40,9 +40,9 @@ package() { make install DESTDIR="$pkgdir" } -md5sums="517450c4a23a5842df3e9905b38801b3 task-2.4.4.tar.gz -1e826dcc0aa6a0c08a6e2b7c450945cd musl-fix.patch" -sha256sums="7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b task-2.4.4.tar.gz -60ece7d726ad383434a802dbfb6d4479200457031e879af0c95e3dd416d562fb musl-fix.patch" -sha512sums="23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103 task-2.4.4.tar.gz -d9e704d47cb1e5a151b39d2733b40fe9a8503d08329bbc4dbe385c59b0dfe6fb60f59888aa10f5139937cd0012326606c9edbdd0677af444d1e66d8c867cceb7 musl-fix.patch" +md5sums="bca2a8a6f7727ccbcefd5e190d935910 task-2.5.0.tar.gz +b26dba3e7e248ec8c22d820bc7b269c4 musl-fix.patch" +sha256sums="4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636 task-2.5.0.tar.gz +49b486a30c18660bb6b2544e920f0015db81a8cebee1bc22a3684ada2c0430ab musl-fix.patch" +sha512sums="911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd task-2.5.0.tar.gz +f82f9883ef6c885635890453fbb5c1dc4d4bf4b69926962a643bcaeadeb80874200329c3916b9796d26fd5f28eb9ad20f50fe7e4adc9f9ca635aa4b50be81911 musl-fix.patch" diff --git a/main/task/musl-fix.patch b/main/task/musl-fix.patch index 4cc5869..54a5167 100644 --- a/main/task/musl-fix.patch +++ b/main/task/musl-fix.patch @@ -1,20 +1,16 @@ -diff --git a/src/Path.cpp b/src/Path.cpp -index 94657e2..6a82199 100644 ---- a/src/Path.cpp -+++ b/src/Path.cpp -@@ -38,6 +38,15 @@ - #include - #include - -+/* fixes build with musl libc */ -+#ifndef GLOB_TILDE -+#define GLOB_TILDE 0 -+#endif -+ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - //////////////////////////////////////////////////////////////////////////////// - std::ostream& operator<< (std::ostream& out, const Path& path) - { +diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp +index c67ed44..72da081 100644 +--- a/src/TLSClient.cpp ++++ b/src/TLSClient.cpp +@@ -36,11 +36,7 @@ + #include + #include + #include +-#if (defined OPENBSD || defined SOLARIS || defined NETBSD) + #include +-#else +-#include +-#endif + #include + #include + #include -- 2.6.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---