From e69669cdb2beeae2f72630e72a5aa519718aafd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 19 Jan 2023 14:47:45 +0100
Subject: [PATCH] net-nds/adtool: Remove last-rited pkg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 net-nds/adtool/Manifest                       |  1 -
 net-nds/adtool/adtool-1.3.3-r2.ebuild         | 30 -------------------
 .../adtool/files/adtool-1.3.3-automake.patch  |  9 ------
 .../files/adtool-1.3.3-bfr-overflow.patch     | 18 -----------
 .../files/adtool-1.3.3-fno-common.patch       | 19 ------------
 net-nds/adtool/metadata.xml                   |  8 -----
 profiles/package.mask                         |  6 ----
 7 files changed, 91 deletions(-)
 delete mode 100644 net-nds/adtool/Manifest
 delete mode 100644 net-nds/adtool/adtool-1.3.3-r2.ebuild
 delete mode 100644 net-nds/adtool/files/adtool-1.3.3-automake.patch
 delete mode 100644 net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
 delete mode 100644 net-nds/adtool/files/adtool-1.3.3-fno-common.patch
 delete mode 100644 net-nds/adtool/metadata.xml

diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest
deleted file mode 100644
index 4c29795af1a8a..0000000000000
--- a/net-nds/adtool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST adtool-1.3.3.tar.gz 334767 BLAKE2B 401f10df2708a2e2b7384354192337145739d4a8df2f0366171d0989836c9795263dba9d95d597d3e129b72bfcd53df2532c55a62d126e773bcf79cac909df52 SHA512 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251
diff --git a/net-nds/adtool/adtool-1.3.3-r2.ebuild b/net-nds/adtool/adtool-1.3.3-r2.ebuild
deleted file mode 100644
index cb955c1edee45..0000000000000
--- a/net-nds/adtool/adtool-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source
-
-DESCRIPTION="Utility for Active Directory administration"
-HOMEPAGE="http://gp2x.org/adtool/"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# Older OpenLDAP for bug #835649 (ldap_r)
-RDEPEND="<net-nds/openldap-2.6:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bfr-overflow.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-automake.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/net-nds/adtool/files/adtool-1.3.3-automake.patch b/net-nds/adtool/files/adtool-1.3.3-automake.patch
deleted file mode 100644
index df8f99edc46d4..0000000000000
--- a/net-nds/adtool/files/adtool-1.3.3-automake.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -4,5 +4,5 @@
- 
- bin_PROGRAMS = adtool
- 
--adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv 
-+adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
- 
diff --git a/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch b/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
deleted file mode 100644
index f4e7ef0be88b6..0000000000000
--- a/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- src/lib/active_directory.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/active_directory.c b/src/lib/active_directory.c
-index 1eacf5f..d4e1ca6 100644
---- a/src/lib/active_directory.c
-+++ b/src/lib/active_directory.c
-@@ -172,8 +172,8 @@ char *dn2domain(char *dn) {
- 	exp_dn=ldap_explode_dn(dn, 0);
- 	for(i=0; exp_dn[i]!=NULL; i++) {
- 		if(!strncasecmp("dc=", exp_dn[i], 3)) {
--			strncat(dc, exp_dn[i]+3, 1024);
--			strncat(dc, ".", 1024);
-+			strncat(dc, exp_dn[i]+3, 1024 - 1);
-+			strncat(dc, ".", 1024 - 1);
- 		}
- 	}
- 	ldap_value_free(exp_dn);
diff --git a/net-nds/adtool/files/adtool-1.3.3-fno-common.patch b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
deleted file mode 100644
index 49391a79920eb..0000000000000
--- a/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/lib/active_directory.h
-+++ b/src/lib/active_directory.h
-@@ -28,11 +28,11 @@
- | if there is a problem reading the config file, or
- |	AD_SERVER_CONNECT_FAILURE if a connection can't be made.
- */
--char *system_config_file;
--char *uri;
--char *binddn;
--char *bindpw;
--char *search_base;
-+extern char *system_config_file;
-+extern char *uri;
-+extern char *binddn;
-+extern char *bindpw;
-+extern char *search_base;
- 
- /* ad_get_error() returns a pointer to a string containing an
- | explanation of the last error that occured.
diff --git a/net-nds/adtool/metadata.xml b/net-nds/adtool/metadata.xml
deleted file mode 100644
index 1fa87073ed6f1..0000000000000
--- a/net-nds/adtool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-	adtool is a unix command line utility for Active Directory administration, through ldap repository management.
-	</longdescription>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 6e8ebc0e923b2..c6c6969aa87f7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -823,12 +823,6 @@ media-video/shrip
 # Removal on 2023-01-15.  Bug #839723.
 net-firewall/nufw
 
-# Michał Górny <mgorny@gentoo.org> (2022-12-16)
-# Unmaintained.  Broken with >=net-nds/openldap-2.6.
-# Last release in 2009.
-# Removal on 2023-01-15.  Bug #835649.
-net-nds/adtool
-
 # Jaco Kroon <jaco@uls.co.za> (2022-12-14)
 # Multiple open bugs (bug #870910, bug #877731, bug #884815), only one of which
 # is trivial to solve.