[csw-devel] SF.net SVN: gar:[18478] csw/mgar/pkg/aide/trunk

[cgrzemba at users.sourceforge.net]

Revision: 18478
          http://gar.svn.sourceforge.net/gar/?rev=18478&view=rev
Author:   cgrzemba
Date:     2012-06-21 10:43:00 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
aide/trunk: version bump, remove lipg dependency

Modified Paths:
--------------
    csw/mgar/pkg/aide/trunk/Makefile
    csw/mgar/pkg/aide/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch

Modified: csw/mgar/pkg/aide/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aide/trunk/Makefile	2012-06-21 09:16:34 UTC (rev 18477)
+++ csw/mgar/pkg/aide/trunk/Makefile	2012-06-21 10:43:00 UTC (rev 18478)
@@ -1,5 +1,5 @@
 NAME = aide
-VERSION = 0.13.1
+VERSION = 0.15.1
 CATEGORIES = utils
 GARTYPE = v2
 
@@ -14,23 +14,34 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += aide.conf
 
+GARCOMPILER = GNU
 # Disable Sun ACLs for now until bug #2887984 is fixed:
 #   http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579
 #PATCHFILES = 0001-Fix-ACL-ifdef-logic.patch
 
 # Add patch until bug #2888035 is fixed:
 #   http://sourceforge.net/tracker/?func=detail&aid=2888035&group_id=86976&atid=581579
-PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch
+# PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch
+# PATCHFILES += 0003-fix-zlib-test_configure.in.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq
-RUNTIME_DEP_PKGS += CSWoldaprt CSWosslrt CSWzlib
-
 sysconfdir = /etc/opt/csw/aide
 PRESERVECONF = $(sysconfdir)/aide.conf
 
+CHECKPKG_OVERRIDES_CSWaide += file-with-bad-content|/usr/local|root/etc/opt/csw/aide/aide.conf.CSW
+
+RUNTIME_DEP_PKGS_CSWaide += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWaide += CSWlibz1
+RUNTIME_DEP_PKGS_CSWaide += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWaide += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWaide += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWaide += CSWlibmhash
+RUNTIME_DEP_PKGS_CSWaide += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWaide += CSWlibpq5
+
+
 EXTRA_LIB = $(prefix)/postgresql/lib
 EXTRA_INC = $(prefix)/postgresql/include
 
@@ -38,6 +49,8 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-curl
+# we have no libs.a
+CONFIGURE_ARGS += --disable-static
 
 # Disable Sun ACLs for now until bug #2887984 is fixed (see above)
 #CONFIGURE_ARGS += --with-sun-acl

Modified: csw/mgar/pkg/aide/trunk/checksums
===================================================================
--- csw/mgar/pkg/aide/trunk/checksums	2012-06-21 09:16:34 UTC (rev 18477)
+++ csw/mgar/pkg/aide/trunk/checksums	2012-06-21 10:43:00 UTC (rev 18478)
@@ -1,3 +1 @@
-c0fe56738d4f293c4d5a8de164a2a01c  0002-Add-missing-prototypes-for-db_sql.patch
-27978cc6bca4f0fbf3f6f5a1b330661c  aide-0.13.1.tar.gz
-a488b910d69ebf4edf65e350994ccbba  aide.conf
+d0b72535ff68b93a648e4d08b0ed7f07  aide-0.15.1.tar.gz

Added: csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch
===================================================================
--- csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch	                        (rev 0)
+++ csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch	2012-06-21 10:43:00 UTC (rev 18478)
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index cc3e6ff..08e7cf1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -666,7 +666,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_DB,"$default_db",[Default location of signature datab
+ AC_DEFINE_UNQUOTED(DEFAULT_DB_OUT,"$default_db_out",[Default output location for newly-generated signature database])
+ 
+ dnl Do the library tests with the static flag
+-LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
++EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LD_STATIC_FLAG"
+ if test x$with_zlib = xyes; then
+   AC_CHECK_HEADERS(zlib.h,[],
+  	[AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])])

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.