diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-15 01:21:10 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-15 01:21:35 +0200 |
| commit | 6020727d4b626472aac1a38a7ca0ed6959f9a85f (patch) | |
| tree | e57be71eaf26b849eb4c9963a56744c688b727ca /community/xbps/fix-build-with-misleading-indentation.patch | |
| parent | 50cf88b61df8a5172b3731f8def875301bbb18d7 (diff) | |
| download | aports-6020727d4b626472aac1a38a7ca0ed6959f9a85f.tar.bz2 aports-6020727d4b626472aac1a38a7ca0ed6959f9a85f.tar.xz | |
community/xbps: move from testing
Diffstat (limited to 'community/xbps/fix-build-with-misleading-indentation.patch')
| -rw-r--r-- | community/xbps/fix-build-with-misleading-indentation.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/community/xbps/fix-build-with-misleading-indentation.patch b/community/xbps/fix-build-with-misleading-indentation.patch new file mode 100644 index 0000000000..7fb8bfdb78 --- /dev/null +++ b/community/xbps/fix-build-with-misleading-indentation.patch @@ -0,0 +1,44 @@ +From 46744c412dca9ca2efc0df8ba1473ffd9145ddac Mon Sep 17 00:00:00 2001 +From: Michael Gehring <mg@ebfe.org> +Date: Fri, 3 Jun 2016 20:23:52 +0200 +Subject: [PATCH] lib/fetch/common.c: fix build with + -Werror=misleading-indentation + +Fixes #179 +--- + lib/fetch/common.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lib/fetch/common.c b/lib/fetch/common.c +index 77ffb7b..dd98a88 100644 +--- a/lib/fetch/common.c ++++ b/lib/fetch/common.c +@@ -754,17 +754,17 @@ fetch_ssl_verify_cn(X509_NAME *subject, const char *host, + NID_commonName, lastpos)) != -1) + loc = lastpos; + +- if (loc > -1) { +- nameentry = X509_NAME_get_entry(subject, loc); +- namedata = X509_NAME_ENTRY_get_data(nameentry); +- cnlen = ASN1_STRING_to_UTF8(&cn, namedata); +- if (ip == NULL && +- fetch_ssl_hname_match(host, strlen(host), (const char *)cn, cnlen)) +- ret = 1; +- else if (ip != NULL && fetch_ssl_ipaddr_match(ip, (const char *)cn, cnlen)) +- ret = 1; +- OPENSSL_free(cn); +- } ++ if (loc > -1) { ++ nameentry = X509_NAME_get_entry(subject, loc); ++ namedata = X509_NAME_ENTRY_get_data(nameentry); ++ cnlen = ASN1_STRING_to_UTF8(&cn, namedata); ++ if (ip == NULL && ++ fetch_ssl_hname_match(host, strlen(host), (const char *)cn, cnlen)) ++ ret = 1; ++ else if (ip != NULL && fetch_ssl_ipaddr_match(ip, (const char *)cn, cnlen)) ++ ret = 1; ++ OPENSSL_free(cn); ++ } + return (ret); + } + |