From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- app-admin/apg/Manifest | 5 ++- 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, 102 insertions(+), 3 deletions(-) create mode 100644 app-admin/apg/apg-2.3.0b_p20150129.ebuild create mode 100644 app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch (limited to 'app-admin/apg') diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest index 4a53ac0c40f9..a9b71bc2e076 100644 --- a/app-admin/apg/Manifest +++ b/app-admin/apg/Manifest @@ -1,6 +1,9 @@ AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94 +AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114 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 EBUILD apg-2.3.0b-r7.ebuild 1239 BLAKE2B 2a055b82dfe3a78baa04b03cbce4c9bc73c43373e54f52cb41e3b9f886c5d3e40cd687df0603193426b57cb0012336ff41bff0d9f22be25455fb884b2e4585f1 SHA512 ebc9adc8af01ebd0109ef693ca63c6a374fd458980c602cbb6556b913059708ae10dd2c78b9fcd8ffed2833d0da559ff7a0c88de6953662f287589ecb902f83d -MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d +EBUILD apg-2.3.0b_p20150129.ebuild 833 BLAKE2B e27c5f98156804de422c5f742ad17b757ee0fec888c3f3ebaaaf29331283a185ac9f9f7c0d0e24c60257295e63369729306ec094cfea619ad8e33425589e22c3 SHA512 d482bab8448b61ba4cb2f0272295cb709dafd509509d49312ee3a4340d56132aef80a5e18a4ba5758eb295adf002b0a46178664ab5e7097b9b31931619cf3874 +MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926 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 000000000000..0d351d723be8 --- /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 000000000000..b019f565e154 --- /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 585b0dc75dda..039bfee611a0 100644 --- a/app-admin/apg/metadata.xml +++ b/app-admin/apg/metadata.xml @@ -1,5 +1,11 @@ - - + + bircoph@gentoo.org + Andrew Savchenko + + + wilx/apg + + -- cgit v1.2.3