[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/
commit: eb92af2b5638720bd439406295a237063f0f1a4e Author: Andrew Savchenko gentoo org> AuthorDate: Wed Jan 6 03:14:28 2021 + Commit: Andrew Savchenko gentoo org> CommitDate: Wed Jan 6 03:17:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb92af2b app-admin/apg: remove old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Savchenko gentoo.org> app-admin/apg/Manifest| 1 - app-admin/apg/apg-2.3.0b-r7.ebuild| 49 --- app-admin/apg/files/apg-2.3.0b-cracklib.patch | 17 -- app-admin/apg/files/apg-glibc-2.4.patch | 11 -- 4 files changed, 78 deletions(-) diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest index 64074f5c0ab..67631f69f40 100644 --- a/app-admin/apg/Manifest +++ b/app-admin/apg/Manifest @@ -1,2 +1 @@ -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-r7.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild deleted file mode 100644 index cfc9ecdda9b..000 --- a/app-admin/apg/apg-2.3.0b-r7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Another Password Generator" -HOMEPAGE="http://www.adel.nursat.kz/apg/; -SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz; - -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}" - -src_prepare() { - default - if use cracklib; then - eapply "${FILESDIR}"/${P}-cracklib.patch - fi - eapply "${FILESDIR}"/${PN}-glibc-2.4.patch - eapply "${FILESDIR}"/${P}-crypt_password.patch - - sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \ - || die "Sed failed" - if [[ ${CHOST} == *-darwin* ]]; then - sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \ - || die "Sed failed" - fi -} - -src_compile() { - emake \ - FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \ - CC="$(tc-getCC)" standalone - emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ - -C bfconvert -} - -src_install() { - dobin apg apgbfm bfconvert/bfconvert - dodoc CHANGES INSTALL README THANKS TODO \ - doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt} - doman doc/man/{apg.1,apgbfm.1} -} diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch deleted file mode 100644 index d297495b321..000 --- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch +++ /dev/null @@ -1,17 +0,0 @@ a/Makefile 2003-08-07 09:40:39.0 -0600 -+++ b/Makefile 2004-10-14 07:16:17.288530686 -0600 -@@ -44,10 +44,10 @@ - # If you want to use cracklib for password quality check then you - # must uncomment the folowing 4 lines (you must not do this for WIN32) - # --#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict" --#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib --#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib --#APG_CLIBS += -lcrack -+CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict" -+STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -+CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -+APG_CLIBS += -lcrack - - ## - # Support for ANSI X9.17/SHA1 PRNG diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch deleted file mode 100644 index 43b5874fa2b..000 --- a/app-admin/apg/files/apg-glibc-2.4.patch +++ /dev/null @@ -1,11 +0,0 @@ a/restrict.h 2006-03-26 03:33:50.168661936 +0400 -+++ b/restrict.h 2006-03-26 03:34:10.427582112 +0400 -@@ -33,6 +33,8 @@ - #ifndef APG_RESTRICT_H - #define APG_RESTRICT_H1 - -+#define uint32_t int -+ - #if defined(APG_USE_CRACKLIB) - #include - #endif
[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/
commit: aa72164a2295449bbe4728884441a79d21aa975d Author: Andrew Savchenko gentoo org> AuthorDate: Wed Sep 30 15:16:32 2020 + Commit: Andrew Savchenko gentoo org> CommitDate: Wed Sep 30 15:21:26 2020 + 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 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 000..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 000..b019f565e15 --- /dev/null +++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch @@ -0,0 +1,47 @@ +commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92 +Author: Andrew Savchenko +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 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - + + birc...@gentoo.org + Andrew Savchenko + + +
[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/
commit: 4c77d2a532c04095b44862b3d579420ede3a4a4f Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Jul 8 16:14:53 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri Jul 20 12:50:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c77d2a5 app-admin/apg: EAPI7, improve ebuild Closes: https://github.com/gentoo/gentoo/pull/9146 app-admin/apg/apg-2.3.0b-r6.ebuild | 48 ++ app-admin/apg/files/apg-2.3.0b-cracklib.patch | 4 +- .../apg/files/apg-2.3.0b-crypt_password.patch | 8 ++-- app-admin/apg/files/apg-glibc-2.4.patch| 4 +- 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild b/app-admin/apg/apg-2.3.0b-r6.ebuild new file mode 100644 index 000..34ea033ebee --- /dev/null +++ b/app-admin/apg/apg-2.3.0b-r6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Another Password Generator" +HOMEPAGE="http://www.adel.nursat.kz/apg/; +SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cracklib" + +DEPEND="cracklib? ( sys-libs/cracklib )" + +src_prepare() { + default + if use cracklib; then + eapply "${FILESDIR}"/${P}-cracklib.patch + fi + eapply "${FILESDIR}"/${PN}-glibc-2.4.patch + eapply "${FILESDIR}"/${P}-crypt_password.patch + + sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \ + || die "Sed failed" + if [[ ${CHOST} == *-darwin* ]]; then + sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \ + || die "Sed failed" + fi +} + +src_compile() { + emake \ + FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \ + CC="$(tc-getCC)" standalone + emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ + -C bfconvert +} + +src_install() { + dobin apg apgbfm bfconvert/bfconvert + dodoc CHANGES INSTALL README THANKS TODO \ + doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt} + doman doc/man/{apg.1,apgbfm.1} +} diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch index a1c34a14f5a..d297495b321 100644 --- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch +++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch @@ -1,5 +1,5 @@ Makefile 2003-08-07 09:40:39.0 -0600 -+++ Makefile.cracklib 2004-10-14 07:16:17.288530686 -0600 +--- a/Makefile 2003-08-07 09:40:39.0 -0600 b/Makefile 2004-10-14 07:16:17.288530686 -0600 @@ -44,10 +44,10 @@ # If you want to use cracklib for password quality check then you # must uncomment the folowing 4 lines (you must not do this for WIN32) diff --git a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch index 93f3f152a2b..64a7fdcb37d 100644 --- a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch +++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch @@ -1,5 +1,5 @@ restrict.c 2007-03-09 13:48:27.0 +0300 -+++ restrict.c 2007-03-09 13:49:31.0 +0300 +--- a/restrict.c 2007-03-09 13:48:27.0 +0300 b/restrict.c 2007-03-09 13:49:31.0 +0300 @@ -33,6 +33,9 @@ #include #include @@ -10,8 +10,8 @@ #include "restrict.h" extern struct sym smbl[94]; /* apg.c 2007-03-08 17:32:40.0 +0300 -+++ apg.c 2007-03-08 17:34:07.0 +0300 +--- a/apg.c2007-03-08 17:32:40.0 +0300 b/apg.c2007-03-08 17:34:07.0 +0300 @@ -100,6 +100,7 @@ #else /* CLISERV */ #if defined(APG_USE_CRACKLIB) diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch index be90c6355e6..43b5874fa2b 100644 --- a/app-admin/apg/files/apg-glibc-2.4.patch +++ b/app-admin/apg/files/apg-glibc-2.4.patch @@ -1,5 +1,5 @@ restrict.h.orig2006-03-26 03:33:50.168661936 +0400 -+++ restrict.h 2006-03-26 03:34:10.427582112 +0400 +--- a/restrict.h 2006-03-26 03:33:50.168661936 +0400 b/restrict.h 2006-03-26 03:34:10.427582112 +0400 @@ -33,6 +33,8 @@ #ifndef APG_RESTRICT_H #define APG_RESTRICT_H1