commit: 28d674a9bd916d0683a36cec475fd712af6111de Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Feb 20 09:27:16 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Feb 20 09:27:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d674a9
app-backup/fsarchiver: Bump to version 0.8.4 Closes: https://bugs.gentoo.org/648120 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-backup/fsarchiver/Manifest | 1 + .../fsarchiver/files/fsarchiver-0.8.4-xattr.patch | 69 ++++++++++++++++++++++ app-backup/fsarchiver/fsarchiver-0.8.4.ebuild | 53 +++++++++++++++++ app-backup/fsarchiver/metadata.xml | 4 ++ 4 files changed, 127 insertions(+) diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest index 5cdd28b3775..d2928fb2eb3 100644 --- a/app-backup/fsarchiver/Manifest +++ b/app-backup/fsarchiver/Manifest @@ -1,2 +1,3 @@ DIST fsarchiver-0.8.1.tar.gz 265048 BLAKE2B 2bf36ea0c1370abcce94e7e603ae98112c7da09ec6f9c7c928d78596093a6e478032a2e4ed408ace0a938b909be7317f841a84f2906345f20aec077d9372429e SHA512 17133392b0678b88552ae356bc199a8a5a8a88d3c8878b593b36acdc0f9dc3869f87475cc1a36d0df752e3bc3df8c9c0641954f675aaf60da4f1b0862dec1bc6 DIST fsarchiver-0.8.2.tar.gz 296486 BLAKE2B 655377c4e99bd45eccf529f13a3bf1f1e944a9fb18f91f57d2c59b46beb3cf7f85b9c1ab617aea7e021009c242a016cc351d6117466768c6ebbacd9be756d783 SHA512 e7b5b5dcd44be57d2d8a2639a54d8ef9c8bf9fde39ed3ca317c7cc124e1735a88db4a2be937b890c582eb4881926c8d50cdf940d13c0f97f9b8276f2b0a9319c +DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317158478422e0fb999ed277185f83ca9a5a607f189c9bbf6b63c6bf1b4d9589d51fcbf3b256d57b6cd056757156ae3 SHA512 15712e5fdb9695148e8fe42791952acf0c7d34611c3467a0cb2e2631c9c5f1c55a4e839098085e6a72c2d8988b05e6f515ef772bcc5766b57a07da65a5209efd diff --git a/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch b/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch new file mode 100644 index 00000000000..75472011600 --- /dev/null +++ b/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch @@ -0,0 +1,69 @@ +From 3c346717b7dcd8cfcbf7a359c2f924e00435b5f0 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Tue, 20 Feb 2018 10:13:30 +0100 +Subject: [PATCH] Replace <attr/xattr.h> with <sys/xattr.h> + +The former has been long deprecated and removed in attr-2.4.48 + +Signed-off-by: Lars Wendler <[email protected]> +--- + configure.ac | 2 +- + src/oper_restore.c | 3 ++- + src/oper_save.c | 7 ++++++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 66cfbf3..6eca553 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([BLKID], [blkid]) + PKG_CHECK_MODULES([UUID], [uuid]) + + dnl Check for header files installed with a library +-AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])]) ++AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])]) + + dnl Check for standard header files. + AC_CHECK_HEADERS([malloc.h unistd.h pthread.h]) +diff --git a/src/oper_restore.c b/src/oper_restore.c +index dd8af1f..92eb5f6 100644 +--- a/src/oper_restore.c ++++ b/src/oper_restore.c +@@ -24,7 +24,8 @@ + #include <assert.h> + #include <string.h> + #include <stdlib.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> ++#include <errno.h> + #include <sys/time.h> + #include <sys/stat.h> + #include <gcrypt.h> +diff --git a/src/oper_save.c b/src/oper_save.c +index ce6f194..ff29074 100644 +--- a/src/oper_save.c ++++ b/src/oper_save.c +@@ -29,7 +29,8 @@ + #include <sys/param.h> + #include <sys/statvfs.h> + #include <sys/stat.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> ++#include <errno.h> + #include <zlib.h> + #include <assert.h> + #include <gcrypt.h> +@@ -59,6 +60,10 @@ + #include "error.h" + #include "queue.h" + ++#ifndef ENOATTR ++#define ENOATTR ENODATA ++#endif ++ + typedef struct s_savear + { carchwriter ai; + cregmulti regmulti; +-- +2.16.2 + diff --git a/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild new file mode 100644 index 00000000000..2868e88f398 --- /dev/null +++ b/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Flexible filesystem archiver for backup and deployment tool" +HOMEPAGE="http://www.fsarchiver.org"; +SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug lz4 lzma lzo static zstd" + +DEPEND="dev-libs/libgcrypt:0= + >=sys-fs/e2fsprogs-1.41.4 + lz4? ( app-arch/lz4 ) + lzma? ( >=app-arch/xz-utils-4.999.9_beta ) + lzo? ( >=dev-libs/lzo-2.02 ) + static? ( + lz4? ( app-arch/lz4[static-libs] ) + lzma? ( app-arch/xz-utils[static-libs] ) + lzo? ( dev-libs/lzo[static-libs] ) + zstd? ( app-arch/zstd[static-libs] ) + ) + zstd? ( app-arch/zstd ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-xattr.patch" +) + +src_prepare() { + default + sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \ + || die "seding failed" + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable debug devel) + $(use_enable lz4) + $(use_enable lzma) + $(use_enable lzo) + $(use_enable static) + $(use_enable zstd) + ) + econf "${myeconfargs[@]}" +} diff --git a/app-backup/fsarchiver/metadata.xml b/app-backup/fsarchiver/metadata.xml index f825fbf7a69..b705057e31d 100644 --- a/app-backup/fsarchiver/metadata.xml +++ b/app-backup/fsarchiver/metadata.xml @@ -5,6 +5,10 @@ <email>[email protected]</email> <name>Markos Chandras</name> </maintainer> + <use> + <flag name="lz4">Enable lz4 compression support</flag> + <flag name="zstd">Enable zstd compression support</flag> + </use> <upstream> <remote-id type="sourceforge">fsarchiver</remote-id> <remote-id type="github">fdupoux/fsarchiver</remote-id>
