Always use bzip2 compression for pkg metadata

ports/pkg/nacl.patch

 diff --git a/compat/Makefile.am b/compat/Makefile.am
 --- a/compat/Makefile.am
 +++ b/compat/Makefile.am
 @@ -1,8 +1,7 @@
 -noinst_LTLIBRARIES=    libbsd_compat.la
  noinst_HEADERS=                bsd_compat.h endian_util.h \
                         humanize_number.h
  
 -libbsd_compat_la_SOURCES=      basename.c \
 +sources=       basename.c \
@@ skipping 1173 matching lines @@
                 return (NULL);
         }
  
 +#ifdef __native_client__
 +       (void)unlink(tmp_file);
 +       free(tmp_file);
 +#endif
         *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);
 +#ifdef __native_client__
 +       (void)unlink(tmp_file);
 +       free(tmp_file);
 +#endif
  
         if (repo->signature_type == SIG_FINGERPRINT && repo->trusted_fp == NULL) {
                 if (pkg_repo_load_fingerprints(repo) != EPKG_OK)
                         return (EPKG_FATAL);
         }
  
 +  // No pubkey or fingerprint for nacl repo now.
 +#ifndef __native_client__
         /* 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;
         }
 +#endif
  
         if (repo->signature_type == SIG_FINGERPRINT) {
                 cbdata.len = st.st_size;
 diff --git a/libpkg/pkg_repo_create.c b/libpkg/pkg_repo_create.c
 --- a/libpkg/pkg_repo_create.c
 +++ b/libpkg/pkg_repo_create.c
@@ skipping 917 matching lines @@
  
 +if DYNAMIC
 +       GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat.la -lutil
 +else
 +       GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat_static.la
 +endif
 +
  if HAVE_ELF_ABI
  if LIBELF_BUNDLED
  GENERIC_LDADD+=        $(top_builddir)/external/libelf_static.la