From f2d0b8b2ef42a320052092d96423ec2e35cf3faf Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 8 Sep 2016 16:31:29 +0200 Subject: ip-patch aus curl entfernt --- ...p-is-enough-for-ssl-if-only-ip-is-given.Pkgfile.patch | 16 ---------------- ...id-ip-is-enough-for-ssl-if-only-ip-is-given.patch.new | 11 ----------- core/curl/with-ca-path.Pkgfile.patch | 2 +- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.Pkgfile.patch delete mode 100644 core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch.new diff --git a/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.Pkgfile.patch b/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.Pkgfile.patch deleted file mode 100644 index 47b206c..0000000 --- a/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.Pkgfile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Pkgfile 2016-07-21 22:33:02.008231411 +0200 -+++ Pkgfile 2016-07-21 22:33:33.768262647 +0200 -@@ -6,10 +6,12 @@ - name=curl - version=7.50.1 - release=1 --source=(http://curl.haxx.se/download/$name-$version.tar.lzma) -+source=(http://curl.haxx.se/download/$name-$version.tar.lzma -+ valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch) - - build() { - cd $name-$version -+ patch -p0 -i ../valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch - ./configure --prefix=/usr \ - --enable-ipv6 \ - --without-libidn \ diff --git a/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch.new b/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch.new deleted file mode 100644 index e458c8c..0000000 --- a/core/curl/valid-ip-is-enough-for-ssl-if-only-ip-is-given.patch.new +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/vtls/openssl.c 2016-07-21 21:40:37.014958580 +0200 -+++ lib/vtls/openssl.c 2016-07-21 22:22:13.284274185 +0200 -@@ -1117,7 +1117,7 @@ - - /* If a subjectAltName extension of type dNSName is present, that MUST - be used as the identity. / RFC2818 section 3.1 */ -- if(check->type == GEN_DNS) -+ if(check->type == GEN_DNS && strcmp(conn->ip_addr_str,conn->host.name)) - dNSName = TRUE; - - /* only check alternatives of the same type the target is */ diff --git a/core/curl/with-ca-path.Pkgfile.patch b/core/curl/with-ca-path.Pkgfile.patch index 3529a90..55ef20f 100644 --- a/core/curl/with-ca-path.Pkgfile.patch +++ b/core/curl/with-ca-path.Pkgfile.patch @@ -1,6 +1,6 @@ --- Pkgfile 2016-04-27 21:29:05.981945202 +0200 +++ Pkgfile 2016-04-27 22:49:18.883588926 +0200 -@@ -17,6 +17,7 @@ +@@ -15,6 +15,7 @@ --without-libidn \ --without-cyassl \ --enable-threaded-resolver \ -- cgit v1.2.3-54-g00ecf