[csw-devel] SF.net SVN: gar:[8932] csw/mgar/pkg/sudo

[wahwah at users.sourceforge.net]

Revision: 8932
          http://gar.svn.sourceforge.net/gar/?rev=8932&view=rev
Author:   wahwah
Date:     2010-03-02 08:54:55 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
sudo: Version bump to 1.7.2p5

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2010-03-02 07:46:03 UTC (rev 8931)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2010-03-02 08:54:55 UTC (rev 8932)
@@ -1,7 +1,7 @@
 GARNAME = sudo
 GARVERSION = 1.7.2
 CATEGORIES = utils
-RELEASE = p4
+RELEASE = p5
 
 DISTVERSION = $(GARVERSION)$(RELEASE)
 DISTNAME = $(GARNAME)-$(DISTVERSION)
@@ -56,15 +56,14 @@
 TEST_TARGET = check
 FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir)
 
-PKGFILES_CSWsudo  = $(bindir)/sudo.minimal
-PKGFILES_CSWsudo += $(bindir)/sudo
+PKGFILES_CSWsudo  = $(bindir)/sudo\.minimal
+PKGFILES_CSWsudo += $(bindir)/sudoedit\.minimal
 
 PROTOTYPE_MODIFIERS = sudo
-PROTOTYPE_FILES_sudo = $(bindir)/sudo.minimal
+PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).minimal
 PROTOTYPE_PERMS_sudo = 4755
 
 LICENSE = LICENSE
-
 ALTERNATIVES_CSWsudo = minimal
 ALTERNATIVE_minimal  = $(bindir)/sudo     sudo     $(bindir)/sudo.minimal     50
 ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal
@@ -77,10 +76,3 @@
 	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
 	install -m 755 -d $(DESTDIR)$(LOGPATH)/logs
 	@$(MAKECOOKIE)
-
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir); \
-		gfind . -type f -name sudo\* -exec gchmod 4755 {} \; )
-	@$(MAKECOOKIE)
-
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2010-03-02 07:46:03 UTC (rev 8931)
+++ csw/mgar/pkg/sudo/trunk/checksums	2010-03-02 08:54:55 UTC (rev 8932)
@@ -1,3 +1,3 @@
 955d99eda1432c7b7e00d98b91e35a79  CSWsudo-common.postinstall
 157b2e5e38ca54eb36e0364706bd0292  install.diff
-3989e5a00538247d7dcef8b514076752  sudo-1.7.2p4.tar.gz
+398f584e831bd75b3c0179e28368c2a3  sudo-1.7.2p5.tar.gz

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2010-03-02 07:46:03 UTC (rev 8931)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2010-03-02 08:54:55 UTC (rev 8932)
@@ -1,7 +1,7 @@
 GARNAME = sudo
 GARVERSION = 1.7.2
 CATEGORIES = utils
-RELEASE = p4
+RELEASE = p5
 
 DISTVERSION = $(GARVERSION)$(RELEASE)
 DISTNAME = $(GARNAME)-$(DISTVERSION)
@@ -28,6 +28,7 @@
 SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
 RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt 
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext
 
 LOGPATH = /var/opt/csw/log/sudo
 
@@ -51,6 +52,13 @@
 TEST_TARGET = check
 FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir)
 
+PKGFILES_CSWsudoldap  = $(bindir)/sudo\.ldap
+PKGFILES_CSWsudoldap += $(bindir)/sudoedit\.ldap
+
+PROTOTYPE_MODIFIERS = sudo
+PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).ldap
+PROTOTYPE_PERMS_sudo = 4755
+
 LICENSE = LICENSE
 ALTERNATIVES_CSWsudoldap = sudoldap
 ALTERNATIVE_sudoldap  = $(bindir)/sudo     sudo     $(bindir)/sudo.ldap     60
@@ -58,17 +66,10 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap
+PKGFILES_CSWsudoldap = $(bindir)/sudo.*
 
 post-install-modulated:
-	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )
-	@( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.ldap )
+	( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )
+	( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.ldap )
 	install -m 755 -d $(DESTDIR)$(LOGPATH)/logs
 	@$(MAKECOOKIE)
-
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir); \
-		gfind . -type f -name sudo\* -exec gchmod 4755 {} \; )
-	@$(MAKECOOKIE)
-
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)

Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/checksums	2010-03-02 07:46:03 UTC (rev 8931)
+++ csw/mgar/pkg/sudo_ldap/trunk/checksums	2010-03-02 08:54:55 UTC (rev 8932)
@@ -1,2 +1,2 @@
 157b2e5e38ca54eb36e0364706bd0292  install.diff
-3989e5a00538247d7dcef8b514076752  sudo-1.7.2p4.tar.gz
+398f584e831bd75b3c0179e28368c2a3  sudo-1.7.2p5.tar.gz


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