OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Feb-2006 12:38:42
Branch: HEAD Handle: 2006021911384200
Modified files:
openpkg-src/aide aide.patch aide.spec
Log:
upgrading package: aide 0.10 -> 0.11
Summary:
Revision Changes Path
1.5 +37 -50 openpkg-src/aide/aide.patch
1.40 +2 -16 openpkg-src/aide/aide.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aide/aide.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 aide.patch
--- openpkg-src/aide/aide.patch 10 Feb 2004 17:42:09 -0000 1.4
+++ openpkg-src/aide/aide.patch 19 Feb 2006 11:38:42 -0000 1.5
@@ -1,63 +1,50 @@
---- include/util.h Wed May 29 10:04:26 2002
-+++ include/util.h Mon Oct 21 16:31:03 2002
-@@ -57,6 +57,8 @@
+Index: include/util.h
+--- include/util.h.orig 2006-01-22 13:00:55 +0100
++++ include/util.h 2006-02-19 11:25:47 +0100
+@@ -57,7 +57,9 @@
void init_sighandler(void);
-+#ifndef HAVE_STRNSTR
++#if !defined(__FreeBSD__)
char* strnstr(char* haystack,char* needle,int n);
+#endif
- #endif
---- src/Makefile.am Wed Mar 6 14:12:12 2002
-+++ src/Makefile.am Fri Nov 15 09:12:05 2002
-@@ -46,7 +46,7 @@
- util.c \
- aide.c
+ int syslog_facility_lookup(char *);
--INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
-+INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include
-
- LDADD = @CRYPTLIB@ @ACLLIB@
-
---- src/Makefile.in Tue Jun 4 10:33:26 2002
-+++ src/Makefile.in Fri Nov 15 09:01:44 2002
-@@ -98,7 +98,7 @@
- aide_SOURCES = conf_yacc.y conf_lex.l
getopt.c getopt1.c
gnu_regex.c error.c md.c
db.c commandconf.c
db_file.c db_disk.c db_lex.l
db_sql.c gen_list.c
list.c do_md.c base64.c
symboltable.c compare_db.c
be.c util.c aide.c
-
-
--INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
-+INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include
-
- LDADD = @CRYPTLIB@ @ACLLIB@
-
---- src/util.c Wed May 29 10:04:27 2002
-+++ src/util.c Mon Oct 21 16:31:15 2002
-@@ -356,7 +356,7 @@
- return;
- }
-
--
-+#ifndef HAVE_STRNSTR
- /* Like strstr but only do search for maximum of n chars.
- haystack does not have to be NULL terminated
+Index: src/snprintf.c
+--- src/snprintf.c.orig 2005-04-06 12:16:30 +0200
++++ src/snprintf.c 2006-02-19 11:23:54 +0100
+@@ -410,10 +410,10 @@
+
+ /* declarations */
+
+-static char credits[] = "\n\
+-@(#)snprintf.c, v2.2: Mark Martinec, <[EMAIL PROTECTED]>\n\
+-@(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic
License applies.\n\
+-@(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n";;
++static char credits[] = "\n"
++"@(#)snprintf.c, v2.2: Mark Martinec, <[EMAIL PROTECTED]>\n"
++"@(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic
License applies.\n"
++"@(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n";;
+
+ #if defined(NEED_ASPRINTF)
+ int asprintf(char **ptr, const char *fmt, /*args*/ ...) {
+Index: src/util.c
+--- src/util.c.orig 2006-02-09 12:45:43 +0100
++++ src/util.c 2006-02-19 11:26:12 +0100
+@@ -363,6 +363,7 @@
needle has to be NULL terminated. NULL in needle is not used in compare.
-@@ -392,6 +392,7 @@
+ NULLs in haystack are ignored.
+ */
++#if !defined(__FreeBSD__)
+ char* strnstr(char* haystack,char* needle,int n)
+ {
+ char* h=haystack;
+@@ -393,6 +394,7 @@
/* If we get this far no match was found so we return NULL */
return NULL;
}
+#endif
- /* We need these dummy stubs to fool the linker into believing that
- we do not need them at link time */
-Index: src/do_md.c
---- src/do_md.c.orig 2004-02-10 18:40:27.000000000 +0100
-+++ src/do_md.c 2004-02-10 18:41:14.000000000 +0100
-@@ -43,7 +43,6 @@
-
- /* This define should be somewhere else */
- #define READ_BLOCK_SIZE 16384
--#define READ_BLOCK_SIZE 16777216
-
- #ifdef WITH_MHASH
- #include <mhash.h>
+ /* Lookup syslog facilities by name */
+ int syslog_facility_lookup(char *s)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aide/aide.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 aide.spec
--- openpkg-src/aide/aide.spec 1 Jan 2006 13:11:51 -0000 1.39
+++ openpkg-src/aide/aide.spec 19 Feb 2006 11:38:42 -0000 1.40
@@ -32,8 +32,8 @@
Class: PLUS
Group: Security
License: GPL
-Version: 0.10
-Release: 20051006
+Version: 0.11
+Release: 20060219
# package options
%option with_fsl yes
@@ -73,22 +73,8 @@
%prep
%setup -q
%patch -p0
- case "%{l_platform -t}" in
- *-freebsd* )
- %{l_shtool} subst -e 's;^\(#define AIDE_BLKCNT_TYPE\)
blkcnt_t.*$;\1 int64_t;' config.h.in
- echo "#define HAVE_STRNSTR 1" >>config.h.in
- ;;
- *-sunos* )
- %{l_shtool} subst -e
's;LD_STATIC_FLAG=.-static.;LD_STATIC_FLAG="";' configure
- ;;
- esac
%build
- # marvelling about its beauty
- %{l_shtool} subst \
- -e 's;//\(.*\);/*\1*/;g' \
- src/*.c
-
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
