| Index: ports/pkg/nacl.patch
|
| diff --git a/ports/pkg/nacl.patch b/ports/pkg/nacl.patch
|
| index f1c7627c6e605315fefb71bb127ed13c7a39a9ec..bd9695960d1d532ff6b9b56d8f768f3d4a582732 100644
|
| --- a/ports/pkg/nacl.patch
|
| +++ b/ports/pkg/nacl.patch
|
| @@ -1191,31 +1191,22 @@ diff --git a/libpkg/pkg_repo.c b/libpkg/pkg_repo.c
|
| *rc = EPKG_OK;
|
| return (res);
|
| }
|
| -@@ -890,9 +1052,21 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
| +@@ -890,9 +1052,12 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
|
|
| dbdir = pkg_object_string(pkg_config_get("PKG_DBDIR"));
|
|
|
| +#ifdef __native_client__
|
| + char* tmp_file;
|
| -+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "txz", t, &rc, &tmp_file);
|
| ++ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc, &tmp_file);
|
| +#else
|
| fd = pkg_repo_fetch_remote_tmp(repo, "meta", "txz", t, &rc);
|
| - if (fd == -1)
|
| - return (rc);
|
| +#endif
|
| -+ if (fd == -1) {
|
| -+#ifdef __native_client__
|
| -+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc, &tmp_file);
|
| -+#else
|
| -+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc);
|
| -+#endif
|
| -+ if (fd == -1)
|
| -+ return (rc);
|
| -+ }
|
|
|
| snprintf(filepath, sizeof(filepath), "%s/%s.meta", dbdir, pkg_repo_name(repo));
|
|
|
| -@@ -922,12 +1096,18 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
| +@@ -922,12 +1087,18 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
| }
|
|
|
| close(fd);
|
| @@ -1234,7 +1225,7 @@ diff --git a/libpkg/pkg_repo.c b/libpkg/pkg_repo.c
|
| /* Map meta file for extracting pubkeys from it */
|
| if (stat(filepath, &st) == -1) {
|
| pkg_emit_errno("pkg_repo_fetch_meta", "cannot stat meta fetched");
|
| -@@ -947,6 +1127,7 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
| +@@ -947,6 +1118,7 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
|
| rc = EPKG_FATAL;
|
| goto cleanup;
|
| }
|
|
|