* [PR PATCH] deluge: update to 2.0.5.
@ 2022-01-23 9:54 mobinmob
2022-01-23 15:22 ` [PR PATCH] [Updated] " mobinmob
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: mobinmob @ 2022-01-23 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 4429 bytes --]
From e5a4cae0479da49a8fea19e82647a3451912711e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 11:53:17 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 6 +--
3 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..c2c3330c2f90 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
build_style=python3-module
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
@@ -14,7 +14,7 @@ maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
@ 2022-01-23 15:22 ` mobinmob
2022-01-23 15:58 ` mobinmob
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-01-23 15:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5741 bytes --]
From 50cf19250f657384e52ff92215e911ec0d1a903c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:21:42 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 27 ++++++++-----
3 files changed, 18 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..becafbd59dd4 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,21 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
build_style=python3-module
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
-checkdepends="python3-pytest $depends"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +26,26 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+pre_check() {
+ # Remove failing tests.
+ rm -f deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+ rm -f deluge/tests/test_torrentview.py
+ rm -f deluge/tests/test_ui_entry.py
+ rm -f deluge/tests/test_files_tab.py
+ rm -f deluge/tests/test_ui_gtk3.py
+ rm -f deluge/tests/test_web_api.py
+ rm -f deluge/tests/test_web_api.py
+ rm -f deluge/tests/test_webserver.py
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
2022-01-23 15:22 ` [PR PATCH] [Updated] " mobinmob
@ 2022-01-23 15:58 ` mobinmob
2022-01-23 15:59 ` mobinmob
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-01-23 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5741 bytes --]
From 50cf19250f657384e52ff92215e911ec0d1a903c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:21:42 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 27 ++++++++-----
3 files changed, 18 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..becafbd59dd4 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,21 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
build_style=python3-module
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
-checkdepends="python3-pytest $depends"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +26,26 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+pre_check() {
+ # Remove failing tests.
+ rm -f deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+ rm -f deluge/tests/test_torrentview.py
+ rm -f deluge/tests/test_ui_entry.py
+ rm -f deluge/tests/test_files_tab.py
+ rm -f deluge/tests/test_ui_gtk3.py
+ rm -f deluge/tests/test_web_api.py
+ rm -f deluge/tests/test_web_api.py
+ rm -f deluge/tests/test_webserver.py
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
2022-01-23 15:22 ` [PR PATCH] [Updated] " mobinmob
2022-01-23 15:58 ` mobinmob
@ 2022-01-23 15:59 ` mobinmob
2022-01-23 16:00 ` mobinmob
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-01-23 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#issuecomment-1019513856
Comment:
> * add a changelog - https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md+
Done.
> * deluge-gtk should depend on gtk+3
OK.
> * do_check() should be removed and ideally tests fixed or investigated (at least python3-mock, python3-gobject and gtk+3 are missing from checkdepends)
Most tests pass, I removed 5 scripts in _pre_check()_.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (2 preceding siblings ...)
2022-01-23 15:59 ` mobinmob
@ 2022-01-23 16:00 ` mobinmob
2022-01-23 21:29 ` [PR REVIEW] " paper42
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-01-23 16:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#issuecomment-1019513856
Comment:
> * add a changelog - https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md+
Done.
> * deluge-gtk should depend on gtk+3
OK.
> * do_check() should be removed and ideally tests fixed or investigated (at least python3-mock, python3-gobject and gtk+3 are missing from checkdepends)
Most tests pass, I removed 5 scripts in `pre_check()`.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (3 preceding siblings ...)
2022-01-23 16:00 ` mobinmob
@ 2022-01-23 21:29 ` paper42
2022-01-23 21:29 ` paper42
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-01-23 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#discussion_r790333330
Comment:
```suggestion
do_check() {
rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
xvfb-run python3 -m pytest
}
```
and add `xvfb-run cantarell-fonts` to `$checkdepends`
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (4 preceding siblings ...)
2022-01-23 21:29 ` [PR REVIEW] " paper42
@ 2022-01-23 21:29 ` paper42
2022-01-23 21:29 ` paper42
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-01-23 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#discussion_r790333342
Comment:
wrap at 80 columns
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (5 preceding siblings ...)
2022-01-23 21:29 ` paper42
@ 2022-01-23 21:29 ` paper42
2022-02-06 18:19 ` [PR PATCH] [Updated] " mobinmob
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-01-23 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#discussion_r790333375
Comment:
add quotes just for consistency
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (6 preceding siblings ...)
2022-01-23 21:29 ` paper42
@ 2022-02-06 18:19 ` mobinmob
2022-02-06 18:22 ` mobinmob
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-02-06 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5552 bytes --]
From c17de6a22910627bf07731523e83caf965138e95 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 23 ++++++-----
3 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..4d395042bc29 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
-build_style=python3-module
+version=2.0.5
+revision=1
+build_style="python3-module"
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
-checkdepends="python3-pytest $depends"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+do_check() {
+ rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+ xvfb-run python3 -m pytest
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (7 preceding siblings ...)
2022-02-06 18:19 ` [PR PATCH] [Updated] " mobinmob
@ 2022-02-06 18:22 ` mobinmob
2022-02-06 18:28 ` mobinmob
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-02-06 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5552 bytes --]
From c76f1658350c08a24443d80a3a1402f27e686c37 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 23 ++++++-----
3 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..4d395042bc29 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
-build_style=python3-module
+version=2.0.5
+revision=1
+build_style="python3-module"
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
-checkdepends="python3-pytest $depends"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+do_check() {
+ rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+ xvfb-run python3 -m pytest
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (8 preceding siblings ...)
2022-02-06 18:22 ` mobinmob
@ 2022-02-06 18:28 ` mobinmob
2022-02-08 22:36 ` [PR REVIEW] " paper42
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-02-06 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#issuecomment-1030887799
Comment:
@paper42 Commited the suggested changes, thanks. Still need to remove more test scripts. The test suite takes a **lot** of time on my system.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (9 preceding siblings ...)
2022-02-06 18:28 ` mobinmob
@ 2022-02-08 22:36 ` paper42
2022-02-08 22:38 ` paper42
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-02-08 22:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#discussion_r802117563
Comment:
```suggestion
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface"
```
All of them are installed as dependencies of dependencies, but it's much better to have them listed explicitly when they are listed in setup.py.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (10 preceding siblings ...)
2022-02-08 22:36 ` [PR REVIEW] " paper42
@ 2022-02-08 22:38 ` paper42
2022-03-18 15:46 ` [PR PATCH] [Updated] " mobinmob
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-02-08 22:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#discussion_r802118595
Comment:
I have no idea what I was thinking when I wrote this, it's the other way around, we have only 12 python3 packages with quotes and 1000 without. Sorry for the confusion.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (11 preceding siblings ...)
2022-02-08 22:38 ` paper42
@ 2022-03-18 15:46 ` mobinmob
2022-03-18 15:47 ` mobinmob
2022-03-20 21:48 ` [PR PATCH] [Merged]: " paper42
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-03-18 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages deluge
https://github.com/void-linux/void-packages/pull/35190
deluge: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deluge-35190.patch --]
[-- Type: text/x-diff, Size: 5606 bytes --]
From df8ecfe6a4f10a3a866b03a2d78e0ca11ba37727 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH] deluge: update to 2.0.5.
---
.../0001-Fix-warning-related-to-gettext.patch | 25 ------------
srcpkgs/deluge/patches/drop-priv.patch | 40 -------------------
srcpkgs/deluge/template | 23 ++++++-----
3 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
-
-- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
-
- libintl = None
---
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
- _file.write('%d\n' % os.getpid())
-
- if not common.windows_check():
-+ if options.group:
-+ if not options.group.isdigit():
-+ import grp
-+
-+ options.group = grp.getgrnam(options.group)[2]
-+ os.setgid(options.group)
- if options.user:
- if not options.user.isdigit():
- import pwd
-
- options.user = pwd.getpwnam(options.user)[2]
- os.setuid(options.user)
-- if options.group:
-- if not options.group.isdigit():
-- import grp
--
-- options.group = grp.getgrnam(options.group)[2]
-- os.setuid(options.group)
-
- return options
-
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..bdb186148072 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
# Template file for 'deluge'
pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
build_style=python3-module
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
- python3-Pillow"
-checkdepends="python3-pytest $depends"
+ python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
system_accounts="deluge"
deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
/var/lib/deluge/.config/deluge 0755 deluge deluge
"
-post_install() {
- vsv deluged
+do_check() {
+ rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+ xvfb-run python3 -m pytest
}
-do_check() {
- python3 -m pytest || : # fails
+post_install() {
+ vsv deluged
}
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
- depends="${sourcepkg}-${version}_${revision} python3-gobject"
+ depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
pkg_install() {
vmove usr/bin/deluge
vmove usr/bin/deluge-gtk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (12 preceding siblings ...)
2022-03-18 15:46 ` [PR PATCH] [Updated] " mobinmob
@ 2022-03-18 15:47 ` mobinmob
2022-03-20 21:48 ` [PR PATCH] [Merged]: " paper42
14 siblings, 0 replies; 16+ messages in thread
From: mobinmob @ 2022-03-18 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/35190#issuecomment-1072538123
Comment:
@paper42
Rebased on master and added the suggested fixes. Thanks :)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: deluge: update to 2.0.5.
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
` (13 preceding siblings ...)
2022-03-18 15:47 ` mobinmob
@ 2022-03-20 21:48 ` paper42
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2022-03-20 21:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
There's a merged pull request on the void-packages repository
deluge: update to 2.0.5.
https://github.com/void-linux/void-packages/pull/35190
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-03-20 21:48 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-23 9:54 [PR PATCH] deluge: update to 2.0.5 mobinmob
2022-01-23 15:22 ` [PR PATCH] [Updated] " mobinmob
2022-01-23 15:58 ` mobinmob
2022-01-23 15:59 ` mobinmob
2022-01-23 16:00 ` mobinmob
2022-01-23 21:29 ` [PR REVIEW] " paper42
2022-01-23 21:29 ` paper42
2022-01-23 21:29 ` paper42
2022-02-06 18:19 ` [PR PATCH] [Updated] " mobinmob
2022-02-06 18:22 ` mobinmob
2022-02-06 18:28 ` mobinmob
2022-02-08 22:36 ` [PR REVIEW] " paper42
2022-02-08 22:38 ` paper42
2022-03-18 15:46 ` [PR PATCH] [Updated] " mobinmob
2022-03-18 15:47 ` mobinmob
2022-03-20 21:48 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).