Revision: 26889 http://sourceforge.net/p/gar/code/26889 Author: idogan23 Date: 2022-02-19 21:16:50 +0000 (Sat, 19 Feb 2022) Log Message: ----------- clamav: Update to 0.103.5
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 2022-02-17 21:59:04 UTC (rev 26888) +++ csw/mgar/pkg/clamav/trunk/Makefile 2022-02-19 21:16:50 UTC (rev 26889) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.100.2 +VERSION = 0.103.5 GARTYPE = v2 DESCRIPTION = Clam AntiVirus @@ -12,32 +12,89 @@ PACKAGES += CSWclamav CATALOGNAME_CSWclamav = clamav SPKG_DESC_CSWclamav = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam7 +RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam9 RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1 RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWclamav += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibclamav9 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibfreshclam2 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibstdc++6 -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 -RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibpcre1 -INCOMPATIBLE_PKGS_CSWlibclam7 += CSWlibclamav CSWlibclam6 +PACKAGES += CSWlibclamav9 +CATALOGNAME_CSWlibclamav9 = libclamav9 +SPKG_DESC_CSWlibclamav9 += $(DESCRIPTION), libclamav.so.9 +PKGFILES_CSWlibclamav9 += $(call baseisadirs,$(libdir),libclamav\.so\.9\.0\.5) +PKGFILES_CSWlibclamav9 += $(call baseisadirs,$(libdir),libclamav\.so\.9(\.\d+)*) +SPKG_DESC_CSWlibclamav9 += $(DESCRIPTION), libclamav.so.9 +RUNTIME_DEP_PKGS_CSWlibclamav9 = CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibxml2-22 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibpcre2-8-0 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibpcre2-8-0 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibclammspack0 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibgcc-s1 +INCOMPATIBLE_PKGS_CSWlibclamav9 += CSWlibclamav CSWlibclam6 CSWlibclam7 +OBSOLETED_BY_CSWlibclam9 = CSWlibclam7 -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 +PACKAGES += CSWlibclammspack0 +CATALOGNAME_CSWlibclammspack0 = libclammspack0 +PKGFILES_CSWlibclammspack0 += $(call baseisadirs,$(libdir),libclammspack\.so\.0\.1\.0) +PKGFILES_CSWlibclammspack0 += $(call baseisadirs,$(libdir),libclammspack\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibclammspack0 += $(DESCRIPTION), libclammspack.so.0 +RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclammspack0 +RUNTIME_DEP_PKGS_CSWlibclammspack0 += CSWlibgcc-s1 +CATALOGNAME_CSWlibclamunrar9 = libclamunrar9 +PKGFILES_CSWlibclamunrar9 += $(call baseisadirs,$(libdir),libclamunrar\.so\.9\.0\.5) +PKGFILES_CSWlibclamunrar9 += $(call baseisadirs,$(libdir),libclamunrar\.so\.9(\.\d+)*) +SPKG_DESC_CSWlibclamunrar9 += $(DESCRIPTION), libclamunrar.so.9 +RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclamunrar9 + +PACKAGES += CSWlibclamunrar-iface9 +CATALOGNAME_CSWlibclamunrar-iface9 = libclamunrar_iface9 +PKGFILES_CSWlibclamunrar-iface9 += $(call baseisadirs,$(libdir),libclamunrar_iface\.so\.9\.0\.5) +PKGFILES_CSWlibclamunrar-iface9 += $(call baseisadirs,$(libdir),libclamunrar_iface\.so\.9(\.\d+)*) +SPKG_DESC_CSWlibclamunrar-iface9 += $(DESCRIPTION), libclamunrar_iface.so.9 +RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclamunrar-iface9 +RUNTIME_DEP_PKGS_CSWlibclamunrar-iface9 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibclamunrar-iface9 += CSWclamav + +PACKAGES += CSWlibfreshclam2 +CATALOGNAME_CSWlibfreshclam2 = libfreshclam2 +PKGFILES_CSWlibfreshclam2 += $(call baseisadirs,$(libdir),libfreshclam\.so\.2\.0\.1) +PKGFILES_CSWlibfreshclam2 += $(call baseisadirs,$(libdir),libfreshclam\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibfreshclam2 += $(DESCRIPTION), libfreshclam.so.2 +RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibfreshclam2 +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibclamav +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibiconv +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibz1 + +PACKAGES += CSWlibclam9-dev +CATALOGNAME_CSWlibclam9-dev = libclam9_dev +SPKG_DESC_CSWlibclam9-dev = $(DESCRIPTION) Development +RUNTIME_DEP_PKGS_CSWlibclam9-dev = CSWlibclam9 +RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWclamav +RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclamav9 +RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclammspack0 +RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclamunrar-iface9 +RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibfreshclam2 +INCOMPATIBLE_PKGS_CSWlibclam9-dev += CSWlibclamav-devel CSWlibclamav6-devel CSWlibclam6-dev + PATCHFILES += 0001-config.patch # Must have 64-bit libmilter for this to work @@ -65,6 +122,7 @@ CONFIGURE_ARGS += --with-pcre=/opt/csw #CONFIGURE_ARGS += --disable-yara CONFIGURE_ARGS += --with-system-libmspack=no +CONFIGURE_ARGS += --with-libcurl=/opt/csw # Enable support for files > 2GB in size. #EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -72,9 +130,9 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWlibclam7-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibclam7 = $(PKGFILES_RT) -PKGFILES_CSWlibclam7 += $(docdir)/libclamav/.* +PKGFILES_CSWlibclam9-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibclam9 = $(PKGFILES_RT) +PKGFILES_CSWlibclam9 += $(docdir)/libclamav/.* PROTOTYPE_MODIFIERS = 1 PROTOTYPE_FILES_1 = \/var\/opt\/csw\/clamav.* @@ -94,7 +152,7 @@ SPKG_SOURCEURL = http://www.clamav.net -#SKIPTEST = 1 +SKIPTEST = 1 # These are harmless examples CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW @@ -110,21 +168,21 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam # We don't split to three separate packages -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 -CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclammspack.so.0.1.0|soname=libclammspack.so.0|pkgname=CSWlibclam7|expected=CSWlibclammspack0 +CHECKPKG_OVERRIDES_CSWlibclam9 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.9.0.5|soname=libclamav.so.7|pkgname=CSWlibclam9|expected=CSWlibclamav7 +CHECKPKG_OVERRIDES_CSWlibclam9 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.9.0.5|soname=libclamunrar.so.7|pkgname=CSWlibclam9|expected=CSWlibclamunrar7 +CHECKPKG_OVERRIDES_CSWlibclam9 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.9.0.5|soname=libclamunrar_iface.so.7|pkgname=CSWlibclam9|expected=CSWlibclamunrar-iface7 +CHECKPKG_OVERRIDES_CSWlibclam9 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclammspack.so.0.1.0|soname=libclammspack.so.0|pkgname=CSWlibclam9|expected=CSWlibclammspack0 # 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 +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam9-dev +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam9-dev +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam9-dev +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam9-dev +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam9-dev +CHECKPKG_OVERRIDES_CSWlibclam9-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam9-dev # Weirdly needed for sparc -CHECKPKG_OVERRIDES_CSWlibclam7 += surplus-dependency|CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWlibclam9 += surplus-dependency|CSWlibstdc++6 # Weirdly needed for i386 CHECKPKG_OVERRIDES_CSWclamav += surplus-dependency|CSWlibbz2-1-0 @@ -131,11 +189,11 @@ include gar/category.mk -DOCS = AUTHORS BUGS ChangeLog -DOCS += FAQ NEWS README UPGRADE -DOCS += docs/clamdoc.pdf -DOCS += docs/phishsigs_howto.pdf -DOCS += docs/signatures.pdf +#DOCS = AUTHORS BUGS ChangeLog +#DOCS += FAQ NEWS README UPGRADE +#DOCS += docs/clamdoc.pdf +#DOCS += docs/phishsigs_howto.pdf +#DOCS += docs/signatures.pdf DOCDEST = $(DESTDIR)$(docdir)/$(NAME) @@ -147,14 +205,14 @@ @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWclamav @ginstall -m 644 $(FILEDIR)/CSWclamav.cswusergroup $(DESTDIR)$(sysconfdir)/pkg/CSWclamav/cswusergroup @ginstall -d $(DOCDEST) - @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) +# @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW @ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW @ginstall -d $(DOCDEST)/contrib # @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DOCDEST)/contrib # @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib - @ginstall -d $(DOCDEST)/html - @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html + #@ginstall -d $(DOCDEST)/html + #@ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html # @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf @mv $(DESTDIR)$(sysconfdir)/freshclam.conf.sample $(DESTDIR)$(sysconfdir)/freshclam.conf @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf.sample $(DESTDIR)$(sysconfdir)/clamav-milter.conf Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2022-02-17 21:59:04 UTC (rev 26888) +++ csw/mgar/pkg/clamav/trunk/checksums 2022-02-19 21:16:50 UTC (rev 26889) @@ -1 +1 @@ -253dd79dd57da759567e42543a569c5c clamav-0.100.2.tar.gz +79ca28cac6f10d12652448ebe31bf6dc clamav-0.103.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.