From patchwork Sat Apr 3 15:20:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 28313 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 6954027BC65; Sat, 3 Apr 2021 16:26:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 E051227BC5A for ; Sat, 3 Apr 2021 16:26:09 +0100 (BST) Received: from localhost ([::1]:49034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSiA5-0005FT-3S for patchwork@mira.cbaines.net; Sat, 03 Apr 2021 11:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSi9y-0005E5-F4 for guix-patches@gnu.org; Sat, 03 Apr 2021 11:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSi9y-00044v-7d for guix-patches@gnu.org; Sat, 03 Apr 2021 11:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSi9y-00017W-3w for guix-patches@gnu.org; Sat, 03 Apr 2021 11:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47582] [PATCH 1/2] gnu: lksctp-tools: Fix build of include file. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Apr 2021 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47582@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16174635254261 (code B ref -1); Sat, 03 Apr 2021 15:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2021 15:25:25 +0000 Received: from localhost ([127.0.0.1]:34307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSi9M-00016e-Hz for submit@debbugs.gnu.org; Sat, 03 Apr 2021 11:25:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:50428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSi9J-00016S-LY for submit@debbugs.gnu.org; Sat, 03 Apr 2021 11:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSi9J-000514-Fc for guix-patches@gnu.org; Sat, 03 Apr 2021 11:25:21 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:35932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSi9G-0003V3-5x for guix-patches@gnu.org; Sat, 03 Apr 2021 11:25:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FCLGl67VYz1rwmn for ; Sat, 3 Apr 2021 17:21:03 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FCLGl60p6z1qqx5 for ; Sat, 3 Apr 2021 17:21:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id EczxDAyatj3h for ; Sat, 3 Apr 2021 17:21:02 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-58-114.dynamic.mnet-online.de [188.174.58.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Sat, 3 Apr 2021 17:21:02 +0200 (CEST) Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id E2245601A3; Sat, 3 Apr 2021 17:29:05 +0200 (CEST) From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:20:59 +0200 Message-Id: <7403e614931a4e0763650380cd0e0da4db4ec888.1617463189.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 MIME-Version: 1.0 Received-SPF: none client-ip=212.18.0.10; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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 * gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch: New file. * gnu/local.mk[patches]: Add it. * gnu/packages/networking.scm(/lksctp-tools)[source]: Use this patch. --- gnu/local.mk | 1 + gnu/packages/networking.scm | 2 ++ ...tp-tools-1.0.18-fix-header-file-name.patch | 32 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch diff --git a/gnu/local.mk b/gnu/local.mk index deb4ddcede..728c0fc718 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1264,6 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ + %D%/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7dd484fa94..a227cb2d3e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -448,6 +448,8 @@ performance across unpredictable networks, such as the Internet.") (url "https://github.com/sctp/lksctp-tools") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches + (search-patches "lksctp-tools-1.0.18-fix-header-file-name.patch")) (sha256 (base32 "1x4fwzrlzvfa3vcpja97m8w5g9ir2zrh4zs7zksminrnmdrs0dsr")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch new file mode 100644 index 0000000000..1ebe6c803d --- /dev/null +++ b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch @@ -0,0 +1,32 @@ +From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Fri, 24 Aug 2018 01:13:32 +0800 +Subject: [PATCH] build: fix netinet/sctp.h not to be installed + +After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can +no longer be installed into ${includedir}. + +Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already +added into configure.ac, there's no need to generate sctp.h by +automake. + +So we simply set libcnetinet_HEADERS back to sctp.h. + +Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") +Signed-off-by: Xin Long +Signed-off-by: Marcelo Ricardo Leitner +--- + src/include/netinet/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am +index ca0aac2..965db8c 100644 +--- a/src/include/netinet/Makefile.am ++++ b/src/include/netinet/Makefile.am +@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet + # API. + include_HEADERS = + +-libcnetinet_HEADERS = sctp.h.in +-BUILT_SOURCES = sctp.h ++libcnetinet_HEADERS = sctp.h From patchwork Sat Apr 3 15:28:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 28314 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 DEF0427BC65; Sat, 3 Apr 2021 16:29:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 A393627BC5A for ; Sat, 3 Apr 2021 16:29:09 +0100 (BST) Received: from localhost ([::1]:49748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSiCy-0005j1-Ss for patchwork@mira.cbaines.net; Sat, 03 Apr 2021 11:29:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSiCs-0005hE-DV for guix-patches@gnu.org; Sat, 03 Apr 2021 11:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSiCs-0005mX-60 for guix-patches@gnu.org; Sat, 03 Apr 2021 11:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSiCs-0001CD-3J for guix-patches@gnu.org; Sat, 03 Apr 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47582] [PATCH 2/2] gnu: Add python-pysctp. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Apr 2021 15:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47582@debbugs.gnu.org X-Debbugs-Original-To: 47582@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16174636884538 (code B ref -1); Sat, 03 Apr 2021 15:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2021 15:28:08 +0000 Received: from localhost ([127.0.0.1]:34316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSiC0-0001B8-Fs for submit@debbugs.gnu.org; Sat, 03 Apr 2021 11:28:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:51012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSiBz-0001Av-96 for submit@debbugs.gnu.org; Sat, 03 Apr 2021 11:28:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSiBz-0005Y2-3S for guix-patches@gnu.org; Sat, 03 Apr 2021 11:28:07 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:35118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSiBx-0005Bx-HU for guix-patches@gnu.org; Sat, 03 Apr 2021 11:28:06 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FCLQr21grz1qsbw; Sat, 3 Apr 2021 17:28:04 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FCLQr0RlYz1qqxB; Sat, 3 Apr 2021 17:28:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id tFvV8KoOzj77; Sat, 3 Apr 2021 17:28:03 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-58-114.dynamic.mnet-online.de [188.174.58.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sat, 3 Apr 2021 17:28:03 +0200 (CEST) Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id B0BBF60166; Sat, 3 Apr 2021 17:36:06 +0200 (CEST) From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:28:00 +0200 Message-Id: <35e212d90dd9d99a273e6c667cbd92b41b80219f.1617463189.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 In-Reply-To: <7403e614931a4e0763650380cd0e0da4db4ec888.1617463189.git.h.goebel@crazy-compilers.com> References: <7403e614931a4e0763650380cd0e0da4db4ec888.1617463189.git.h.goebel@crazy-compilers.com> MIME-Version: 1.0 Received-SPF: none client-ip=212.18.0.9; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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 * gnu/packages/networking.scm(python-pysctp): New variable. --- gnu/packages/networking.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a227cb2d3e..f8ab1bbddb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -473,6 +473,40 @@ sockets, and also some helper utilities around SCTP.") ;; Others. license:gpl2+)))) +(define-public python-pysctp +(package + (name "python-pysctp") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pysctp" version)) + (sha256 + (base32 "14h2qlmfi24bizhvvqkfqfa78pzm3911ibrzy9k94i97xy1978dy")))) + (build-system python-build-system) + (inputs + `(("lksctp-tools" ,lksctp-tools))) + (arguments + `(#:tests? #f ;; require network + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.py + (lambda _ + (substitute* "setup.py" + (("include_dirs\\s*=.*") + (string-append "include_dirs = ['.'] + '" + (getenv "C_INCLUDE_PATH") "'.split(':'),")) + (("library_dirs\\s*=.*") + (string-append "library_dirs = '" + (getenv "LIBRARY_PATH") "'.split(':'),"))) + #t))))) + (home-page "https://github.com/p1sec/pysctp") + (synopsis "Python module for the SCTP protocol stack and library") + (description + "@code{pysctp} implements the SCTP socket API. You need a SCTP-aware +kernel (most are).") + (license license:lgpl2.1+))) + (define-public knockd (package (name "knockd")