diff options
author | Lachlan McIlroy <lachlan@sgi.com> | 2006-12-09 02:55:54 +0000 |
---|---|---|
committer | Lachlan McIlroy <lachlan@sgi.com> | 2006-12-09 02:55:54 +0000 |
commit | bdca08384b68341275309e50823a6311d5e4af7a (patch) | |
tree | a0554ede8b7c1047c0cf066cea44ddcca2ce6e3a | |
parent | 6fcfa34114bec2885e6e46782df670ba98ba5034 (diff) | |
download | acl-bdca08384b68341275309e50823a6311d5e4af7a.tar.gz |
Fix a build issue on GNU/kFreeBSD, thanks to Petr Salinger.
Also updates Debian packaging.
Merge of master-melb:xfs-cmds:27678a by kenmcd.
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | doc/CHANGES | 3 | ||||
-rw-r--r-- | include/config.h.in | 5 | ||||
-rw-r--r-- | libacl/acl_delete_def_file.c | 1 |
5 files changed, 17 insertions, 1 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=2 -PKG_REVISION=41 +PKG_REVISION=42 PKG_BUILD=1 diff --git a/debian/changelog b/debian/changelog index 60ded06..10f4787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +acl (2.2.42-1) unstable; urgency=low + + * New upstream release + * Incorporate Petr Salinger's GNU/kFreeBSD patch (closes: #401511) + + -- Nathan Scott <nathans@debian.org> Fri, 08 Dec 2006 14:21:40 +1100 + acl (2.2.41-1) unstable; urgency=low * New upstream release diff --git a/doc/CHANGES b/doc/CHANGES index cb4de90..3ee0e9e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +2.2.42 (08 December 2006) +* Fix a build issue on GNU/kFreeBSD, thanks to Petr Salinger. + 2.2.41 (14 July 2006) * Fix issues with makedepend on libtool libraries. * Fix issues with install using named ids instead of numeric ones. diff --git a/include/config.h.in b/include/config.h.in index 0a508e8..6ca788b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -30,3 +30,8 @@ #endif #include <locale.h> +/* On GNU/kFreeBSD, ENODATA is not defined in the system headers */ +#include <errno.h> +#ifndef ENODATA +# define ENODATA ENOATTR +#endif diff --git a/libacl/acl_delete_def_file.c b/libacl/acl_delete_def_file.c index 5e1bce7..cb6083e 100644 --- a/libacl/acl_delete_def_file.c +++ b/libacl/acl_delete_def_file.c @@ -23,6 +23,7 @@ #include <attr/xattr.h> #include "byteorder.h" #include "acl_ea.h" +#include "config.h" /* 23.4.8 */ |