summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/openldap-client/Makefile3
-rw-r--r--databases/openldap-cloak/Makefile3
-rw-r--r--databases/openldap-doc/distinfo8
-rw-r--r--databases/openldap-nops/Makefile3
-rw-r--r--databases/openldap-server/Makefile3
-rw-r--r--databases/openldap-smbk5pwd/Makefile3
-rw-r--r--databases/openldap/Makefile.version4
-rw-r--r--databases/openldap/distinfo12
-rw-r--r--databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile19
-rw-r--r--databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile19
-rw-r--r--databases/openldap/patches/patch-da47
11 files changed, 80 insertions, 44 deletions
diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index 67326bcd741..bdaa3fe0a82 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/02/06 23:21:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2013/03/16 12:49:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 2
COMMENT= Lightweight Directory Access Protocol libraries and client programs
CONFLICTS+= openldap<2.3.23nb1
diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile
index 09a1e6191d5..6f05dcf6a4e 100644
--- a/databases/openldap-cloak/Makefile
+++ b/databases/openldap-cloak/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/02/06 23:21:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2013/03/16 12:49:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/-cloak-/}
-PKGREVISION= 2
COMMENT= Remove null-ops for OpenLDAP
CONFLICTS+= openldap<2.3.23nb1
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index 887cd2b7e50..b2d87639930 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/10/13 11:47:19 adam Exp $
+$NetBSD: distinfo,v 1.5 2013/03/16 12:49:55 adam Exp $
-SHA1 (openldap-2.4.33.tgz) = 0cea642ba2dae1eb719da41bfedb9eba72ad504d
-RMD160 (openldap-2.4.33.tgz) = 6ec75c4af25e7afd2b5dbba397710d72791c5a94
-Size (openldap-2.4.33.tgz) = 5463850 bytes
+SHA1 (openldap-2.4.34.tgz) = 39c81f32b8c7af1e20047535f0b9ea894235c588
+RMD160 (openldap-2.4.34.tgz) = 87e8d3a41b5e708e31eb29bb8b936d519a0374d3
+Size (openldap-2.4.34.tgz) = 5485028 bytes
diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile
index 297f3564996..5fa122dec6c 100644
--- a/databases/openldap-nops/Makefile
+++ b/databases/openldap-nops/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/02/06 23:21:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2013/03/16 12:49:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/-nops-/}
-PKGREVISION= 2
COMMENT= Remove null-ops for OpenLDAP
CONFLICTS+= openldap<2.3.23nb1
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index f93d4772d17..18b25d91b5f 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2012/12/16 01:52:02 obache Exp $
+# $NetBSD: Makefile,v 1.35 2013/03/16 12:49:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
COMMENT= Lightweight Directory Access Protocol server suite
CONFLICTS+= openldap<2.3.23nb1
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index c771749eeca..ab7142a9f0d 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/02/06 23:21:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2013/03/16 12:49:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION= 2
COMMENT= Samba and Kerberos password sync for OpenLDAP
CONFLICTS+= openldap<2.3.23nb1
diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index f4e91288d5c..166f49fe062 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.2 2012/10/13 11:47:19 adam Exp $
+# $NetBSD: Makefile.version,v 1.3 2013/03/16 12:49:54 adam Exp $
# used by databases/openldap/Makefile
# used by databases/openldap/Makefile.common
# used by databases/openldap-docs/Makefile
-OPENLDAP_VERSION= 2.4.33
+OPENLDAP_VERSION= 2.4.34
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 2476f7331dd..24bfd6a5938 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.88 2012/10/13 11:47:19 adam Exp $
+$NetBSD: distinfo,v 1.89 2013/03/16 12:49:54 adam Exp $
-SHA1 (openldap-2.4.33.tgz) = 0cea642ba2dae1eb719da41bfedb9eba72ad504d
-RMD160 (openldap-2.4.33.tgz) = 6ec75c4af25e7afd2b5dbba397710d72791c5a94
-Size (openldap-2.4.33.tgz) = 5463850 bytes
+SHA1 (openldap-2.4.34.tgz) = 39c81f32b8c7af1e20047535f0b9ea894235c588
+RMD160 (openldap-2.4.34.tgz) = 87e8d3a41b5e708e31eb29bb8b936d519a0374d3
+Size (openldap-2.4.34.tgz) = 5485028 bytes
SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
@@ -12,7 +12,9 @@ SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
+SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 36c416f21982235270ca9f0e4b54f677c4deb1ea
+SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a8eafca130a5
SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
-SHA1 (patch-da) = 49c267f09ba7d1a3290bb0b6b273e85296962c0d
+SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
diff --git a/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile b/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
new file mode 100644
index 00000000000..2c58e7f3157
--- /dev/null
+++ b/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+
+--- contrib/slapd-modules/cloak/Makefile.orig 2013-03-16 12:37:06.000000000 +0000
++++ contrib/slapd-modules/cloak/Makefile
+@@ -3,12 +3,10 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+- $(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
+
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
+ DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
+ INCS = $(LDAP_INC)
+ LIBS = $(LDAP_LIB)
diff --git a/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile b/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
new file mode 100644
index 00000000000..e1b2e98384c
--- /dev/null
+++ b/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+
+--- contrib/slapd-modules/nops/Makefile.orig 2013-03-16 12:40:41.000000000 +0000
++++ contrib/slapd-modules/nops/Makefile
+@@ -3,12 +3,10 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+- $(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
+
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
+ DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
+ INCS = $(LDAP_INC)
+ LIBS = $(LDAP_LIB)
diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da
index 55ddc63992d..8b8711ba180 100644
--- a/databases/openldap/patches/patch-da
+++ b/databases/openldap/patches/patch-da
@@ -1,29 +1,30 @@
-$NetBSD: patch-da,v 1.6 2012/09/28 12:28:53 manu Exp $
+$NetBSD: patch-da,v 1.7 2013/03/16 12:49:54 adam Exp $
---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2012-02-29 17:37:09.000000000 +0000
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2013-03-03 21:17:30.000000000 +0000
+++ contrib/slapd-modules/smbk5pwd/Makefile
-@@ -13,21 +13,19 @@
- # <http://www.OpenLDAP.org/license.html>.
+@@ -15,8 +15,7 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+- $(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
- LIBTOOL=../../../libtool
--OPT=-g -O2
--CC=gcc
-+OPT=${CFLAGS} ${CPPFLAGS}
+ SSL_INC =
+ SSL_LIB = -lcrypto
+@@ -25,12 +24,10 @@ HEIMDAL_INC = -I/usr/heimdal/include
+ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+-DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+-INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+-LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
++INCS = $(LDAP_INC) $(SSL_INC)
++LIBS = $(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
- HEIMDAL_INC=-I/usr/heimdal/include
- SSL_INC=
- LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
-+INCS=$(LDAP_INC) $(SSL_INC)
-
- HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
- SSL_LIB=-lcrypto
- LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
-+LIBS=$(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
-
- prefix=/usr/local
- exec_prefix=$(prefix)
+ PROGRAMS = smbk5pwd.la
+ LTVER = 0:0:0
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 03:20:53 +0000