Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-forensics/aide/files: aide-0.14-as-needed.patch aide-0.14-gentoo.patch
Date: Thu, 27 May 2010 17:24:13
Message-Id: 20100527172355.5CA132CE3C@corvid.gentoo.org
1 matsuu 10/05/27 17:23:55
2
3 Added: aide-0.14-as-needed.patch aide-0.14-gentoo.patch
4 Log:
5 Version bumped, bug #319561.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-forensics/aide/files/aide-0.14-as-needed.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/aide/files/aide-0.14-as-needed.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/aide/files/aide-0.14-as-needed.patch?rev=1.1&content-type=text/plain
13
14 Index: aide-0.14-as-needed.patch
15 ===================================================================
16 --- aide-0.14.orig/configure.in 2010-02-26 17:25:29.000000000 +0900
17 +++ aide-0.14/configure.in 2010-05-27 00:11:34.000000000 +0900
18 @@ -42,7 +42,7 @@
19 AC_ARG_WITH(extra-libs,
20 AC_HELP_STRING([--with-extra-libs],
21 [Specify additional paths with -L to find libraries]),
22 - [LDFLAGS="$LDFLAGS $withval"]
23 + [LIBS="$LIBS $withval"]
24 )
25 AC_ARG_WITH(extra-link-libs,
26 AC_HELP_STRING([--with-extra-link-libs],
27 @@ -671,7 +671,7 @@
28 AC_CHECK_HEADERS(curl/curl.h,,
29 [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
30 CFLAGS="$CFLAGS $CURL_CFLAGS"
31 - LDFLAGS="$LDFLAGS $CURL_LIBS"
32 + LIBS="$LIBS $CURL_LIBS"
33 AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
34 [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
35 )
36
37
38
39 1.1 app-forensics/aide/files/aide-0.14-gentoo.patch
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/aide/files/aide-0.14-gentoo.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/aide/files/aide-0.14-gentoo.patch?rev=1.1&content-type=text/plain
43
44 Index: aide-0.14-gentoo.patch
45 ===================================================================
46 diff -Naur aide-0.14.orig//src/Makefile.am aide-0.14//src/Makefile.am
47 --- aide-0.14.orig//src/Makefile.am 2010-02-20 04:23:08.000000000 +0900
48 +++ aide-0.14//src/Makefile.am 2010-05-26 23:56:47.000000000 +0900
49 @@ -26,7 +26,7 @@
50 LEX_OUTPUT_ROOT = lex.yy
51
52 LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @ELFLIB@
53 -AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
54 +AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" @AIDE_DEFS@ -W -Wall -g
55
56 CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
57
58 diff -Naur aide-0.14.orig//src/db.c aide-0.14//src/db.c
59 --- aide-0.14.orig//src/db.c 2010-02-18 05:06:57.000000000 +0900
60 +++ aide-0.14//src/db.c 2010-05-27 00:16:07.000000000 +0900
61 @@ -26,6 +26,10 @@
62 #include "db_file.h"
63 #include "db_disk.h"
64
65 +#ifdef WITH_CURL
66 +#include "fopen.h"
67 +#endif
68 +
69 #ifdef WITH_PSQL
70 #include "db_sql.h"
71 #endif