GNU bug report logs -
#27784
[PATCH] gnu: quassel: Enable SSL
Previous Next
Reported by: Ryan Moe <ryan.moe <at> gmail.com>
Date: Fri, 21 Jul 2017 20:21:02 UTC
Severity: normal
Tags: patch
Done: Leo Famulari <leo <at> famulari.name>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 27784 in the body.
You can then email your comments to 27784 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#27784; Package
guix-patches.
(Fri, 21 Jul 2017 20:21:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Ryan Moe <ryan.moe <at> gmail.com>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Fri, 21 Jul 2017 20:21:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
This allows quasselclient to connect to SSL-enabled quasselcore
instances.
* gnu/packages/patches/quassel-fix-ssl-check.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/irc.scm (quassel)[arguments]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/irc.scm | 3 ++-
gnu/packages/patches/quassel-fix-ssl-check.patch | 21 +++++++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/quassel-fix-ssl-check.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6d9e57062..f1f343b86 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -984,6 +984,7 @@ dist_patch_DATA = \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
+ %D%/packages/patches/quassel-fix-ssl-check.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 011665d38..8bd877d28 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -68,7 +68,8 @@
version ".tar.bz2"))
(sha256
(base32
- "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))))
+ "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))
+ (patches (search-patches "quassel-fix-ssl-check.patch"))))
(build-system cmake-build-system)
(arguments
;; The three binaries are not mutually exlusive, and are all built
diff --git a/gnu/packages/patches/quassel-fix-ssl-check.patch b/gnu/packages/patches/quassel-fix-ssl-check.patch
new file mode 100644
index 000000000..f825cb77e
--- /dev/null
+++ b/gnu/packages/patches/quassel-fix-ssl-check.patch
@@ -0,0 +1,21 @@
+The check in qglobal.h requires -fPIC (not -fPIE as it
+is now). When this check fails SSL is disabled.
+
+This patch comes from upstream master and can be removed when
+the next version is packaged.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -428,6 +428,11 @@ endif()
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
++
++if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
++ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
++endif()
++
+ check_cxx_source_compiles("
+ #include \"qglobal.h\"
+ #if defined QT_NO_SSL
+
--
2.13.3
Information forwarded
to
guix-patches <at> gnu.org:
bug#27784; Package
guix-patches.
(Sat, 22 Jul 2017 12:38:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 27784 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hello!
Ryan Moe <ryan.moe <at> gmail.com> writes:
> This allows quasselclient to connect to SSL-enabled quasselcore
> instances.
>
> * gnu/packages/patches/quassel-fix-ssl-check.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/irc.scm (quassel)[arguments]: Use it.
[...]
> diff --git a/gnu/packages/patches/quassel-fix-ssl-check.patch b/gnu/packages/patches/quassel-fix-ssl-check.patch
> new file mode 100644
> index 000000000..f825cb77e
> --- /dev/null
> +++ b/gnu/packages/patches/quassel-fix-ssl-check.patch
> @@ -0,0 +1,21 @@
> +The check in qglobal.h requires -fPIC (not -fPIE as it
> +is now). When this check fails SSL is disabled.
> +
> +This patch comes from upstream master and can be removed when
> +the next version is packaged.
Can you add the URL to the relevant upstream commit? Apart from that
this LGTM.
Thanks!
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#27784; Package
guix-patches.
(Sat, 22 Jul 2017 17:24:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 27784 <at> debbugs.gnu.org (full text, mbox):
This allows quasselclient to connect to SSL-enabled quasselcore
instances.
* gnu/packages/patches/quassel-fix-ssl-check.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/irc.scm (quassel)[arguments]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/irc.scm | 3 ++-
gnu/packages/patches/quassel-fix-ssl-check.patch | 23 +++++++++++++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/quassel-fix-ssl-check.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6d9e57062..f1f343b86 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -984,6 +984,7 @@ dist_patch_DATA = \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
+ %D%/packages/patches/quassel-fix-ssl-check.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 011665d38..8bd877d28 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -68,7 +68,8 @@
version ".tar.bz2"))
(sha256
(base32
- "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))))
+ "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))
+ (patches (search-patches "quassel-fix-ssl-check.patch"))))
(build-system cmake-build-system)
(arguments
;; The three binaries are not mutually exlusive, and are all built
diff --git a/gnu/packages/patches/quassel-fix-ssl-check.patch b/gnu/packages/patches/quassel-fix-ssl-check.patch
new file mode 100644
index 000000000..14c57883f
--- /dev/null
+++ b/gnu/packages/patches/quassel-fix-ssl-check.patch
@@ -0,0 +1,23 @@
+The check in qglobal.h requires -fPIC (not -fPIE as it
+is now). When this check fails SSL is disabled.
+
+This patch comes from upstream master [0] and can be removed
+when the next version is packaged.
+
+[0] https://github.com/quassel/quassel/commit/4768c9e99
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -428,6 +428,11 @@ endif()
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
++
++if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
++ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
++endif()
++
+ check_cxx_source_compiles("
+ #include \"qglobal.h\"
+ #if defined QT_NO_SSL
+
--
2.13.3
Reply sent
to
Leo Famulari <leo <at> famulari.name>:
You have taken responsibility.
(Sun, 23 Jul 2017 00:09:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Ryan Moe <ryan.moe <at> gmail.com>:
bug acknowledged by developer.
(Sun, 23 Jul 2017 00:09:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 27784-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
On Sat, Jul 22, 2017 at 07:18:42AM -0700, Ryan Moe wrote:
Thanks for this updated patch! I pushed as
36378bd57ec31ba2bbedbdbdbd77b5b0f82f3b8a with the following changes:
I changed all mention of SSL to TLS, which is (optimistically) more
accurate nowadays since all the SSL protocols have been broken and
deprecated.
> This allows quasselclient to connect to SSL-enabled quasselcore
> instances.
I moved this comment into the patch.
> * gnu/packages/patches/quassel-fix-ssl-check.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/irc.scm (quassel)[arguments]: Use it.
s/arguments/source
> diff --git a/gnu/packages/patches/quassel-fix-ssl-check.patch b/gnu/packages/patches/quassel-fix-ssl-check.patch
> new file mode 100644
> index 000000000..14c57883f
> --- /dev/null
> +++ b/gnu/packages/patches/quassel-fix-ssl-check.patch
> @@ -0,0 +1,23 @@
> +The check in qglobal.h requires -fPIC (not -fPIE as it
> +is now). When this check fails SSL is disabled.
> +
> +This patch comes from upstream master [0] and can be removed
> +when the next version is packaged.
> +
> +[0] https://github.com/quassel/quassel/commit/4768c9e99
I used the full commit hash here.
Plus various stylistic and cosmetic changes.
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sun, 20 Aug 2017 11:24:04 GMT)
Full text and
rfc822 format available.
This bug report was last modified 7 years and 363 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.