diff --git a/configure.ac b/configure.ac index d34aa98..8661866 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,15 @@ AC_ARG_ENABLE( AC_DEFINE(SWUPD_WITH_STATELESS,1,[OS is stateless]) ) +AC_ARG_ENABLE( + [bsdtar], + AS_HELP_STRING([--enable-bsdtar],[Use alternative bsdtar command (uses tar by default)]), + AS_IF([test "x$enable_bsdtar" = "xyes"], + AC_DEFINE([SWUPD_WITH_BSDTAR], 1, [Use alternative bsdtar]), + AC_DEFINE([SWUPD_WITH_BSDTAR], 0, [Use default tar command])), + AC_DEFINE([SWUPD_WITH_BSDTAR], 0, [Use default tar command]) +) + AC_ARG_ENABLE( [tests], [AS_HELP_STRING([--disable-tests], [Do not enable functional test framework (enabled by default)])] diff --git a/include/swupd.h b/include/swupd.h index 8eafe9a..184f959 100644 --- a/include/swupd.h +++ b/include/swupd.h @@ -17,10 +17,20 @@ #define SWUPD_SERVER_STATE_DIR "/var/lib/update" -#if SWUPD_WITH_SELINUX -#define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*' --selinux" +#if SWUPD_WITH_BSDTAR +#define TAR_COMMAND "bsdtar" +#define TAR_XATTR_ARGS "" +#define TAR_WARN_ARGS "" #else -#define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*'" +#define TAR_COMMAND "tar" +#define TAR_XATTR_ARGS "--xattrs --xattrs-include='*'" +#define TAR_WARN_ARGS "--warning=no-timestamp" +#endif + +#if SWUPD_WITH_SELINUX +#define TAR_PERM_ATTR_ARGS "--preserve-permissions --selinux " TAR_XATTR_ARGS +#else +#define TAR_PERM_ATTR_ARGS "--preserve-permissions " TAR_XATTR_ARGS #endif #if SWUPD_WITH_STATELESS diff --git a/src/fullfiles.c b/src/fullfiles.c index 89077cd..58cd7c0 100644 --- a/src/fullfiles.c +++ b/src/fullfiles.c @@ -92,8 +92,8 @@ static void create_fullfile(struct file *file) assert(0); } - string_or_die(&tarcommand, "tar -C %s " TAR_PERM_ATTR_ARGS " -cf - --exclude='%s'/* '%s' 2> /dev/null | " - "tar -C %s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", + string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -cf - --exclude='%s/?*' './%s' 2> /dev/null | " + TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", dir, base, base, rename_tmpdir); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); @@ -110,7 +110,7 @@ static void create_fullfile(struct file *file) free(rename_source); /* for a directory file, tar up simply with gzip */ - string_or_die(&tarcommand, "tar -C %s " TAR_PERM_ATTR_ARGS " -zcf %s/%i/files/%s.tar %s", + string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -zcf %s/%i/files/%s.tar %s", rename_tmpdir, outdir, file->last_change, file->hash, file->hash); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); @@ -145,7 +145,7 @@ static void create_fullfile(struct file *file) /* step 2a: tar it with each compression type */ // lzma - string_or_die(&tarcommand, "tar --directory=%s " TAR_PERM_ATTR_ARGS " -Jcf %s/%i/files/%s.tar.xz %s", + string_or_die(&tarcommand, TAR_COMMAND " --directory=%s " TAR_PERM_ATTR_ARGS " -Jcf %s/%i/files/%s.tar.xz %s", empty, outdir, file->last_change, file->hash, file->hash); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); @@ -153,7 +153,7 @@ static void create_fullfile(struct file *file) } free(tarcommand); // gzip - string_or_die(&tarcommand, "tar --directory=%s " TAR_PERM_ATTR_ARGS " -zcf %s/%i/files/%s.tar.gz %s", + string_or_die(&tarcommand, TAR_COMMAND " --directory=%s " TAR_PERM_ATTR_ARGS " -zcf %s/%i/files/%s.tar.gz %s", empty, outdir, file->last_change, file->hash, file->hash); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); @@ -161,7 +161,7 @@ static void create_fullfile(struct file *file) } free(tarcommand); #ifdef SWUPD_WITH_BZIP2 - string_or_die(&tarcommand, "tar --directory=%s " TAR_PERM_ATTR_ARGS " -jcf %s/%i/files/%s.tar.bz2 %s", + string_or_die(&tarcommand, TAR_COMMAND " --directory=%s " TAR_PERM_ATTR_ARGS " -jcf %s/%i/files/%s.tar.bz2 %s", empty, outdir, file->last_change, file->hash, file->hash); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); diff --git a/src/manifest.c b/src/manifest.c index dcda18d..1b893bc 100644 --- a/src/manifest.c +++ b/src/manifest.c @@ -749,12 +749,12 @@ static int write_manifest_tar(struct manifest *manifest) /* now, tar the thing up for efficient full file download */ /* and put the signature of the plain manifest into the archive, too */ if (enable_signing) { - string_or_die(&tarcmd, "tar --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " + string_or_die(&tarcmd, TAR_COMMAND " --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " "%s/%i/Manifest.%s.tar Manifest.%s Manifest.%s.signed", conf, manifest->version, conf, manifest->version, manifest->component, manifest->component, manifest->component); } else { - string_or_die(&tarcmd, "tar --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " + string_or_die(&tarcmd, TAR_COMMAND " --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " "%s/%i/Manifest.%s.tar Manifest.%s", conf, manifest->version, conf, manifest->version, manifest->component, manifest->component); diff --git a/src/pack.c b/src/pack.c index 7926bec..d337ce6 100644 --- a/src/pack.c +++ b/src/pack.c @@ -113,8 +113,8 @@ static void explode_pack_stage(int version, char *module) * the resulting pack is slightly smaller, and in addition, we're saving CPU * time on the client... */ - string_or_die(&tar, "tar --directory=%s/%s/%i/staged --warning=no-timestamp " TAR_PERM_ATTR_ARGS - " -xf %s", + string_or_die(&tar, TAR_COMMAND " --directory=%s/%s/%i/staged " TAR_WARN_ARGS " " + TAR_PERM_ATTR_ARGS " -xf %s", packstage_dir, module, version, path); ret = system(tar); if (!ret) { @@ -443,8 +443,8 @@ static int make_final_pack(struct packdata *pack) /* tar the staging directory up */ LOG(NULL, "starting tar for pack", "%s: %i to %i", pack->module, pack->from, pack->to); - string_or_die(&tar, "tar " TAR_PERM_ATTR_ARGS " --directory=%s/%s/%i/ " - "--numeric-owner -Jcf %s/%i/pack-%s-from-%i.tar delta staged", + string_or_die(&tar, TAR_COMMAND " " TAR_PERM_ATTR_ARGS " --directory=%s/%s/%i/ " + "--numeric-owner -Jcf %s/%i/pack-%s-from-%i.tar delta staged", packstage_dir, pack->module, pack->from, staging_dir, pack->to, pack->module, pack->from); ret = system(tar); free(tar);