CVS commit: pkgsrc/net/py-ldapdomaindump

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 22 14:20:02 UTC 2023

Modified Files:
        pkgsrc/net/py-ldapdomaindump: DESCR Makefile PLIST

Log Message:
py-ldapdomaindump: convert to wheel.mk

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-ldapdomaindump/DESCR
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/py-ldapdomaindump/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-ldapdomaindump/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-ldapdomaindump/DESCR
diff -u pkgsrc/net/py-ldapdomaindump/DESCR:1.1 pkgsrc/net/py-ldapdomaindump/DESCR:1.2
--- pkgsrc/net/py-ldapdomaindump/DESCR:1.1      Thu Apr 30 11:48:42 2020
+++ pkgsrc/net/py-ldapdomaindump/DESCR  Wed Nov 22 14:20:02 2023
@@ -8,25 +8,3 @@ ldapdomaindump is a tool which aims to s
 collecting and parsing information available via LDAP and outputting
 it in a human readable HTML format, as well as machine readable json
 and csv/tsv/greppable files.
-
-The tool was designed with the following goals in mind:
-- Easy overview of all users/groups/computers/policies in the domain
-- Authentication both via username and password, as with NTLM hashes
-  (requires ldap3 >=1.3.1)
-- Possibility to run the tool with an existing authenticated
-  connection to an LDAP service, allowing for integration with
-  relaying tools such as impackets ntlmrelayx
-
-The tool outputs several files containing an overview of objects in
-the domain:
-- domain_groups: List of groups in the domain
-- domain_users: List of users in the domain
-- domain_computers: List of computer accounts in the domain
-- domain_policy: Domain policy such as password requirements and
-  lockout policy
-- domain_trusts: Incoming and outgoing domain trusts, and their
-  properties
-
-As well as two grouped files:
-- domain_users_by_group: Domain users per group they are member of
-- domain_computers_by_os: Domain computers sorted by Operating System

Index: pkgsrc/net/py-ldapdomaindump/Makefile
diff -u pkgsrc/net/py-ldapdomaindump/Makefile:1.9 pkgsrc/net/py-ldapdomaindump/Makefile:1.10
--- pkgsrc/net/py-ldapdomaindump/Makefile:1.9   Wed Nov 22 14:11:59 2023
+++ pkgsrc/net/py-ldapdomaindump/Makefile       Wed Nov 22 14:20:02 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2023/11/22 14:11:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2023/11/22 14:20:02 wiz Exp $
 
 DISTNAME=      ldapdomaindump-0.9.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=l/ldapdomaindump/}
 
@@ -10,12 +11,14 @@ HOMEPAGE=   https://github.com/dirkjanm/ld
 COMMENT=       Collection of Python classes for working with network protocols
 LICENSE=       mit
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-ldap3>=2.7:../../databases/py-ldap3
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= dns
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 post-install:
@@ -24,6 +27,5 @@ post-install:
        ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
 .endfor
 
-.include "../../lang/python/versioned_dependencies.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-ldapdomaindump/PLIST
diff -u pkgsrc/net/py-ldapdomaindump/PLIST:1.4 pkgsrc/net/py-ldapdomaindump/PLIST:1.5
--- pkgsrc/net/py-ldapdomaindump/PLIST:1.4      Thu Jun 18 17:02:45 2020
+++ pkgsrc/net/py-ldapdomaindump/PLIST  Wed Nov 22 14:20:02 2023
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2020/06/18 17:02:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/11/22 14:20:02 wiz Exp $
 bin/ldapdomaindump-${PYVERSSUFFIX}
 bin/ldd2bloodhound-${PYVERSSUFFIX}
 bin/ldd2pretty-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/ldapdomaindump/__init__.py
 ${PYSITELIB}/ldapdomaindump/__init__.pyc
 ${PYSITELIB}/ldapdomaindump/__init__.pyo