mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

net/openldap2[45]-server: Fix SMBPWD module

Browse Source
This commit is contained in:
Xin LI 2021-09-07 23:54:57 -07:00
parent 37c07fdad3
commit 494b728b36
5 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/openldap24-server/Makefile
View File

@ -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}

13
net/openldap24-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile Normal file
View File

@ -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

11
net/openldap24-server/files/patch-smbk5pwd-Makefile
View File

@ -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

2
net/openldap25-server/Makefile
View File

@ -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}

20
net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
View File

@ -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