Mon Mar 12 14:18:44 2012 UTC ()
Value of _FILE_OFFSET_BITS corrected. Disabled static linking for Solaris 10
and later (no longer supports static linking).


(fhajny)
diff -r1.32 -r1.33 pkgsrc/security/aide/Makefile
diff -r1.12 -r1.13 pkgsrc/security/aide/distinfo
diff -r1.4 -r1.5 pkgsrc/security/aide/patches/patch-ab
cvs diff -r1.32 -r1.33 pkgsrc/security/aide/Makefile (expand / switch to unified diff)

--- pkgsrc/security/aide/Makefile 2010/09/13 13:09:20 1.32
+++ pkgsrc/security/aide/Makefile 2012/03/12 14:18:44 1.33
@@ -1,23 +1,29 @@ @@ -1,23 +1,29 @@
1# $NetBSD: Makefile,v 1.32 2010/09/13 13:09:20 pettai Exp $ 1# $NetBSD: Makefile,v 1.33 2012/03/12 14:18:44 fhajny Exp $
2# 2#
3 3
4DISTNAME= aide-0.15.1 4DISTNAME= aide-0.15.1
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/}
7 7
8MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
9HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html 9HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html
10COMMENT= Free intrusion detection system for checking file integrity 10COMMENT= Free intrusion detection system for checking file integrity
11LICENSE= artistic 11LICENSE= artistic
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15BUILDLINK_API_DEPENDS.mhash?= mhash>=0.8.17 15BUILDLINK_API_DEPENDS.mhash?= mhash>=0.8.17
16 16
17 
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_TOOLS+= bison flex gmake 18USE_TOOLS+= bison flex gmake
20 19
 20.include "../../mk/bsd.prefs.mk"
 21
 22.if ${OPSYS} == "SunOS" && empty(OS_VERSION:M5.[6-9])
 23# Since Solaris 10, static linking no longer possible
 24CONFIGURE_ARGS+= --disable-static
 25.endif
 26
21.include "../../devel/zlib/buildlink3.mk" 27.include "../../devel/zlib/buildlink3.mk"
22.include "../../security/mhash/buildlink3.mk" 28.include "../../security/mhash/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/security/aide/distinfo (expand / switch to unified diff)

--- pkgsrc/security/aide/distinfo 2010/09/19 06:11:04 1.12
+++ pkgsrc/security/aide/distinfo 2012/03/12 14:18:44 1.13
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.12 2010/09/19 06:11:04 obache Exp $ 1$NetBSD: distinfo,v 1.13 2012/03/12 14:18:44 fhajny Exp $
2 2
3SHA1 (aide-0.15.1.tar.gz) = c5998c04a223416142323fa1bd18db0936099827 3SHA1 (aide-0.15.1.tar.gz) = c5998c04a223416142323fa1bd18db0936099827
4RMD160 (aide-0.15.1.tar.gz) = 80ea88b1c1496bcca57d2d1cdeecdcdfca0fa5cf 4RMD160 (aide-0.15.1.tar.gz) = 80ea88b1c1496bcca57d2d1cdeecdcdfca0fa5cf
5Size (aide-0.15.1.tar.gz) = 424970 bytes 5Size (aide-0.15.1.tar.gz) = 424970 bytes
6SHA1 (patch-ab) = 21bcedc7d2838974f934e9c8a2be7a17920a183d 6SHA1 (patch-ab) = ddfaaf42767ebb6eaab73c33489b7aef19e5b003
7SHA1 (patch-ae) = 87c234f8d316117cf766134ca69d6f753c59dd91 7SHA1 (patch-ae) = 87c234f8d316117cf766134ca69d6f753c59dd91
8SHA1 (patch-af) = 70ac8a100e9d601b7ffcaa9d716742d1d947aca7 8SHA1 (patch-af) = 70ac8a100e9d601b7ffcaa9d716742d1d947aca7
cvs diff -r1.4 -r1.5 pkgsrc/security/aide/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/aide/patches/patch-ab 2010/09/19 06:11:04 1.4
+++ pkgsrc/security/aide/patches/patch-ab 2012/03/12 14:18:44 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-ab,v 1.4 2010/09/19 06:11:04 obache Exp $ 1$NetBSD: patch-ab,v 1.5 2012/03/12 14:18:44 fhajny Exp $
2 2
3* YACC and LEX are passwd as full path. 3* YACC and LEX are passwd as full path.
4* static linking is not supported on MacOS X. PR#39058. 4* static linking is not supported on MacOS X. PR#39058.
 5* FILE_OFFSET_BITS corrected
5 6
6--- configure.orig 2010-09-10 17:48:04.000000000 +0000 7--- configure.orig 2010-09-10 17:48:04.000000000 +0000
7+++ configure 8+++ configure
8@@ -4231,10 +4231,6 @@ fi 9@@ -4231,10 +4231,6 @@ fi
9 done 10 done
10 test -n "$YACC" || YACC="yacc" 11 test -n "$YACC" || YACC="yacc"
11  12
12-if test "x${YACC}" != "xbison -y"; then 13-if test "x${YACC}" != "xbison -y"; then
13- echo "AIDE requires GNU bison" 14- echo "AIDE requires GNU bison"
14- exit 5 15- exit 5
15-fi 16-fi
16  17
17  18
@@ -27,13 +28,22 @@ $NetBSD: patch-ab,v 1.4 2010/09/19 06:11 @@ -27,13 +28,22 @@ $NetBSD: patch-ab,v 1.4 2010/09/19 06:11
27 for ac_prog in ld 28 for ac_prog in ld
28 do 29 do
29 # Extract the first word of "$ac_prog", so it can be a program name with args. 30 # Extract the first word of "$ac_prog", so it can be a program name with args.
30@@ -4539,6 +4531,9 @@ if test $ac_cv_c_compiler_gnu = yes; the 31@@ -4539,6 +4531,9 @@ if test $ac_cv_c_compiler_gnu = yes; the
31 ## pic_flag=-Kconform_pic 32 ## pic_flag=-Kconform_pic
32 ## fi 33 ## fi
33 ;; 34 ;;
34+ darwin*) 35+ darwin*)
35+ LD_STATIC_FLAG='' 36+ LD_STATIC_FLAG=''
36+ ;; 37+ ;;
37 *) 38 *)
38 ## pic_flag='-fPIC' 39 ## pic_flag='-fPIC'
39 ;; 40 ;;
 41@@ -6435,7 +6430,7 @@ ac_fn_c_check_func "$LINENO" "lstat64" "
 42 if test "x$ac_cv_func_lstat64" = x""yes; then :
 43 ac_fn_c_check_func "$LINENO" "stat64" "ac_cv_func_stat64"
 44 if test "x$ac_cv_func_stat64" = x""yes; then :
 45- AIDE_DEFS="$AIDE_DEFS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS"
 46+ AIDE_DEFS="$AIDE_DEFS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 47 AIDE_LSTAT_FUNC="lstat64"
 48 compoptionstring="${compoptionstring}WITH_LSTAT64\\n"
 49 AIDE_STAT_FUNC="stat64"