From owner-freebsd-questions@FreeBSD.ORG Fri May 17 23:49:34 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7BE5311B; Fri, 17 May 2013 23:49:34 +0000 (UTC) (envelope-from cliffyapp@gmail.com) Received: from mail-oa0-f48.google.com (mail-oa0-f48.google.com [209.85.219.48]) by mx1.freebsd.org (Postfix) with ESMTP id 4208E3E5; Fri, 17 May 2013 23:49:33 +0000 (UTC) Received: by mail-oa0-f48.google.com with SMTP id i4so5674717oah.7 for ; Fri, 17 May 2013 16:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=UkL8rVLkzpW4MZU/V6UC/FDWD67At0+g+y71LhT1EAI=; b=IfJnoQ+d+DDvdQBhbPcQuA+eOluHLHuKPYLAh7djpbxF/QgGF+tuiIRLCd9817lj7T G2g1ERyksZkmuQEg0z2hddjVu0IB1UcSZaTDzL1fAzEF20vsCBwzq+b3h5x/2/MWWTI6 EklWkdpMJtBoJtN5O1AO3n7JUbbqcjugpmdz8uCjYsEHl/xEZCSV9iIwQsEGL8GdpQGe 1tSOa8LswXky5qRvCooqzyRYuMZG8tdo4KH7V03+6NqbqdUvikmLQivotXd0R9fIhI4H keW5feHP+7FLWfLjeN+gcXWRbWIgd9tKdmDK98yKCzXTe8RWPMxz6xR1WqTPgXH/K/1I umgQ== MIME-Version: 1.0 X-Received: by 10.182.19.168 with SMTP id g8mr22727360obe.21.1368834573372; Fri, 17 May 2013 16:49:33 -0700 (PDT) Received: by 10.182.157.82 with HTTP; Fri, 17 May 2013 16:49:32 -0700 (PDT) Date: Fri, 17 May 2013 19:49:32 -0400 Message-ID: Subject: License on the original BSD diff From: Clifford Yapp To: freebsd-questions@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: des@freebsd.org X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 23:49:34 -0000 Looking at the original code for diff: http://svnweb.freebsd.org/csrg/usr.bin/diff/ The licensing that applies to it seems to be simply that of the standard BSD license: http://www.freebsd.org/copyright/license.html Is that correct? If so, what's the relationship between that code and the diff code currently in openbsd: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/diff/ The original commit in the openbsd tree by deraadt seems to indicate that the Caldera license is what made the code usable, but if the diffreg.c file was in the original BSD 4.4 lite release (diffing the original openBSD diffreg.c upload with the copy in csrg shows only the BSD header and one other line as differences) wouldn't the code already have been usable from the get-go without Caldera's say-so? The diffreg.c file in csrg shows a copyright of the Regents of the University of California, and doesn't mention Caldera at all. The issue is of some interest because the wiki page documenting candidates to replace GPL software in base list the OpenBSD copies of the diff tools: https://wiki.freebsd.org/GPLinBase The 4 clause BSD license that comes with the Caldera copyright is a problem when it comes to mixing and matching with (L)GPL code, which is one of my possible use cases, so I'm interested in whether the original diff in csrg can be regarded as licensed with the standard 3 clause license? If that is the case, is there a possibility that the changes made to OpenBSD's version could be re-applied starting with the 4.4BSD-lite copy as a base rather than the Caldera version to create a "modern" 3-clause BSD licensed diff? Apologies if this has been covered before in the process of the SoC projects, but if it was I haven't turned it up yet - any help appreciated. Thanks, CY