OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Feb-2004 18:42:10
Branch: HEAD Handle: 2004021017420900
Modified files:
openpkg-src/aide aide.patch aide.spec
Log:
cleanup packaging and fix building under Solaris
Summary:
Revision Changes Path
1.4 +19 -12 openpkg-src/aide/aide.patch
1.32 +7 -4 openpkg-src/aide/aide.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aide/aide.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 aide.patch
--- openpkg-src/aide/aide.patch 6 Feb 2004 09:31:48 -0000 1.3
+++ openpkg-src/aide/aide.patch 10 Feb 2004 17:42:09 -0000 1.4
@@ -1,6 +1,5 @@
-diff -r -u aide-0.9/include/util.h aide-0.9x/include/util.h
---- aide-0.9/include/util.h Wed May 29 10:04:26 2002
-+++ aide-0.9x/include/util.h Mon Oct 21 16:31:03 2002
+--- include/util.h Wed May 29 10:04:26 2002
++++ include/util.h Mon Oct 21 16:31:03 2002
@@ -57,6 +57,8 @@
void init_sighandler(void);
@@ -10,9 +9,8 @@
+#endif
#endif
-diff -r -u aide-0.9/src/Makefile.am aide-0.9x/src/Makefile.am
---- aide-0.9/src/Makefile.am Wed Mar 6 14:12:12 2002
-+++ aide-0.9x/src/Makefile.am Fri Nov 15 09:12:05 2002
+--- 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
@@ -22,9 +20,8 @@
LDADD = @CRYPTLIB@ @ACLLIB@
-diff -r -u aide-0.9/src/Makefile.in aide-0.9x/src/Makefile.in
---- aide-0.9/src/Makefile.in Tue Jun 4 10:33:26 2002
-+++ aide-0.9x/src/Makefile.in Fri Nov 15 09:01:44 2002
+--- 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
@@ -34,9 +31,8 @@
LDADD = @CRYPTLIB@ @ACLLIB@
-diff -r -u aide-0.9/src/util.c aide-0.9x/src/util.c
---- aide-0.9/src/util.c Wed May 29 10:04:27 2002
-+++ aide-0.9x/src/util.c Mon Oct 21 16:31:15 2002
+--- 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;
}
@@ -54,3 +50,14 @@
/* 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>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aide/aide.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 aide.spec
--- openpkg-src/aide/aide.spec 10 Feb 2004 12:41:47 -0000 1.31
+++ openpkg-src/aide/aide.spec 10 Feb 2004 17:42:09 -0000 1.32
@@ -73,19 +73,22 @@
%prep
%setup -q
- %patch -p1
+ %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
- for i in src/*.c; do
- %{l_shtool} subst -e 's;//\(.*\);/*\1*/;g' $i
- done
+ %{l_shtool} subst \
+ -e 's;//\(.*\);/*\1*/;g' \
+ src/*.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
