From a1385167e87b08ef31675344f0f6a847a9d112a6f45658927cafbe3525944e58 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 1 Jun 2014 09:21:38 +0000 Subject: [PATCH 1/2] 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 --- aide-xattr-in-libc.patch | 21 +++++++++++++++++++++ aide.changes | 7 +++++++ aide.spec | 4 ++-- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 aide-xattr-in-libc.patch diff --git a/aide-xattr-in-libc.patch b/aide-xattr-in-libc.patch new file mode 100644 index 0000000..d14c8dd --- /dev/null +++ b/aide-xattr-in-libc.patch @@ -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 +-#include + #endif + + typedef struct xattr_node diff --git a/aide.changes b/aide.changes index e8f02a5..8569b93 100644 --- a/aide.changes +++ b/aide.changes @@ -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 diff --git a/aide.spec b/aide.spec index cdd2b30..e8cc939 100644 --- a/aide.spec +++ b/aide.spec @@ -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 \ From c9af39c8616d1d02a2b3dbc95db6b28450b1e00f3b8bb9b7217f2287d53573fa Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 1 Jun 2014 10:00:07 +0000 Subject: [PATCH 2/2] - aide-xattr-in-libc.patch: 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. OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=26 --- aide.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aide.changes b/aide.changes index 8569b93..00c81c2 100644 --- a/aide.changes +++ b/aide.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- 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) +- aide-xattr-in-libc.patch: 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. ------------------------------------------------------------------- Thu Jan 23 08:33:09 UTC 2014 - meissner@suse.com