[arch-commits] Commit in curl/repos (3 files)

[Christian Hesse]

    Date: Tuesday, July 24, 2018 @ 19:27:08
  Author: eworm
Revision: 329520

archrelease: copy trunk to testing-x86_64

Added:
  curl/repos/testing-x86_64/
  curl/repos/testing-x86_64/0001-header-output-switch-off-all-styles-not-just-unbold.patch
    (from rev 329519, curl/trunk/0001-header-output-switch-off-all-styles-not-just-unbold.patch)
  curl/repos/testing-x86_64/PKGBUILD
    (from rev 329519, curl/trunk/PKGBUILD)

----------------------------------------------------------------+
 0001-header-output-switch-off-all-styles-not-just-unbold.patch |   30 +++++
 PKGBUILD                                                       |   59 ++++++++++
 2 files changed, 89 insertions(+)

Copied: curl/repos/testing-x86_64/0001-header-output-switch-off-all-styles-not-just-unbold.patch (from rev 329519, curl/trunk/0001-header-output-switch-off-all-styles-not-just-unbold.patch)
===================================================================
--- testing-x86_64/0001-header-output-switch-off-all-styles-not-just-unbold.patch	                        (rev 0)
+++ testing-x86_64/0001-header-output-switch-off-all-styles-not-just-unbold.patch	2018-07-24 19:27:08 UTC (rev 329520)
@@ -0,0 +1,30 @@
+From 48ba5ea4618a88ce9b3a4dbb51a0d8311936d308 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Thu, 12 Jul 2018 11:04:00 +0200
+Subject: [PATCH] header output: switch off all styles, not just unbold
+
+... the "unbold" sequence doesn't work on the mac Terminal.
+
+Reported-by: Zero King
+Fixes #2736
+Closes #2738
+---
+ src/tool_cb_hdr.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
+index 88ce5e13b8..6419b72048 100644
+--- a/src/tool_cb_hdr.c
++++ b/src/tool_cb_hdr.c
+@@ -42,7 +42,10 @@ static char *parse_filename(const char *ptr, size_t len);
+ #define BOLDOFF
+ #else
+ #define BOLD "\x1b[1m"
+-#define BOLDOFF "\x1b[21m"
++/* Switch off bold by settting "all attributes off" since the explicit
++   bold-off code (21) isn't supported everywhere - like in the mac
++   Terminal. */
++#define BOLDOFF "\x1b[0m"
+ #endif
+ 
+ /*

Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 329519, curl/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-07-24 19:27:08 UTC (rev 329520)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.61.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('x86_64')
+url="https://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-header-output-switch-off-all-styles-not-just-unbold.patch')
+sha512sums=('e55193d1893e7619c8a599299bc030db1307260b19803d01983d4229820e3da8afd274eaee9c5be57911591ffe1fe44ac10d2da38f2d3d3204d8ce9df8d06a93'
+            'SKIP'
+            'af8df41040778853bef695f0d1cde78efbb907a5f49bd596393096791daa90fccc556a9e8701a7ab8db379fbefe27fffc590c95f33b0917406c1fe16a036281d')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < ../0001-header-output-switch-off-all-styles-not-just-unbold.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-ldap \
+      --disable-ldaps \
+      --disable-manual \
+      --enable-ipv6 \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --with-gssapi \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install -C scripts
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}