From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
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 IOLNNGPwql/4EgAA0tVLHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 10 Nov 2020 19:56:19 +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 yEeSMGPwql8AFAAAB5/wlQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 10 Nov 2020 19:56:19 +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 237FD940111
	for <larch@yhetil.org>; Tue, 10 Nov 2020 19:56:19 +0000 (UTC)
Received: from localhost ([::1]:43158 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1kcZkX-0001NR-S9
	for larch@yhetil.org; Tue, 10 Nov 2020 14:56:17 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:57936)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1kcZkI-0001MD-O4
 for guix-patches@gnu.org; Tue, 10 Nov 2020 14:56:02 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:55656)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1kcZkH-0003Vu-UF
 for guix-patches@gnu.org; Tue, 10 Nov 2020 14:56:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1kcZkH-0008Th-Tm
 for guix-patches@gnu.org; Tue, 10 Nov 2020 14:56:01 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#44258] Add Network UPS Tools
Resent-From: Marius Bakke <marius@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 10 Nov 2020 19:56:01 +0000
Resent-Message-ID: <handler.44258.B44258.160503815732578@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 44258
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti <anothersms@gmail.com>,
 44258@debbugs.gnu.org
Received: via spool by 44258-submit@debbugs.gnu.org id=B44258.160503815732578
 (code B ref 44258); Tue, 10 Nov 2020 19:56:01 +0000
Received: (at 44258) by debbugs.gnu.org; 10 Nov 2020 19:55:57 +0000
Received: from localhost ([127.0.0.1]:38969 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1kcZkD-0008TN-Ge
 for submit@debbugs.gnu.org; Tue, 10 Nov 2020 14:55:57 -0500
Received: from eggs.gnu.org ([209.51.188.92]:57756)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <marius@gnu.org>) id 1kcZkB-0008TB-3s
 for 44258@debbugs.gnu.org; Tue, 10 Nov 2020 14:55:55 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e]:39405)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <marius@gnu.org>)
 id 1kcZk5-0003V0-Q3; Tue, 10 Nov 2020 14:55:49 -0500
Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:50674
 helo=localhost)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <marius@gnu.org>)
 id 1kcZjx-0005gw-MQ; Tue, 10 Nov 2020 14:55:47 -0500
From: Marius Bakke <marius@gnu.org>
In-Reply-To: <87lffrmyvp.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me>
References: <87lffrmyvp.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me>
Date: Tue, 10 Nov 2020 20:55:39 +0100
Message-ID: <87h7pxdm10.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-Spam-Score: -1.3 (-)
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Scanner: ns3122888.ip-94-23-21.eu
Authentication-Results: aspmx1.migadu.com;
	dkim=none;
	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-Spam-Score: -3.61
X-TUID: ar8mumTLDYo0

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Nicol=C3=B2 Balzarotti <anothersms@gmail.com> writes:

> Hi guix!
> This patch adds Network UPS Tools (nut).

Cool!

[...]

>>>From 0e3a16eb19bc481d38edbe36c241ec4631cbdd33 Mon Sep 17 00:00:00 2001
> From: nixo <nicolo@nixo.xyz>
> Date: Tue, 27 Oct 2020 10:56:35 +0100
> Subject: [PATCH] gnu: Add nut.
>
> * gnu/packages/admin.scm (nut): New variable.

[...]
=20=20
> +(define-public nut
> +  (package
> +    (name "nut")
> +    (version "2.7.4")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri "https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz")

Avoid hard-coding versions in URLs.  You can use the version-major+minor
procedure to create that "2.7" URL component.

> +       (patches
> +        (list
> +         ;; OpenSSL 1.1 support
> +         (origin
> +           (method url-fetch)
> +           (uri (string-append "https://patch-diff.githubusercontent.com=
/raw/"
> +                               "networkupstools/nut/pull/504.patch"))
> +           (sha256
> +            (base32 "1dabbzlmb886qy39xjx6nxlfrzfkm99n48la1ip32zm3baal6qp=
h"))
> +           (file-name (string-append name "-openssl1.1")))))))

This got merged in 2017, and still not released!

Looking at the pull request[0], this URL is a squashed version of 7
commits.  While convenient, this trick has failed before due to subtle
changes in GitHub machinery, eventually leading to a hash mismatch[1].

Taking 7 patches directly is no fun either, so I wonder if we can just
stick with OpenSSL 1.0 for now?

[0] https://github.com/networkupstools/nut/pull/504
[1] commit 7670efefe4fb4aca12cb19ea5d89ff37c48e3ea6

> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags '("--with-all"
> +                           "--with-openssl"
> +                           ;; powerman is required (where is it hosted?)
> +                           "--without-powerman"

Can you elaborate on powerman being required?  Is the package not usable
without it?

> +                           ;; cgi requires libgd
> +                           "--without-cgi")

We do have libgd (in the 'gd' package).

> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'update-configure
> +           ;; required to apply the patch to the ./configure script
> +           (lambda _
> +             (invoke "autoconf"))))))

This may not be necessary due to the 'bootstrap' phase (but I haven't
verified).

> +    (native-inputs `(("autoconf" ,autoconf)
> +                     ("cppunit" ,cppunit)
> +                     ("pkg-config" ,pkg-config)))
> +    (inputs `(("avahi" ,avahi)
> +              ("libusb" ,libusb-compat)
> +              ("libltdl" ,libltdl)
> +              ("freeipmi" ,freeipmi)
> +              ("neon" ,neon)
> +              ("openssl" ,openssl)
> +              ("net-snmp" ,net-snmp)))

The indentation of these are a bit weird.  :-)

> +    (home-page "https://networkupstools.org")
> +    (license
> +     (list
> +      ;; - most files under gpl2+
> +      license:gpl2+
> +      ;; - scripts/python/ under gpl3+
> +      license:gpl3+
> +      ;; - scripts/perl/Nut.pm same as perl (either gpl1+ or artistic)
> +      license:gpl1+ license:artistic2.0))

Great job at listing licenses!

> +    (synopsis "Collection of programs for monitoring and administering U=
PS")
> +    (description "Network UPS Tools is a collection of programs which pr=
ovide
> +a common interface for monitoring and administering UPS, PDU and SCD har=
dware.
> +It uses a layered approach to connect all of the parts.  Drivers are pro=
vided
> +for a wide assortment of equipment.")))

Maybe add @acronym{UPS, Uninterruptible Power Supply},
@acronym{PDU, ...} etc, but no strong opinion.

Can you send an updated patch?

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl+q8DsPHG1hcml1c0Bn
bnUub3JnAAoJEKKgbfKjOlT6UtYH/AtjrjHebyz5YlGQhv4giwVK3illSb0fYfY+
nvzsdm/KqnbH6IORxCOosKDOz6RIZJXpeIjO/Y1d2xC3KalAcXXCis16zSo+cgu/
yaTwmez8QUXqcWZuBBrcW44W1xIIP1/4AYRtPi3YOdHdlmUCTJW45Jb4nSWuvHIc
gKMUamvqVrxSJ691tEL21I/gSqLynmUsgoMgCeHkkET3pZLVlmRrmNCWipUUYfIU
jWEEGz7Uoe7Jbd8scZU1iAcfEhrhXxikKf8hhUq5t30vRtlTzbc3MVqo+JBRUz0/
tFpMTVTKgB/agGtxNXMdJ4D2ifeVTdjGWiqxCLnBX1LUBuNrOy0=
=mfMe
-----END PGP SIGNATURE-----
--=-=-=--