From patchwork Mon Dec 7 20:28:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 25640 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9C52B27BC01; Mon, 7 Dec 2020 20:29:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 134DC27BC00 for ; Mon, 7 Dec 2020 20:29:30 +0000 (GMT) Received: from localhost ([::1]:40180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmN8T-0005BE-0s for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 15:29:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmN82-0005Al-68 for guix-patches@gnu.org; Mon, 07 Dec 2020 15:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmN81-0001wE-UY for guix-patches@gnu.org; Mon, 07 Dec 2020 15:29:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmN81-0007RE-Ql for guix-patches@gnu.org; Mon, 07 Dec 2020 15:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45106] [PATCH] gnu: shadowsocks: Build against openssl. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 20:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45106@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160737293128572 (code B ref -1); Mon, 07 Dec 2020 20:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Dec 2020 20:28:51 +0000 Received: from localhost ([127.0.0.1]:55612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmN7n-0007Qj-JJ for submit@debbugs.gnu.org; Mon, 07 Dec 2020 15:28:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:34134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmN7l-0007Qb-QV for submit@debbugs.gnu.org; Mon, 07 Dec 2020 15:28:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmN7j-000536-9T for guix-patches@gnu.org; Mon, 07 Dec 2020 15:28:43 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:61217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmN7c-0001ip-EB for guix-patches@gnu.org; Mon, 07 Dec 2020 15:28:42 -0500 Received: from localhost.localdomain (217-149-166-73.nat.highway.telekom.at [217.149.166.73]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4CqZdR3VBCz3wYd for ; Mon, 7 Dec 2020 21:28:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1607372907; bh=oQDRLrMmyc83lRheVu08E+B4tfchez3YZoxe2SAjEp4=; h=From:To:Subject:Date; b=CkDY0rOQXzgPhFb9JUgZsNn8g0sjdODjg9VbqYgA3ta94qpASiQLPnR0Rv33x8mnJ k5EhDYPmfO+Wk+UhqAYxl9VRB/ID7bH77+rM6wdXMBsIWF9ndWzhnXTtO630OO5Edh bk2G0wZt7zbYfwNHQKR2KiPAtAjL9Fcz5BZXaUtY= From: Leo Prikler Date: Mon, 7 Dec 2020 21:28:18 +0100 Message-Id: <20201207202818.12122-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This patch allows shadowsocks to be used without supplying libopenssl in its configuration. See also https://unix.stackexchange.com/questions/623324/. * gnu/packages/networking.scm (shadowsocks)[inputs]: Add openssl. [#:phases]: Add patch-crypto-paths. --- gnu/packages/networking.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8a84c8476a..1f50c76962 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3024,6 +3024,19 @@ asynchronous model using a modern C++ approach.") (base32 "1idd9b4f2pnhcpk1bh030hqg5zq25gkwxd53xi3c0cj242w7sp2j")) (file-name (git-file-name name version)))) + (inputs + `(("openssl" ,openssl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-crypto-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "shadowsocks/shell.py" + (("config\\.get\\('libopenssl', None\\)") + (format #f "config.get('libopenssl', ~s)" + (string-append + (assoc-ref inputs "openssl") + "/lib/libssl.so")))))))))) (build-system python-build-system) (synopsis "Fast tunnel proxy that helps you bypass firewalls") (description