diff mbox series

[AUH] jack: upgrading to 2 SUCCEEDED

Message ID 0101018b96beca92-c23491b4-e265-48b6-826b-407851a8a508-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] jack: upgrading to 2 SUCCEEDED | expand

Commit Message

auh@yoctoproject.org Nov. 3, 2023, 7:52 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *jack* to *2* has Succeeded.

Next steps:
    - apply the patch: git am 0001-jack-upgrade-1.19.22-2.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From eef657c9b09e20176899189525b158e63b1405ae Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Fri, 3 Nov 2023 13:23:36 +0000
Subject: [PATCH] jack: upgrade 1.19.22 -> 2

---
 .../jack/{jack_1.19.22.bb => jack_2.bb}       | 63 +++++++++++++++++--
 1 file changed, 57 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-multimedia/jack/{jack_1.19.22.bb => jack_2.bb} (38%)

Comments

Peter Kjellerstedt Nov. 7, 2023, 7:04 a.m. UTC | #1
> -----Original Message-----
> From: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> On Behalf Of Auto Upgrade Helper
> Sent: den 3 november 2023 20:53
> To: Forced@yoctoproject.org; maintainer@yoctoproject.org; for@yoctoproject.org; AUH@yoctoproject.org
> Cc: openembedded-devel@lists.openembedded.org
> Subject: [oe] [AUH] jack: upgrading to 2 SUCCEEDED
> 
> Hello,
> 
> this email is a notification from the Auto Upgrade Helper
> that the automatic attempt to upgrade the recipe *jack* to *2* has
> Succeeded.
> 
> Next steps:
>     - apply the patch: git am 0001-jack-upgrade-1.19.22-2.patch
>     - check the changes to upstream patches and summarize them in the commit message,
>     - compile an image that contains the package
>     - perform some basic sanity tests
>     - amend the patch and sign it off: git commit -s --reset-author --amend
>     - send it to the appropriate mailing list
> 
> Alternatively, if you believe the recipe should not be upgraded at this time,
> you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
> automatic upgrades would no longer be attempted.
> 
> Please review the attached files for further information and build/update failures.
> Any problem please file a bug at
> https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
> 
> Regards,
> The Upgrade Helper
> 
> -- >8 --
> From eef657c9b09e20176899189525b158e63b1405ae Mon Sep 17 00:00:00 2001
> From: Upgrade Helper <auh@yoctoproject.org>
> Date: Fri, 3 Nov 2023 13:23:36 +0000
> Subject: [PATCH] jack: upgrade 1.19.22 -> 2
> 
> ---
>  .../jack/{jack_1.19.22.bb => jack_2.bb}       | 63 +++++++++++++++++--
>  1 file changed, 57 insertions(+), 6 deletions(-)
>  rename meta-oe/recipes-multimedia/jack/{jack_1.19.22.bb => jack_2.bb} (38%)
> 
> diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb b/meta-oe/recipes-multimedia/jack/jack_2.bb
> similarity index 38%
> rename from meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
> rename to meta-oe/recipes-multimedia/jack/jack_2.bb
> index ef9936dab..4b31be7b4 100644
> --- a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
> +++ b/meta-oe/recipes-multimedia/jack/jack_2.bb
> @@ -1,3 +1,55 @@
> +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
> +# The following is the difference between the old and the new license text.
> +# Please update the LICENSE value if needed, and summarize the changes in
> +# the commit message via 'License-Update:' tag.
> +# (example: 'License-Update: copyright years updated.')
> +#
> +# The changes:
> +#
> +# --- common/jack/control.h
> +# +++ common/jack/control.h
> +# @@ -1,20 +1,20 @@
> +# -/*
> +# -  JACK control API
> +# +/* JACK server control API */
> +# +/* SPDX-FileCopyrightText:  2008-2023 Nedko Arnaudov */
> +# +/* SPDX-FileCopyrightText:  2008-2023 Grame */
> +# +/* SPDX-License-Identifier: ( GPL-2.0-or-later OR LGPL-2.1-or-later OR MIT OR AFL-2.1 ) */
> +# +/**
> +# + * @file   jack/control.h
> +# + * @ingroup publicheader
> +# + * @brief  JACK control API
> +# + *
> +# + */
> +#
> +# -  Copyright (C) 2008 Nedko Arnaudov
> +# -  Copyright (C) 2008 GRAME
> +# +#ifndef JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
> +# +#define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
> +#
> +# -  This program is free software; you can redistribute it and/or modify
> +# -  it under the terms of the GNU General Public License as published by
> +# -  the Free Software Foundation; version 2 of the License.
> +# -
> +# -  This program is distributed in the hope that it will be useful,
> +# -  but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# -  GNU General Public License for more details.
> +# -
> +# -  You should have received a copy of the GNU General Public License
> +# -  along with this program; if not, write to the Free Software
> +# -  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> +# -
> +# -*/
> +# +#include <jack/types.h>
> +# +#include <jack/jslist.h>
> +# +#include <jack/systemdeps.h>
> +# +#if !defined(sun) && !defined(__sun__)
> +# +#include <stdbool.h>
> +# +#endif
> +#
> +#
> +
>  DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \
>  server for multi-processor machines. It is a new implementation of the \
>  JACK server core features that aims in removing some limitations of \
> @@ -7,15 +59,14 @@ been used to have a more dynamic and robust system."
>  SECTION = "libs/multimedia"
> 
>  LICENSE = "GPL-2.0-only & LGPL-2.1-only"
> -LIC_FILES_CHKSUM = " \
> -    file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \
> -    file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \
> -"
> +LIC_FILES_CHKSUM = "file://common/jack/control.h;beginline=2;endline=21;md5=9edb8b99b7a0dcd49dbf8741444f123d \
> +                    file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \
> +                    "
> 
>  DEPENDS = "libsamplerate0 libsndfile1"
> 
> -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https"
> -SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb"
> +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=develop;protocol=https"
> +SRCREV = "520dfa0ac5a72d292f5b9fc5835926f925129764"
> 
>  S = "${WORKDIR}/git"
> 
> --
> 2.39.2

AFAICT, this was integrated with additional modifications without sending 
the resulting commit for review to the list. That makes it hard to comment...

Anyway, in addition to the above, LICENSE was changed as:

-LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LICENSE = "GPL-2.0-or-later | LGPL-2.1-or-later | MIT | AFL-2.1"

and I am pretty sure that is not correct. Those licenses only apply to two 
files (control.h and JackControlAPI.h) out of the entire source code. I.e., 
while you can distribute those two files under any of those licenses, the 
rest of the code is (AFAICT) GPL and LGPL.

The licensing information for the whole work could definitely be better 
though. According to my analysis, most code is either GPL-2.0-or-later or 
LGPL-2.1-or-later, but there are a couple of GPL-2.0-only files too. And 
then there are a couple of files with the following in the header:

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License.

which makes it a bit hard to determine whether they meant to write "either
version 2 of the License, or (at your option) any later version." or if they 
were trying to remove the "or later" part and missed to remove the "either".

So, the correct LICENSE should be:

LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & (GPL-2.0-or-later | LGPL-2.1-or-later | MIT | AFL-2.1)"

However, after having done all of the above analysis, here comes the catch:
there is no version "2" of jack! AUH has mistakenly identified the tag 
"jack2-control-api-relicense-nedko" as version "2" and updated to the first 
commit on the develop branch (which, incidentally, is also the one that 
relicenses the two files mentioned above).

And here comes catch two: there is no version "1.19.22" either (which was the 
previous version of the recipe). The last version is actually 1.9.22. The 
recipe version was accidentally updated from 1.9.13 to 1.19.14 instead of 
1.9.14, and the mistake then lived on with the subsequent version updates.

I will send a patch to correct the above. However, whoever does the update 
to the next release after 1.9.22 needs to be vary of the license changes.
Thus I have added both common/JackControlAPI.cpp and common/JackControlAPI.h 
to LIC_FILES_CHKSUM, though even if they are identical in this release, with 
the next release, the license for common/JackControlAPI.h will change.

I will also send a bunch of other patches to correct other stuff that was 
incorrectly changed as a result of the AUH updates.

//Peter
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb b/meta-oe/recipes-multimedia/jack/jack_2.bb
similarity index 38%
rename from meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
rename to meta-oe/recipes-multimedia/jack/jack_2.bb
index ef9936dab..4b31be7b4 100644
--- a/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_2.bb
@@ -1,3 +1,55 @@ 
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- common/jack/control.h
+# +++ common/jack/control.h
+# @@ -1,20 +1,20 @@
+# -/*
+# -  JACK control API
+# +/* JACK server control API */
+# +/* SPDX-FileCopyrightText:  2008-2023 Nedko Arnaudov */
+# +/* SPDX-FileCopyrightText:  2008-2023 Grame */
+# +/* SPDX-License-Identifier: ( GPL-2.0-or-later OR LGPL-2.1-or-later OR MIT OR AFL-2.1 ) */
+# +/**
+# + * @file   jack/control.h
+# + * @ingroup publicheader
+# + * @brief  JACK control API
+# + *
+# + */
+#  
+# -  Copyright (C) 2008 Nedko Arnaudov
+# -  Copyright (C) 2008 GRAME
+# +#ifndef JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
+# +#define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
+#  
+# -  This program is free software; you can redistribute it and/or modify
+# -  it under the terms of the GNU General Public License as published by
+# -  the Free Software Foundation; version 2 of the License.
+# -
+# -  This program is distributed in the hope that it will be useful,
+# -  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# -  GNU General Public License for more details.
+# -
+# -  You should have received a copy of the GNU General Public License
+# -  along with this program; if not, write to the Free Software
+# -  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# -
+# -*/
+# +#include <jack/types.h>
+# +#include <jack/jslist.h>
+# +#include <jack/systemdeps.h>
+# +#if !defined(sun) && !defined(__sun__)
+# +#include <stdbool.h>
+# +#endif
+# 
+#
+
 DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \
 server for multi-processor machines. It is a new implementation of the \
 JACK server core features that aims in removing some limitations of \
@@ -7,15 +59,14 @@  been used to have a more dynamic and robust system."
 SECTION = "libs/multimedia"
 
 LICENSE = "GPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = " \
-    file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \
-    file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \
-"
+LIC_FILES_CHKSUM = "file://common/jack/control.h;beginline=2;endline=21;md5=9edb8b99b7a0dcd49dbf8741444f123d \
+                    file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \
+                    "
 
 DEPENDS = "libsamplerate0 libsndfile1"
 
-SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https"
-SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb"
+SRC_URI = "git://github.com/jackaudio/jack2.git;branch=develop;protocol=https"
+SRCREV = "520dfa0ac5a72d292f5b9fc5835926f925129764"
 
 S = "${WORKDIR}/git"