diff --git a/net-im/poezio/patches/poezio-0.13.patchset b/net-im/poezio/patches/poezio-0.13.patchset deleted file mode 100644 index e4543e2cd..000000000 --- a/net-im/poezio/patches/poezio-0.13.patchset +++ /dev/null @@ -1,59 +0,0 @@ -From 67190179b3e1c03db6bccb97ef8e3e71600d1e77 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 24 May 2020 18:16:23 +0200 -Subject: Fix installation directory - - -diff --git a/setup.py b/setup.py -index 035d58b..7fd2dcb 100755 ---- a/setup.py -+++ b/setup.py -@@ -123,13 +123,11 @@ setup(name="poezio", - package_data={'poezio': ['default_config.cfg']}, - scripts=['scripts/poezio_logs'], - entry_points={'console_scripts': ['poezio = poezio.__main__:run']}, -- data_files=([('share/man/man1/', ['data/poezio.1', -+ data_files=([('documentation/man/man1/', ['data/poezio.1', - 'data/poezio_logs.1']), -- ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']), -- ('share/applications/', ['data/io.poez.Poezio.desktop']), -- ('share/metainfo/', ['data/io.poez.Poezio.appdata.xml'])] -- + find_doc('share/doc/poezio/source', 'source') -- + find_doc('share/doc/poezio/html', 'build/html')), -+ ('documentation/packages/poezio/', ['README.rst', 'COPYING', 'CHANGELOG'])] -+ + find_doc('documentation/packages/poezio/source', 'source') -+ + find_doc('documentation/packages/poezio/html', 'build/html')), - install_requires=['slixmpp>=1.3.0', 'aiodns', 'pyasn1_modules', 'pyasn1'], - extras_require={'OTR plugin': 'python-potr>=1.0', - 'Screen autoaway plugin': 'pyinotify==0.9.4', --- -2.36.1 - - -From cdf227f1fbb1d0f0f6b329d7db7a916e3bd28724 Mon Sep 17 00:00:00 2001 -From: PulkoMandy -Date: Sat, 20 Aug 2022 13:57:24 +0200 -Subject: Remove root user protection - -Not applicable on Haiku. - -diff --git a/poezio/poezio.py b/poezio/poezio.py -index e38871c..38eb4cb 100644 ---- a/poezio/poezio.py -+++ b/poezio/poezio.py -@@ -73,9 +73,9 @@ def main(): - Entry point. - """ - -- if os.geteuid() == 0: -- sys.stdout.write("Please do not run poezio as root.\n") -- sys.exit(0) -+ #if os.geteuid() == 0: -+ # sys.stdout.write("Please do not run poezio as root.\n") -+ # sys.exit(0) - - sys.stdout.write("\x1b]0;poezio\x07") - sys.stdout.flush() --- -2.36.1 - diff --git a/net-im/poezio/patches/poezio-0.14.patchset b/net-im/poezio/patches/poezio-0.14.patchset new file mode 100644 index 000000000..26c6f54eb --- /dev/null +++ b/net-im/poezio/patches/poezio-0.14.patchset @@ -0,0 +1,91 @@ +From 6ac7bf1fceefc0f679ef94c8469f20b9af519431 Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Sat, 20 Aug 2022 13:57:24 +0200 +Subject: Remove root user protection + +Not applicable on Haiku. + +diff --git a/poezio/poezio.py b/poezio/poezio.py +index b149abd..64fca8d 100644 +--- a/poezio/poezio.py ++++ b/poezio/poezio.py +@@ -73,9 +73,9 @@ def main(): + Entry point. + """ + +- if os.geteuid() == 0: +- sys.stdout.write("Please do not run poezio as root.\n") +- sys.exit(0) ++ #if os.geteuid() == 0: ++ # sys.stdout.write("Please do not run poezio as root.\n") ++ # sys.exit(0) + + sys.stdout.write("\x1b]0;poezio\x07") + sys.stdout.flush() +-- +2.37.3 + + +From 407bfe0d6b8bb355a2c817311223f6b7f84e8080 Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Tue, 21 Mar 2023 07:30:35 -0300 +Subject: Fix installation directory + +Minor update to Adrien Destugues 2020's +patch, that wasn't applying cleanly anymore. + +diff --git a/setup.py b/setup.py +index 09a6e1f..1343433 100755 +--- a/setup.py ++++ b/setup.py +@@ -141,13 +141,11 @@ setup( + scripts=['scripts/poezio_logs'], + entry_points={'console_scripts': ['poezio = poezio.__main__:run']}, + data_files=([ +- ('share/man/man1/', ['data/poezio.1', 'data/poezio_logs.1']), +- ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']), +- ('share/applications/', ['data/io.poez.Poezio.desktop']), +- ('share/metainfo/', ['data/io.poez.Poezio.appdata.xml']) ++ ('documentation/man/man1/', ['data/poezio.1', 'data/poezio_logs.1']), ++ ('documentation/packages/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']) + ] +- + find_doc('share/doc/poezio/source', 'source') +- + find_doc('share/doc/poezio/html', 'build/html') ++ + find_doc('documentation/packages/poezio/source', 'source') ++ + find_doc('documentation/packages/poezio/html', 'build/html') + + sphinx_files_found + ), + install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'], +-- +2.37.3 + + +From 8561f0dd4d5ecd9026c7bf0a7d7c7e77c18a2d9d Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Tue, 21 Mar 2023 07:30:35 -0300 +Subject: Fix paths to certs + +Point mostly to ca_root_certificates.hpkg's CARootCertificates.pem + +diff --git a/poezio/config.py b/poezio/config.py +index dbbed5b..0d58a8b 100644 +--- a/poezio/config.py ++++ b/poezio/config.py +@@ -31,13 +31,14 @@ ConfigDict = Dict[str, Dict[str, ConfigValue]] + USE_DEFAULT_SECTION = '__DEFAULT SECTION PLACEHOLDER__' + + CA_CERT_DEFAULT_PATHS = { ++ '/boot/system/data/ssl/CARootCertificates.pem', + '/etc/ssl/cert.pem', + '/etc/ssl/certs/ca-certificates.crt', + '/etc/ssl/certs/ca-bundle.crt', + '/etc/pki/tls/certs/ca-bundle.crt', + '/etc/ssl/certs/ca-certificates.crt', + '/etc/ca-certificates/extracted/tls-ca-bundle.pem', + '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt', + } + + DEFAULT_CONFIG: ConfigDict = { +-- +2.37.3 + diff --git a/net-im/poezio/poezio-0.13.recipe b/net-im/poezio/poezio-0.14.recipe similarity index 77% rename from net-im/poezio/poezio-0.13.recipe rename to net-im/poezio/poezio-0.14.recipe index 10e173b1e..ba56613dc 100644 --- a/net-im/poezio/poezio-0.13.recipe +++ b/net-im/poezio/poezio-0.14.recipe @@ -13,13 +13,13 @@ powerful, standard and open protocol." HOMEPAGE="https://poez.io" COPYRIGHT="2010-2020 Florent Le Coz, Mathieu Pasquet" LICENSE="Zlib" -REVISION="2" +REVISION="1" SOURCE_URI="https://pypi.io/packages/source/p/poezio/poezio-$portVersion.tar.gz" -CHECKSUM_SHA256="d12a95e5895d2aae17621f60092b5ca56384922b3637bff0e8a92952c0188e2d" +CHECKSUM_SHA256="d9b8a3e22fa39a8683a9a289229f23d922e63c938a76b9897b77f3278bb3a420" SOURCE_DIR="poezio-$portVersion" PATCHES="poezio-$portVersion.patchset" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -29,36 +29,37 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - aiodns_python3 - pyasn1_modules_python3 - pyasn1_python3 - pycares_python3 - slixmpp_python3 >= 1.3.0 - cmd:python3 + aiodns_python39 + pyasn1_modules_python39 + pyasn1_python39 + pycares_python39 + slixmpp_python39 >= 1.8.2 + typing_extensions_python39 + cmd:python3.9 " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - setuptools_python3 + setuptools_python39 cmd:gcc$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " BUILD() { - python3 setup.py build + python3.9 setup.py build } INSTALL() { # GENERIC: all python_setuptools-based installs need this - pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3) + pythonVersion=$(python3.9 --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$PYTHONPATH mkdir -p $installLocation - $portPackageLinksDir/cmd~python3/bin/python3 setup.py install \ + python3.9 setup.py install \ --root=$prefix --prefix=. --skip-build }