From 098ff97edd83629eaee27975c235a35a87e81d4b Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 27 May 2021 17:49:02 +0200 Subject: [PATCH] drivers: Fix upekts/upek_proto license The (trivial) CRC code was copied from gstreamer. However, the license stated here was LGPLv2 rather than LGPLv2.1+. Identical code can currently be found upstream in gstreamer licensed under LGPLv2+. As such, update the license, making it more compatible with the rest of libfprint. Also add the "or any later version" to upekts.c. The library was already LGPL2.1+ at the time and libthinkfinger authors approved a license change. --- libfprint/drivers/upek_proto.c | 21 ++++++++++++--------- libfprint/drivers/upek_proto.h | 21 ++++++++++++--------- libfprint/drivers/upekts.c | 15 ++++++++------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/libfprint/drivers/upek_proto.c b/libfprint/drivers/upek_proto.c index 13c4d98..3bdb291 100644 --- a/libfprint/drivers/upek_proto.c +++ b/libfprint/drivers/upek_proto.c @@ -1,21 +1,24 @@ /* - * LGPL CRC code copied from GStreamer-0.10.10: + * Code copied from gstreamer-plugins-bad gst/gdp/dataprotocol.c + * * Copyright (C) <1999> Erik Walthinsen * Copyright (C) 2004,2006 Thomas Vander Stichele - - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version - * 2.1 of the License. + * Copyright (C) 2014 Tim-Philipp Müller * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of the + * License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ #include "upek_proto.h" diff --git a/libfprint/drivers/upek_proto.h b/libfprint/drivers/upek_proto.h index 9459748..b6ec126 100644 --- a/libfprint/drivers/upek_proto.h +++ b/libfprint/drivers/upek_proto.h @@ -1,21 +1,24 @@ /* - * LGPL CRC code copied from GStreamer-0.10.10: + * Code copied from gstreamer-plugins-bad gst/gdp/dataprotocol.c + * * Copyright (C) <1999> Erik Walthinsen * Copyright (C) 2004,2006 Thomas Vander Stichele - - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version - * 2.1 of the License. + * Copyright (C) 2014 Tim-Philipp Müller * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of the + * License, or (at your option) any later version. + * + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ #include diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c index cf02161..1f1b181 100644 --- a/libfprint/drivers/upekts.c +++ b/libfprint/drivers/upekts.c @@ -10,19 +10,20 @@ * Copyright (C) <1999> Erik Walthinsen * Copyright (C) 2004,2006 Thomas Vander Stichele - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version - * 2.1 of the License. + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of the + * License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ #define FP_COMPONENT "upekts"