SF.net SVN: gar:[24640] csw/mgar/pkg/sudo/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24640
          http://sourceforge.net/p/gar/code/24640
Author:   dmichelsen
Date:     2015-02-11 10:32:04 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
sudo/trunk: Update to 1.8.12, adjust overrides, skip obsoleted packages

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2015-02-11 10:14:46 UTC (rev 24639)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2015-02-11 10:32:04 UTC (rev 24640)
@@ -2,7 +2,7 @@
 #
 
 NAME = sudo
-VERSION = 1.8.11p2
+VERSION = 1.8.12
 GARTYPE = v2
 
 EXTRA_MODULATORS = LDAP
@@ -30,26 +30,20 @@
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 #PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
 
-#Use custom map for solaris 10
+# Use custom map for Solaris 10
+LINKER_MAPS-5.10 += -M "$(abspath $(WORKDIR)/map.sudo)"
+LINKER_MAPS += $(LINKER_MAPS-$(GAROSREL))
 
-ifneq ($(shell /usr/bin/uname -r),5.9)
-        LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.sudo)"
-endif
-
-
 PACKAGES += CSWsudo
 SPKG_DESC_CSWsudo = Provides limited super user privileges
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1
-OBSOLETED_BY_CSWsudo = CSWsudo-common
+#OBSOLETED_BY_CSWsudo = CSWsudo-common
 
 # These are just docs
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW
 
-# This is a private library
-CHECKPKG_OVERRIDES_CSWsudo += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so
-
 LDAP_DOCFILES += $(docdir)/sudo/README.LDAP
 LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory
 LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP
@@ -68,24 +62,21 @@
 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibz1
 # This logical dependency can not be tracked via checkpkg
 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWsudo
-CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWsudo
-OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap
+#OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap
 CATALOGNAME_CSWsudoldap = sudo_ldap_stub
-#on solaris9 this is still a dep. Should be checked
-CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWliblber2-4-2
 
+# This is for /usr/share/lib/zoneinfo
+CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/libexec/sudo/sudoers.so
+CHECKPKG_OVERRIDES_CSWsudo-ldap += file-with-bad-content|/usr/share|root/opt/csw/libexec/sudo/sudoers-ldap.so
+
 # This is a private library
 CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so
 
-# This is needed AFAIK due to libtool
+# This is needed AFAIK due to libtool and dlopen
 CHECKPKG_OVERRIDES_CSWsudo += discouraged-path-in-pkgmap|/opt/csw/libexec/sudo/libsudo_util.la
 
-# Looks like these are still needed
-CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/sbin/visudo|but|never|used
-CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudoers.so|but|never|used
-CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudo_noexec.so|but|never|used
-CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sudoreplay|but|never|used
-CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudoers-ldap.so|but|never|used
+CHECKPKG_OVERRIDES_CSWsudo += $(CHECKPKG_OVERRIDES_CSWsudo-$(GAROSREL))
+CHECKPKG_OVERRIDES_CSWsudo-ldap += $(CHECKPKG_OVERRIDES_CSWsudo-ldap-$(GAROSREL))
 
 LOGPATH    = $(localstatedir)/log/sudo
 VARDIR     = $(localstatedir)/sudo
@@ -164,10 +155,9 @@
 
 include gar/category.mk
 
-post-install-modulated:
+post-install:
 	ginstall -d $(DESTDIR)$(IOLOGPATH)
 	ginstall -d $(DESTDIR)$(TIMEPATH)
-	ginstall -d $(DESTDIR)$(sysconfdir)
-	ginstall $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir)
+	ginstall -D $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir)/sudo.conf.CSW
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2015-02-11 10:14:46 UTC (rev 24639)
+++ csw/mgar/pkg/sudo/trunk/checksums	2015-02-11 10:32:04 UTC (rev 24640)
@@ -1 +1 @@
-84012b4871b6c775c957cd310d5bad87  sudo-1.8.11p2.tar.gz
+87558f3a55c62bc9244b19594f103ffa  sudo-1.8.12.tar.gz

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