Re: security/py-axolotl: move to python3-only

Theo Buehler Mon, 15 Mar 2021 20:44:00 -0700

On Tue, Mar 16, 2021 at 04:24:30AM +0100, Theo Buehler wrote:
> As mentioned in the py-protobuf update mail, moving py-axolotl to
> python3 only will allow moving py-protobuf to python3 only which will
> make my life a bit easier.  It's the first time I do this, so please
> look closely. Not showing the quirks diff as there's too much churn in
> there these days.


And here with a fixed conflict marker, as spotted by daniel

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/py-axolotl/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile    3 Jul 2020 21:13:06 -0000       1.7
+++ Makefile    14 Mar 2021 15:44:06 -0000
@@ -5,7 +5,7 @@ COMMENT =               Python port of libaxolotl
 MODPY_EGG_VERSION =    0.2.3
 DISTNAME =             python-axolotl-${MODPY_EGG_VERSION}
 PKGNAME =              py-axolotl-${MODPY_EGG_VERSION}
-REVISION =             0
+REVISION =             1
 
 CATEGORIES =           security
 
@@ -19,7 +19,7 @@ MODPY_PI =            Yes
 MODPY_SETUPTOOLS =     Yes
 
 FLAVORS =              python3
-FLAVOR ?=
+FLAVOR =               python3
 
 RUN_DEPENDS =          devel/py-protobuf${MODPY_FLAVOR} \
                        security/py-axolotl-curve25519${MODPY_FLAVOR} \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/py-axolotl/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   20 Jun 2018 11:35:20 -0000      1.1.1.1
+++ pkg/PLIST   16 Mar 2021 03:40:45 -0000
@@ -1,7 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/06/20 11:35:20 feinerer Exp $
+@conflict py-axolotl-*
+@pkgpath security/py-axolotl
 lib/python${MODPY_VERSION}/site-packages/axolotl/
 lib/python${MODPY_VERSION}/site-packages/axolotl/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}axolotladdress.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}duplicatemessagexception.${MODPY_PYC_MAGIC_TAG}pyc
@@ -21,7 +23,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/duplicatemessagexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}curve.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}djbec.${MODPY_PYC_MAGIC_TAG}pyc
@@ -33,7 +35,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/eckeypair.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupcipher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupsessionbuilder.${MODPY_PYC_MAGIC_TAG}pyc
@@ -42,7 +44,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/groupsessionbuilder.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}senderchainkey.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}sendermessagekey.${MODPY_PYC_MAGIC_TAG}pyc
@@ -51,7 +53,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/senderkeyname.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeyrecord.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeystate.${MODPY_PYC_MAGIC_TAG}pyc
@@ -67,7 +69,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/invalidversionexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedmessagesecrets.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedrootsecrets.${MODPY_PYC_MAGIC_TAG}pyc
@@ -85,7 +87,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/nosessionexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}ciphertextmessage.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}keyexchangemessage.${MODPY_PYC_MAGIC_TAG}pyc
@@ -103,7 +105,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/whisperprotos_pb2.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}aliceaxolotlparameters.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}bobaxolotlparamaters.${MODPY_PYC_MAGIC_TAG}pyc
@@ -121,7 +123,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/sessioncipher.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}axolotlstore.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}identitykeystore.${MODPY_PYC_MAGIC_TAG}pyc
@@ -148,7 +150,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/statekeyexchangeexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryaxolotlstore.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryidentitykeystore.${MODPY_PYC_MAGIC_TAG}pyc
@@ -160,7 +162,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sigs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}inmemorysenderkeystore.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}test_groupcipher.${MODPY_PYC_MAGIC_TAG}pyc
@@ -173,13 +175,13 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/inmemorysignedprekeystore.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}test_hkdf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/test_hkdf.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_chainkey.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_ratchetingsession.${MODPY_PYC_MAGIC_TAG}pyc
@@ -192,14 +194,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/test_sigs.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}test_byteutil.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/test_byteutil.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/untrustedidentityexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}byteutil.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}hexutil.${MODPY_PYC_MAGIC_TAG}pyc

Re: security/py-axolotl: move to python3-only

Reply via email to