From 87d4ab1fa532b41bdef7efab639958bd2c84856e Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Wed, 23 Feb 2011 14:05:06 -0800 Subject: [PATCH] Merge from trunk rev 1667: more adjustments to the libapparmor license headers. --- libraries/libapparmor/AUTHORS | 2 +- libraries/libapparmor/src/aalogparse.h | 6 ++--- libraries/libapparmor/src/apparmor.h | 5 ++++ libraries/libapparmor/src/change_hat.c | 5 ++++ libraries/libapparmor/src/grammar.y | 18 +++++++-------- libraries/libapparmor/src/libaalogparse.c | 6 ++--- .../libapparmor/src/libimmunix_warning.c | 23 ++++++++++++------- libraries/libapparmor/src/parser.h | 22 +++++++++--------- libraries/libapparmor/src/tst_aalogmisc.c | 17 ++++++++++++++ 9 files changed, 69 insertions(+), 35 deletions(-) diff --git a/libraries/libapparmor/AUTHORS b/libraries/libapparmor/AUTHORS index 7e97ff99a..87660c6d9 100644 --- a/libraries/libapparmor/AUTHORS +++ b/libraries/libapparmor/AUTHORS @@ -1,2 +1,2 @@ -Steve Beattie +Steve Beattie Matt Barringer diff --git a/libraries/libapparmor/src/aalogparse.h b/libraries/libapparmor/src/aalogparse.h index 1e23f7e26..ff04432eb 100644 --- a/libraries/libapparmor/src/aalogparse.h +++ b/libraries/libapparmor/src/aalogparse.h @@ -3,13 +3,13 @@ * 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. + * modify it under the terms of version 2.1 of the GNU Lesser 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. + * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . diff --git a/libraries/libapparmor/src/apparmor.h b/libraries/libapparmor/src/apparmor.h index c3f181a7b..5d7156022 100644 --- a/libraries/libapparmor/src/apparmor.h +++ b/libraries/libapparmor/src/apparmor.h @@ -6,6 +6,11 @@ * Lesser General Public License, version 2.1. Please see the file * COPYING.LGPL. * + * 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 program. If not, see . */ diff --git a/libraries/libapparmor/src/change_hat.c b/libraries/libapparmor/src/change_hat.c index 0df8a5544..781489e6b 100644 --- a/libraries/libapparmor/src/change_hat.c +++ b/libraries/libapparmor/src/change_hat.c @@ -6,6 +6,11 @@ * Lesser General Public License, version 2.1. Please see the file * COPYING.LGPL. * + * 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 program. If not, see . */ diff --git a/libraries/libapparmor/src/grammar.y b/libraries/libapparmor/src/grammar.y index ebcf8435b..7247d7887 100644 --- a/libraries/libapparmor/src/grammar.y +++ b/libraries/libapparmor/src/grammar.y @@ -1,15 +1,15 @@ /* - * Copyright (c) 1999-2008 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.1 of the GNU Lesser 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 Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . diff --git a/libraries/libapparmor/src/libaalogparse.c b/libraries/libapparmor/src/libaalogparse.c index 3abd13657..0688852d6 100644 --- a/libraries/libapparmor/src/libaalogparse.c +++ b/libraries/libapparmor/src/libaalogparse.c @@ -3,13 +3,13 @@ * 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. + * modify it under the terms of version 2.1 of the GNU Lesser 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. + * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . diff --git a/libraries/libapparmor/src/libimmunix_warning.c b/libraries/libapparmor/src/libimmunix_warning.c index bdedb2138..c48da9dbd 100644 --- a/libraries/libapparmor/src/libimmunix_warning.c +++ b/libraries/libapparmor/src/libimmunix_warning.c @@ -1,11 +1,18 @@ -/* $Id$ - - Copyright (c) 2006 Novell, Inc. (All rights reserved) - The libimmunix library is licensed under the terms of the GNU - Lesser General Public License, version 2.1. Please see the file - COPYING.LGPL. - -*/ +/* + * Copyright (c) 2006 Novell, Inc. (All rights reserved) + * + * The libimmunix library is licensed under the terms of the GNU + * Lesser General Public License, version 2.1. Please see the file + * COPYING.LGPL. + * + * 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ #include diff --git a/libraries/libapparmor/src/parser.h b/libraries/libapparmor/src/parser.h index 43da0c0b5..dcb6e5c91 100644 --- a/libraries/libapparmor/src/parser.h +++ b/libraries/libapparmor/src/parser.h @@ -1,18 +1,18 @@ /* - * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - * NOVELL (All rights reserved) + * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + * NOVELL (All rights reserved) * - * 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.1 of the GNU Lesser 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 Lesser 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 Lesser General Public License + * along with this program; if not, . */ diff --git a/libraries/libapparmor/src/tst_aalogmisc.c b/libraries/libapparmor/src/tst_aalogmisc.c index 3292dfd28..af8b000dc 100644 --- a/libraries/libapparmor/src/tst_aalogmisc.c +++ b/libraries/libapparmor/src/tst_aalogmisc.c @@ -1,3 +1,20 @@ +/* + * 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.1 of the GNU Lesser 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + #include #include #include