[apparmor] [patch] libapparmor - remove deprecated libimmunix

[John Johansen]

On 01/10/2013 12:04 PM, Steve Beattie wrote:
> As mentioned in an earlier thread, the libimmunix library is a
> historical artifact and has generated a deprecation warning when used to
> syslog for over 4 years. This patch removes it entirely from the
> libapparmor tree.
> 

Acked-by: John Johansen <john.johansen at canonical.com>

> ---
>  libraries/libapparmor/src/Makefile.am          |    5 ----
>  libraries/libapparmor/src/libimmunix_warning.c |   30 -------------------------
>  2 files changed, 1 insertion(+), 34 deletions(-)
> 
> Index: b/libraries/libapparmor/src/Makefile.am
> ===================================================================
> --- a/libraries/libapparmor/src/Makefile.am
> +++ b/libraries/libapparmor/src/Makefile.am
> @@ -43,16 +43,13 @@ changehat_HEADERS = apparmor.h
>  aalogparsedir = $(includedir)/aalogparse
>  aalogparse_HEADERS = aalogparse.h
>  
> -lib_LTLIBRARIES = libapparmor.la libimmunix.la
> +lib_LTLIBRARIES = libapparmor.la
>  noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h
>  
>  libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel_interface.c scanner.c
>  libapparmor_la_LDFLAGS = -version-info $(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic \
>  	-Wl,--version-script=$(top_srcdir)/src/libapparmor.map -Wl,-soname=libapparmor.so.1
>  
> -libimmunix_la_SOURCES = kernel_interface.c libimmunix_warning.c
> -libimmunix_la_LDFLAGS = -version-info $(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -Wl,--version-script=$(top_srcdir)/src/libapparmor.map -Wl,-soname=libimmunix.so.1
> -
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = libapparmor.pc
>  
> Index: b/libraries/libapparmor/src/libimmunix_warning.c
> ===================================================================
> --- a/libraries/libapparmor/src/libimmunix_warning.c
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/*
> - * 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 <http://www.gnu.org/licenses/>.
> - */
> -
> -#include <syslog.h>
> -
> -void __libimmunix_warning(void) __attribute__ ((constructor));
> -void __libimmunix_warning(void)
> -{
> -	extern const char *__progname; /* global from linux crt0 */
> -	openlog (__progname, LOG_PID|LOG_PERROR, LOG_USER);
> -	syslog(LOG_NOTICE,
> -			"%s links against libimmunix.so, which is deprecated. "
> -			"Please link against libapparmor instead\n",
> -			__progname);
> -	closelog();
> -
> -}
> 
> 
>