From 8685e6ed5a7b5b7c2ffed0520b8edb8e420eda24 Mon Sep 17 00:00:00 2001 From: "Thomas B. Ruecker" Date: Fri, 5 Dec 2014 09:31:08 +0000 Subject: [PATCH] Explicitly license httpp log net thread and timing This change was ACKd by all authors and explicitly states the license to be LGPLv2 in all files to match COPYING. This removes ambiguity when using these files e.g. as part of libshout. For a list of authors, pease refer to the copyright headers of each file. --- httpp/httpp.c | 25 ++++++++++++++++++++++--- httpp/httpp.h | 24 +++++++++++++++++++++--- log/log.c | 25 +++++++++++++++++++++++-- log/log.h | 25 +++++++++++++++++++++++-- net/resolver.c | 30 ++++++++++++++++++------------ net/resolver.h | 28 +++++++++++++++++++++++----- net/sock.c | 30 ++++++++++++++++++------------ net/sock.h | 31 ++++++++++++++++++------------- thread/thread.c | 30 ++++++++++++++++++------------ thread/thread.h | 29 +++++++++++++++++------------ timing/timing.c | 30 +++++++++++++++++++++++++----- timing/timing.h | 29 ++++++++++++++++++++++++----- 12 files changed, 250 insertions(+), 86 deletions(-) diff --git a/httpp/httpp.c b/httpp/httpp.c index d65c00a..2363931 100644 --- a/httpp/httpp.c +++ b/httpp/httpp.c @@ -1,9 +1,28 @@ /* Httpp.c ** ** http parsing engine -** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. +** +** Copyright (C) 2014 Michael Smith , +** Ralph Giles , +** Ed "oddsock" Zaleski , +** Karl Heyes , +** Philipp "ph3-der-loewe" Schafft +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Library General Public +** License as published by the Free Software Foundation; either +** version 2 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 +** Library General Public License for more details. +** +** You should have received a copy of the GNU Library General Public +** License along with this library; if not, write to the +** Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +** Boston, MA 02110-1301, USA. +** */ #ifdef HAVE_CONFIG_H diff --git a/httpp/httpp.h b/httpp/httpp.h index 10abbd8..580fff4 100644 --- a/httpp/httpp.h +++ b/httpp/httpp.h @@ -1,9 +1,27 @@ /* httpp.h ** ** http parsing library -** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. +** +** Copyright (C) 2014 Michael Smith , +** Ralph Giles , +** Karl Heyes , +** Philipp "ph3-der-loewe" Schafft +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Library General Public +** License as published by the Free Software Foundation; either +** version 2 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 +** Library General Public License for more details. +** +** You should have received a copy of the GNU Library General Public +** License along with this library; if not, write to the +** Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +** Boston, MA 02110-1301, USA. +** */ #ifndef __HTTPP_H diff --git a/log/log.c b/log/log.c index 8987aac..29f2474 100644 --- a/log/log.c +++ b/log/log.c @@ -1,8 +1,29 @@ /* ** Logging framework. ** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. +** Copyright (C) 2014 Michael Smith , +** Ralph Giles , +** Ed "oddsock" Zaleski , +** Karl Heyes , +** Jack Moffitt , +** Philipp "ph3-der-loewe" Schafft , +** Thomas Ruecker +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Library General Public +** License as published by the Free Software Foundation; either +** version 2 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 +** Library General Public License for more details. +** +** You should have received a copy of the GNU Library General Public +** License along with this library; if not, write to the +** Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +** Boston, MA 02110-1301, USA. +** */ #ifdef HAVE_CONFIG_H diff --git a/log/log.h b/log/log.h index a7718f0..b5fd187 100644 --- a/log/log.h +++ b/log/log.h @@ -1,8 +1,29 @@ /* ** Logging framework. ** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. +** Copyright (C) 2014 Michael Smith , +** Ralph Giles , +** Ed "oddsock" Zaleski , +** Karl Heyes , +** Jack Moffitt , +** Philipp "ph3-der-loewe" Schafft , +** Thomas Ruecker +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Library General Public +** License as published by the Free Software Foundation; either +** version 2 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 +** Library General Public License for more details. +** +** You should have received a copy of the GNU Library General Public +** License along with this library; if not, write to the +** Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +** Boston, MA 02110-1301, USA. +** */ #ifndef __LOG_H__ diff --git a/net/resolver.c b/net/resolver.c index 8172578..f502082 100644 --- a/net/resolver.c +++ b/net/resolver.c @@ -1,21 +1,27 @@ /* * resolver.c - name resolver library * - * Copyright (C) 1999 the icecast team + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt , + * Philipp "ph3-der-loewe" Schafft * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 - * Library General Public License for more details. + * 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H #include diff --git a/net/resolver.h b/net/resolver.h index 6ed1a21..d4529ce 100644 --- a/net/resolver.h +++ b/net/resolver.h @@ -1,9 +1,27 @@ /* -** resolver.h -** -** name resolver library header -** -*/ + * resolver.h + * + * name resolver library header + * + * Copyright (C) 2014 Brendan Cully , + * Jack Moffitt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ #ifndef __RESOLVER_H #define __RESOLVER_H diff --git a/net/sock.c b/net/sock.c index beb5302..d9bc18e 100644 --- a/net/sock.c +++ b/net/sock.c @@ -1,21 +1,27 @@ /* -*- c-basic-offset: 4; -*- */ /* sock.c: General Socket Functions * - * Copyright (c) 1999 the icecast team + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt , + * Ed "oddsock" Zaleski * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 - * Library General Public License for more details. + * 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff --git a/net/sock.h b/net/sock.h index eb0e901..e0e3d4f 100644 --- a/net/sock.h +++ b/net/sock.h @@ -1,21 +1,26 @@ /* sock.h * - General Socket Function Headers * - * Copyright (c) 1999 the icecast team + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt , + * Ed "oddsock" Zaleski * - * 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, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * */ diff --git a/thread/thread.c b/thread/thread.c index e842448..b82af96 100644 --- a/thread/thread.c +++ b/thread/thread.c @@ -1,20 +1,26 @@ /* threads.c: Thread Abstraction Functions * - * Copyright (c) 1999, 2000 the icecast team + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt , + * Ed "oddsock" Zaleski * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 - * Library General Public License for more details. + * 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff --git a/thread/thread.h b/thread/thread.h index 9b50040..d2c3be3 100644 --- a/thread/thread.h +++ b/thread/thread.h @@ -1,21 +1,26 @@ /* thread.h * - Thread Abstraction Function Headers * - * Copyright (c) 1999, 2000 the icecast team + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 - * Library General Public License for more details. + * 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __THREAD_H__ diff --git a/timing/timing.c b/timing/timing.c index dd80231..9be67d5 100644 --- a/timing/timing.c +++ b/timing/timing.c @@ -1,9 +1,29 @@ /* timing.c -** - Timing functions -** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. -*/ + * - Timing functions + * + * Copyright (C) 2014 Michael Smith , + * Brendan Cully , + * Karl Heyes , + * Jack Moffitt , + * Ed "oddsock" Zaleski , + * Ralph Giles + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ #ifdef HAVE_CONFIG_H #include diff --git a/timing/timing.h b/timing/timing.h index 2ecd524..4ef88a0 100644 --- a/timing/timing.h +++ b/timing/timing.h @@ -1,9 +1,28 @@ /* -** Timing functions. -** -** This program is distributed under the GNU General Public License, version 2. -** A copy of this license is included with this source. -*/ + * Timing functions. + * + * Copyright (C) 2014 Michael Smith , + * Karl Heyes , + * Jack Moffitt , + * Moritz Grimm , + * Ralph Giles + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ #ifndef __TIMING_H__ #define __TIMING_H__