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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Feb 14 11:43:20 CET 2012 

Revision: 17049
          http://gar.svn.sourceforge.net/gar/?rev=17049&view=rev
Author:   dmichelsen
Date:     2012-02-14 10:43:20 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
sudo/trunk: Add sample sudo.conf, rework sudo-ldap

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

Added Paths:
-----------
    csw/mgar/pkg/sudo/trunk/files/
    csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2012-02-14 09:42:33 UTC (rev 17048)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2012-02-14 10:43:20 UTC (rev 17049)
@@ -1,6 +1,5 @@
 # $Id$
 #
-# Make sudo-ldap with AUXV-linkage of /opt/csw/libexec/sudoers.so, which is the file differing between minimal and ldap
 
 NAME = sudo
 VERSION = 1.8.3p2
@@ -20,30 +19,21 @@
 
 MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/
 DISTFILES += $(DISTNAME).tar.gz 
+DISTFILES += sudo.conf.CSW
 
 LICENSE = doc/LICENSE
 
 VENDOR_URL = http://www.sudo.ws
 
-LDAP_DOCFILES += $(docdir)/sudo/README.LDAP
-LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory
-LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP
-LDAP_DOCFILES += $(docdir)/sudo/schema.iPlanet
-LDAP_DOCFILES += $(docdir)/sudo/sudoers2ldif
-
-LDAP_MANFILES += $(mandir)/man4/sudoers.ldap.4
-
 PACKAGES += CSWsudo
 SPKG_DESC_CSWsudo = Provides limited super user privileges
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1
-# Logical dependency, no tracking via checkpkg
-RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common
-CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common
 OBSOLETED_BY_CSWsudo = CSWsudo-common
 
 # These are just docs
+CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE
@@ -52,20 +42,36 @@
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW
 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog
-CHECKPKG_OVERRIDES_CSWsudo += pkginfo-opencsw-repository-uncommitted
+
+# 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
+LDAP_DOCFILES += $(docdir)/sudo/schema.iPlanet
+LDAP_DOCFILES += $(docdir)/sudo/sudoers2ldif
+LDAP_MANFILES += $(mandir)/man4/sudoers.ldap.4
+
 PACKAGES += CSWsudo-ldap
 SPKG_DESC_CSWsudo-ldap = LDAP bindings for SUDO
-PKGFILES_CSWsudo-ldap  = $(bindir)/sudo\.ldap
-PKGFILES_CSWsudo-ldap += $(bindir)/sudoedit\.ldap
-PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES)
+PKGFILES_CSWsudo-ldap += $(libexecdir)/sudoers-ldap.so
 PKGFILES_CSWsudo-ldap += $(LDAP_DOCFILES)
+PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES)
 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibldap2-4-2
+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
 CATALOGNAME_CSWsudoldap = sudo_ldap_stub
+CHECKPKG_OVERRIDES_CSWsudo-ldap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/README.LDAP
 
+# This is a private library
+CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so
+
 LOGPATH    = $(localstatedir)/log/sudo
 TIMEPATH   = $(localstatedir)/sudo
 IOLOGPATH  = $(LOGPATH)/io
@@ -115,28 +121,20 @@
 MERGE_SCRIPTS_isa-default-ldap-disabled = copy-all
 MERGE_SCRIPTS_isa-default-ldap-enabled = copy-all
 
-EXTRA_PAX_ARGS_LDAP-disabled += -s ',($(bindir)/sudo.*),$$1.minimal,'
-EXTRA_PAX_ARGS_LDAP-enabled += -s ',($(bindir)/sudo.*),$$1.ldap,'
+EXTRA_PAX_ARGS_LDAP-enabled += -s ',($(libexecdir))/sudoers.so,$$1/sudoers-ldap.so,'
 EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_LDAP-$(LDAP))
 
 MIGRATE_FILES_CSWsudo += sudoers
 
 PRESERVECONF += $(sysconfdir)/sudoers
+PRESERVECONF += $(sysconfdir)/sudo.conf
 
-ALTERNATIVES_CSWsudo += minimal
-ALTERNATIVE_minimal += $(bindir)/sudo sudo $(bindir)/sudo.minimal 50
-ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal
-
-ALTERNATIVES_CSWsudo-ldap += ldap
-ALTERNATIVE_ldap += $(bindir)/sudo sudo $(bindir)/sudo.ldap 60
-ALTERNATIVE_ldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap
-
 include gar/category.mk
 
 post-install-modulated:
-	#@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal )
-	#@( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal )
-	@ginstall -d $(DESTDIR)$(IOLOGPATH)
-	@ginstall -d $(DESTDIR)$(TIMEPATH)
+	ginstall -d $(DESTDIR)$(IOLOGPATH)
+	ginstall -d $(DESTDIR)$(TIMEPATH)
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	ginstall $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir)
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW
===================================================================
--- csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW	2012-02-14 10:43:20 UTC (rev 17049)
@@ -0,0 +1,46 @@
+#
+# Sample /etc/opt/csw/sudo.conf file
+#
+# Format:
+#   Plugin plugin_name plugin_path
+#   Path askpass /path/to/askpass
+#   Path noexec /path/to/noexec.so
+#
+# Sudo plugins:
+#
+# The plugin_path is relative to ${prefix}/libexec unless fully qualified.
+# The plugin_name corresponds to a global symbol in the plugin
+#   that contains the plugin interface structure.
+#
+# The sudoers plugin is used by default if no Plugin lines are present.
+#Plugin sudoers_policy sudoers.so
+#Plugin sudoers_io sudoers.so
+
+# LDAP-enabled plugin:
+#Plugin sudoers_policy sudoers-ldap.so
+#Plugin sudoers_io sudoers-ldap.so
+
+#
+# Sudo askpass:
+#
+# An askpass helper program may be specified to provide a graphical
+# password prompt for "sudo -A" support.  Sudo does not ship with its
+# own passpass program but can use the OpenSSH askpass.
+#
+# Use the OpenSSH askpass
+#Path askpass /usr/X11R6/bin/ssh-askpass
+#
+# Use the Gnome OpenSSH askpass (requires CSWgnome-ssh-askpass)
+#Path askpass /opt/csw/bin/gnome-ssh-askpass
+
+#
+# Sudo noexec:
+#
+# Path to a shared library containing dummy versions of the execv(),
+# execve() and fexecve() library functions that just return an error.
+# This is used to implement the "noexec" functionality on systems that
+# support C<LD_PRELOAD> or its equivalent.
+# The compiled-in value is usually sufficient and should only be changed
+# if you rename or move the sudo_noexec.so file.
+#
+#Path noexec /opt/csw/libexec/sudo_noexec.so

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

More information about the devel mailing list