Attachment 209127 Details for Bug 241913 – netbox-switch-to-py-pycryptodomex.patch

[patch] netbox-switch-to-py-pycryptodomex.patch

netbox-switch-to-py-pycryptodomex.patch (text/plain), 5.85 KB, created by Kai Knoblich on 2019-11-13 10:23:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-11-13 10:23:06 UTC

Size: 5.85 KB

patch

obsolete

>Index: net-mgmt/netbox/Makefile
>===================================================================
>--- net-mgmt/netbox/Makefile	(revision 517363)
>+++ net-mgmt/netbox/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	netbox
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.6.7
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	kai@FreeBSD.org
>@@ -30,7 +31,7 @@
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.8.2:security/py-pycryptodome@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.8.2:security/py-pycryptodomex@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=6.2.0:graphics/py-pillow@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR}
> 
>Index: net-mgmt/netbox/files/patch-netbox_secrets_api_views.py
>===================================================================
>--- net-mgmt/netbox/files/patch-netbox_secrets_api_views.py	(nonexistent)
>+++ net-mgmt/netbox/files/patch-netbox_secrets_api_views.py	(working copy)
>@@ -0,0 +1,10 @@
>+--- netbox/secrets/api/views.py.orig	2019-11-13 08:39:05 UTC
>++++ netbox/secrets/api/views.py
>+@@ -1,6 +1,6 @@
>+ import base64
>+ 
>+-from Crypto.PublicKey import RSA
>++from Cryptodome.PublicKey import RSA
>+ from django.db.models import Count
>+ from django.http import HttpResponseBadRequest
>+ from rest_framework.exceptions import ValidationError
>
>Property changes on: net-mgmt/netbox/files/patch-netbox_secrets_api_views.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/netbox/files/patch-netbox_secrets_forms.py
>===================================================================
>--- net-mgmt/netbox/files/patch-netbox_secrets_forms.py	(nonexistent)
>+++ net-mgmt/netbox/files/patch-netbox_secrets_forms.py	(working copy)
>@@ -0,0 +1,10 @@
>+--- netbox/secrets/forms.py.orig	2019-11-13 08:38:33 UTC
>++++ netbox/secrets/forms.py
>+@@ -1,5 +1,5 @@
>+-from Crypto.Cipher import PKCS1_OAEP
>+-from Crypto.PublicKey import RSA
>++from Cryptodome.Cipher import PKCS1_OAEP
>++from Cryptodome.PublicKey import RSA
>+ from django import forms
>+ from taggit.forms import TagField
>+ 
>
>Property changes on: net-mgmt/netbox/files/patch-netbox_secrets_forms.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/netbox/files/patch-netbox_secrets_models.py
>===================================================================
>--- net-mgmt/netbox/files/patch-netbox_secrets_models.py	(nonexistent)
>+++ net-mgmt/netbox/files/patch-netbox_secrets_models.py	(working copy)
>@@ -0,0 +1,15 @@
>+--- netbox/secrets/models.py.orig	2019-11-13 08:38:48 UTC
>++++ netbox/secrets/models.py
>+@@ -1,9 +1,9 @@
>+ import os
>+ import sys
>+ 
>+-from Crypto.Cipher import AES, PKCS1_OAEP
>+-from Crypto.PublicKey import RSA
>+-from Crypto.Util import strxor
>++from Cryptodome.Cipher import AES, PKCS1_OAEP
>++from Cryptodome.PublicKey import RSA
>++from Cryptodome.Util import strxor
>+ from django.conf import settings
>+ from django.contrib.auth.hashers import make_password, check_password
>+ from django.contrib.auth.models import Group, User
>
>Property changes on: net-mgmt/netbox/files/patch-netbox_secrets_models.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/netbox/files/patch-netbox_secrets_tests_test__models.py
>===================================================================
>--- net-mgmt/netbox/files/patch-netbox_secrets_tests_test__models.py	(nonexistent)
>+++ net-mgmt/netbox/files/patch-netbox_secrets_tests_test__models.py	(working copy)
>@@ -0,0 +1,10 @@
>+--- netbox/secrets/tests/test_models.py.orig	2019-11-13 08:38:20 UTC
>++++ netbox/secrets/tests/test_models.py
>+@@ -1,6 +1,6 @@
>+ import string
>+ 
>+-from Crypto.PublicKey import RSA
>++from Cryptodome.PublicKey import RSA
>+ from django.conf import settings
>+ from django.contrib.auth.models import User
>+ from django.core.exceptions import ValidationError
>
>Property changes on: net-mgmt/netbox/files/patch-netbox_secrets_tests_test__models.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/netbox/files/patch-requirements.txt
>===================================================================
>--- net-mgmt/netbox/files/patch-requirements.txt	(nonexistent)
>+++ net-mgmt/netbox/files/patch-requirements.txt	(working copy)
>@@ -0,0 +1,8 @@
>+--- requirements.txt.orig	2019-11-13 08:43:54 UTC
>++++ requirements.txt
>+@@ -19,4 +19,4 @@ netaddr==0.7.19
>+ Pillow==6.2.0
>+ psycopg2-binary==2.8.3
>+ py-gfm==0.1.4
>+-pycryptodome==3.8.2
>++pycryptodomex==3.8.2
>
>Property changes on: net-mgmt/netbox/files/patch-requirements.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

kai: maintainer-approval+

Actions: View | Diff

Attachments on bug 241913: 209127