[arch-commits] Commit in curl/trunk (2 files)

[Christian Hesse]

    Date: Tuesday, July 24, 2018 @ 19:27:00
  Author: eworm
Revision: 329519

upgpkg: curl 7.61.0-2

header output: switch off all styles, not just unbold (FS#59435)

Added:
  curl/trunk/0001-header-output-switch-off-all-styles-not-just-unbold.patch
Modified:
  curl/trunk/PKGBUILD

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

Added: 0001-header-output-switch-off-all-styles-not-just-unbold.patch
===================================================================
--- 0001-header-output-switch-off-all-styles-not-just-unbold.patch	                        (rev 0)
+++ 0001-header-output-switch-off-all-styles-not-just-unbold.patch	2018-07-24 19:27:00 UTC (rev 329519)
@@ -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
+ 
+ /*

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-24 18:47:41 UTC (rev 329518)
+++ PKGBUILD	2018-07-24 19:27:00 UTC (rev 329519)
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.61.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('x86_64')
 url="https://curl.haxx.se"
@@ -15,12 +15,20 @@
 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})
+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')
+            '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"