diff options
| author | Xin LI <delphij@FreeBSD.org> | 2021-09-08 06:54:57 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2021-09-08 06:54:58 +0000 |
| commit | 494b728b36ff2f341d3d6aa8b69b7215058dd672 (patch) | |
| tree | 3d7917f1f014b0a6da967934fb6ed20798c6efa1 /net | |
| parent | 37c07fdad3643e411ac843a63137bf2a4f926724 (diff) | |
| download | ports-494b728b36ff2f341d3d6aa8b69b7215058dd672.tar.gz ports-494b728b36ff2f341d3d6aa8b69b7215058dd672.zip | |
net/openldap2[45]-server: Fix SMBPWD module
Diffstat (limited to 'net')
5 files changed, 26 insertions, 22 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index f61cbd144015..fc33844d3489 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -50,7 +50,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 2 -PORTREVISION_SERVER= 4 +PORTREVISION_SERVER= 5 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 11.7 OPENLDAP_MAJOR= ${DISTVERSION:R} diff --git a/net/openldap24-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/net/openldap24-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile new file mode 100644 index 000000000000..1f2d56dc866e --- /dev/null +++ b/net/openldap24-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile @@ -0,0 +1,13 @@ +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2021-06-03 18:40:31 UTC ++++ contrib/slapd-modules/smbk5pwd/Makefile +@@ -21,8 +21,8 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r + SSL_INC = + SSL_LIB = -lcrypto + +-HEIMDAL_INC = -I/usr/heimdal/include +-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv ++HEIMDAL_INC = -I/usr/include ++HEIMDAL_LIB = -L/usr/lib -lkrb5 -lkadm5srv + + LIBTOOL = $(LDAP_BUILD)/libtool + CC = gcc diff --git a/net/openldap24-server/files/patch-smbk5pwd-Makefile b/net/openldap24-server/files/patch-smbk5pwd-Makefile deleted file mode 100644 index 9eedd8552020..000000000000 --- a/net/openldap24-server/files/patch-smbk5pwd-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2013-03-03 13:17:30.000000000 -0800 -+++ contrib/slapd-modules/smbk5pwd/Makefile 2013-03-14 10:54:56.917578861 -0700 -@@ -30,7 +30,7 @@ - # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. - DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW - INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) --LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -+LIBS = $(LDAP_LIB) $(SSL_LIB) - - PROGRAMS = smbk5pwd.la - LTVER = 0:0:0 diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index dc02e97c583b..182728977812 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-* GNU_CONFIGURE= yes PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 0 OPENLDAP_SHLIB_MINOR= 1.2 OPENLDAP_MAJOR= ${DISTVERSION:R} diff --git a/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile index 455ff8aec560..1f2d56dc866e 100644 --- a/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile +++ b/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile @@ -1,11 +1,13 @@ ---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2021-07-27 17:44:47 UTC +--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2021-06-03 18:40:31 UTC +++ contrib/slapd-modules/smbk5pwd/Makefile -@@ -30,7 +30,7 @@ - # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. - DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW - INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) --LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -+LIBS = $(LDAP_LIB) $(SSL_LIB) +@@ -21,8 +21,8 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r + SSL_INC = + SSL_LIB = -lcrypto - PROGRAMS = smbk5pwd.la - LTVER = 0:0:0 +-HEIMDAL_INC = -I/usr/heimdal/include +-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv ++HEIMDAL_INC = -I/usr/include ++HEIMDAL_LIB = -L/usr/lib -lkrb5 -lkadm5srv + + LIBTOOL = $(LDAP_BUILD)/libtool + CC = gcc |