git: 64e2b0206e4b - main - net-mgmt/adcli: upgrade from 0.9.1 to 0.9.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikhail Teterin <mi_at_FreeBSD.org>
Date: Thu, 18 Jan 2024 23:39:42 UTC
The branch main has been updated by mi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=64e2b0206e4b53515059207935091b9ed1c49a21

commit 64e2b0206e4b53515059207935091b9ed1c49a21
Author:     Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2024-01-18 23:35:44 +0000
Commit:     Mikhail Teterin <mi@FreeBSD.org>
CommitDate: 2024-01-18 23:39:17 +0000

    net-mgmt/adcli: upgrade from 0.9.1 to 0.9.2
    
    Also switch to .tar.bz2 and the master-site, that's easier
    for Portscout to check.
    
    Changes: https://gitlab.freedesktop.org/realmd/adcli/-/releases
---
 net-mgmt/adcli/Makefile            | 12 +++++-------
 net-mgmt/adcli/distinfo            |  6 +++---
 net-mgmt/adcli/files/patch-doc     | 17 -----------------
 net-mgmt/adcli/files/patch-heimdal |  8 +++++++-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/net-mgmt/adcli/Makefile b/net-mgmt/adcli/Makefile
index 65cd4c224ccb..b10620e12b07 100644
--- a/net-mgmt/adcli/Makefile
+++ b/net-mgmt/adcli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	adcli
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	net-mgmt net security
-MASTER_SITES=	https://gitlab.freedesktop.org/sbose/adcli//uploads/30880d967e79cee789194435e70fbf30/
+MASTER_SITES=	https://gitlab.freedesktop.org/realmd/adcli/-/archive/${PORTVERSION}/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tool for performing actions on an Active Directory domain
@@ -27,11 +27,9 @@ CONFIGURE_ENV+=	ac_cv_path_KRB5_CONFIG=${KRB5CONFIG}	\
 	ac_cv_path_XMLTO=${PORT_OPTIONS:MDOCS:S|DOCS|${LOCALBASE}/bin/xmlto|:S|^$|${TRUE}|}
 CONFIGURE_ARGS=	--sysconfdir=/etc
 
-USES=	autoreconf ldap libtool
-
-# Kerberos may or may not be there, but LDAP always is:
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${ICONV_INCLUDE_PATH}
+LDFLAGS+=	-L${ICONV_LIB_PATH} ${ICONV_LIB}
+USES=	autoreconf iconv ldap libtool localbase tar:bz2
 
 DOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto
 GSSAPI_BASE_USES=	gssapi
diff --git a/net-mgmt/adcli/distinfo b/net-mgmt/adcli/distinfo
index a1f2e3234167..8e3f540f7c85 100644
--- a/net-mgmt/adcli/distinfo
+++ b/net-mgmt/adcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634140826
-SHA256 (adcli-0.9.1.tar.gz) = 8d8a2814d6792f4b06feeaefacf6f6c3605fcfa46ba6c938314386434c1a6952
-SIZE (adcli-0.9.1.tar.gz) = 504052
+TIMESTAMP = 1705619311
+SHA256 (adcli-0.9.2.tar.bz2) = 1288b3ccd7ded42367626a9c4d95d569a37054813be2605a4852dbd9250800b2
+SIZE (adcli-0.9.2.tar.bz2) = 93680
diff --git a/net-mgmt/adcli/files/patch-doc b/net-mgmt/adcli/files/patch-doc
deleted file mode 100644
index 6fd1ff97d7b4..000000000000
--- a/net-mgmt/adcli/files/patch-doc
+++ /dev/null
@@ -1,17 +0,0 @@
-See:
-
-	https://gitlab.freedesktop.org/realmd/adcli/-/issues/26
-
---- doc/Makefile.am	2020-11-11 05:48:13.000000000 -0500
-+++ doc/Makefile.am	2021-10-14 13:36:38.468268000 -0400
-@@ -54,7 +54,8 @@
- 	$(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
- 
--permissions.xml: ../library/adenroll.c adcli.xml
-+permissions.xml: ../library/adenroll.c
- 	echo "<itemizedlist>" > $@
--	grep '".*".*/\* :ADPermissions: ' $< | sed -e 's#.*"\(.*\)".*/\* :ADPermissions: \(.*\)\*/$$#<listitem><para>\1</para><itemizedlist><listitem><para>\2</para></listitem></itemizedlist></listitem>#' | sed -e 's#\*#</para></listitem><listitem><para>#g' >> $@
-+	sed -n -e 's#.*"\(.*\)".* /\* :ADPermissions: \(.*\) \*/$$#<listitem><para>\1</para><itemizedlist><listitem><para>\2</para></listitem></itemizedlist></listitem>#p' $? \
-+	    | sed -e 's# *\* *#</para></listitem><listitem><para>#g' >> $@
- 	echo "</itemizedlist>" >> $@
- 
diff --git a/net-mgmt/adcli/files/patch-heimdal b/net-mgmt/adcli/files/patch-heimdal
index 7c4438cb70c2..01beb36be797 100644
--- a/net-mgmt/adcli/files/patch-heimdal
+++ b/net-mgmt/adcli/files/patch-heimdal
@@ -500,7 +500,13 @@ Submitted upstream:
  #include <ldap.h>
  #include <sasl/sasl.h>
 --- library/adutil.c	2021-02-20 08:51:40.000000000 -0500
-+++ library/adutil.c	2021-10-12 22:06:04.556460000 -0400
++++ library/adutil.c	2024-01-18 18:14:00.000000000 -0400
+@@ -30,5 +30,4 @@
+ #include <assert.h>
+ #include <ctype.h>
+-#include <endian.h>
+ #include <errno.h>
+ #include <stdio.h>
 @@ -38,4 +38,9 @@
  #include <time.h>
  #include <sys/wait.h>