dar: update to 2.6.6
This commit is contained in:
Nathan Owens
Juan RP
parent
4aa3104dab
commit
b0a5e07877
|
|
@ -1701,7 +1701,8 @@ libefivar.so.1 libefivar-31_1
|
|||
libefiboot.so.1 libefivar-31_1
|
||||
libportaudio.so.2 portaudio-19.20140130_1
|
||||
libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
|
||||
libdar.so.5000 libdar-2.4.14_1
|
||||
libdar.so.6000 libdar-2.6.6_1
|
||||
libdar64.so.6000 libdar-2.6.6_1
|
||||
libpython3.so python3-3.6.2_1
|
||||
libpython3.6m.so.1.0 python3-3.6.2_1
|
||||
libbrscandec2.so.1 brother-brscan3-0.2.11_2
|
||||
|
|
|
|||
|
|
@ -1,143 +0,0 @@
|
|||
Our libgcrypt is recent enough so patch out the tests which
|
||||
prevent cross compiling dar. Also set the required gettext
|
||||
version to 0.19 and remove a test for static linking, which
|
||||
always works for Void Linux.
|
||||
|
||||
--- configure.ac 2017-01-21 11:59:32.000000000 +0100
|
||||
+++ configure.ac 2017-01-25 12:42:51.662888147 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
AM_INIT_AUTOMAKE([subdir-objects])
|
||||
AM_GNU_GETTEXT([external])
|
||||
-AM_GNU_GETTEXT_VERSION
|
||||
+AM_GNU_GETTEXT_VERSION([0.19])
|
||||
XGETTEXT_EXTRA_OPTIONS='--keyword=dar_gettext'
|
||||
AM_ICONV
|
||||
|
||||
@@ -528,58 +528,10 @@
|
||||
local_crypto="no"
|
||||
])
|
||||
if test "$local_crypto" = "yes" ; then
|
||||
- min_version_gcrypt="1.4.0"
|
||||
- AC_DEFINE_UNQUOTED(MIN_VERSION_GCRYPT, "$min_version_gcrypt", [libgcrypt minimum version])
|
||||
- min_version_gcrypt_hash_bug="1.6.0"
|
||||
- AC_DEFINE_UNQUOTED(MIN_VERSION_GCRYPT_HASH_BUG, "$min_version_gcrypt_hash_bug", [ligcrypt minimum version without hash bug])
|
||||
- AC_MSG_CHECKING([for libgcrypt usability])
|
||||
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ extern "C"
|
||||
- {
|
||||
- #if HAVE_GCRYPT_H
|
||||
- #include <gcrypt.h>
|
||||
- #endif
|
||||
- }
|
||||
- #include <iostream>
|
||||
- using namespace std;
|
||||
- ]],
|
||||
- [[
|
||||
- if(!gcry_check_version(MIN_VERSION_GCRYPT))
|
||||
- {
|
||||
- cout << "ligcrypt version too low, minimum version is " << MIN_VERSION_GCRYPT << endl;
|
||||
- exit(1);
|
||||
- }
|
||||
- else
|
||||
- exit(0);
|
||||
- ]])
|
||||
- ],
|
||||
- [ AC_DEFINE(CRYPTO_AVAILABLE, 1, [header and linking is available to have strong encryption works])
|
||||
- AC_MSG_RESULT([ok])
|
||||
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ extern "C"
|
||||
- {
|
||||
- #if HAVE_GCRYPT_H
|
||||
- #include <gcrypt.h>
|
||||
- #endif
|
||||
- }
|
||||
- ]],
|
||||
- [[
|
||||
- if(!gcry_check_version(MIN_VERSION_GCRYPT_HASH_BUG))
|
||||
- exit(1);
|
||||
- else
|
||||
- exit(0);
|
||||
- ]])
|
||||
- ],
|
||||
- [],
|
||||
- [ libgcrypt_hash_bug="yes" ])
|
||||
- ],
|
||||
- [
|
||||
- if test "$?" = "1" ; then
|
||||
- AC_MSG_RESULT([failed: need libgcypt >= $min_version_gcrypt, disabling strong encryption support])
|
||||
- else
|
||||
- AC_MSG_RESULT([failed: libgcrypt is unusable, cannot even call gcry_check_version(). Disabling strong encryption support])
|
||||
- fi
|
||||
- local_crypto="no"
|
||||
- ])
|
||||
- else
|
||||
+ AC_DEFINE_UNQUOTED(MIN_VERSION_GCRYPT, "1.4.0", [libgcrypt minimum version])
|
||||
+ AC_DEFINE_UNQUOTED(MIN_VERSION_GCRYPT_HASH_BUG, "1.6.0", [ligcrypt minimum version without hash bug])
|
||||
+ AC_DEFINE(CRYPTO_AVAILABLE, 1, [header and linking is available to have strong encryption works])
|
||||
+ else
|
||||
AC_MSG_WARN([strong encryption support not available])
|
||||
fi
|
||||
])
|
||||
@@ -1119,61 +1119,8 @@
|
||||
],
|
||||
[])
|
||||
|
||||
-
|
||||
-MEM_LDFLAGS=$LDFLAGS
|
||||
-MEM_CXXFLAGS=$CXXFLAGS
|
||||
-LDFLAGS="-static $MEM_LDFLAGS $GPGME_LIBS"
|
||||
-CXXFLAGS="$CXXFLAGS $GPGME_CFLAGS"
|
||||
-AC_MSG_CHECKING([static linking])
|
||||
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[ extern "C" {
|
||||
- #if HAVE_STDIO_H
|
||||
- #include <stdio.h>
|
||||
- #endif
|
||||
- #if HAVE_EXECINFO_H
|
||||
- #include <execinfo.h>
|
||||
- #endif
|
||||
- #if HAVE_STDLIB_H
|
||||
- #include <stdlib.h>
|
||||
- #endif
|
||||
- #if HAVE_PTHREAD_H
|
||||
- #include <pthread.h>
|
||||
- #endif
|
||||
- }
|
||||
- ]],
|
||||
- [[
|
||||
- #if HAVE_EXECINFO_H
|
||||
- const int buf_size = 20;
|
||||
- void *buffer[buf_size];
|
||||
- int size = backtrace(buffer, buf_size);
|
||||
- char **symbols = backtrace_symbols(buffer, size);
|
||||
-
|
||||
- if(symbols != nullptr)
|
||||
- free(symbols);
|
||||
- #endif
|
||||
- #if MUTEX_WORKS
|
||||
- pthread_mutex_t test;
|
||||
- if(pthread_mutex_init(&test, NULL) == 0)
|
||||
- {
|
||||
- if(pthread_mutex_lock(&test) == 0)
|
||||
- pthread_mutex_unlock(&test);
|
||||
- }
|
||||
- pthread_mutex_destroy(&test);
|
||||
- #endif
|
||||
-
|
||||
- printf("Hello World!");
|
||||
- return 0;
|
||||
- ]])
|
||||
- ],
|
||||
- [
|
||||
- AC_MSG_RESULT([yes, perfect!])
|
||||
- static_pb="no"
|
||||
- ],
|
||||
- [
|
||||
- AC_MSG_RESULT([failed])
|
||||
- static_pb="yes"
|
||||
- ])
|
||||
-LDFLAGS=$MEM_LDFLAGS
|
||||
-CXXFLAGS=$MEM_CXXFLAGS
|
||||
+# static linking supported
|
||||
+static_pb="yes"
|
||||
|
||||
AM_CONDITIONAL([MAKE_ALL_DIR], [test $examples = "yes"])
|
||||
AM_CONDITIONAL([BUILD_DAR_STATIC], [test $build_static = "yes" -a $static_pb = "no"])
|
||||
|
|
@ -21,3 +21,16 @@ tests. They are not required.
|
|||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "cannot run test program while cross compiling
|
||||
diff --git configure configure
|
||||
index 157b7a9..7c6a50d 100755
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -25481,7 +25481,7 @@ fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libthreadar() operationability" >&5
|
||||
$as_echo_n "checking for libthreadar() operationability... " >&6; }
|
||||
- if test "$cross_compiling" = yes; then :
|
||||
+ if test "$cross_compiling" = xxx; then :
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "cannot run test program while cross compiling
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
# Template file for 'dar'
|
||||
pkgname=dar
|
||||
version=2.5.20
|
||||
revision=2
|
||||
version=2.6.6
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-upx --disable-build-html"
|
||||
conf_files="/etc/darrc"
|
||||
hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config"
|
||||
makedepends="acl-devel bzip2-devel e2fsprogs-devel libgcrypt-devel liblzma-devel
|
||||
lzo-devel"
|
||||
lzo-devel librsync-devel libcurl-devel"
|
||||
short_desc="Shell command that backs up directory trees and files"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://dar.linux.free.fr/"
|
||||
distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz"
|
||||
checksum=01e352e81a0d578ff1333be0453afdb9c4af22685ee3d30d8f82a96b3ff893a5
|
||||
checksum=fac66df4df145b3b6d6faa934d1f3035439b367ba45b7d3f478ecad9d2620ddf
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
|
||||
|
|
@ -21,15 +21,17 @@ if [ "$CROSS_BUILD" ]; then
|
|||
LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lgcrypt"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
do_check() {
|
||||
# need to be run as root
|
||||
:
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# Prevent writing memory pages to disk,
|
||||
# which gives "Warning: using insecure memory"
|
||||
chmod u+s ${DESTDIR}/usr/bin/dar
|
||||
}
|
||||
|
||||
libdar_package() {
|
||||
short_desc+=" - runtime library"
|
||||
pkg_install() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue