commit: aa72164a2295449bbe4728884441a79d21aa975d Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> AuthorDate: Wed Sep 30 15:16:32 2020 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Wed Sep 30 15:21:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa72164a
app-admin/apg: version bump - switch to new upstream - update to the latest git head - port cracklib support to the new build system Closes: https://bugs.gentoo.org/629272 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> app-admin/apg/Manifest | 1 + app-admin/apg/apg-2.3.0b_p20150129.ebuild | 43 ++++++++++++++++++++ .../apg/files/apg-2.3.0b_p20150129-cracklib.patch | 47 ++++++++++++++++++++++ app-admin/apg/metadata.xml | 10 ++++- 4 files changed, 99 insertions(+), 2 deletions(-) diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest index ea6ed5bf852..64074f5c0ab 100644 --- a/app-admin/apg/Manifest +++ b/app-admin/apg/Manifest @@ -1 +1,2 @@ DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a +DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8 diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild new file mode 100644 index 00000000000..0d351d723be --- /dev/null +++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 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 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cracklib" + +DEPEND="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 new file mode 100644 index 00000000000..b019f565e15 --- /dev/null +++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch @@ -0,0 +1,47 @@ +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 diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml index 585b0dc75dd..039bfee611a 100644 --- a/app-admin/apg/metadata.xml +++ b/app-admin/apg/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> - </pkgmetadata> + <maintainer type="person"> + <email>[email protected]</email> + <name>Andrew Savchenko</name> + </maintainer> + <upstream> + <remote-id type="github">wilx/apg</remote-id> + </upstream> +</pkgmetadata>
