[csw-devel] SF.net SVN: gar:[6998] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Oct 28 16:21:45 CET 2009


Revision: 6998
          http://gar.svn.sourceforge.net/gar/?rev=6998&view=rev
Author:   dmichelsen
Date:     2009-10-28 15:21:45 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
sasl-2.1.23-mGARv2: Pull in dynamic gspecs

Modified Paths:
--------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums

Added Paths:
-----------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup

Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2009-10-28 15:17:27 UTC (rev 6997)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2009-10-28 15:21:45 UTC (rev 6998)
@@ -1,5 +1,5 @@
 GARNAME = sasl
-GARVERSION = 2.1.22
+GARVERSION = 2.1.23
 CATEGORIES = lib
 
 DESCRIPTION = Simple Authentication and Security Layer
@@ -12,7 +12,7 @@
 endef
 
 # Source location
-MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
+MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 # Visitor information
 SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/
@@ -21,34 +21,52 @@
 
 DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
-BUILD_ENV = _REENTRANT=1
-
-TEST_TARGET = check
-
-SED=/usr/bin/sed
-EGREP=/usr/bin/egrep
-max_cmd_line=65535
-
 # SASL libraries and utilities
-DISTFILES += $(call admfiles,CSWsasl,$(ADMSTANDARD) $(ADMISCRIPTS))
+DISTFILES += CSWsasl.preinstall CSWsasl.postinstall
 # SASL authentication server
-DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON))
+#DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON))
 # SASL sql plugin
-DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD))
+#DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD))
 # SASL gssapi plugin
-DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD))
+#DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD))
 
+DISTFILES += cswusergroup
+
 # Init files for SASLAUTHD
 DISTFILES += cswsaslauthd.init saslauthd.init.CSW
 
 PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff
 
-#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir
+PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql
 
-EXTRA_LIBS += /opt/csw/bdb4/lib
+CATALOGNAME_CSWsasl = sasl
+CATALOGNAME_CSWsaslauthd = saslauthd
+CATALOGNAME_CSWsaslgssapi = sasl_gssapi
+CATALOGNAME_CSWsaslsql = sasl_sql
+
+REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb4
+REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib
+REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib
+REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite
+
+SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
+SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon
+SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding
+SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+BUILD64 = 1
+
+# Do not use LD_OPTIONS as it breaks tests by using the installed libraries
+# before the newly built ones.
+EXTRA_LDFLAGS = $(RUNPATH_LINKER_FLAGS)
+LD_OPTIONS =
+
+BUILD_ENV = _REENTRANT=1
+
+EXTRA_LIBS += /opt/csw/bdb47/lib
 EXTRA_LIBS += /opt/csw/mysql4/lib
 EXTRA_LIBS += /opt/csw/postgresql/lib
 
@@ -56,8 +74,8 @@
 CONFIGURE_ARGS = $(DIRPATHS) 
 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-bdb-libdir=/opt/csw/bdb47/lib 
+CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ 
 CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
 CONFIGURE_ARGS += --with-ldap=/opt/csw 
@@ -68,13 +86,18 @@
 CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 
 CONFIGURE_ARGS += --enable-login
 
+SED=/usr/bin/sed
+EGREP=/usr/bin/egrep
+max_cmd_line=65535
 
-all: .DEFAULT
-.DEFAULT:
-	@true
+TEST_TARGET = check
 
-post-install: testsaslauthd install-testsaslauthd install-doc
+#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir
 
+include gar/category.mk
+
+post-install-modulated: testsaslauthd install-testsaslauthd install-doc
+
 DOC_FILES = rfc1321.txt \
                 rfc1939.txt \
                 rfc2104.txt \
@@ -139,5 +162,3 @@
 	cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd
 	cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW
 
-
-include gar/category.mk

Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums	2009-10-28 15:17:27 UTC (rev 6997)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums	2009-10-28 15:21:45 UTC (rev 6998)
@@ -1,22 +1,8 @@
-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
+614bb55932ed32486c1fd57a0059059a  CSWsasl.postinstall
+2762eafea57ec2e5e28e5a5a95937fa7  CSWsasl.preinstall
+b2491dcfbb2be4a4a09f3003cffb1bc7  cswsaslauthd.init
+2eb0e48106f0e9cd8001e654f267ecbc  cyrus-sasl-2.1.23.tar.gz
+48af784184961368ce250c7b33d207b8  ltmain.diff
+40b526754554c46d5b134f5ca21fe371  saslauthd-doc.diff
+21cbef68d9f2dc2447326cbda8bf842e  saslauthd-groff.diff
+b190992e18cc7add35a6934d896a1130  saslauthd.init.CSW

Added: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup	2009-10-28 15:21:45 UTC (rev 6998)
@@ -0,0 +1 @@
+:sasl::::::


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