From 6010c2750adf3086b76638cbbfd663ace80cf32d Mon Sep 17 00:00:00 2001 From: "Konstantin V. Arkhipov" Date: Thu, 8 Mar 2007 16:34:04 +0000 Subject: [PATCH] * closing bug #155526 Package-Manager: portage-2.1.2.2 --- app-admin/apg/ChangeLog | 10 ++++- app-admin/apg/Manifest | 29 ++++++------- app-admin/apg/apg-2.3.0b-r3.ebuild | 42 +++++++++++++++++++ .../apg/files/apg-2.3.0b-crypt_password.patch | 19 +++++++++ app-admin/apg/files/digest-apg-2.3.0b-r3 | 3 ++ 5 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 app-admin/apg/apg-2.3.0b-r3.ebuild create mode 100644 app-admin/apg/files/apg-2.3.0b-crypt_password.patch create mode 100644 app-admin/apg/files/digest-apg-2.3.0b-r3 diff --git a/app-admin/apg/ChangeLog b/app-admin/apg/ChangeLog index 7d120fdcc609..06ce6b5f5eff 100644 --- a/app-admin/apg/ChangeLog +++ b/app-admin/apg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/apg -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.22 2006/12/17 18:01:29 voxus Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.23 2007/03/08 16:34:04 voxus Exp $ + +*apg-2.3.0b-r3 (08 Mar 2007) + + 08 Mar 2007; Konstantin V. Arkhipov + +files/apg-2.3.0b-crypt_password.patch, +apg-2.3.0b-r3.ebuild: + Finally closing bug #155526. 17 Dec 2006; Konstantin V. Arkhipov apg-2.3.0b-r2.ebuild: diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest index 8a5c88919a42..c54bafc366ba 100644 --- a/app-admin/apg/Manifest +++ b/app-admin/apg/Manifest @@ -1,10 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX apg-2.3.0b-cracklib.patch 925 RMD160 d1335cd51f86799596bb7d3349049caa6f44204b SHA1 bd9e126d1a0fa31b4a7c817dd811f76513d858e4 SHA256 fbe7c7761187b358164bc768ab57475d2662bf855d79f285af92de15e007b3da MD5 dce62874a145061a44503024bea45cd0 files/apg-2.3.0b-cracklib.patch 925 RMD160 d1335cd51f86799596bb7d3349049caa6f44204b files/apg-2.3.0b-cracklib.patch 925 SHA256 fbe7c7761187b358164bc768ab57475d2662bf855d79f285af92de15e007b3da files/apg-2.3.0b-cracklib.patch 925 +AUX apg-2.3.0b-crypt_password.patch 516 RMD160 e642e593c4c9c488c1f478c9b7c6ec0aefc4dc8e SHA1 7bd6426c7b31a235d5251dd2e27c1e3ab89722dd SHA256 b5d6e629ed4292003c2dc96c5c7f370c0a382417e6ee423dc096a1113625adbf +MD5 7b9a8f2e3f862a3cf758c6bc122f2337 files/apg-2.3.0b-crypt_password.patch 516 +RMD160 e642e593c4c9c488c1f478c9b7c6ec0aefc4dc8e files/apg-2.3.0b-crypt_password.patch 516 +SHA256 b5d6e629ed4292003c2dc96c5c7f370c0a382417e6ee423dc096a1113625adbf files/apg-2.3.0b-crypt_password.patch 516 AUX apg-glibc-2.4.patch 261 RMD160 71d148c23339c0d3a4a4913c5be5837df0eb6263 SHA1 f6f60fecea7ddddef782ab755c8688cbeea2fef7 SHA256 2d9e4deff463ba2419fea45d9942309b6d7ae5e3b32ceb835715bc98791e23cb MD5 974fa5c90251f2d9b21637301f1fa238 files/apg-glibc-2.4.patch 261 RMD160 71d148c23339c0d3a4a4913c5be5837df0eb6263 files/apg-glibc-2.4.patch 261 @@ -18,10 +19,14 @@ EBUILD apg-2.3.0b-r2.ebuild 1029 RMD160 4137f95e9e0d8d801d05b6d92751fbf05caedd98 MD5 6ea5ca6f4a07fe81e8ac2af9c8225016 apg-2.3.0b-r2.ebuild 1029 RMD160 4137f95e9e0d8d801d05b6d92751fbf05caedd98 apg-2.3.0b-r2.ebuild 1029 SHA256 ad881833786043e4623f1fb8da16bc776fe8775ef2a5a685c15b11caa36a5dda apg-2.3.0b-r2.ebuild 1029 -MISC ChangeLog 3099 RMD160 669ae8efdc459b3415bb398837def7069890f269 SHA1 150faa84f27b697fc021b1a3c9545b308873f142 SHA256 9deec3bed029f68c5aaaacfcebb4c811e69a703e7d05f59b593c57afe4800554 -MD5 30b9507d3567031d1096bc23405dfa17 ChangeLog 3099 -RMD160 669ae8efdc459b3415bb398837def7069890f269 ChangeLog 3099 -SHA256 9deec3bed029f68c5aaaacfcebb4c811e69a703e7d05f59b593c57afe4800554 ChangeLog 3099 +EBUILD apg-2.3.0b-r3.ebuild 1075 RMD160 1ce17de62d8ca7b77949d011b7991813c5b1c6dd SHA1 5bddb7ecaeeb0001d6d6e4870adbd60064f1dd61 SHA256 a3aca97d0efc4db8e6bfbf35a499ae3be5efc3b1f69e3a240849f11770db486d +MD5 0c351cd4b54b4a8878291a2b5f12df16 apg-2.3.0b-r3.ebuild 1075 +RMD160 1ce17de62d8ca7b77949d011b7991813c5b1c6dd apg-2.3.0b-r3.ebuild 1075 +SHA256 a3aca97d0efc4db8e6bfbf35a499ae3be5efc3b1f69e3a240849f11770db486d apg-2.3.0b-r3.ebuild 1075 +MISC ChangeLog 3283 RMD160 2f8532db50fbb397ae402c62eed07d40134dcd09 SHA1 7c5929764239862e05f8be2f24aa392e6882a5b7 SHA256 3bf177a057fc99fb41df20cf5f49f8afdd41d1201f76ff34f34ed8dc51a291b6 +MD5 55306ef7af4700c424be2d0512ffca3c ChangeLog 3283 +RMD160 2f8532db50fbb397ae402c62eed07d40134dcd09 ChangeLog 3283 +SHA256 3bf177a057fc99fb41df20cf5f49f8afdd41d1201f76ff34f34ed8dc51a291b6 ChangeLog 3283 MISC metadata.xml 389 RMD160 ed839ff6c7cbf1fc1e76d0c067ff45d5d02beae1 SHA1 06add57ffc50c909d85283f53029a4c6a86c47a0 SHA256 f9598ea46753fa2e0a19c1941b9a45b15bbc1ff03a58274438fe88eb7f78fe8c MD5 3d43186fb48e5b87885712431e438a41 metadata.xml 389 RMD160 ed839ff6c7cbf1fc1e76d0c067ff45d5d02beae1 metadata.xml 389 @@ -32,10 +37,6 @@ SHA256 bba6febbb858351c4965e9427b5c5c14c82a64c4ba7fab5e22588bf07bedecfc files/di MD5 dc44f4bf1b541fc11f5cee276da1cf02 files/digest-apg-2.3.0b-r2 232 RMD160 df7053fcbe7fd5c526f00212667bf0742d4aaeaf files/digest-apg-2.3.0b-r2 232 SHA256 bba6febbb858351c4965e9427b5c5c14c82a64c4ba7fab5e22588bf07bedecfc files/digest-apg-2.3.0b-r2 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFhYYJbwxeDFj+ScoRAlCtAKCYk8ctVpLEqH5/aiqgZuMqlUs1kACfQ5nX -ySShHqtj5AounM9Oa2dqbxw= -=AH2b ------END PGP SIGNATURE----- +MD5 dc44f4bf1b541fc11f5cee276da1cf02 files/digest-apg-2.3.0b-r3 232 +RMD160 df7053fcbe7fd5c526f00212667bf0742d4aaeaf files/digest-apg-2.3.0b-r3 232 +SHA256 bba6febbb858351c4965e9427b5c5c14c82a64c4ba7fab5e22588bf07bedecfc files/digest-apg-2.3.0b-r3 232 diff --git a/app-admin/apg/apg-2.3.0b-r3.ebuild b/app-admin/apg/apg-2.3.0b-r3.ebuild new file mode 100644 index 000000000000..cf88597dfc14 --- /dev/null +++ b/app-admin/apg/apg-2.3.0b-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r3.ebuild,v 1.1 2007/03/08 16:34:04 voxus Exp $ + +inherit eutils + +DESCRIPTION="Another Password Generator" +HOMEPAGE="http://www.adel.nursat.kz/apg/" +SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="amd64 hppa ppc ~sparc x86" +IUSE="cracklib" + +DEPEND="cracklib? ( sys-libs/cracklib )" + +src_unpack() { + unpack "${A}" + chmod -R 0700 "${S}" + cd ${S} + if use cracklib; then + epatch ${FILESDIR}/${P}-cracklib.patch + epatch ${FILESDIR}/${PN}-glibc-2.4.patch + fi + epatch ${FILESDIR}/${P}-crypt_password.patch +} + +src_compile() { + sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile + + emake standalone || die "compile problem" + emake -C bfconvert || die "compile problem" +} + +src_install() { + dobin apg apgbfm bfconvert/bfconvert || die + dodoc CHANGES INSTALL README THANKS TODO + cd doc + doman man/apg.1 man/apgbfm.1 + dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt +} 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 new file mode 100644 index 000000000000..1f55c230a56f --- /dev/null +++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch @@ -0,0 +1,19 @@ +--- apg.c 2007-03-08 17:32:40.000000000 +0300 ++++ apg.c 2007-03-08 17:34:07.000000000 +0300 +@@ -100,6 +100,7 @@ + #else /* CLISERV */ + #if defined(APG_USE_CRACKLIB) + #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vkt" ++#include + #else /* CRACKLIB */ + #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vt" + #endif /* CRACKLIB */ +@@ -709,7 +710,7 @@ + */ + char * crypt_passstring (const char *p) + { +- char salt[10]; ++ char salt[11]; + gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); + return (crypt(p, salt)); + } diff --git a/app-admin/apg/files/digest-apg-2.3.0b-r3 b/app-admin/apg/files/digest-apg-2.3.0b-r3 new file mode 100644 index 000000000000..bfa7c2e787b1 --- /dev/null +++ b/app-admin/apg/files/digest-apg-2.3.0b-r3 @@ -0,0 +1,3 @@ +MD5 bd82400a5a731070ce895313576afe24 apg-2.3.0b.tar.gz 109995 +RMD160 18f9955d6fdb721bec26613860b312d7fea6fba7 apg-2.3.0b.tar.gz 109995 +SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 apg-2.3.0b.tar.gz 109995 -- 2.26.2