[apparmor] [PATCH 2/6] Update licencing in libapparmor

[Seth Arnold]

Most of it looks good to me, but I think that we should replace
"contact Novell, Inc" with the following:

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

(Cut-n-pasted from http://www.gnu.org/licenses/gpl.html )

On Thu, Feb 17, 2011 at 5:22 PM, John Johansen
<john.johansen at canonical.com> wrote:
> Signed-off-by: John Johansen <john.johansen at canonical.com>
> ---
>  libraries/libapparmor/src/aalogparse.h    |   22 +++++++++++-----------
>  libraries/libapparmor/src/apparmor.h      |   20 +++++++++++---------
>  libraries/libapparmor/src/change_hat.c    |   14 +++++++-------
>  libraries/libapparmor/src/grammar.y       |    3 +--
>  libraries/libapparmor/src/libaalogparse.c |   23 +++++++++++------------
>  libraries/libapparmor/src/scanner.l       |   23 +++++++++++------------
>  6 files changed, 52 insertions(+), 53 deletions(-)
>
> diff --git a/libraries/libapparmor/src/aalogparse.h b/libraries/libapparmor/src/aalogparse.h
> index b60fc89..5ae2cbf 100644
> --- a/libraries/libapparmor/src/aalogparse.h
> +++ b/libraries/libapparmor/src/aalogparse.h
> @@ -1,18 +1,18 @@
>  /*
> - *   Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
> - *   NOVELL (All rights reserved)
> + * Copyright (c) 1999-2008 NOVELL (All rights reserved)
> + * Copyright 2009-2010 Canonical Ltd.
>  *
> - *   This program is free software; you can redistribute it and/or
> - *   modify it under the terms of version 2 of the GNU General Public
> - *   License published by the Free Software Foundation.
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of version 2 of the GNU General Public
> + * License published by the Free Software Foundation.
>  *
> - *   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.
> + * 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, contact Novell, Inc.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, contact Novell, Inc.
>  */
>
>
> diff --git a/libraries/libapparmor/src/apparmor.h b/libraries/libapparmor/src/apparmor.h
> index 07c2c19..abb4c8a 100644
> --- a/libraries/libapparmor/src/apparmor.h
> +++ b/libraries/libapparmor/src/apparmor.h
> @@ -1,19 +1,21 @@
>  /*
> -     Copyright (c) 2003-2007 Novell, Inc. (All rights reserved)
> -
> -     The libapparmor library is licensed under the terms of the GNU
> -     Lesser General Public License, version 2.1. Please see the file
> -     COPYING.LGPL.
> -*/
> + * Copyright (c) 2003-2008 Novell, Inc. (All rights reserved)
> + * Copyright 2009-2010 Canonical Ltd.
> + *
> + * The libapparmor library is licensed under the terms of the GNU
> + * Lesser General Public License, version 2.1. Please see the file
> + * COPYING.LGPL.
> + */
>
>  #ifndef _SYS_APPARMOR_H_
>  #define _SYS_APPARMOR_H        1
>
>  __BEGIN_DECLS
>
> -/* Prototype for change_hat as defined by the AppArmor project
> -   <http://forge.novell.com/modules/xfmod/project/?apparmor>
> -   Please see the change_hat(2) manpage for information. */
> +/* Prototypes for self directed domain transitions
> + * see <http://apparmor.net>
> + * Please see the change_hat(2) manpage for information.
> + */
>
>  #define change_hat(X, Y) aa_change_hat((X), (Y))
>  extern int (change_hat)(const char *subprofile, unsigned int magic_token);
> diff --git a/libraries/libapparmor/src/change_hat.c b/libraries/libapparmor/src/change_hat.c
> index 7a3f9c5..3f00376 100644
> --- a/libraries/libapparmor/src/change_hat.c
> +++ b/libraries/libapparmor/src/change_hat.c
> @@ -1,11 +1,11 @@
>  /*
> -     Copyright (c) 2003-2007 Novell, Inc. (All rights reserved)
> -
> -     The libapparmor library is licensed under the terms of the GNU
> -     Lesser General Public License, version 2.1. Please see the file
> -     COPYING.LGPL.
> -
> -*/
> + * Copyright (c) 2003-2008 Novell, Inc. (All rights reserved)
> + * Copyright 2009-2010 Canonical Ltd.
> + *
> + * The libapparmor library is licensed under the terms of the GNU
> + * Lesser General Public License, version 2.1. Please see the file
> + * COPYING.LGPL.
> + */
>
>  #include <stdlib.h>
>  #include <stdio.h>
> diff --git a/libraries/libapparmor/src/grammar.y b/libraries/libapparmor/src/grammar.y
> index 7b4bbe3..0fc29b9 100644
> --- a/libraries/libapparmor/src/grammar.y
> +++ b/libraries/libapparmor/src/grammar.y
> @@ -1,6 +1,5 @@
>  /*
> - *   Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
> - *   NOVELL (All rights reserved)
> + *   Copyright (c) 1999-2008 NOVELL (All rights reserved)
>  *   Copyright (c) 2010, Canonical, Ltd.
>  *
>  *   This program is free software; you can redistribute it and/or
> diff --git a/libraries/libapparmor/src/libaalogparse.c b/libraries/libapparmor/src/libaalogparse.c
> index 3852e11..086478e 100644
> --- a/libraries/libapparmor/src/libaalogparse.c
> +++ b/libraries/libapparmor/src/libaalogparse.c
> @@ -1,19 +1,18 @@
>  /*
> - *   Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
> - *   NOVELL (All rights reserved)
> + * Copyright (c) 1999-2008 NOVELL (All rights reserved)
> + * Copyright 2009-2010 Canonical Ltd.
>  *
> - *   This program is free software; you can redistribute it and/or
> - *   modify it under the terms of version 2 of the GNU General Public
> - *   License published by the Free Software Foundation.
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of version 2 of the GNU General Public
> + * License published by the Free Software Foundation.
>  *
> - *   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, contact Novell, Inc.
> + * 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, contact Novell, Inc.
>  */
>
>  /*
> diff --git a/libraries/libapparmor/src/scanner.l b/libraries/libapparmor/src/scanner.l
> index dc931cd..9c9b8f9 100644
> --- a/libraries/libapparmor/src/scanner.l
> +++ b/libraries/libapparmor/src/scanner.l
> @@ -1,19 +1,18 @@
>  /*
> - *   Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
> - *   NOVELL (All rights reserved)
> - *   Copyright (c) 2010, Canonical, Ltd.
> + * Copyright (c) 1999-2008 NOVELL (All rights reserved)
> + * Copyright (c) 2010, Canonical, Ltd.
>  *
> - *   This program is free software; you can redistribute it and/or
> - *   modify it under the terms of version 2 of the GNU General Public
> - *   License published by the Free Software Foundation.
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of version 2 of the GNU General Public
> + * License published by the Free Software Foundation.
>  *
> - *   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.
> + * 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, contact Novell, Inc.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, contact Novell, Inc.
>  */
>
>  %option noyywrap
> --
> 1.7.1
>
>
> --
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
>