Merge pull request #2139 from blshkv/master

opensnitch
pentoo · Oct 30, 2024 · 7a7a55c · 7a7a55c
2 parents 148167b + eb3b263
commit 7a7a55c
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 35 deletions.
diff --git a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 S="${WORKDIR}/opensnitch-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dist-kernel"
 
 EBPF_DIR=ebpf_prog

diff --git a/app-admin/opensnitch/opensnitch-1.6.6.ebuild → ...min/opensnitch/opensnitch-1.6.6-r1.ebuild b/app-admin/opensnitch/opensnitch-1.6.6.ebuild → ...min/opensnitch/opensnitch-1.6.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+audit bpf +iptables +nftables systemd"
 REQUIRED_USE="|| ( iptables nftables )"
 
@@ -114,7 +114,7 @@ src_install(){
 
 	pushd daemon || die
 	dobin opensnitchd
-	insinto /etc/opensnitchd/rules
+	keepdir /etc/opensnitchd/rules
 	insinto /etc/opensnitchd/
 	doins default-config.json
 	doins system-fw.json
@@ -131,4 +131,11 @@ src_install(){
 
 pkg_postinst() {
 	xdg_icon_cache_update
+
+	#FIXME upstream bug: https://github.com/evilsocket/opensnitch/issues/795
+	elog "Under regular user, run the following commands to display IP's network name:"
+	elog "cd ~/.config/opensnitch/"
+	elog "wget https://github.com/hadiasghari/pyasn/blob/master/data/ipasn_20140513_v12.dat.gz?raw=true -O ipasn_db.dat.gz"
+	elog  "wget https://github.com/hadiasghari/pyasn/blob/master/data/asnames.json?raw=true"
+
 }
diff --git a/dev-python/pyasn/Manifest b/dev-python/pyasn/Manifest
@@ -1 +1 @@
-DIST pyasn-1.6.1-re.tar.gz 11823216 BLAKE2B 028cf3958cc1436a69f2bf5107fbf38d6a11308d8fa52c622be0dba4fba6e9fc450bcad7d6403c6fc83db2cce61d3163d459cbea17fd4fcf0c24d9d02f6ed835 SHA512 fd7e5b0282a39d4a8bac5741fe3f31955ff3e791ecf31183c2ffdefb824dfc70cca8abde3f0349e83b631ca48a354bdb66279565ab0247a3e6c3168143d2095e
+DIST pyasn-1.6.2.tar.gz 49132 BLAKE2B fc6fa1192a9d4d18db386db254b2a0bbd54691a0ed5ca58db21ac00ada7961413f7d2055af216b0171ec8fe2cdc91bf0a6ee7865d32bbb11b87a3a5f8662fcac SHA512 432d1bca71f32d6d09101d6180e512285841d1201d50e9833ed211b3d2b1d52923d9f3cff8b8763927dcc75cf44ba965d121b62ac78b9b620c40e7eb6e21c433
diff --git a/dev-python/pyasn/metadata.xml b/dev-python/pyasn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>unknown@pentoo.ch</email>
+		<name>Author Unknown</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hadiasghari/pyasn</remote-id>
+		<remote-id type="pypi">pyasn</remote-id> 
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyasn/pyasn-1.6.1-r1.ebuild b/dev-python/pyasn/pyasn-1.6.1-r1.ebuild
diff --git a/dev-python/pyasn/pyasn-1.6.2.ebuild b/dev-python/pyasn/pyasn-1.6.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python IP address to Autonomous System Number lookup module"
+HOMEPAGE="https://github.com/hadiasghari/pyasn"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RESTRICT="test"
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -283,10 +283,6 @@ dev-python/apng
 #required by sqlmap atlas
 =dev-python/humanfriendly-9*
 
-app-admin/opensnitch
-# https://github.com/grpc/grpc/issues/33918
-=dev-python/grpcio-tools-1.51*
-
 #empire
 <dev-python/jq-1.6 ~amd64
 =dev-python/python-socketio-5*