1 |
commit: 8ece9896e800e5a76aa92a1202b2727c363690ce |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 29 15:46:46 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 15:49:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ece9896 |
7 |
|
8 |
net-misc/wget2: Fixed avoid_bashisms patch |
9 |
|
10 |
I forgot to address one remaining bashism |
11 |
|
12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch | 15 +++++++++------ |
16 |
1 file changed, 9 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch b/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch |
19 |
index 9b57117135a..8835171bb61 100644 |
20 |
--- a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch |
21 |
+++ b/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch |
22 |
@@ -1,4 +1,4 @@ |
23 |
-From c2a27f61db2de16fbadd1d52802c667cb0a2f819 Mon Sep 17 00:00:00 2001 |
24 |
+From 60b50a9076c06933f7255afc8df0733a4311f767 Mon Sep 17 00:00:00 2001 |
25 |
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@×××.de> |
26 |
Date: Thu, 29 Oct 2020 23:05:18 +0100 |
27 |
Subject: [PATCH] * configure.ac: Fix configure.ac bashisms |
28 |
@@ -8,11 +8,11 @@ Reported-by: Brian Inglis |
29 |
Backported to 1.99.2 release |
30 |
Signed-off-by: Lars Wendler <polynomial-c@g.o> |
31 |
--- |
32 |
- configure.ac | 18 +++++++++--------- |
33 |
- 1 file changed, 9 insertions(+), 9 deletions(-) |
34 |
+ configure.ac | 20 ++++++++++---------- |
35 |
+ 1 file changed, 10 insertions(+), 10 deletions(-) |
36 |
|
37 |
diff --git a/configure.ac b/configure.ac |
38 |
-index ab3d9fdf..158d5aea 100644 |
39 |
+index ab3d9fdf..4cc5eff2 100644 |
40 |
--- a/configure.ac |
41 |
+++ b/configure.ac |
42 |
@@ -350,13 +350,13 @@ if test "$enable_doc" = yes; then |
43 |
@@ -40,9 +40,12 @@ index ab3d9fdf..158d5aea 100644 |
44 |
PKG_CHECK_MODULES([GNUTLS], [gnutls], [ |
45 |
with_gnutls=yes |
46 |
LIBS="$GNUTLS_LIBS $LIBS" |
47 |
-@@ -454,14 +454,14 @@ AS_IF([test "x$with_ssl" == "xgnutls"], [ |
48 |
+@@ -452,16 +452,16 @@ AS_IF([test "x$with_ssl" == "xgnutls"], [ |
49 |
+ [with_gnutls=no; AC_MSG_WARN(*** GNUTLS was not found. You will not be able to use HTTPS. Fallback to libnettle for hashing and checksumming.)]) |
50 |
+ ]) |
51 |
|
52 |
- AS_IF([test "x$with_gnutls" == xyes], [ |
53 |
+- AS_IF([test "x$with_gnutls" == xyes], [ |
54 |
++ AS_IF([test "x$with_gnutls" = xyes], [ |
55 |
AC_SEARCH_LIBS(gnutls_hash, gnutls, [with_gnutls_hash=yes]) |
56 |
- AS_IF([test "x$with_gnutls_hash" == xyes], |
57 |
+ AS_IF([test "x$with_gnutls_hash" = xyes], |