From 739d8e3ed1a96afa899c1d8df562a00cc5801c38 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 10:02:15 -0400 Subject: [PATCH 01/13] profile: moar ruby23 --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index fea6e056b..61022195c 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -15,6 +15,7 @@ dev-ruby/activejob:4.2 dev-ruby/actionview:4.2 #ruby23 +~dev-ruby//daemons-1.2.4 ~dev-ruby/did_you_mean-1.0.2 ~dev-ruby/rdoc-5.1.0 =dev-ruby/test-unit-3.2* From 67eb82102d44532d7f3d15880b8a3d7514c1c88b Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 10:03:20 -0400 Subject: [PATCH 02/13] profile: grr, typo --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index 61022195c..ba8f53e7d 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -15,7 +15,7 @@ dev-ruby/activejob:4.2 dev-ruby/actionview:4.2 #ruby23 -~dev-ruby//daemons-1.2.4 +~dev-ruby/daemons-1.2.4 ~dev-ruby/did_you_mean-1.0.2 ~dev-ruby/rdoc-5.1.0 =dev-ruby/test-unit-3.2* From edf2739d8c13fa6e0a9806c9dcd80f086ad01a42 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 10:07:11 -0400 Subject: [PATCH 03/13] profile: ruby23 tins --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index ba8f53e7d..67e5f1da8 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -38,7 +38,7 @@ dev-ruby/json:2 =dev-ruby/nokogiri-1.7* =dev-ruby/rack-1.6* =dev-ruby/hoe-3.16* -=dev-ruby/tins-1.13* +=dev-ruby/tins-1.15* ~dev-ruby/webmock-1.24.6 =dev-ruby/hashdiff-0.3* ~dev-ruby/racc-1.4.14 From cfd90ca828fde31d7586ad6e5a645c25b16606da Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 10:13:28 -0400 Subject: [PATCH 04/13] profile: updating ancient msgpack --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index 67e5f1da8..b2d729580 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -90,7 +90,7 @@ dev-ruby/rex-text dev-ruby/bit-struct ~dev-ruby/sshkey-1.8.0 =dev-ruby/minitest-5.3* -=dev-ruby/msgpack-0.7* +=dev-ruby/msgpack-1.1* =dev-ruby/rake-10.5* dev-ruby/rkelly-remix dev-ruby/arel:6.0 From 29537d52fb0d04eb0e4b1db21b938875aeadec7f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 13:08:28 -0400 Subject: [PATCH 05/13] profile: I hate 32 bit garbage --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index b2d729580..27955cf71 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -55,6 +55,7 @@ dev-ruby/i18n:0.7 ~dev-ruby/http_configuration-1.0.4 #required by metasploit-9999 +~dev-ruby/bcrypt_pbkdf-1.0.0 ** dev-ruby/rbnacl:4 dev-ruby/rbnacl-libsodium dev-ruby/bcrypt_pbkdf From 5db49a628aa9b4f43a6026603d77b9e577b36601 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 13:09:00 -0400 Subject: [PATCH 06/13] profile: cleanup --- profiles/pentoo/base/package.accept_keywords/dev-ruby | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index 27955cf71..d2e2c40cb 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -58,7 +58,6 @@ dev-ruby/i18n:0.7 ~dev-ruby/bcrypt_pbkdf-1.0.0 ** dev-ruby/rbnacl:4 dev-ruby/rbnacl-libsodium -dev-ruby/bcrypt_pbkdf =dev-ruby/faraday-0.12* dev-ruby/rjb ~dev-ruby/backports-3.8.0 From 37287b94bb24b180106ef95270b06d00d58e2d58 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 13:59:11 -0400 Subject: [PATCH 07/13] profile: no one uses 32 bit --- profiles/pentoo/arch/x86/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/arch/x86/package.accept_keywords b/profiles/pentoo/arch/x86/package.accept_keywords index 48fb2e5b8..1e78a224c 100644 --- a/profiles/pentoo/arch/x86/package.accept_keywords +++ b/profiles/pentoo/arch/x86/package.accept_keywords @@ -1,4 +1,5 @@ =dev-ruby/tilt-2.0.5 +=dev-ruby/rbnacl-4.0* ** dev-python/numpy amd64 dev-ruby/eventmachine amd64 dev-ruby/tzinfo amd64 From 5b2c4ce103f1b14995d106af702e11a2e9f83146 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 14:09:17 -0400 Subject: [PATCH 08/13] profile: I may just give up on x86 and lie about being amd64 --- profiles/pentoo/arch/x86/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/arch/x86/package.accept_keywords b/profiles/pentoo/arch/x86/package.accept_keywords index 1e78a224c..fb583ce96 100644 --- a/profiles/pentoo/arch/x86/package.accept_keywords +++ b/profiles/pentoo/arch/x86/package.accept_keywords @@ -25,6 +25,7 @@ dev-ruby/ruby-gtk2 amd64 dev-ruby/ruby-pango amd64 net-misc/iprange amd64 dev-ruby/rack-protection amd64 +dev-ruby/rack-test amd64 dev-ruby/rcairo amd64 =app-crypt/yubikey-manager-0.4* ~amd64 ~dev-ruby/nio4r-2.1.0 ** From dad84cb16a73c001cb13214220167882a40a44bb Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 14:18:28 -0400 Subject: [PATCH 09/13] profile: everything new is new again --- profiles/pentoo/arch/x86/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/arch/x86/package.accept_keywords b/profiles/pentoo/arch/x86/package.accept_keywords index fb583ce96..b15875df7 100644 --- a/profiles/pentoo/arch/x86/package.accept_keywords +++ b/profiles/pentoo/arch/x86/package.accept_keywords @@ -44,3 +44,4 @@ net-analyzer/metasploit:4.14 ** ~dev-ruby/arel-helpers-2.4.0 ** ~dev-ruby/postgres_ext-3.0.0 ** ~dev-ruby/pg_array_parser-0.0.9 ** +www-client/chromium amd64 From 62b05c1257f395373cf44a1c099dffff3a018387 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 14:32:14 -0400 Subject: [PATCH 10/13] profile: more x86 matching games --- profiles/pentoo/arch/x86/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/arch/x86/package.accept_keywords b/profiles/pentoo/arch/x86/package.accept_keywords index b15875df7..5dbff6d31 100644 --- a/profiles/pentoo/arch/x86/package.accept_keywords +++ b/profiles/pentoo/arch/x86/package.accept_keywords @@ -45,3 +45,4 @@ net-analyzer/metasploit:4.14 ** ~dev-ruby/postgres_ext-3.0.0 ** ~dev-ruby/pg_array_parser-0.0.9 ** www-client/chromium amd64 +=dev-python/scapy-python3-0.21* ~amd64 From dbf26dca2c13e5bc7d029f97e922d94d8e0ed403 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 16:36:18 -0400 Subject: [PATCH 11/13] profile: upgrade elfutils to avoid https://bugs.gentoo.org/627576 --- profiles/pentoo/base/package.accept_keywords/dev-libs | 3 +++ profiles/pentoo/base/package.mask | 3 +++ 2 files changed, 6 insertions(+) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-libs b/profiles/pentoo/base/package.accept_keywords/dev-libs index 94322f7c5..177bb9d62 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-libs +++ b/profiles/pentoo/base/package.accept_keywords/dev-libs @@ -1,3 +1,6 @@ +#ugh https://bugs.gentoo.org/627576 +~dev-libs/elfutils-0.170 + #new kismet dev-libs/msgpack diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 62dc02783..da95974fd 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -19,3 +19,6 @@ sys-apps/systemd #kill old ruby dev-lang/ruby:2.1 dev-lang/ruby:2.2 + +#ugh, https://bugs.gentoo.org/627576 + Date: Wed, 18 Oct 2017 17:18:24 -0400 Subject: [PATCH 12/13] sleuthkit: minor cleanup --- ...leuthkit-4.1.3.ebuild => sleuthkit-4.1.3-r1.ebuild} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename app-forensics/sleuthkit/{sleuthkit-4.1.3.ebuild => sleuthkit-4.1.3-r1.ebuild} (82%) diff --git a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild similarity index 82% rename from app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild rename to app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild index 844b4ff30..703a6f7fb 100644 --- a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild +++ b/app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,9 +16,11 @@ SLOT="0/10" # subslot = major soname version KEYWORDS="~amd64 ~hppa ~ppc ~x86" IUSE="aff ewf static-libs" -DEPEND="dev-db/sqlite:3 - ewf? ( >=app-forensics/libewf-20170701 ) - aff? ( app-forensics/afflib )" +DEPEND="virtual/jdk + dev-db/sqlite:3 + sys-libs/zlib:= + ewf? ( >=app-forensics/libewf-20170701:= ) + aff? ( app-forensics/afflib:= )" RDEPEND="${DEPEND} dev-perl/Date-Manip" From 90d5f252aa974c9d4ef007d06502c520401d4488 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 18 Oct 2017 20:53:33 -0400 Subject: [PATCH 13/13] firmware testing seems kinda awesome, also pentoo-system really needs a mini flag --- ...entoo-system-2017.4.ebuild => pentoo-system-2017.4-r1.ebuild} | 1 + profiles/pentoo/base/package.accept_keywords/sys-apps | 1 + profiles/pentoo/overlay/package.accept_keywords/sys-apps | 1 + 3 files changed, 3 insertions(+) rename pentoo/pentoo-system/{pentoo-system-2017.4.ebuild => pentoo-system-2017.4-r1.ebuild} (99%) create mode 100644 profiles/pentoo/base/package.accept_keywords/sys-apps create mode 120000 profiles/pentoo/overlay/package.accept_keywords/sys-apps diff --git a/pentoo/pentoo-system/pentoo-system-2017.4.ebuild b/pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild similarity index 99% rename from pentoo/pentoo-system/pentoo-system-2017.4.ebuild rename to pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild index 5fb859124..12046fc1c 100644 --- a/pentoo/pentoo-system/pentoo-system-2017.4.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild @@ -111,6 +111,7 @@ PDEPEND="${PDEPEND} sys-apps/ethtool sys-apps/iproute2 sys-apps/fbset + sys-apps/fwts sys-apps/sysvinit sys-apps/rng-tools sys-devel/crossdev diff --git a/profiles/pentoo/base/package.accept_keywords/sys-apps b/profiles/pentoo/base/package.accept_keywords/sys-apps new file mode 100644 index 000000000..f2d2a4e7c --- /dev/null +++ b/profiles/pentoo/base/package.accept_keywords/sys-apps @@ -0,0 +1 @@ +sys-apps/fwts diff --git a/profiles/pentoo/overlay/package.accept_keywords/sys-apps b/profiles/pentoo/overlay/package.accept_keywords/sys-apps new file mode 120000 index 000000000..24dfa42db --- /dev/null +++ b/profiles/pentoo/overlay/package.accept_keywords/sys-apps @@ -0,0 +1 @@ +../../base/package.accept_keywords/sys-apps \ No newline at end of file