attr: update to 2.4.48.

This commit is contained in:
maxice8 2018-06-19 02:58:32 -03:00
parent 19aae4127d
commit e57aef15bf
3 changed files with 20 additions and 70 deletions

View file

@ -0,0 +1,11 @@
--- test/run
+++ test/run
@@ -106,7 +106,7 @@ for (;;) {
if (defined $line) {
# Substitute %VAR and %{VAR} with environment variables.
$line =~ s[%(\w+)][$ENV{$1}]eg;
- $line =~ s[%{(\w+)}][$ENV{$1}]eg;
+ $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
}
if (defined $line) {
if ($line =~ s/^\s*< ?//) {

View file

@ -1,55 +0,0 @@
--- include/xattr.h.orig 2013-03-01 20:24:44.620880695 +0100
+++ include/xattr.h 2013-03-01 20:26:28.802885344 +0100
@@ -31,33 +31,37 @@
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
extern int setxattr (const char *__path, const char *__name,
- const void *__value, size_t __size, int __flags) __THROW;
+ const void *__value, size_t __size, int __flags);
extern int lsetxattr (const char *__path, const char *__name,
- const void *__value, size_t __size, int __flags) __THROW;
+ const void *__value, size_t __size, int __flags);
extern int fsetxattr (int __filedes, const char *__name,
- const void *__value, size_t __size, int __flags) __THROW;
+ const void *__value, size_t __size, int __flags);
extern ssize_t getxattr (const char *__path, const char *__name,
- void *__value, size_t __size) __THROW;
+ void *__value, size_t __size);
extern ssize_t lgetxattr (const char *__path, const char *__name,
- void *__value, size_t __size) __THROW;
+ void *__value, size_t __size);
extern ssize_t fgetxattr (int __filedes, const char *__name,
- void *__value, size_t __size) __THROW;
+ void *__value, size_t __size);
extern ssize_t listxattr (const char *__path, char *__list,
- size_t __size) __THROW;
+ size_t __size);
extern ssize_t llistxattr (const char *__path, char *__list,
- size_t __size) __THROW;
+ size_t __size);
extern ssize_t flistxattr (int __filedes, char *__list,
- size_t __size) __THROW;
+ size_t __size);
-extern int removexattr (const char *__path, const char *__name) __THROW;
-extern int lremovexattr (const char *__path, const char *__name) __THROW;
-extern int fremovexattr (int __filedes, const char *__name) __THROW;
-
-__END_DECLS
+extern int removexattr (const char *__path, const char *__name);
+extern int lremovexattr (const char *__path, const char *__name);
+extern int fremovexattr (int __filedes, const char *__name);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* __XATTR_H__ */

View file

@ -1,19 +1,19 @@
# Template file for 'attr'
pkgname=attr
version=2.4.47
revision=7
version=2.4.48
revision=1
bootstrap=yes
build_style=gnu-configure
checkdepends="perl"
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
short_desc="Extended attribute support library for ACL support"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1-or-later"
homepage="http://savannah.nongnu.org/projects/attr"
license="LGPL-2.1"
distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz"
checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz"
checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
make_check_args="-j1" # Tests broken when ran in parallel
make_check_target="tests"
conf_files="/etc/xattr.conf"
# The included libtool is rotten and only works with bash; easiest fix.
export CONFIG_SHELL=/bin/bash
@ -23,8 +23,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
fi
pre_check() {
sed -i 's:{(:\\{(:' test/run
# Either the test wasn't updated or the package misconfigures/miscompiles
# the error message in musl based systems
# EXPECTED: Operation not supported
@ -34,23 +32,19 @@ pre_check() {
esac
}
do_install() {
make DIST_ROOT=${DESTDIR} install install-lib install-dev
}
attr-devel_package() {
depends="attr>=${version}_${revision}"
depends="attr-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share/man/man2
vmove usr/share/man/man3
vmove usr/share/man/man5
vmove usr/share/doc
vmove usr/lib/pkgconfig
}
}
attr-progs_package() {
short_desc+=" - utilities"
pkg_install() {