From owner-dev-commits-ports-main@freebsd.org Wed Sep 8 06:57:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3530467567A; Wed, 8 Sep 2021 06:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H4Ccs0l1Zz4SNp; Wed, 8 Sep 2021 06:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA2D221350; Wed, 8 Sep 2021 06:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1886vWDF097620; Wed, 8 Sep 2021 06:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1886vWkx097619; Wed, 8 Sep 2021 06:57:32 GMT (envelope-from git) Date: Wed, 8 Sep 2021 06:57:32 GMT Message-Id: <202109080657.1886vWkx097619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 494b728b36ff - main - net/openldap2[45]-server: Fix SMBPWD module MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 494b728b36ff2f341d3d6aa8b69b7215058dd672 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Sep 2021 06:57:33 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=494b728b36ff2f341d3d6aa8b69b7215058dd672 commit 494b728b36ff2f341d3d6aa8b69b7215058dd672 Author: Xin LI AuthorDate: 2021-09-08 06:54:57 +0000 Commit: Xin LI CommitDate: 2021-09-08 06:54:58 +0000 net/openldap2[45]-server: Fix SMBPWD module --- net/openldap24-server/Makefile | 2 +- .../patch-contrib_slapd-modules_smbk5pwd_Makefile | 13 +++++++++++++ net/openldap24-server/files/patch-smbk5pwd-Makefile | 11 ----------- net/openldap25-server/Makefile | 2 +- .../patch-contrib_slapd-modules_smbk5pwd_Makefile | 20 +++++++++++--------- 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