[Pkg-gnutls-commits] r1686 - in /packages/p11-kit/branches/experimental/debian: changelog patches/relicense_buffer-code.diff patches/series
ametzler at users.alioth.debian.org
ametzler at users.alioth.debian.org
Sat Feb 16 14:00:00 UTC 2013
Author: ametzler
Date: Sat Feb 16 14:00:00 2013
New Revision: 1686
URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1686
Log:
relicense_buffer-code.diff (from upstream GIT), relicense two files
from GPLv2+ to to BSD.
Added:
packages/p11-kit/branches/experimental/debian/patches/relicense_buffer-code.diff
Modified:
packages/p11-kit/branches/experimental/debian/changelog
packages/p11-kit/branches/experimental/debian/patches/series
Modified: packages/p11-kit/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/changelog?rev=1686&op=diff
==============================================================================
--- packages/p11-kit/branches/experimental/debian/changelog (original)
+++ packages/p11-kit/branches/experimental/debian/changelog Sat Feb 16 14:00:00 2013
@@ -8,6 +8,8 @@
* Ship system trust policy module in p11-kit package.
* Enable (enable_locale.diff) and ship gettext translations.
Closes: #641994
+ * relicense_buffer-code.diff (from upstream GIT), relicense two files
+ from GPLv2+ to to BSD.
-- Andreas Metzler <ametzler at debian.org> Thu, 06 Sep 2012 19:40:17 +0200
Added: packages/p11-kit/branches/experimental/debian/patches/relicense_buffer-code.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/patches/relicense_buffer-code.diff?rev=1686&op=file
==============================================================================
--- packages/p11-kit/branches/experimental/debian/patches/relicense_buffer-code.diff (added)
+++ packages/p11-kit/branches/experimental/debian/patches/relicense_buffer-code.diff Sat Feb 16 14:00:00 2013
@@ -1,0 +1,146 @@
+From 380f457ce458e32f1ccc15acfa664df82629981f Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Tue, 12 Feb 2013 19:13:41 +0100
+Subject: [PATCH 1/2] Relicense the buffer code appropriate for inclusion in
+ p11-kit
+
+ * All original lines in this file upon arrival in the p11-kit
+ project were written by me, and copyright held by me.
+---
+ common/buffer.c | 57 +++++++++++++++++++++++++++++++++----------------------
+ common/buffer.h | 57 +++++++++++++++++++++++++++++++++----------------------
+ 2 files changed, 68 insertions(+), 46 deletions(-)
+
+diff --git a/common/buffer.c b/common/buffer.c
+index a91623e..dc46fcb 100644
+--- a/common/buffer.c
++++ b/common/buffer.c
+@@ -1,26 +1,37 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-/* buffer.c - Generic data buffer, used by openssh, gnome-keyring
+-
+- Copyright (C) 2007, 2012 Stefan Walter
+- Copyright (C) 2013 Red Hat Inc.
+-
+- The Gnome Keyring 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.
+-
+- The Gnome Keyring 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 the Gnome Library; see the file COPYING.LIB. If not,
+- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
+-
+- Author: Stef Walter <stef at thewalter.net>
+-*/
++/*
++ * Copyright (C) 2007, 2012 Stefan Walter
++ * Copyright (C) 2013 Red Hat Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * * Redistributions of source code must retain the above
++ * copyright notice, this list of conditions and the
++ * following disclaimer.
++ * * Redistributions in binary form must reproduce the
++ * above copyright notice, this list of conditions and
++ * the following disclaimer in the documentation and/or
++ * other materials provided with the distribution.
++ * * The names of contributors to this software may not be
++ * used to endorse or promote products derived from this
++ * software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
++ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ * Author: Stef Walter <stef at thewalter.net>
++ */
+
+ #include "config.h"
+
+diff --git a/common/buffer.h b/common/buffer.h
+index d5335f8..6a61083 100644
+--- a/common/buffer.h
++++ b/common/buffer.h
+@@ -1,26 +1,37 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-/* buffer.h - Generic data buffer, used by openssh, gnome-keyring
+-
+- Copyright (C) 2007, 2012 Stefan Walter
+- Copyright (C) 2012 Red Hat Inc.
+-
+- The Gnome Keyring 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.
+-
+- The Gnome Keyring 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 the Gnome Library; see the file COPYING.LIB. If not,
+- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
+-
+- Author: Stef Walter <stef at thewalter.net>
+-*/
++/*
++ * Copyright (C) 2007, 2012 Stefan Walter
++ * Copyright (C) 2012 Red Hat Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * * Redistributions of source code must retain the above
++ * copyright notice, this list of conditions and the
++ * following disclaimer.
++ * * Redistributions in binary form must reproduce the
++ * above copyright notice, this list of conditions and
++ * the following disclaimer in the documentation and/or
++ * other materials provided with the distribution.
++ * * The names of contributors to this software may not be
++ * used to endorse or promote products derived from this
++ * software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
++ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
++ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
++ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
++ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ * Author: Stef Walter <stef at thewalter.net>
++ */
+
+ #ifndef P11_BUFFER_H_
+ #define P11_BUFFER_H_
+--
+1.7.10.4
+
Modified: packages/p11-kit/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/patches/series?rev=1686&op=diff
==============================================================================
--- packages/p11-kit/branches/experimental/debian/patches/series (original)
+++ packages/p11-kit/branches/experimental/debian/patches/series Sat Feb 16 14:00:00 2013
@@ -1,1 +1,2 @@
enable_locale.diff
+relicense_buffer-code.diff
More information about the Pkg-gnutls-commits
mailing list