add fixes for samba >= 4.20

[packages/openchange.git] / openchange-link.patch

diff --git a/openchange-link.patch b/openchange-link.patch
index 3882fb73e59256c17dc8b43a68607a5a0396df8b..8ae03638426ba0f4491b028bfc41ecd67dc86b81 100644 (file)
--- a/openchange-link.patch
+++ b/openchange-link.patch
@@ -1,11 +1,33 @@
---- openchange-openchange-2.3-VULCAN/config.mk.in.orig 2015-05-22 23:30:25.141933097 +0200
-+++ openchange-openchange-2.3-VULCAN/config.mk.in      2015-05-22 23:30:28.665266286 +0200
-@@ -68,7 +68,7 @@
+--- openchange-openchange-2.3-VULCAN.orig/configure.ac 2024-04-09 11:55:51.678247965 +0200
++++ openchange-openchange-2.3-VULCAN/configure.ac      2024-04-09 20:15:46.847384577 +0200
+@@ -464,6 +464,18 @@
+ AC_CHECK_HEADER([samba/version.h],, AC_MSG_ERROR([Could not find Samba4 headers. Re-run ./configure with --with-samba=XXX where
+  XXX is the prefix that Samba4 was installed to.]))
+ 
++AC_MSG_CHECKING(samba private libraries suffix)
++samba_private_libdir="$($PKG_CONFIG --variable=libdir samba-hostconfig)/samba"
++if test -e "$samba_private_libdir/libndr-samba-private-samba.so"; then
++    SMB_PRIV_LIB_SFX=private-samba
++elif test -e "$samba_private_libdir/libndr-samba-samba4.so"; then
++    SMB_PRIV_LIB_SFX=samba4
++else
++    AC_MSG_ERROR([failed])
++fi
++AC_MSG_RESULT($SMB_PRIV_LIB_SFX)
++AC_SUBST(SMB_PRIV_LIB_SFX)
++
+ . `dirname $0`/script/samba4_ver.sh
+ 
+ OC_CHECK_SAMBA_VERSION([$SAMBA4_RELEASE],[$SAMBA4_GIT_VER-GIT-$SAMBA4_GIT_REV])
+--- openchange-openchange-2.3-VULCAN.orig/config.mk.in 2024-04-09 19:08:35.278698007 +0200
++++ openchange-openchange-2.3-VULCAN/config.mk.in      2024-04-09 18:58:37.035533217 +0200
+@@ -68,7 +68,8 @@
  TALLOC_LIBS=@TALLOC_LIBS@
  
  CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS) $(NANOMSG_CFLAGS)
 -LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS)
-+LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) -ltevent-util -lsamba-errors -lndr-krb5pac ${libdir}/samba/libcli-ldap-common-samba4.so ${libdir}/samba/libcliauth-samba4.so ${libdir}/samba/libdcerpc-samba-samba4.so ${libdir}/samba/libldbsamba-samba4.so ${libdir}/samba/libndr-samba-samba4.so ${libdir}/samba/libsamba-debug-samba4.so ${libdir}/samba/libsamba-security-samba4.so ${libdir}/samba/libsamdb-common-samba4.so
++SMB_PRIV_LIB_SFX=@SMB_PRIV_LIB_SFX@
++LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) -ltevent-util -lsamba-errors -lndr-krb5pac ${libdir}/samba/libcli-ldap-common-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libcliauth-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libdcerpc-samba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libldbsamba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libndr-samba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamba-debug-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamba-security-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamdb-common-$(SMB_PRIV_LIB_SFX).so
  LDFLAGS+=@LDFLAGS@
  
  THREAD_LIBS=@THREAD_LIBS@