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