components/libarchive/patches/fix-tests.patch
branchs11u3-sru
changeset 6358 3b2a73b969a9
equal deleted inserted replaced
6356:64e0f06b8b9e 6358:3b2a73b969a9
       
     1 Version related tests fail because we have:
       
     2 
       
     3 #define ZLIB_VERSION "1.2.8-T4mods"
       
     4 
       
     5 in /usr/include/zlib.h instead of the normal:
       
     6 
       
     7 #define ZLIB_VERSION "1.2.8"
       
     8 
       
     9 This patch has been submitted upstream. See:
       
    10 https://github.com/libarchive/libarchive/issues/720
       
    11 
       
    12 --- libarchive-3.2.0/tar/test/test_version.c.orig	2016-06-17 15:01:20.182487097 -0700
       
    13 +++ libarchive-3.2.0/tar/test/test_version.c	2016-06-17 16:09:37.869258356 -0700
       
    14 @@ -88,7 +88,7 @@
       
    15  	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
       
    16  		++q;
       
    17  	/* Skip arbitrary third-party version numbers. */
       
    18 -	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    19 +	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    20  		++q;
       
    21  		--s;
       
    22  	}
       
    23 --- libarchive-3.2.0/cpio/test/test_option_version.c.orig	2016-06-17 16:33:58.917721419 -0700
       
    24 +++ libarchive-3.2.0/cpio/test/test_option_version.c	2016-06-17 16:34:20.005855444 -0700
       
    25 @@ -75,7 +75,7 @@
       
    26  	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
       
    27  		++q;
       
    28  	/* Skip arbitrary third-party version numbers. */
       
    29 -	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    30 +	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    31  		++q;
       
    32  		--s;
       
    33  	}
       
    34 --- libarchive-3.2.0/cat/test/test_version.c.orig	2016-06-17 16:36:09.148321710 -0700
       
    35 +++ libarchive-3.2.0/cat/test/test_version.c	2016-06-17 16:36:25.036590222 -0700
       
    36 @@ -83,7 +83,7 @@
       
    37  	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
       
    38  		++q;
       
    39  	/* Skip arbitrary third-party version numbers. */
       
    40 -	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    41 +	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
       
    42  		++q;
       
    43  		--s;
       
    44  	}