From 1539dc3f1ebe3011570a4e33176bfe802be1c334 Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Wed, 25 Sep 2019 07:05:33 +0300 Subject: [PATCH] lazagne: 2.4.3 bump --- app-forensics/lazagne/Manifest | 2 +- .../lazagne-2.4.3_fix_attributeerror.patch | 23 ++++++++++ app-forensics/lazagne/lazagne-2.4.2.ebuild | 1 - app-forensics/lazagne/lazagne-2.4.3.ebuild | 44 +++++++++++++++++++ app-forensics/lazagne/lazagne-9999.ebuild | 38 +++++++--------- 5 files changed, 83 insertions(+), 25 deletions(-) create mode 100644 app-forensics/lazagne/files/lazagne-2.4.3_fix_attributeerror.patch delete mode 120000 app-forensics/lazagne/lazagne-2.4.2.ebuild create mode 100644 app-forensics/lazagne/lazagne-2.4.3.ebuild diff --git a/app-forensics/lazagne/Manifest b/app-forensics/lazagne/Manifest index bb03a9b01..714be1200 100644 --- a/app-forensics/lazagne/Manifest +++ b/app-forensics/lazagne/Manifest @@ -1 +1 @@ -DIST LaZagne-2.4.2.tar.gz 517870 BLAKE2B a81ce508fe4611346891b2106e3bb9baa4726e7dd08dd3772396800f4636b7014d48000bc699217f6ba2dad8e868d249803c992b2f6f278ba5140ee2cf583f0d SHA512 a71f4a31e1d4f1252ca105aeaf61191599ecc94bb6236810c86707b3f117fd0edf446f1b468fe4c652039d2110cb85162042cddaa773c73e14e0f5fbbdff0022 +DIST lazagne-2.4.3.tar.gz 547441 BLAKE2B 4b5e6d93711a53afdebd550c801890db790913e3ea1af9eea4c2f02e1542053a010fa567b50d44e83b9fbe5f4777e5987829a2c13f16bc8ae813ca759457626e SHA512 5f3949d403b66ed4f535f0de4031e9e57596c5cf32381f61dbd06c9fd304cd52b6f60b673ef1b4e2472a06ba0aa2fec1b86edab502b74906767912e534e3669a diff --git a/app-forensics/lazagne/files/lazagne-2.4.3_fix_attributeerror.patch b/app-forensics/lazagne/files/lazagne-2.4.3_fix_attributeerror.patch new file mode 100644 index 000000000..4106a3b04 --- /dev/null +++ b/app-forensics/lazagne/files/lazagne-2.4.3_fix_attributeerror.patch @@ -0,0 +1,23 @@ +From 517dc6777fcceb60abb53be6977eb6938fb920a9 Mon Sep 17 00:00:00 2001 +From: AlessandroZ +Date: Tue, 24 Sep 2019 10:45:16 +0200 +Subject: [PATCH] fix #428 + +--- + Linux/lazagne/config/run.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Linux/lazagne/config/run.py b/Linux/lazagne/config/run.py +index a7fb67e2..1a2918e3 100644 +--- a/Linux/lazagne/config/run.py ++++ b/Linux/lazagne/config/run.py +@@ -61,7 +61,8 @@ def run_modules(category_selected, subcategories): + Run modules + """ + modules = create_module_dic() +- categories = [category_selected] if category_selected != 'all' else get_categories() ++ categories = {category_selected: get_categories()[category_selected]} \ ++ if category_selected != 'all' else get_categories() + + # Sort dict in reverse mode to run libsecrets as first module + for cat in OrderedDict(reversed(sorted(categories.items(), key=lambda t: t[0]))): diff --git a/app-forensics/lazagne/lazagne-2.4.2.ebuild b/app-forensics/lazagne/lazagne-2.4.2.ebuild deleted file mode 120000 index 82134114c..000000000 --- a/app-forensics/lazagne/lazagne-2.4.2.ebuild +++ /dev/null @@ -1 +0,0 @@ -lazagne-9999.ebuild \ No newline at end of file diff --git a/app-forensics/lazagne/lazagne-2.4.3.ebuild b/app-forensics/lazagne/lazagne-2.4.3.ebuild new file mode 100644 index 000000000..79dbfbc59 --- /dev/null +++ b/app-forensics/lazagne/lazagne-2.4.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit python-r1 + +DESCRIPTION="Credentials recovery project" +HOMEPAGE="https://github.com/AlessandroZ/LaZagne" + +# LGPL-3 — * +# GPL-3 — Linux/lazagne/config/lib/memorpy/* +# MIT — Linux/lazagne/config/crypto/* +LICENSE="LGPL-3 GPL-3 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AlessandroZ/LaZagne" +else + SRC_URI="https://github.com/AlessandroZ/LaZagne/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/LaZagne-${PV}" +fi + +IUSE="" +SLOT="0" + +# using bundled memorypy instead dev-python/memorpy +RDEPEND="${PYTHON_DEPS} + dev-python/pyasn1[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}]" + +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}_fix_attributeerror.patch ) + +src_install() { + dodoc README.md CHANGELOG + + python_foreach_impl python_domodule Linux/lazagne + python_foreach_impl python_newscript Linux/laZagne.py lazagne +} diff --git a/app-forensics/lazagne/lazagne-9999.ebuild b/app-forensics/lazagne/lazagne-9999.ebuild index f9480fe67..2d753a28e 100644 --- a/app-forensics/lazagne/lazagne-9999.ebuild +++ b/app-forensics/lazagne/lazagne-9999.ebuild @@ -1,34 +1,36 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 -inherit eutils python-r1 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit python-r1 DESCRIPTION="Credentials recovery project" HOMEPAGE="https://github.com/AlessandroZ/LaZagne" -LICENSE="LGPL-3" + +# LGPL-3 — * +# GPL-3 — Linux/lazagne/config/lib/memorpy/* +# MIT — Linux/lazagne/config/crypto/* +LICENSE="LGPL-3 GPL-3 MIT" if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/AlessandroZ/LaZagne" else - MY_PN="LaZagne" - MY_P="${MY_PN}-${PV}" + SRC_URI="https://github.com/AlessandroZ/LaZagne/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/AlessandroZ/LaZagne/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - S="${WORKDIR}"/${MY_P} + S="${WORKDIR}/LaZagne-${PV}" fi -RESTRICT="mirror" +IUSE="" SLOT="0" +# using bundled memorypy instead dev-python/memorpy RDEPEND="${PYTHON_DEPS} - dev-python/traceback2[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/memorpy[${PYTHON_USEDEP}] - dev-python/configparser[${PYTHON_USEDEP}]" + dev-python/psutil[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" @@ -36,15 +38,5 @@ src_install() { dodoc README.md CHANGELOG python_foreach_impl python_domodule Linux/lazagne - python_foreach_impl python_doscript Linux/laZagne.py - - make_wrapper \ - "${PN}" \ - "python2 /usr/bin/laZagne.py" -} - -pkg_postinst() { - elog - elog "See documentation: https://github.com/AlessandroZ/LaZagne#usage" - elog + python_foreach_impl python_newscript Linux/laZagne.py lazagne }