[gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: slapd-initd-2.4.28-r1 openldap-2.4.30-contrib-samba4.patch

[gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: slapd-initd-2.4.28-r1 openldap-2.4.30-contrib-samba4.patch

[Robin H. Johnson (robbat2)]

robbat2     12/05/25 22:21:46

  Modified:             slapd-initd-2.4.28-r1
  Added:                openldap-2.4.30-contrib-samba4.patch
  Log:
  Version bump, contains fixes for bugs #408009, #408001, #410913, #407541, #412613, #413647, #302310, #414503, #408077.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-nds/openldap/files/slapd-initd-2.4.28-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1?r1=1.2&r2=1.3

Index: slapd-initd-2.4.28-r1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- slapd-initd-2.4.28-r1	12 Feb 2012 21:35:04 -0000	1.2
+++ slapd-initd-2.4.28-r1	25 May 2012 22:21:46 -0000	1.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.2 2012/02/12 21:35:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.3 2012/05/25 22:21:46 robbat2 Exp $
 
 extra_commands="checkconfig"
 
@@ -14,6 +14,7 @@ depend() {
 }
 
 start() {
+	checkpath -q -d /var/run/openldap/ -u ldap:ldap 
 	if ! checkconfig -Q ; then
 		eerror "There is a problem with your slapd.conf!"
 		return 1



1.1                  net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch?rev=1.1&content-type=text/plain

Index: openldap-2.4.30-contrib-samba4.patch
===================================================================
--- openldap-2.4.30/contrib/slapd-modules/samba4/Makefile.orig	2012-02-29 21:37:09.000000000 +0400
+++ openldap-2.4.30/contrib/slapd-modules/samba4/Makefile	2012-05-13 17:01:38.155625715 +0400
@@ -17,7 +17,7 @@
 LDAP_BUILD=../../..
 
 LIBTOOL=$(LDAP_BUILD)/libtool
-OPT=-g -O2
+#OPT=-g -O2
 CC=gcc
 
 DEFS=-DSLAPD_OVER_RDNVAL=2 -DSLAPD_OVER_PGUID=2 -DSLAPD_OVER_VERNUM=2
@@ -26,7 +26,7 @@
 	-I$(LDAP_BUILD)/include
 INCS=$(LDAP_INC)
 
-LDAP_LIB=-lldap_r -llber
+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
 LIBS=$(LDAP_LIB)
 
 prefix=/usr/local
@@ -42,24 +42,24 @@
 all:	$(PROGRAMS)
 
 pguid.lo:	pguid.c
-	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
 
 pguid.la:	pguid.lo
-	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 rdnval.lo:	rdnval.c
-	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
 
 rdnval.la:	rdnval.lo
-	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 vernum.lo:	vernum.c
-	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
 
 vernum.la:	vernum.lo
-	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean: