commit: 5c5a6f6ee9f6beca52461358ca194ed91078210b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 9 21:33:39 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Mar 10 18:33:14 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5a6f6e
app-admin/apg: drop 2.3.0b_p20150129-r1 Bug: https://bugs.gentoo.org/971030 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-admin/apg/Manifest | 1 - app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild | 44 -------------------- .../apg/files/apg-2.3.0b_p20150129-cracklib.patch | 47 ---------------------- 3 files changed, 92 deletions(-) diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest index 4651c76fdb90..885e17cee487 100644 --- a/app-admin/apg/Manifest +++ b/app-admin/apg/Manifest @@ -1,2 +1 @@ -DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8 DIST apg-2.3.0b_p20240821.tar.gz 465729 BLAKE2B caa5add3ba5f54a1d57f135f2b72a4ca1aa1d8374bcb1a5532bec9075a56d1c96ff740330be6f2f3cef54c759e34c00b463387de6962d3ba0407adb02398289f SHA512 d34667f1ead74c7ac284dd8d40eb49c2a5885aee3da2e1607ca54465ffa69caa489ffe669036fbc881d54e75f9ca1c551dff84e87f8ce03439c4efbfeedd322f diff --git a/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild b/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild deleted file mode 100644 index 18c78cdb6c38..000000000000 --- a/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -BASEVER=$(ver_cut 1-4) - -DESCRIPTION="Another Password Generator" -HOMEPAGE="https://github.com/wilx/apg"; -SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cracklib" - -DEPEND="virtual/libcrypt:= - cracklib? ( sys-libs/cracklib )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch" - "${FILESDIR}/${P}-cracklib.patch" -) - -DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt ) - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with cracklib) -} - -src_install() { - default - doman doc/man/apg* -} diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch deleted file mode 100644 index b019f565e154..000000000000 --- a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92 -Author: Andrew Savchenko <[email protected]> -Date: Wed Sep 30 17:12:18 2020 +0300 - - add cracklib support to the new build system - -diff --git a/Makefile.am b/Makefile.am -index 42068bf..3871295 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,9 +19,15 @@ common_apg_sources = \ - convert.c - - apg_SOURCES = $(common_apg_sources) -+if HAVE_CRACKLIB -+apg_LDFLAGS = -lcrack -+apg_CPPFLAGS = -DAPG_USE_CRACKLIB -DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\" -+endif - - apgd_SOURCES = $(common_apg_sources) - apgd_CPPFLAGS = -DCLISERV -+apgd_CPPFLAGS += $(apg_CPPFLAGS) -+apgd_LDFLAGS = $(apg_LDFLAGS) - - apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c - apgbfm_CPPFLAGS = -DAPGBFM -diff --git a/configure.ac b/configure.ac -index d8fd056..75483d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix]) - AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror]) - AC_CHECK_FUNCS([crypt]) - -+AC_ARG_WITH([cracklib], -+ AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password checking [default=no]])) -+AS_IF([test "x$with_cracklib" = "xyes"],[ -+ AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1], -+ AC_MSG_ERROR([cracklib requested but not found])) -+]) -+ - LT_PREREQ([2.4.2]) - LT_INIT([win32-dll disable-static pic-only]) - -+AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT
