rpms/aide/devel aide-0.12-getopt.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 aide.spec, 1.14, 1.15 sources, 1.7, 1.8
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Oct 14 20:41:22 UTC 2006
Author: mschwendt
Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14388
Modified Files:
.cvsignore aide.spec sources
Added Files:
aide-0.12-getopt.patch
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes
aide-0.12-getopt.patch:
--- NEW FILE aide-0.12-getopt.patch ---
Do what the manual says.
diff -Nur aide-0.12-orig/src/aide.c aide-0.12/src/aide.c
--- aide-0.12-orig/src/aide.c 2006-10-04 12:20:25.000000000 +0200
+++ aide-0.12/src/aide.c 2006-10-14 22:35:47.000000000 +0200
@@ -109,7 +109,7 @@
{ "update", no_argument, NULL, 'u'},
{ "config-check", no_argument, NULL, 'D'},
{ "compare", no_argument, NULL, 'E'},
- { NULL }
+ { NULL, 0, NULL, 0 }
};
while(1){
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 11 Sep 2006 09:11:31 -0000 1.7
+++ .cvsignore 14 Oct 2006 20:41:21 -0000 1.8
@@ -1 +1 @@
-aide-0.11.tar.gz
+aide-0.12.tar.gz
Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aide.spec 2 Oct 2006 19:41:16 -0000 1.14
+++ aide.spec 14 Oct 2006 20:41:21 -0000 1.15
@@ -1,20 +1,26 @@
-%{?_with_static: %define nostatic 0}
-%{!?_with_static: %define nostatic 1}
+%{?_with_static: %define nostatic %nil }
+%{!?_with_static: %define nostatic --disable-static }
+
+# segfaults
+%{!?_with_curl: %{!?_without_curl: %define _without_curl --without-curl}}
Summary: Intrusion detection environment
Name: aide
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
URL: http://sourceforge.net/projects/aide
License: GPL
Group: Applications/System
Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
Source1: aide.conf
Source2: README.quickstart
-Patch0: aide-0.11-no-static.patch
+Patch0: aide-0.12-getopt.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
Buildrequires: mhash-devel zlib-devel
Buildrequires: flex bison
+%if "%{?_with_curl}x" != "x"
+Buildrequires: curl-devel
+%endif
#Buildrequires: postgresql-devel libgcrypt-devel
#(needs --with-psql and -lgcrypt in src/Makefile.in)
@@ -25,15 +31,15 @@
%prep
%setup -q
-%if 0%{nostatic}
-%patch0 -p1 -b .no-static
-%endif
+%patch0 -p1 -b .getopt
%build
%configure --with-config_file=%{_sysconfdir}/aide.conf \
--with-zlib \
- --with-mhash --enable-mhash
+ --with-mhash --enable-mhash \
+ %{?_with_curl} %{?_without_curl} \
+ %{?nostatic}
# Adjust default database paths.
perl -pi -e 's!%{_sysconfdir}/aide.db!%{_localstatedir}/lib/aide.db!' config.h
@@ -51,7 +57,6 @@
install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
install -p %{SOURCE2} README.quickstart
-mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5}
%clean
@@ -70,7 +75,12 @@
%changelog
-* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
+- Update to 0.12 release.
+- now offers --disable-static, so -no-static patch is obsolete
+- fill last element of getopt struct array with zeroes
+
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-3
- rebuilt
* Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 11 Sep 2006 09:11:31 -0000 1.7
+++ sources 14 Oct 2006 20:41:21 -0000 1.8
@@ -1 +1 @@
-9a44e5386b0355ef57c60f627ff4d085 aide-0.11.tar.gz
+fee8da9fe8ac4f78de1a237290ed3204 aide-0.12.tar.gz
More information about the fedora-extras-commits
mailing list