diff options
| author | adam <adam> | 2010-12-17 10:20:51 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-12-17 10:20:51 +0000 |
| commit | 37e9ac41f34f615d7be55264db9e743ef1a66a2e (patch) | |
| tree | ca51c26def34fb2c0bcc55e44113df397b65b1bd /databases/openldap | |
| parent | a98a77446421cdd3f3449d438051251c3a208e9b (diff) | |
| download | pkgsrc-37e9ac41f34f615d7be55264db9e743ef1a66a2e.tar.gz | |
Fix building openldap-smbk5pwd on machines other than NetBSD, and without kerberos if Heimdal not found (only Samba support).
Diffstat (limited to 'databases/openldap')
| -rw-r--r-- | databases/openldap/Makefile.common | 7 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 4 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-da | 31 |
3 files changed, 27 insertions, 15 deletions
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index 1e9faad978e..e216a4b0409 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,4 +1,9 @@ -# $NetBSD: Makefile.common,v 1.26 2010/07/24 11:15:16 ghen Exp $ +# $NetBSD: Makefile.common,v 1.27 2010/12/17 10:20:51 adam Exp $ +# +# used by databases/openldap-client/Makefile +# used by databases/openldap-nops/Makefile +# used by databases/openldap-server/Makefile +# used by databases/openldap-smbk5pwd/Makefile # please stick to the "stable" releases as much as possible! DISTNAME= openldap-2.4.23 diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index f6715ad2c64..0e3138154b4 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.78 2010/07/24 11:15:16 ghen Exp $ +$NetBSD: distinfo,v 1.79 2010/12/17 10:20:51 adam Exp $ SHA1 (openldap-2.4.23.tgz) = 26027e7020256c5f47e17787f17ee8b31af42378 RMD160 (openldap-2.4.23.tgz) = d2268e8fb894680d1d9926fedca736f195e0a0be @@ -13,6 +13,6 @@ SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0 -SHA1 (patch-da) = b1b3759c0450fe9324c5d222969fd57788506e4a +SHA1 (patch-da) = cb705b12715869ef4df4477ac82ab006154978de SHA1 (patch-dd) = bc1b506e0516f8ee604898beb39380111d07c56f SHA1 (patch-de) = 749cdbf2d76bcf4ff192ef087f1404b608447a30 diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da index 123b6285d9c..db384c1e9e2 100644 --- a/databases/openldap/patches/patch-da +++ b/databases/openldap/patches/patch-da @@ -1,24 +1,31 @@ -$NetBSD: patch-da,v 1.3 2009/10/29 13:51:19 ghen Exp $ +$NetBSD: patch-da,v 1.4 2010/12/17 10:20:51 adam Exp $ ---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2009-10-02 23:16:53.000000000 +0200 +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2010-04-13 20:22:30.000000000 +0000 +++ contrib/slapd-modules/smbk5pwd/Makefile -@@ -13,8 +13,8 @@ +@@ -13,21 +13,21 @@ # <http://www.OpenLDAP.org/license.html>. LIBTOOL=../../../libtool -OPT=-g -O2 -CC=gcc -+OPT=-g -O2 ${CPPFLAGS} ++OPT=${CFLAGS} ${CPPFLAGS} +#CC=gcc # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. - DEFS=-DDO_KRB5 -DDO_SAMBA -@@ -45,7 +45,7 @@ smbk5pwd.lo: smbk5pwd.c +-DEFS=-DDO_KRB5 -DDO_SAMBA ++#DEFS=-DDO_KRB5 -DDO_SAMBA - smbk5pwd.la: smbk5pwd.lo - $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -- -rpath $(moduledir) -module -o $@ $? $(LIBS) -+ -rpath $(moduledir) -module -o $@ $? -ldes $(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) - clean: - rm -f smbk5pwd.lo smbk5pwd.la + 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) + + prefix=/usr/local + exec_prefix=$(prefix) |