[csw-devel] SF.net SVN: gar:[8921] csw/mgar/pkg/sudo_ldap/trunk

[wahwah at users.sourceforge.net]

Revision: 8921
          http://gar.svn.sourceforge.net/gar/?rev=8921&view=rev
Author:   wahwah
Date:     2010-03-01 17:23:46 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
sudo_ldap: Version update to 1.7.2p4, adding alternatives support.

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2010-03-01 14:44:14 UTC (rev 8920)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2010-03-01 17:23:46 UTC (rev 8921)
@@ -1,7 +1,7 @@
 GARNAME = sudo
 GARVERSION = 1.7.2
 CATEGORIES = utils
-RELEASE = p2
+RELEASE = p4
 
 DISTVERSION = $(GARVERSION)$(RELEASE)
 DISTNAME = $(GARNAME)-$(DISTVERSION)
@@ -29,6 +29,8 @@
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
 RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt 
 
+LOGPATH = /var/opt/csw/log/sudo
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-logging=both
@@ -37,23 +39,36 @@
 CONFIGURE_ARGS += --with-ldap=$(prefix)
 CONFIGURE_ARGS += --with-ldap-conf-file=$(sysconfdir)/ldap.conf
 CONFIGURE_ARGS += --disable-path-info
-CONFIGURE_ARGS += --with-logpath=/var/opt/csw/sudo/logs/sudolog
+CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog
 ifneq ($(shell uname -r),5.8)
     CONFIGURE_ARGS += --with-project
 endif
 
+# sysconfdir to be enabled later
+# sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
 
 TEST_TARGET = check
+FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir)
 
+LICENSE = LICENSE
+ALTERNATIVES_CSWsudoldap = sudoldap
+ALTERNATIVE_sudoldap  = $(bindir)/sudo     sudo     $(bindir)/sudo.ldap     60
+ALTERNATIVE_sudoldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap
+
 include gar/category.mk
 
 PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )
-	@( cd $(DESTDIR)$(bindir) ; grm sudoedit )
-	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 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-01 14:44:14 UTC (rev 8920)
+++ csw/mgar/pkg/sudo_ldap/trunk/checksums	2010-03-01 17:23:46 UTC (rev 8921)
@@ -1,2 +1,2 @@
 157b2e5e38ca54eb36e0364706bd0292  install.diff
-2a19cf1ab4afc94fe19d0d0899d4cd45  sudo-1.7.2p2.tar.gz
+3989e5a00538247d7dcef8b514076752  sudo-1.7.2p4.tar.gz


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