Revision: 15786
http://gar.svn.sourceforge.net/gar/?rev=15786&view=rev
Author: dmichelsen
Date: 2011-09-28 09:06:55 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
openldap23: Initial commit for single-package 2.3.x libs
Modified Paths:
--------------
csw/mgar/pkg/openldap23/trunk/Makefile
csw/mgar/pkg/openldap23/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/openldap23/
csw/mgar/pkg/openldap23/Makefile
csw/mgar/pkg/openldap23/branches/
csw/mgar/pkg/openldap23/tags/
csw/mgar/pkg/openldap23/tags/openldap-2.3.43-2.4.26/
csw/mgar/pkg/openldap23/trunk/
Removed Paths:
-------------
csw/mgar/pkg/openldap23/Makefile
csw/mgar/pkg/openldap23/branches/
csw/mgar/pkg/openldap23/tags/
csw/mgar/pkg/openldap23/trunk/
Deleted: csw/mgar/pkg/openldap23/Makefile
===================================================================
--- csw/mgar/pkg/openldap/Makefile 2011-09-26 01:51:21 UTC (rev 15757)
+++ csw/mgar/pkg/openldap23/Makefile 2011-09-28 09:06:55 UTC (rev 15786)
@@ -1,15 +0,0 @@
-# vim: ft=make ts=4 sw=4 noet
-
-default:
- @echo "You are in the pkg/ directory."
-
-%:
- $(MAKE) -C trunk $*
-
-paranoid-%:
- $(MAKE) -C trunk $* || exit 2
-
-export BUILDLOG ?= $(shell pwd)/buildlog.txt
-
-report-%:
- $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >>
$(BUILDLOG)
Copied: csw/mgar/pkg/openldap23/Makefile (from rev 15455,
csw/mgar/pkg/openldap/Makefile)
===================================================================
--- csw/mgar/pkg/openldap23/Makefile (rev 0)
+++ csw/mgar/pkg/openldap23/Makefile 2011-09-28 09:06:55 UTC (rev 15786)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >>
$(BUILDLOG)
Modified: csw/mgar/pkg/openldap23/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile 2011-09-23 10:52:22 UTC (rev
15718)
+++ csw/mgar/pkg/openldap23/trunk/Makefile 2011-09-28 09:06:55 UTC (rev
15786)
@@ -1,9 +1,7 @@
NAME = openldap
-VERSION = 2.4.26
+VERSION = 2.3.43
GARTYPE = v2
CATEGORIES = server
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 2.3.43 2.4.26
DESCRIPTION = Open source implementation of the Lightweight Directory Access
Protocol
define BLURB
@@ -16,78 +14,27 @@
MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tgz)
-DISTFILES = $(SOURCEFILES)
-DISTFILES += CSWoldap.postinstall
-DISTFILES += README.CSW openldaprc
-DISTFILES += cswopenldap openldap.xml
+DISTFILES = $(DISTNAME).tgz
-EXPANDVARS = cswopenldap
-EXPANDVARS += CSWoldap.postinstall
-
-PATCHFILES_isa-sparcv8-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-sparcv9-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-i386-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-amd64-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
PATCHFILES += patch-libtool-64bit.diff
-DISTFILES += patch-oldap-2.4.16-ntlm.diff
-# Maybe in
-# /opt/csw/share/man/man5/ldap.conf.5
-# the string
-# /usr/local/var/ldapi
-# should be replaced by something more sane in the future.
-
-NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tgz,$(SOURCEFILES))
-
LICENSE = COPYRIGHT
-PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt
-
-CATALOGNAME_CSWoldap = openldap
-CATALOGNAME_CSWoldapclient = openldap_client
-CATALOGNAME_CSWoldapdevel = openldap_devel
+PACKAGES = CSWoldaprt
CATALOGNAME_CSWoldaprt = openldap_rt
-
-SPKG_DESC_CSWoldap = OpenLDAP server for Lightweight Directory Access
Protocol
-SPKG_DESC_CSWoldapclient = OpenLDAP client executables
-SPKG_DESC_CSWoldapdevel = OpenLDAP development support
SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries
-RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWlibnet
-RUNTIME_DEP_PKGS_CSWoldap += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
-RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl
-RUNTIME_DEP_PKGS_CSWoldap += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl
-RUNTIME_DEP_PKGS_CSWoldapclient += CSWoldaprt
RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl
-SPKG_SOURCEURL = http://www.openldap.org
+VENDOR_URL = http://www.openldap.org
-# We define upstream file regex so we can be notifed of new upstream software
release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc
-
# This is old, stick to BerkeleyDB 4.4
-EXTRA_LIB_version-2.3.43 = $(prefix)/bdb44/lib
-EXTRA_INC_version-2.3.43 = $(prefix)/bdb44/include
+EXTRA_LIB = $(prefix)/bdb44/lib
+EXTRA_INC = $(prefix)/bdb44/include
-# This is also used during EXPANDVARS
-bdbdir = $(prefix)/bdb48
-EXTRA_LIB_version-2.4.26 = $(bdbdir)/lib
-EXTRA_INC_version-2.4.26 = $(bdbdir)/include
-EXTRA_LIB = $(EXTRA_LIB_version-$(VERSION))
-EXTRA_INC = $(EXTRA_INC_version-$(VERSION))
-
# Not released yet.
-#EXTRA_LDFLAGS = -L$(libdir)/libnet-new
+EXTRA_LDFLAGS = -L$(libdir)/libnet-new
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
-
-MIGRATE_FILES = openldap
-
# Is this causing this?
# https://www.opencsw.org/mantis/view.php?id=4555
NOISALIST = 1
@@ -103,8 +50,6 @@
CONFIGURE_ARGS += --enable-modules
CONFIGURE_ARGS += --enable-rlookups
CONFIGURE_ARGS += --enable-slp
-CONFIGURE_ARGS += --enable-backends=mod
-CONFIGURE_ARGS += --enable-overlays=mod
# Is the absence of this arg causing
https://www.opencsw.org/mantis/view.php?id=4468 ?
CONFIGURE_ARGS += --enable-dynamic
@@ -112,103 +57,17 @@
# Disable MySQL Cluster
CONFIGURE_ARGS += --disable-ndb
-# Disable TCPwrappers in 64 bit until the libraries are available
-# <http://opencsw.org/mantis/view.php?id=3748>
-CONFIGURE_ARGS_32 = --enable-wrappers
-# spasswd requires Cyrus SASL
-CONFIGURE_ARGS_32 += --enable-spasswd
-
# Disable Cyrus SASL in 64 bit until the libraries are available
# <http://opencsw.org/mantis/view.php?id=3749>
CONFIGURE_ARGS_64 += --without-cyrus-sasl
-# We have Perl only for 32 bit:
-# <http://opencsw.org/mantis/view.php?id=4484>
-CONFIGURE_ARGS_32 += --enable-perl=mod
-CONFIGURE_ARGS_64 += --enable-perl=no
-
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
-SKIPTEST ?= 1
-
-MERGE_SCRIPTS_isa-default-version-2.3.43 = copy-only
-MERGE_DIRS_isa-default-version-2.3.43 = $(libdir)
-MERGE_SCRIPTS_isa-default64-version-2.3.43 = copy-relocated-only
-MERGE_DIRS_isa-default64-version-2.3.43 = $(libdir)
-
-MERGE_SCRIPTS_isa-default-version-2.4.26 = copy-all
-MERGE_SCRIPTS_isa-default64-version-2.4.26 = copy-relocated-only
-MERGE_DIRS_isa-default64-version-2.4.26 = $(bindir) $(sbindir) $(libexecdir)
$(libdir)
-
# Perl backend is built, although it has been told not to.
EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
-# Make sure we do not use the 2.3 .so-links in any case
-EXTRA_MERGE_EXCLUDE_FILES_isa-i386-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9-version-2.3.43 = .*\.so
-
-# These are the config templates. As we have preserveconf which takes
-# care of this we exclude them in the package.
-EXTRA_MERGE_EXCLUDE_FILES = .*\.default
-
-PRESERVECONF = /etc/opt/csw/openldap/ldap.conf
-PRESERVECONF += /etc/opt/csw/openldap/slapd.conf
-
-PKGFILES_CSWoldapclient = $(bindir)/.*
-PKGFILES_CSWoldapclient += $(mandir)/man1/.*
-
-PKGFILES_CSWoldapdevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWoldapdevel += $(mandir)/man3/.*
-
-PKGFILES_CSWoldaprt = $(PKGFILES_RT)
-PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
-PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
-
-INITSMF = /opt/csw/etc/init.d/cswopenldap
-
-CHECKPKG_OVERRIDES_CSWoldap +=
init-file-wrong-location|/opt/csw/etc/init.d/cswopenldap
-
-# New libnet not released yet
-CHECKPKG_OVERRIDES_CSWoldap += deprecated-library
-CHECKPKG_OVERRIDES_CSWoldapclient += deprecated-library
-CHECKPKG_OVERRIDES_CSWoldaprt += deprecated-library
-
-# Split libraries later
-CHECKPKG_OVERRIDES_CSWoldaprt += non-uniform-lib-versions-in-package
-
-# These are all overrides because the new libnet is not in place yet.
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapdelete
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldappasswd
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapmodrdn
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapmodify
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapwhoami
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapexop
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapcompare
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapsearch
-CHECKPKG_OVERRIDES_CSWoldapclient +=
soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapurl
-CHECKPKG_OVERRIDES_CSWoldapclient += surplus-dependency|CSWlibnet
-CHECKPKG_OVERRIDES_CSWoldaprt +=
soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap_r-2.3.so.0.2.31
-CHECKPKG_OVERRIDES_CSWoldaprt +=
soname-not-found|libnet.so|is|needed|by|opt/csw/lib/liblber-2.4.so.2.5.6
-CHECKPKG_OVERRIDES_CSWoldaprt +=
soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap-2.3.so.0.2.31
-CHECKPKG_OVERRIDES_CSWoldaprt +=
soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap_r-2.4.so.2.5.6
-CHECKPKG_OVERRIDES_CSWoldaprt +=
soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap-2.4.so.2.5.6
-CHECKPKG_OVERRIDES_CSWoldaprt += surplus-dependency|CSWlibnet
-CHECKPKG_OVERRIDES_CSWoldap +=
soname-not-found|libnet.so|is|needed|by|opt/csw/libexec/slapd
-CHECKPKG_OVERRIDES_CSWoldap += surplus-dependency|CSWlibnet
-
-
include gar/category.mk
CFLAGS := $(filter-out -I%,$(CFLAGS))
DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
-
-post-merge:
- ginstall -D $(WORKDIR)/cswopenldap \
- $(PKGROOT)/opt/csw/etc/init.d/cswopenldap
- $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F
$(PKGROOT)$(docdir)/$(NAME)/$F;)
- @# Enable BDB backend so OpenLDAP can start
- perl -pi -e 's/#\s*(modulepath)/$$1/;
s/#\s*(moduleload\s*back_bdb.la)/$$1/'
$(PKGROOT)$(sysconfdir)/openldap/slapd.conf
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/openldap23/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums 2011-09-23 10:52:22 UTC (rev
15718)
+++ csw/mgar/pkg/openldap23/trunk/checksums 2011-09-28 09:06:55 UTC (rev
15786)
@@ -1,2 +1 @@
1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz
-f36f3086031dd56ae94f722ffae8df5e openldap-2.4.26.tgz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
