Revision: 26896
http://sourceforge.net/p/gar/code/26896
Author: idogan23
Date: 2022-02-25 19:45:27 +0000 (Fri, 25 Feb 2022)
Log Message:
-----------
clamav: Smaller overrides.
Modified Paths:
--------------
csw/mgar/pkg/clamav/trunk/Makefile
Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile 2022-02-24 18:46:05 UTC (rev 26895)
+++ csw/mgar/pkg/clamav/trunk/Makefile 2022-02-25 19:45:27 UTC (rev 26896)
@@ -12,16 +12,16 @@
PACKAGES += CSWclamav
CATALOGNAME_CSWclamav = clamav
SPKG_DESC_CSWclamav = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam9
+#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 += 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 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWclamav += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWclamav += CSWlibstdc++6
+#RUNTIME_DEP_PKGS_CSWclamav += CSWlibstdc++6
PACKAGES += CSWlibclamav9
CATALOGNAME_CSWlibclamav9 = libclamav9
@@ -33,13 +33,13 @@
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 += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibxml2-22
+#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 += CSWlibcurl4
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibclammspack0
INCOMPATIBLE_PKGS_CSWlibclamav9 += CSWlibclamav CSWlibclam6 CSWlibclam7
OBSOLETED_BY_CSWlibclam9 += CSWlibclam7
@@ -78,8 +78,8 @@
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 += CSWlibclamav
+#RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibiconv
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibclamav9
@@ -91,7 +91,6 @@
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
@@ -172,20 +171,34 @@
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
+# Should be checked
+CHECKPKG_OVERRIDES_CSWlibfreshclam2 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/libfreshclam.so.2.0.1
+
# We don't split to three separate packages
-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
+#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_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
+#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
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/lib/libclammspack.so|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/lib/libclamav.so|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/bin/clamav-config|CSWlibclam7-dev|CSWlibclam9-dev
+CHECKPKG_OVERRIDES_CSWlibclam9-dev +=
file-collision|/opt/csw/include/clamav.h|CSWlibclam7-dev|CSWlibclam9-dev
+# Keep the dependency
+CHECKPKG_OVERRIDES_CSWlibclamunrar-iface9 += surplus-dependency|CSWclamav
+CHECKPKG_OVERRIDES_CSWlibclam9-dev += surplus-dependency|CSWlibclam9
+
# Weirdly needed for sparc
CHECKPKG_OVERRIDES_CSWlibclam9 += surplus-dependency|CSWlibstdc++6
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
