From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yDq2GRQ+PGDDKAAA0tVLHw (envelope-from ) for ; Mon, 01 Mar 2021 01:06:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6AKRFRQ+PGCWUQAAB5/wlQ (envelope-from ) for ; Mon, 01 Mar 2021 01:06:28 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 56A88171D7 for ; Mon, 1 Mar 2021 02:06:27 +0100 (CET) Received: from localhost ([::1]:52414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGX10-0000Gz-Cj for larch@yhetil.org; Sun, 28 Feb 2021 20:06:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGX0c-0000Gr-BJ for guix-patches@gnu.org; Sun, 28 Feb 2021 20:06:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGX0c-0001V3-3S for guix-patches@gnu.org; Sun, 28 Feb 2021 20:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGX0b-0008PA-Ul for guix-patches@gnu.org; Sun, 28 Feb 2021 20:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46788] v2 References: <1696eb36-ffe5-18ce-81fa-7ddb87f486a7@raghavgururajan.name> In-Reply-To: <1696eb36-ffe5-18ce-81fa-7ddb87f486a7@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Mar 2021 01:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46788 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 46788@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 46788-submit@debbugs.gnu.org id=B46788.161456075632288 (code B ref 46788); Mon, 01 Mar 2021 01:06:01 +0000 Received: (at 46788) by debbugs.gnu.org; 1 Mar 2021 01:05:56 +0000 Received: from localhost ([127.0.0.1]:47610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGX0V-0008Oi-LW for submit@debbugs.gnu.org; Sun, 28 Feb 2021 20:05:55 -0500 Received: from out2.migadu.com ([188.165.223.204]:15228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGX0T-0008OX-23 for 46788@debbugs.gnu.org; Sun, 28 Feb 2021 20:05:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1614560751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=QL20G+yAkHnedv97fHzdCLIFnnc7kL154/diOGbZmno=; b=GnoILe4LpfZ6eBlv8EndhhD/QR4M6wDc5rSiHeKmfHZRzFcelNljkPJvKtdu9cHHkYfEqQ aBlvdWUNNk6lYxzOtjjsabkoYzoJWAH70GhVT7xoE4nzF9FKUpXRRWFo1eWOLE+9NH/7Ox r0SoLp+dQEJMJyuO+qv2PdPVeJsikBouAaA0Sz5/DG3iDfg4C0TsOKRYFANZ9bxWsgriQd EsRWFT4HjQPy2tsTZ1OKZzjIw+dPLhjceD5tVuyIoccTDsN+KYFpEKoi7TVXXM5Sn0p0Au nHRoSo0W4Wj0PG6tMqCJVLytLog8OB8mmG7OZDabX3wdphWMJ7ZnEWCnzyzZGg== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> Date: Sun, 28 Feb 2021 20:05:48 -0500 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="aZ2OqPt8yeBXBhmxyECuUQlrdqRsRuiH6" X-Migadu-Auth-User: rg@raghavgururajan.name 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1614560788; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=QL20G+yAkHnedv97fHzdCLIFnnc7kL154/diOGbZmno=; b=g8Jx9V7wRcyXwaSqQxhU2ZXdFTT6daTJMiYHXQaMvnxglnLemmNAnY5t3l1zDtmsnsjoKK erpxZoHKdVsq2tV32cjqTlON8DrGJoHvhUtziVUnoSc0KbcMQkgP1NkfoZJpHEpGPfnJxR ozISptp9D5JFbxtoEqTQvwb6FAEmz0cBJps06Mec8SBArdAqa5Pf/8198Rc116tT0AckCN Plr/6sP6PrUGiRyEsm5E/7vQt43gojCwMCPCgzWCdaMGrrpUMkZY2FMmyNuCh+Iyq8Eo1M BhCdHQRz/pX6HKrBEFqRMB7auo2OfuOZXRoXpX4fMIt1Ms2CUQ97WRu9Q1Bp+w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614560788; a=rsa-sha256; cv=none; b=MByFIDoEdQiT3I3Ke4Kvubxr88YZnN8NtgMhQ1njh6e7YtWtyp9GzIrmMzEu+6odbDGkDz gaO3z+ollYKWvJNhPlSTbcHeqD/AYKugT7xWuoWpAK8CF/dJc8TZeXuEIDvKxYd0hU7XdU pA8QPYUGbwc0Zq4sIaW1NWOQWmpemGxVWqFKHH7EzrwfDa68ocGvn/NRM8srVat1tYHQz9 Ux+9bXDGwy0J0oucflnRajY/E2mxqHifjVI9JhrTAATngcLfSprHfzCMEn5SPuBO5Ev+E8 6c/RsZQZDCbofwt/cFQ38A40Laz1uprY1+HEZGEVhr5ggIhW/HbZd89oKwdiyQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=GnoILe4L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.46 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=GnoILe4L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 56A88171D7 X-Spam-Score: -3.46 X-Migadu-Scanner: scn1.migadu.com X-TUID: QX6Pj6W7WczY This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aZ2OqPt8yeBXBhmxyECuUQlrdqRsRuiH6 Content-Type: multipart/mixed; boundary="Kk8GeCnofXRtlU4p6ZvdbjH2VEFCMQJYi"; protected-headers="v1" From: Raghav Gururajan To: 46788@debbugs.gnu.org Cc: Danny Milosavljevic Message-ID: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> Subject: v2 --Kk8GeCnofXRtlU4p6ZvdbjH2VEFCMQJYi Content-Type: multipart/mixed; boundary="------------4F142951032FCD27E7B41641" Content-Language: en-US This is a multi-part message in MIME format. --------------4F142951032FCD27E7B41641 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable --------------4F142951032FCD27E7B41641 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-qhttp.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-qhttp.patch" =46rom f8d6fd61db6ef36e67404108e8fb9cff6284ba6a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Feb 2021 19:45:04 -0500 Subject: [PATCH 2/5] gnu: Add qhttp. * gnu/packages/web.scm (qhttp): New variable. --- gnu/packages/web.scm | 78 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e4ba0d5bf9..05182de665 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -77,6 +77,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -170,6 +171,83 @@ #:use-module (gnu packages xml) #:use-module ((srfi srfi-1) #:select (delete-duplicates))) =20 +(define-public qhttp + (package + (name "qhttp") + (version "3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/azadkuh/qhttp.git") + (commit + (string-append "version-" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0cx23g4y4k4v9p5ph6h7gfhp8sfy1gcdv1g6bl44hppar1y0zfdq"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "commondir.pri" + (("\\$\\$PRJDIR/xbin") + (string-append (assoc-ref outputs "out") "/lib")) + (("-L") + "-lhttp_parser -L") + (("\\$\\$PRJDIR/3rdparty") + "")) + (substitute* "src/src.pro" + (("SOURCES \\+=3D \\$\\$PRJDIR/3rdparty/http-parser/http= _parser.c") + "") + (("HEADERS \\+=3D \\$\\$PRJDIR/3rdparty/http-parser/http= _parser.h") + "")) + (substitute* '("src/private/qhttpbase.hpp" "src/qhttpabstra= cts.cpp") + (("http-parser/http_parser.h") + "http_parser.h")) + #t)) + (replace 'configure + (lambda _ + (invoke "qmake") + #t)) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "include/qhttp" + #:include-regexp ("\\.hpp$"))) + args))) + (add-after 'install 'remove-examples + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/lib") + (for-each delete-file + (list + "basic-server" + "helloworld" + "postcollector"))) + #t))))) + (inputs + `(("http-parser" ,http-parser) + ("qtbase" ,qtbase))) + (synopsis "Qt-based HTTP Library") + (description "Qhttp is a light-weight and asynchronous HTTP library +(both server & client) in Qt5 and c++14.") + (home-page "https://github.com/azadkuh/qhttp/") + (license license:expat))) + (define-public httpd (package (name "httpd") --=20 2.30.1 --------------4F142951032FCD27E7B41641-- --Kk8GeCnofXRtlU4p6ZvdbjH2VEFCMQJYi-- --aZ2OqPt8yeBXBhmxyECuUQlrdqRsRuiH6 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDw97AUDAAAAAAAKCRBfWBZkf4vlUSDe AP9lokPeEf3Mn/8k50fQWdnnhwrEGbbOUJWt9mLTO/BQTwD9FG5RDwAtbeufebyyfshfdutAjWmH V26Yn5pRJ3K79A0= =Bdm6 -----END PGP SIGNATURE----- --aZ2OqPt8yeBXBhmxyECuUQlrdqRsRuiH6--