SF.net SVN: gar:[25301] csw/mgar/pkg/clamav/trunk

bonivart at users.sourceforge.net bonivart at users.sourceforge.net
Mon Oct 19 14:09:48 CEST 2015 

Revision: 25301
          http://sourceforge.net/p/gar/code/25301
Author:   bonivart
Date:     2015-10-19 12:09:48 +0000 (Mon, 19 Oct 2015)
Log Message:
-----------
clamav/trunk: testing 0.99-rc1

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

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2015-10-18 20:21:01 UTC (rev 25300)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2015-10-19 12:09:48 UTC (rev 25301)
@@ -1,42 +1,41 @@
 NAME       = clamav
-VERSION    = 0.98.7
+VERSION    = 0.99-rc1
 GARTYPE = v2
 
 DESCRIPTION = Clam AntiVirus
 define BLURB
 endef
 
-SF_PROJECT   = clamav
-MASTER_SITES = $(SF_MIRRORS)
+MASTER_SITES = http://www.clamav.net/downloads/release_candidate/
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
 
 PACKAGES                   += CSWclamav
 CATALOGNAME_CSWclamav       = clamav
 SPKG_DESC_CSWclamav         = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWclamav  = CSWlibclam6
+RUNTIME_DEP_PKGS_CSWclamav  = CSWlibclam7
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibssl1-0-0
 
-PACKAGES                     += CSWlibclam6
-CATALOGNAME_CSWlibclam6       = libclam6
-SPKG_DESC_CSWlibclam6         = $(DESCRIPTION) Library
-RUNTIME_DEP_PKGS_CSWlibclam6  = CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibssl1-0-0
-INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav
+PACKAGES                     += CSWlibclam7
+CATALOGNAME_CSWlibclam7       = libclam7
+SPKG_DESC_CSWlibclam7         = $(DESCRIPTION) Library
+RUNTIME_DEP_PKGS_CSWlibclam7  = CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibssl1-0-0
+INCOMPATIBLE_PKGS_CSWlibclam7 += CSWlibclamav CSWlibclam6
 
-PACKAGES                         += CSWlibclam6-dev
-CATALOGNAME_CSWlibclam6-dev       = libclam6_dev
-SPKG_DESC_CSWlibclam6-dev         = $(DESCRIPTION) Development
-RUNTIME_DEP_PKGS_CSWlibclam6-dev  = CSWlibclam6
-INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel
+PACKAGES                         += CSWlibclam7-dev
+CATALOGNAME_CSWlibclam7-dev       = libclam7_dev
+SPKG_DESC_CSWlibclam7-dev         = $(DESCRIPTION) Development
+RUNTIME_DEP_PKGS_CSWlibclam7-dev  = CSWlibclam7
+INCOMPATIBLE_PKGS_CSWlibclam7-dev += CSWlibclamav-devel CSWlibclamav6-devel CSWlibclam6-dev
 
 PATCHFILES += 0001-config.patch
 
@@ -64,9 +63,9 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la
 
-PKGFILES_CSWlibclam6-dev = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibclam6     = $(PKGFILES_RT)
-PKGFILES_CSWlibclam6    += $(docdir)/libclamav/.*
+PKGFILES_CSWlibclam7-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibclam7     = $(PKGFILES_RT)
+PKGFILES_CSWlibclam7    += $(docdir)/libclamav/.*
 
 PROTOTYPE_MODIFIERS = 1
 PROTOTYPE_FILES_1   = \/var\/opt\/csw\/clamav.*
@@ -88,9 +87,6 @@
 
 #SKIPTEST = 1
 
-# Only "needed" for examples
-CHECKPKG_OVERRIDES_CSWclamav += missing-dependency|CSWperl
-
 # These are harmless examples
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.CSW
@@ -103,15 +99,23 @@
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam
-CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.26
+CHECKPKG_OVERRIDES_CSWlibclam7 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.7.1.1
 
 # We don't split to three separate packages
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.26|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.26|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.26|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.7.1.1|soname=libclamav.so.7|pkgname=CSWlibclam7|expected=CSWlibclamav7
+CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.7.1.1|soname=libclamunrar.so.7|pkgname=CSWlibclam7|expected=CSWlibclamunrar7
+CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.7.1.1|soname=libclamunrar_iface.so.7|pkgname=CSWlibclam7|expected=CSWlibclamunrar-iface7
 
+# Should not matter since the old pkg is declared incompatible
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam7-dev
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam7-dev
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam7-dev
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam7-dev
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam7-dev
+CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam7-dev
+
 # Weirdly needed for sparc
-CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
+CHECKPKG_OVERRIDES_CSWlibclam7 += surplus-dependency|CSWlibstdc++6
 
 # Weirdly needed for i386
 CHECKPKG_OVERRIDES_CSWclamav += surplus-dependency|CSWlibbz2-1-0

Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums	2015-10-18 20:21:01 UTC (rev 25300)
+++ csw/mgar/pkg/clamav/trunk/checksums	2015-10-19 12:09:48 UTC (rev 25301)
@@ -1 +1 @@
-157c601161da1c2d5a0e48ea1b49e067  clamav-0.98.7.tar.gz
+022ffb40c085047dd4475a62b50af914  clamav-0.99-rc1.tar.gz

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

More information about the devel mailing list