cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to OpenLDAP update; libldap_r no longer exists as a separate library. 

the main libldap can be used instead.
This commit is contained in:
sthen 2022-05-14 15:35:07 +00:00
parent 629118de95
commit f0c03f82d3
20 changed files with 91 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
databases/py-ldap/Makefile
View File

@ -1,6 +1,7 @@
COMMENT= LDAP client API for Python
MODPY_EGG_VERSION = 3.4.0
REVISION= 0
DISTNAME= python-ldap-${MODPY_EGG_VERSION}
PKGNAME= py-ldap-${MODPY_EGG_VERSION}
@ -11,7 +12,7 @@ HOMEPAGE= https://www.python-ldap.org/
# Python
PERMIT_PACKAGE= Yes
WANTLIB += lber ldap_r pthread ${MODPY_WANTLIB}
WANTLIB += lber ldap pthread ${MODPY_WANTLIB}
MODULES= lang/python

12
databases/py-ldap/patches/patch-setup_cfg Normal file
View File

@ -0,0 +1,12 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
@@ -5,7 +5,7 @@ license_file = LICENCE
defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
extra_compile_args =
extra_objects =
-libs = ldap_r lber
+libs = ldap lber
[install]
compile = 1

12
databases/py-ldap/patches/patch-setup_py Normal file
View File

@ -0,0 +1,12 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -132,7 +132,7 @@ setup(
extra_objects = LDAP_CLASS.extra_objects,
runtime_library_dirs = (not sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
define_macros = LDAP_CLASS.defines + \
- ('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
+ ('ldap' in LDAP_CLASS.libs or 'oldap_r' in LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
('ssl' in LDAP_CLASS.libs and 'crypto' in LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
[

3
databases/py-ldap0/Makefile
View File

@ -3,6 +3,7 @@ COMMENT = provides an API to access LDAP directory servers for Python
FIX_EXTRACT_PERMISSIONS = Yes
MODPY_EGG_VERSION = 1.4.9
REVISION = 0
DISTNAME = ldap0-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@ -16,7 +17,7 @@ MAINTAINER = Lucas Raab <tuftedocelot@fastmail.fm>
# Apache 2.0
PERMIT_PACKAGE = Yes
WANTLIB += ${MODPY_WANTLIB} pthread ldap_r
WANTLIB += ${MODPY_WANTLIB} pthread ldap
MODULES = lang/python
FLAVOR = python3

12
databases/py-ldap0/patches/patch-setup_cfg Normal file
View File

@ -0,0 +1,12 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
@@ -2,7 +2,7 @@
defines =
extra_compile_args = -Wall -O1 -g -DPYMALLOC_DEBUG
extra_objects =
-libs = ldap_r
+libs = ldap
[metadata]
license_files = LICENSE

3
databases/ruby-ldap/Makefile
View File

@ -1,6 +1,7 @@
COMMENT= Ruby interface to some common LDAP libraries
PKGNAME= ldap-0.9.20
REVISION= 0
DISTNAME= ruby-${PKGNAME}
CATEGORIES= databases
@ -13,7 +14,7 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby
WANTLIB= crypto pthread ssl ldap_r lber
WANTLIB= crypto pthread ssl ldap lber
LIB_DEPENDS= databases/openldap

3
devel/ptlib/Makefile
View File

@ -4,6 +4,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= ptlib
GH_TAGNAME= v2_10_9_4
PKGNAME= ${DISTNAME:S/_/./g}
REVISION= 0
EPOCH= 0
CATEGORIES= devel telephony
@ -18,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MPL 1.0
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap ldap_r m sasl2
WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap m sasl2
WANTLIB += sndio ssl
COMPILER= base-clang ports-gcc base-gcc

16
devel/ptlib/patches/patch-configure
View File

@ -9,15 +9,25 @@ Index: configure
need_pragma=yes ;
$as_echo "#define P_PTHREADS 1" >>confdefs.h
@@ -4674,7 +4673,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
@@ -4674,8 +4673,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
LIB64=1
;;
- sparc | sparc64 )
+ sparc )
+ MACHTYPE=sparc
MACHTYPE=sparc
+ ;;
+ sparc64 )
MACHTYPE=sparc
+ MACHTYPE=sparc
P_64BIT=1
LIB64=1
;;
@@ -7798,7 +7800,7 @@ $as_echo "$as_me: OpenLDAP support disabled due to dis
ptlib_openldap_libs="-lposix4"
;;
* )
- ptlib_openldap_libs="-llber -lldap_r"
+ ptlib_openldap_libs="-llber -lldap"
esac
if test "x${with_ldap_dir}" != "x"; then

3
mail/kopano/core/Makefile
View File

@ -9,6 +9,7 @@ PKGNAME-mapi= kopano-mapi-${V}
EPOCH= 0
REVISION= 0
REVISION-main= 1
CATEGORIES= mail www productivity
@ -54,7 +55,7 @@ WANTLIB-main += curl nghttp2 ical icalss
WANTLIB-main += mariadb curses ssl xml2
WANTLIB-main += gsoapssl++
WANTLIB-main += ${LIBCXX}
WANTLIB-main += icalvcal ldap_r HX jsoncpp
WANTLIB-main += icalvcal ldap HX jsoncpp
WANTLIB-main += X11 expat freetype
WANTLIB-main += xcb
WANTLIB-main += cairo glib-2.0 gobject-2.0

2
mail/kopano/core/patches/patch-configure_ac
View File

@ -46,7 +46,7 @@ Index: configure.ac
AC_CHECK_HEADERS([ldap.h], [
LDAP_FLAGS="-DLDAP_DEPRECATED=1"
- LDAP_LIBS="-lldap_r"
+ LDAP_LIBS="-L/usr/local/lib -lldap_r"
+ LDAP_LIBS="-L/usr/local/lib -lldap"
want_ldap=yes
])
AC_SUBST(LDAP_LIBS)

4
mail/ldapvacation/Makefile
View File

@ -1,14 +1,14 @@
COMMENT= return 'I am not here' indication stored in a LDAP tree
DISTNAME= ldapvacation-1.1.3
REVISION = 5
REVISION= 6
CATEGORIES= mail
# BSD
PERMIT_PACKAGE= Yes
WANTLIB= c pthread ldap_r>=8 lber>=8
WANTLIB= c pthread ldap lber
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz

7
mail/ldapvacation/patches/patch-src_ldapvacation_Makefile
View File

@ -1,12 +1,15 @@
Index: src/ldapvacation/Makefile
--- src/ldapvacation/Makefile.orig
+++ src/ldapvacation/Makefile
@@ -3,8 +3,6 @@
@@ -3,10 +3,8 @@
PROG= ldapvacation
SRCS= ldapvacation.c parse.y scan.l
-CLEANFILES+= y.tab.h
-
CFLAGS+= -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
-LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
+LDADD+= -L/usr/local/lib -lldap -llber -lpthread
LINTFLAGS+= -u
MAN= ldapvacation.1 ldapvacation.conf.5

4
mail/smsmail/Makefile
View File

@ -1,14 +1,14 @@
COMMENT= LDAP enabled MDA to deliver mails as SMS
DISTNAME= smsmail-1.0.2
REVISION= 5
REVISION= 6
CATEGORIES= mail
# BSD
PERMIT_PACKAGE= Yes
WANTLIB= c pthread ldap_r>=8 lber>=8
WANTLIB= c pthread ldap lber
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz

7
mail/smsmail/patches/patch-src_Makefile
View File

@ -1,12 +1,15 @@
Index: src/Makefile
--- src/Makefile.orig
+++ src/Makefile
@@ -3,8 +3,6 @@
@@ -3,10 +3,8 @@
PROG= smsmail
SRCS= smsmail.c parse.y scan.l
-CLEANFILES+= y.tab.h
-
CFLAGS+= -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
-LDADD+= -L/usr/local/lib -lldap_r -llber -lpthread
+LDADD+= -L/usr/local/lib -lldap -llber -lpthread
LINTFLAGS+= -u
MAN= smsmail.1 smsmail.conf.5

4
mail/smtp-vilter/Makefile
View File

@ -2,7 +2,7 @@ COMMENT= sendmail milter to scan messages for viruses and spam
DISTNAME= smtp-vilter-1.3.6
EPOCH= 0
REVISION= 4
REVISION= 5
CATEGORIES= mail
@ -24,7 +24,7 @@ FLAVOR?=
.if ${FLAVOR:Mldap}
MAKE_FLAGS+= -DENABLE_LDAP
LIB_DEPENDS+= databases/openldap
WANTLIB += ldap_r lber
WANTLIB += ldap lber
.endif
CFLAGS+= -I${LOCALBASE}/include

7
mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile
View File

@ -10,3 +10,10 @@ Index: bin/smtp-vilter/Makefile
MAN= smtp-vilter.8 smtp-vilter.conf.5
MANDIR= /usr/local/man/cat
@@ -27,5 +27,5 @@ BINDIR= /usr/local/sbin
CFLAGS+= -I/usr/local/include -DENABLE_LDAP -DLDAP_DEPRECATED
.endif
.if defined(ENABLE_LDAP) || defined(WANT_LDAP)
-LDADD+= -lldap_r -llber
+LDADD+= -lldap -llber
.endif

4
net/gnugk/Makefile
View File

@ -7,7 +7,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= gnugk
GH_TAGNAME= v${V:S/./_/}
PKGNAME= gnugk-${V}
REVISION= 1
REVISION= 2
CATEGORIES= net telephony
@ -19,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c crypto curl h323 kvm lber ldap
WANTLIB += ldap_r lua5.2 m maxminddb netsnmp netsnmpagent netsnmpmibs
WANTLIB += ldap lua5.2 m maxminddb netsnmp netsnmpagent netsnmpmibs
WANTLIB += pt sasl2 ssh ssl z
COMPILER= base-clang ports-gcc base-gcc

4
net/h323plus/Makefile
View File

@ -4,7 +4,7 @@ GH_ACCOUNT= willamowius
GH_PROJECT= h323plus
GH_TAGNAME= v1_27_2
PKGNAME= ${DISTNAME:S/_/./g}
REVISION= 1
REVISION= 2
CATEGORIES= net devel
@ -17,7 +17,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MPL (dlopen(3) GPL modules)
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap ldap_r m pt sasl2
WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap m pt sasl2
WANTLIB += ssl
COMPILER= base-clang ports-gcc base-gcc

4
net/powerdns/Makefile
View File

@ -14,7 +14,7 @@ PKGNAME-ldap= powerdns-ldap-${V}
#REVISION-main= 0
#REVISION-mysql= 0
#REVISION-pgsql= 0
#REVISION-ldap= 0
REVISION-ldap= 0
CATEGORIES= net
@ -115,7 +115,7 @@ LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
databases/openldap,-main \
security/heimdal,-libs
RUN_DEPENDS-ldap= net/powerdns
WANTLIB-ldap= ${WANTLIB} ldap_r
WANTLIB-ldap= ${WANTLIB} ldap
WANTLIB-ldap+= c com_err lber sasl2 util
WANTLIB-ldap+= heimdal/lib/asn1 heimdal/lib/hcrypto heimdal/lib/heimbase
WANTLIB-ldap+= heimdal/lib/heimsqlite heimdal/lib/hx509 heimdal/lib/krb5

3
www/c-icap/c-icap/Makefile
View File

@ -4,6 +4,7 @@ COMMENT-db= Berkeley DB module for c-icap
COMMENT-ldap= LDAP module for c-icap
V= 0.5.10
REVISION-ldap= 0
DISTNAME= c_icap-$V
PKGNAME-main= c-icap-$V
PKGNAME-db= c-icap-db-$V
@ -44,7 +45,7 @@ WANTLIB-db= ${WANTLIB} c db icapapi
LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
databases/openldap
WANTLIB-ldap= ${WANTLIB} crypto icapapi lber ldap_r sasl2 ssl
WANTLIB-ldap= ${WANTLIB} crypto icapapi lber ldap sasl2 ssl
pre-configure:
${SUBST_CMD} ${WRKSRC}/c-icap.conf.in