[csw-devel] SF.net SVN: gar:[15914] csw/mgar/pkg/sasl/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sun Oct 16 13:50:41 CEST 2011


Revision: 15914
          http://gar.svn.sourceforge.net/gar/?rev=15914&view=rev
Author:   guengel
Date:     2011-10-16 11:50:40 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
Merged sasl-2.1.23-mGARv2 branch into trunk.

Modified Paths:
--------------
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/checksums
    csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init

Removed Paths:
-------------
    csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend
    csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec
    csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall
    csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall
    csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend
    csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec
    csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend
    csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec
    csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype
    csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend
    csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec
    csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype

Property Changed:
----------------
    csw/mgar/pkg/sasl/trunk/


Property changes on: csw/mgar/pkg/sasl/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2:6997-15913

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,6 +1,6 @@
 NAME = sasl
-VERSION = 2.1.22
-GARTYPE = v1
+VERSION = 2.1.25
+FILEVERSION = $(VERSION)
 CATEGORIES = lib
 
 DESCRIPTION = Simple Authentication and Security Layer
@@ -12,70 +12,130 @@
    layer is inserted between the protocol and the connection.
 endef
 
-# Source location
-MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
+MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME = cyrus-$(NAME)-$(VERSION)
+DISTFILES = cyrus-$(NAME)-$(FILEVERSION).tar.gz
+DISTFILES += cswsaslauthd.init saslauthd.init.CSW
+DISTFILES += README.sasl README.saslauthd
 
-# Visitor information
-SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/
+# PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff
 
-WORKSRC = $(WORKDIR)/cyrus-$(NAME)-$(VERSION)
+VENDOR_URL = http://asg.web.cmu.edu/sasl/
 
-DISTFILES = cyrus-$(NAME)-$(VERSION).tar.gz
+PACKAGES += CSWsasl
+CATALOGNAME_CSWsasl = sasl
+SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
+RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt
+RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47
+RUNTIME_DEP_PKGS_CSWsasl += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsasl += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = cyrus-$(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWsaslauthd
+CATALOGNAME_CSWsaslauthd = saslauthd
+SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5support0
 
-BUILD_ENV = _REENTRANT=1
+PACKAGES += CSWsaslgssapi
+CATALOGNAME_CSWsaslgssapi = sasl_gssapi
+SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding
+RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib
+CHECKPKG_OVERRIDES_CSWsaslgssapi += surplus-dependency|CSWsasl
 
-TEST_TARGET = check
+PACKAGES += CSWsaslsql
+CATALOGNAME_CSWsaslsql = sasl_sql
+SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding
+RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite
+CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl
 
-SED=/usr/bin/sed
-EGREP=/usr/bin/egrep
-max_cmd_line=65535
+PACKAGES += CSWlibsasl2-2
+SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2
+PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2)
 
-# SASL libraries and utilities
-DISTFILES += $(call admfiles,CSWsasl,$(ADMSTANDARD) $(ADMISCRIPTS))
-# SASL authentication server
-DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON))
-# SASL sql plugin
-DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD))
-# SASL gssapi plugin
-DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD))
+PACKAGES += CSWsasl-dev
+SPKG_DESC_CSWsasl-dev = Development files for SASL
+PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2
 
-# Init files for SASLAUTHD
-DISTFILES += cswsaslauthd.init saslauthd.init.CSW
+EXTRA_CFLAGS = -D__EXTENSIONS__
 
-PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff
+EXTRA_BUILD_ENV = _REENTRANT=1
 
-#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir
+# EXTRA_LIB = $(prefix)/bdb47/lib
 
-EXTRA_LIBS += /opt/csw/bdb4/lib
-EXTRA_LIBS += /opt/csw/mysql4/lib
-EXTRA_LIBS += /opt/csw/postgresql/lib
+EXTRA_INC  = /opt/csw/include/gssapi
+EXTRA_INC += /opt/csw/include/mysql
+EXTRA_INC += /opt/csw/postgresql/include
 
+# Do not use LD_OPTIONS as it breaks tests by using the installed libraries
+# before the newly built ones.
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+LD_OPTIONS = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR))
+
+BUILD64 = 1
+NOISALIST = 1
+
+NODIRPATHS = --docdir
+
 # SASL configuration
 CONFIGURE_ARGS = $(DIRPATHS) 
+CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --disable-static 
 CONFIGURE_ARGS += --enable-sql
-CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb4/lib 
-CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb4/include/ 
-CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd 
+CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ 
+CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
-CONFIGURE_ARGS += --with-ldap=/opt/csw 
-CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql4/ 
-CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql 
-CONFIGURE_ARGS += --with-openssl=/opt/csw 
-CONFIGURE_ARGS += --with-dbpath=/opt/csw/etc/sasldb2 
-CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 
+CONFIGURE_ARGS += --with-ldap=$(libdir)
+# Autoconf tries to find the directory with the shared lib in it. Because of the
+# ISA suffix for 64 bit we must specify the exact library location and add
+# the include directories manually.
+#CONFIGURE_ARGS += --with-mysql=$(libdir)
+CONFIGURE_ARGS += --with-mysql=$(libdir)
+CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --with-openssl=$(libdir)
+CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2
+CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 
 CONFIGURE_ARGS += --enable-login
+# This is for 32/64 switching. We do this all by ourselves, do not use SASLs mechanism
+CONFIGURE_ARGS += --without-lib-subdir
 
+SED=/usr/bin/sed
+EGREP=/usr/bin/egrep
+max_cmd_line=65535
 
-all: .DEFAULT
-.DEFAULT:
-	@true
+#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir
 
-post-install: testsaslauthd install-testsaslauthd install-doc
+PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init
+PKGFILES_CSWsaslauthd += $(bindir)/testsaslauthd
+PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd
+PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8
+PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD
+PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd
+PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd
+PKGFILES_CSWsaslgssapi = $(libdir)/sasl2/libgssapiv2\..*
+PKGFILES_CSWsaslsql = $(libdir)/sasl2/libsql\..*
 
+MIGRATECONF = saslauthd.conf sasldb2
+PRESERVECONF = saslauthd.conf
+
+INITSMF = /etc/opt/csw/init.d/cswsaslauthd.init
+
+CSWsasl_usergroup = :sasl:::::: 
+
+include gar/category.mk
+
+post-install-modulated: testsaslauthd install-testsaslauthd install-doc
+	ginstall -d $(DESTDIR)/etc/opt/csw/init.d/
+	ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d
+	@$(MAKECOOKIE)
+
 DOC_FILES = rfc1321.txt \
                 rfc1939.txt \
                 rfc2104.txt \
@@ -120,25 +180,21 @@
                 TODO \
                 ONEWS
 
-INSTDIR = $(DESTDIR)/opt/csw
-
-
 testsaslauthd:
 	cd $(WORKSRC)/saslauthd && make testsaslauthd
 
 install-testsaslauthd:
-	-mkdir -p $(INSTDIR)/bin
-	cp $(WORKSRC)/saslauthd/testsaslauthd $(INSTDIR)/bin
+	mkdir -p $(DESTDIR)$(bindir)
+	cp $(WORKSRC)/saslauthd/testsaslauthd $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)/var/opt/csw/saslauthd
 
 install-doc:
-	-mkdir -p $(INSTDIR)/share/doc/sasl
+	mkdir -p $(DESTDIR)$(docdir)/sasl
+	cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW
 	list='$(DOC_FILES)'; for file in $$list; do \
-		cp $(WORKSRC)/doc/$$file $(INSTDIR)/share/doc/sasl; \
+		cp $(WORKSRC)/doc/$$file $(DESTDIR)$(docdir)/sasl; \
 	     done
-	cp files/README.sasl $(INSTDIR)/share/doc/sasl/README.CSW
-	-mkdir -p $(INSTDIR)/share/doc/saslauthd
-	cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd
-	cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW
+	mkdir -p $(DESTDIR)$(docdir)/saslauthd
+	cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(DESTDIR)$(docdir)/saslauthd
+	cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW
 
-
-include gar/category.mk

Modified: csw/mgar/pkg/sasl/trunk/checksums
===================================================================
--- csw/mgar/pkg/sasl/trunk/checksums	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/checksums	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,22 +1 @@
-45dde9d19193ae9dd388eb68b2027bc9  download/cyrus-sasl-2.1.22.tar.gz
-f4a742f252ee3b840ffe062d4288e4d4  download/CSWsasl.gspec
-b8dd69fab29e6e9706536229572dbca5  download/CSWsasl.prototype
-773caf5b10e823266e785ec1ac5ea20e  download/CSWsasl.depend
-2762eafea57ec2e5e28e5a5a95937fa7  download/CSWsasl.preinstall
-614bb55932ed32486c1fd57a0059059a  download/CSWsasl.postinstall
-b9b51f830b9524f2d6f35fe428cbce5a  download/CSWsaslauthd.gspec
-8974319c29e07c5b44470c85d91859c8  download/CSWsaslauthd.prototype
-1114b8288fe48e24922fca60ef00da79  download/CSWsaslauthd.depend
-ab89fa9937d1337e30de070bb8b0174b  download/CSWsaslauthd.postinstall
-177c98fa0d192eafe569a3c379388652  download/CSWsaslauthd.preremove
-e2962c2cfefee8bada31b15af8817b52  download/CSWsaslsql.gspec
-5936c0208fc18f2a47f716013171cdf2  download/CSWsaslsql.prototype
-1dbe229bbe3c1f944f95a1ecef65fa49  download/CSWsaslsql.depend
-033ca04bd0d1d5467495af765a890df2  download/CSWsaslgssapi.gspec
-486fb367a3d53ad5125f7678065bfd8d  download/CSWsaslgssapi.prototype
-4c009a25ddbe4325f515a8d605a62ec6  download/CSWsaslgssapi.depend
-b2491dcfbb2be4a4a09f3003cffb1bc7  download/cswsaslauthd.init
-b190992e18cc7add35a6934d896a1130  download/saslauthd.init.CSW
-40b526754554c46d5b134f5ca21fe371  download/saslauthd-doc.diff
-21cbef68d9f2dc2447326cbda8bf842e  download/saslauthd-groff.diff
-48af784184961368ce250c7b33d207b8  download/ltmain.diff
+341cffe829a4d71f2a6503d669d5a946  cyrus-sasl-2.1.25.tar.gz

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-P SUNWcsr  - Core Solaris, (Root)
-P SUNWcsl  - Core Solaris, (Shared Libs)
-P SUNWlibms - Sun WorkShop Bundled shared libm
-P CSWossl - OpenSSL Secure Sockets Layer lib and utilities
-P CSWbdb4 - berkeleydb4, embedded database libraries and utilities 

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-%var            bitname sasl
-%var            pkgname CSWsasl
-%copyright      url file://%{WORKSRC}/COPYING
-%depend         url file://%{GARDIR}/lib/sasl/files/CSWsasl.depend
-%include	url file://%{GARDIR}/pkglib/csw_standard.gspec

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,6 +0,0 @@
-# Display message
-echo '***'
-echo '*** See README.CSW in /opt/csw/share/doc/sasl **'
-echo '***'
-
-exit 0

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi
-
-# Next, verify that group sasl exists.
-# First check target machines group file, THEN check
-# NIS/NIS+/whatever
-
-${BASEDIR}/usr/bin/grep '^sasl:' ${BASEDIR}/etc/group >/dev/null
-if [ $? -ne 0 ] ; then
-        ${BASEDIR}/usr/bin/getent group sasl >/dev/null
-        if [ $? -ne 0 ] ; then
-                ADDGROUP=1
-        fi
-fi
-
-if [ "$ADDGROUP" = 1 ] ; then
-        chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd sasl
-	echo "sasl group added"
-else
-        echo "sasl group detected"
-fi
-
-exit 0

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-P SUNWcsl - Core Solaris, (Shared Libs)
-P SUNWgss - GSSAPI V2
-P CSWossl - OpenSSL Secure Sockets Layer lib and utilities
-P CSWoldaprt - openldap, ldap clients,libraries and server
-P CSWkrb5lib - A Kerberos 5 implementation: libraries

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-%var            bitname saslauthd
-%var            pkgname CSWsaslauthd
-%copyright      url file://%{WORKSRC}/COPYING
-%depend         url file://%{GARDIR}/lib/sasl/files/CSWsaslauthd.depend
-%include	url file://%{GARDIR}/pkglib/csw_standard.gspec

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-P SUNWcsr  - Core Solaris, (Root)
-P SUNWcsl  - Core Solaris, (Shared Libs)
-P SUNWlibms - Sun WorkShop Bundled shared libm
-P CSWsasl - sasl, Simple Authentication and Security Layer
-P CSWkrb5lib - MIT Kerberos 5 core libraries

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-%var            bitname sasl_gssapi
-%var            pkgname CSWsaslgssapi
-%copyright      url file://%{WORKSRC}/COPYING
-%depend         url file://%{GARDIR}/lib/sasl/files/CSWsaslgssapi.depend
-%include	url file://%{GARDIR}/pkglib/csw_standard.gspec

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,7 +0,0 @@
-i copyright=CSWsaslgssapi.copyright
-i depend=CSWsaslgssapi.depend
-i pkginfo=CSWsaslgssapi.pkginfo
-f none /opt/csw/lib/sasl2/libgssapiv2.la 0755 root bin
-f none /opt/csw/lib/sasl2/libgssapiv2.so.2.0.22 0755 root bin
-s none /opt/csw/lib/sasl2/libgssapiv2.so.2=libgssapiv2.so.2.0.22 root bin
-s none /opt/csw/lib/sasl2/libgssapiv2.so=libgssapiv2.so.2.0.22 root bin

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,7 +0,0 @@
-P SUNWcsr  - Core Solaris, (Root)
-P SUNWcsl  - Core Solaris, (Shared Libs)
-P SUNWlibms - Sun WorkShop Bundled shared libm
-P CSWsasl - sasl, Simple Authentication and Security Layer
-P CSWlibpq - libraries needed by postgresql server and clients
-P CSWmysql4rt - run-time lib for mysql4
-P CSWsqlite -  An embeddable SQL engine in a C library

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,5 +0,0 @@
-%var            bitname sasl_sql
-%var            pkgname CSWsaslsql
-%copyright      url file://%{WORKSRC}/COPYING
-%depend         url file://%{GARDIR}/lib/sasl/files/CSWsaslsql.depend
-%include	url file://%{GARDIR}/pkglib/csw_standard.gspec

Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,7 +0,0 @@
-i copyright=CSWsaslsql.copyright
-i depend=CSWsaslsql.depend
-i pkginfo=CSWsaslsql.pkginfo
-f none /opt/csw/lib/sasl2/libsql.la 0755 root bin
-f none /opt/csw/lib/sasl2/libsql.so.2.0.22 0755 root bin
-s none /opt/csw/lib/sasl2/libsql.so.2=libsql.so.2.0.22 root bin
-s none /opt/csw/lib/sasl2/libsql.so=libsql.so.2.0.22 root bin

Modified: csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init	2011-10-16 11:14:52 UTC (rev 15913)
+++ csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init	2011-10-16 11:50:40 UTC (rev 15914)
@@ -1,6 +1,18 @@
 #!/bin/sh
 # Startup script for saslauthd
 
+# s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd
+# s none /etc/rc0.d/K15cswsaslauthd=../init.d/cswsaslauthd
+# s none /etc/rc1.d/K15cswsaslauthd=../init.d/cswsaslauthd
+# s none /etc/rc2.d/K15cswsaslauthd=../init.d/cswsaslauthd
+# s none /etc/rcS.d/K15cswsaslauthd=../init.d/cswsaslauthd
+
+# Magic setting for CSWcswclassutils
+#RC_KNUM 15
+#RC_SNUM 85
+#RC_KLEV 0,1,2,S
+#RC_SLEV 2
+
 INIT_FILE=/etc/opt/csw/saslauthd.init
 if [ -f "${INIT_FILE}" ]; then
   INIT_FILE=/opt/csw/etc/saslauthd.init

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