SHA256
1
0
forked from pool/aide

Accepting request 235720 from home:elvigia:branches:security

- Once upon a time, 10 years ago, basic extended attribute
  functionality moved to libc, therefore libattr is most
  of the time, not needed at all. (aide-xattr-in-libc.patch)

OBS-URL: https://build.opensuse.org/request/show/235720
OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=25
This commit is contained in:
Marcus Meissner 2014-06-01 09:21:38 +00:00 committed by Git OBS Bridge
parent 7bc752d2ff
commit a1385167e8
3 changed files with 30 additions and 2 deletions

21
aide-xattr-in-libc.patch Normal file
View File

@ -0,0 +1,21 @@
--- aide-0.15.1.orig/configure.in
+++ aide-0.15.1/configure.in
@@ -514,7 +514,7 @@ AC_ARG_WITH([xattr],
AS_IF([test "x$with_xattr_support" != xno],
[AC_DEFINE(WITH_XATTR,1,[use xattr])
- ATTRLIB=-lattr
+ ATTRLIB=
compoptionstring="${compoptionstring}WITH_XATTR\\n"
aideextragroups="${aideextragroups}+xattr"
AC_MSG_RESULT(yes)],
--- aide-0.15.1.orig/include/db_config.h
+++ aide-0.15.1/include/db_config.h
@@ -62,7 +62,6 @@ typedef struct acl_type {
#ifdef WITH_XATTR /* Do generic user Xattrs. */
#include <sys/xattr.h>
-#include <attr/xattr.h>
#endif
typedef struct xattr_node

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 28 21:51:58 UTC 2014 - crrodriguez@opensuse.org
- Once upon a time, 10 years ago, basic extended attribute
functionality moved to libc, therefore libattr is most
of the time, not needed at all. (aide-xattr-in-libc.patch)
-------------------------------------------------------------------
Thu Jan 23 08:33:09 UTC 2014 - meissner@suse.com

View File

@ -22,7 +22,6 @@ BuildRequires: bison
BuildRequires: curl-devel
BuildRequires: flex
BuildRequires: libacl-devel
BuildRequires: libattr-devel
BuildRequires: libgcrypt-devel
BuildRequires: libselinux-devel
BuildRequires: pkg-config
@ -38,6 +37,7 @@ Source2: aide-cron_daily.sh
Source3: aide-test.sh
Patch1: aide-%{version}-as-needed.patch
Patch2: aide-no_m4_dir.patch
Patch3: aide-xattr-in-libc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/aide/
@ -55,7 +55,7 @@ Simple AIDE test script for externalized testing.
%setup -q
%patch1 -p1
%patch2
%patch3 -p1
%build
autoreconf -fiv
%configure \