From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH] gnu: Add xinetd.,Re: [PATCH] gnu: Add xinetd.
Date: Tue, 31 Jan 2017 15:10:22 -0500
Message-ID: <20170131201022.GF16979@jasmine>
References: <20170126.155536.1839657954470559729.post@thomasdanckaert.be>
	<20170126.160044.1577108644459704598.post@thomasdanckaert.be>
	<20170130223821.GB5172@jasmine>
	<20170131.084916.1061110240342484370.post@thomasdanckaert.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51920)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1cYel4-0001QW-Ab
	for guix-devel@gnu.org; Tue, 31 Jan 2017 15:10:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1cYekz-0001h3-C0
	for guix-devel@gnu.org; Tue, 31 Jan 2017 15:10:30 -0500
Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59604)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <leo@famulari.name>) id 1cYekz-0001gn-42
	for guix-devel@gnu.org; Tue, 31 Jan 2017 15:10:25 -0500
Content-Disposition: inline
In-Reply-To: <20170131.084916.1061110240342484370.post@thomasdanckaert.be>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Thomas Danckaert <post@thomasdanckaert.be>
Cc: guix-devel@gnu.org

On Tue, Jan 31, 2017 at 08:49:16AM +0100, Thomas Danckaert wrote:
> From: Leo Famulari <leo@famulari.name>
> I've added a patch that fixes a file descriptor leak (and created a pull
> request for it).  There's also a patch to fix compilation on hurd, but
> that's probably something that should be fixed upstream?

We will find out :)

> The other patches are corrections to the man pages, which have made it into
> upstream master as well, so perhaps we do not need to add them all to Guix.

Agreed.

> From 7a10feac4ec4035214a8fc212344aacec83bedc6 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert@gmail.com>
> Date: Thu, 26 Jan 2017 11:35:50 +0100
> Subject: [PATCH] gnu: Add xinetd.
> 
> * gnu/packages/web.scm (xinetd): New variable.
> * gnu/packages/patches/xinetd-CVE-2013-4342.patch: New file.
> * gnu/packages/patches/xinetd-fix-fd-leak.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add patches.

I pushed with the following changes.

I added more comments to the patch files. I think that patches should
include a link to upstream bug reports and upstream source, assuming
they exist.

> +    (license (l:non-copyleft "file://COPYRIGHT"))))

I changed the license to 'fsf-free', since the FSF does describe it as a
copyleft license:

https://www.gnu.org/licenses/license-list.en.html#xinetd

"This is a copyleft free software license, incompatible with the GPL.
It is incompatible because it places extra restrictions on
redistribution of modified versions that contradict the redistribution
requirements in the GPL."