Revision: 27163
http://sourceforge.net/p/gar/code/27163
Author: jake_goerzen
Date: 2025-02-19 21:50:09 +0000 (Wed, 19 Feb 2025)
Log Message:
-----------
openssh: put back RUNTIME_DEP_PKGS and update CHECKPKG_OVERRIDES
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2025-02-19 20:59:21 UTC (rev 27162)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2025-02-19 21:50:09 UTC (rev 27163)
@@ -41,16 +41,14 @@
RUNTIME_DEP_PKGS_CSWopenssh += CSWlibwrap1
RUNTIME_DEP_PKGS_CSWopenssh += CSWlibz1
RUNTIME_DEP_PKGS_CSWopenssh += CSWlibkrb5-3
-#RUNTIME_DEP_PKGS_CSWopenssh += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSWopenssh += CSWopenssh-client
-# The Following does not appear the be required anymore, disabling
-
# Linking on sparc gives an additional dependency
# probably because of the current bug with Solaris 10
# sparc linker (see
http://lists.opencsw.org/pipermail/maintainers/2013-November/018780.html)
RUNTIME_DEP_PKGS_CSWopenssh += $(RUNTIME_DEP_PKGS_CSWopenssh_$(GARCH))
-#RUNTIME_DEP_PKGS_CSWopenssh_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWopenssh_sparc += CSWlibintl8
GARCOMPILER += GNU
@@ -65,7 +63,7 @@
# probably because of the current bug with Solaris 10
# sparc linker (see
http://lists.opencsw.org/pipermail/maintainers/2013-November/018780.html)
RUNTIME_DEP_PKGS_CSWopenssh-client +=
$(RUNTIME_DEP_PKGS_CSWopenssh-client_$(GARCH))
-#RUNTIME_DEP_PKGS_CSWopenssh-client_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWopenssh-client_sparc += CSWlibintl8
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -112,11 +110,15 @@
MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
MIGRATE_DEST_DIR = $(sysconfdir)/ssh
-CHECKPKG_OVERRIDES_CSWopenssh-client +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL
+#CHECKPKG_OVERRIDES_CSWopenssh-client +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL
CHECKPKG_OVERRIDES_CSWopenssh-client +=
file-with-bad-content|/usr/local|root/opt/csw/bin/ssh-agent
-CHECKPKG_OVERRIDES_CSWopenssh +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL
+#CHECKPKG_OVERRIDES_CSWopenssh +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL
CHECKPKG_OVERRIDES_CSWopenssh +=
file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml
+CHECKPKG_OVERRIDES_CSWopenssh-client += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWlibcom-err3
+
# temporay disable to get around git issue on experiental* hosts
NOGITPATCH = 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
