[csw-devel] SF.net SVN: gar:[17231] csw/mgar/pkg/389-ds-base/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Mon Feb 27 16:17:14 CET 2012
Revision: 17231
http://gar.svn.sourceforge.net/gar/?rev=17231&view=rev
Author: cgrzemba
Date: 2012-02-27 15:17:14 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
389-ds-base/trunk: bump version 1.2.10.2
Modified Paths:
--------------
csw/mgar/pkg/389-ds-base/trunk/Makefile
csw/mgar/pkg/389-ds-base/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch
csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch
csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch
csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch
Removed Paths:
-------------
csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-02-27 15:05:29 UTC (rev 17230)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-02-27 15:17:14 UTC (rev 17231)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = 389-ds-base
-VERSION = 1.2.9.9
+VERSION = 1.2.10.2
GARTYPE = v2
CATEGORIES = server
@@ -23,10 +23,12 @@
PATCHFILES += 0005-add-standard-path.patch
PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
-PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
+PATCHFILES += 0005-smf-autoenable-no.patch
+PATCHFILES += 0005-add-var-run-create-initconfig.in.patch
# until Red Hat Bugzilla Bug 773617 is open do it yourself
-PATCHFILES += 0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
-PATCHFILES += 0005-smf-autoenable-no.patch
+PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch
+PATCHFILES += 0007-fixup-Makefile.am.patch
+PATCHFILES += 0007-fixup-plugin_syntax.c.patch
INITSMF = /etc/opt/csw/init.d/dirsrv
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
@@ -39,7 +41,6 @@
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWnetsnmp
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre0
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata48
@@ -54,6 +55,7 @@
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibfreebl3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1
CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
Modified: csw/mgar/pkg/389-ds-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-02-27 15:05:29 UTC (rev 17230)
+++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-02-27 15:17:14 UTC (rev 17231)
@@ -1 +1 @@
-85ca908b219b6b7689bcf411b800e2e2 389-ds-base-1.2.9.9.tar.bz2
+35b326f94ea122eba0b4d52d515ee628 389-ds-base-1.2.10.2.tar.bz2
Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch 2012-02-27 15:05:29 UTC (rev 17230)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -1,64 +0,0 @@
-From 2a0b4df7c481f2f072d432e02389893516ed6007 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at unstable10s.bo.opencsw.org>
-Date: Tue, 10 Jan 2012 15:52:22 +0100
-Subject: [PATCH] add user and var run dirsrv
-
----
- ldap/admin/src/initconfig.in | 20 ++++++++++++++++----
- 1 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
-index 7f9dd8f..f024586 100644
---- a/ldap/admin/src/initconfig.in
-+++ b/ldap/admin/src/initconfig.in
-@@ -1,9 +1,9 @@
--# This file is sourced by @package_name@ upon startup to set
-+# This file is sourced by dirsrv upon startup to set
- # the default environment for all directory server instances.
- # To set instance specific defaults, use the file in the same
--# directory called @package_name at -instance where "instance"
-+# directory called dirsrv-instance where "instance"
- # is the name of your directory server instance e.g.
--# @package_name at -localhost for the slapd-localhost instance.
-+# dirsrv-localhost for the slapd-localhost instance.
-
- # In order to make more file descriptors available
- # to the directory server, first make sure the system
-@@ -26,13 +26,15 @@
- # server needs to know where to find its keytab
- # file - uncomment the following line and set
- # the path and filename appropriately
--# KRB5_KTNAME=@instconfigdir@/myname.keytab ; export KRB5_KTNAME
-+# KRB5_KTNAME=/etc/opt/csw/dirsrv/myname.keytab ; export KRB5_KTNAME
-
- # other environment settings can be added here too
- OS=`uname -s`
- # use the new mt slab memory allocator on Solaris
- # this requires Solaris 9 update 3 or later
- if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
-+# UMEM_DEBUG=default
-+# UMEM_LOGGING=transaction
- LD_PRELOAD=/usr/lib/libumem.so
- export LD_PRELOAD
- fi
-@@ -41,6 +43,17 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
- export LD_PRELOAD_64
- fi
-
-+USER=`/usr/xpg4/bin/id -u -n`
-+export USER
-+[ ! -d /var/opt/csw/run/dirsrv ] && mkdir -p /var/opt/csw/run/dirsrv
-+if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
-+ slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
-+ slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
-+ chown $slapd-user:$slapd-group /var/opt/csw/run/dirsrv
-+fi
-+chmod g+w /var/opt/csw/run/dirsrv
-+chmod +rx /var/opt/csw/run
-+
- # how many seconds to wait for the startpid file to show
- # up before we assume there is a problem and fail to start
- #STARTPID_TIME=10 ; export STARTPID_TIME
---
-1.7.8.2
-
Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch 2012-02-27 15:05:29 UTC (rev 17230)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -1,90 +0,0 @@
-From f4315b6b8516a8bfd9b09d2723b78c90e4581652 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Thu, 12 Jan 2012 12:09:34 +0100
-Subject: [PATCH] add i386 platform to Makefile.am and configure.ac
-
----
- Makefile.am | 4 ++--
- configure.ac | 18 ++++++++++++++----
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4bf1966..6b01783 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -682,7 +682,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
- $(libavl_a_SOURCES)
-
- libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@
--if SOLARIS
-+if SPARC
- libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
- endif
-
-@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
- ldap/servers/plugins/collation/config.c \
- ldap/servers/plugins/collation/orfilter.c
-
--libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-+libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
- libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
- libcollation_plugin_la_LDFLAGS = -avoid-version
- libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
-diff --git a/configure.ac b/configure.ac
-index 6d8e277..ad94787 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -460,20 +460,18 @@ case $host in
- # HPUX doesn't use /etc for this
- initdir=/init.d
- ;;
-- sparc-sun-solaris*)
-+ *-*-solaris*)
- AC_DEFINE([XP_UNIX], [1], [UNIX])
- AC_DEFINE([SVR4], [1], [SVR4])
- AC_DEFINE([__svr4], [1], [SVR4])
- AC_DEFINE([__svr4__], [1], [SVR4])
- AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
- AC_DEFINE([SOLARIS], [1], [SOLARIS])
-- AC_DEFINE([CPU_sparc], [], [cpu type sparc])
- AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
- AC_DEFINE([sunos5], [1], [SunOS5])
- AC_DEFINE([OSVERSION], [509], [OS version])
- AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
- AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname])
-- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
- dnl socket nsl and dl are required to link several programs and libdb
- LIBSOCKET=-lsocket
- AC_SUBST([LIBSOCKET], [$LIBSOCKET])
-@@ -488,8 +486,19 @@ dnl Cstd and Crun are required to link any C++ related code
- AC_SUBST([LIBCRUN], [$LIBCRUN])
- platform="solaris"
- # assume 64 bit
-- perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
- initdir='$(sysconfdir)/init.d'
-+ case $host in
-+ i?86-*-solaris2.1[[0-9]]*)
-+dnl I dont know why i386 need this explicit
-+ AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred])
-+ ;;
-+ sparc-*-solaris*)
-+dnl includes some assembler stuff in counter.o
-+ AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
-+ AC_DEFINE([CPU_sparc], [], [cpu type sparc])
-+ TARGET='SPARC'
-+ ;;
-+ esac
- ;;
- *)
- platform=""
-@@ -519,6 +528,7 @@ AC_SUBST(initconfigdir)
-
- AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
- AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
-+AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
-
- # Check for library dependencies
- m4_include(m4/nspr.m4)
---
-1.7.8.2
-
Added: csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -0,0 +1,40 @@
+From 02d3fc96b22f79ca5562949790b53ce7ae63f019 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 27 Feb 2012 10:16:15 +0100
+Subject: [PATCH] add var run create initconfig.in
+
+---
+ ldap/admin/src/initconfig.in | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
+index 134e82c..8a73573 100644
+--- a/ldap/admin/src/initconfig.in
++++ b/ldap/admin/src/initconfig.in
+@@ -4,9 +4,22 @@ OS=`uname -s`
+ # this requires Solaris 9 update 3 or later
+ if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
+ LD_PRELOAD=/usr/lib/libumem.so
+- export LD_PRELOAD
++# UMEM_DEBUG=default
++# UMEM_LOGGING=transaction
++ export LD_PRELOAD # UMEM_DEBUG UMEM_LOGGING
+ fi
+ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+ LD_PRELOAD_64=/usr/lib/64/libumem.so
+ export LD_PRELOAD_64
+ fi
++
++USER=`/usr/xpg4/bin/id -u -n`
++export USER
++[ ! -d @localstatedir@/opt/csw/run/dirsrv ] && mkdir -p @localstatedir@/opt/csw/run/dirsrv
++if [ -f @instconfigdir@/admin-serv/adm.conf ]; then
++ slapduser=`grep SuiteSpotUserID @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '`
++ slapdgroup=`grep SuiteSpotGroup @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '`
++ chown $slapduser:$slapdgroup @localstatedir@/opt/csw/run/dirsrv
++fi
++chmod g+w @localstatedir@/opt/csw/run/dirsrv
++chmod +rx @localstatedir@/opt/csw/run
+--
+1.7.9
+
Added: csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -0,0 +1,67 @@
+From 84b9164a4de6e6a31fe9b1fb239f09debd71b001 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 27 Feb 2012 10:26:02 +0100
+Subject: [PATCH] add i386 platform in configure.ac
+
+---
+ configure.ac | 18 ++++++++++++++----
+ 1 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f993e37..a773763 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -524,20 +524,18 @@ case $host in
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
+ ;;
+- sparc-sun-solaris*)
++ *-*-solaris*)
+ AC_DEFINE([XP_UNIX], [1], [UNIX])
+ AC_DEFINE([SVR4], [1], [SVR4])
+ AC_DEFINE([__svr4], [1], [SVR4])
+ AC_DEFINE([__svr4__], [1], [SVR4])
+ AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
+ AC_DEFINE([SOLARIS], [1], [SOLARIS])
+- AC_DEFINE([CPU_sparc], [], [cpu type sparc])
+ AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
+ AC_DEFINE([sunos5], [1], [SunOS5])
+ AC_DEFINE([OSVERSION], [509], [OS version])
+ AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+ AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname])
+- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
+ dnl socket nsl and dl are required to link several programs and libdb
+ LIBSOCKET=-lsocket
+ AC_SUBST([LIBSOCKET], [$LIBSOCKET])
+@@ -552,8 +550,19 @@ dnl Cstd and Crun are required to link any C++ related code
+ AC_SUBST([LIBCRUN], [$LIBCRUN])
+ platform="solaris"
+ # assume 64 bit
+- perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
+ initdir='$(sysconfdir)/init.d'
++ case $host in
++ i?86-*-solaris2.1[[0-9]]*)
++dnl I dont know why i386 need this explicit
++ AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred])
++ ;;
++ sparc-*-solaris*)
++dnl includes some assembler stuff in counter.o
++ AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
++ AC_DEFINE([CPU_sparc], [], [cpu type sparc])
++ TARGET='SPARC'
++ ;;
++ esac
+ ;;
+ *)
+ platform=""
+@@ -584,6 +593,7 @@ AC_SUBST(initconfigdir)
+
+ AM_CONDITIONAL([HPUX],[test "$platform" = "hpux"])
+ AM_CONDITIONAL([SOLARIS],[test "$platform" = "solaris"])
++AM_CONDITIONAL(SPARC, [test "$TARGET" = "SPARC"])
+ AM_CONDITIONAL([SYSTEMD],[test -n "$with_systemdsystemunitdir" -o -n "$with_systemdsystemconfdir"])
+
+ # Check for library dependencies
+--
+1.7.9
+
Added: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -0,0 +1,61 @@
+From db06cf05345797aabaaa727e4b8c613c3f6e067e Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 27 Feb 2012 15:36:21 +0100
+Subject: [PATCH] fixup Makefile.am
+
+---
+ Makefile.am | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb761e3..0bd9fb3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -696,7 +696,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
+ $(libavl_a_SOURCES)
+
+ libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@
+-if SOLARIS
++if SPARC
+ libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
+ endif
+
+@@ -886,7 +886,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
+ ldap/servers/plugins/collation/config.c \
+ ldap/servers/plugins/collation/orfilter.c
+
+-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
+ libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+ libcollation_plugin_la_LDFLAGS = -avoid-version
+ libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
+@@ -1439,7 +1439,7 @@ fixupcmd = sed \
+ -e 's, at systemdsystemconfdir\@,$(systemdsystemconfdir),g' \
+ -e 's, at systemdgroupname\@,$(systemdgroupname),g'
+ else
+-fixupcmd = sed \
++fixupcmd = $(SED) \
+ -e 's, at bindir\@,$(bindir),g' \
+ -e 's, at sbindir\@,$(sbindir),g' \
+ -e 's, at libdir\@,$(libdir),g' \
+@@ -1519,7 +1519,7 @@ endif
+ if SYSTEMD
+ $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
+ else
+- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
++ $(fixupcmd) $^ | $(SED) -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
+ $(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@
+ endif
+
+@@ -1528,7 +1528,7 @@ endif
+ if SYSTEMD
+ $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
+ else
+- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
++ $(fixupcmd) $^ | $(SED) -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
+ endif
+
+ %/$(PACKAGE_NAME).pc: %/dirsrv.pc.in
+--
+1.7.9
+
Added: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch 2012-02-27 15:17:14 UTC (rev 17231)
@@ -0,0 +1,23 @@
+From 3686fdb384225d622c118c8302fc20b6f8d0824f Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 27 Feb 2012 13:01:13 +0100
+Subject: [PATCH] fixup plugin_syntax.c
+
+---
+ ldap/servers/slapd/plugin_syntax.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ldap/servers/slapd/plugin_syntax.c b/ldap/servers/slapd/plugin_syntax.c
+index 0438ceb..840fa7a 100644
+--- a/ldap/servers/slapd/plugin_syntax.c
++++ b/ldap/servers/slapd/plugin_syntax.c
+@@ -991,5 +991,5 @@ slapi_attr_value_normalize(
+ char **retval
+ )
+ {
+- return slapi_attr_value_normalize_ext(pb, sattr, type, val, trim_spaces, retval, 0);
++ slapi_attr_value_normalize_ext(pb, sattr, type, val, trim_spaces, retval, 0);
+ }
+--
+1.7.9
+
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