Hello community,
here is the log from the commit of package apparmor-parser
checked in at Mon Aug 20 17:21:55 CEST 2007.
--------
--- apparmor-parser/apparmor-parser.changes 2007-08-06 18:16:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/apparmor-parser/apparmor-parser.changes 2007-08-20 05:40:36.873691000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 20 05:38:37 CEST 2007 - sbeattie@suse.de
+
+- disabled aaeventd initscript before uninstalling [#301418]
+- Fix double free bug
+
+-------------------------------------------------------------------
Old:
----
apparmor-parser-2.0.2-882.tar.gz
New:
----
apparmor-parser-2.1-936.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apparmor-parser.spec ++++++
--- /var/tmp/diff_new_pack.nS1474/_old 2007-08-20 17:19:36.000000000 +0200
+++ /var/tmp/diff_new_pack.nS1474/_new 2007-08-20 17:19:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package apparmor-parser (Version 2.0.2)
+# spec file for package apparmor-parser (Version 2.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,10 +23,10 @@
%define distro suse
%endif
Summary: AppArmor userlevel parser utility
-Version: 2.0.2
-Release: 40
+Version: 2.1
+Release: 1
Group: Productivity/Networking/Security
-Source0: %{name}-%{version}-882.tar.gz
+Source0: %{name}-%{version}-936.tar.gz
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -81,6 +81,7 @@
Authors:
--------
lcambell@novell.com
+ Seth Arnold
%prep
%setup -q
@@ -169,9 +170,11 @@
%preun
if [ "$1" = 0 ] ; then
%if %{distro} == "suse"
- /sbin/insserv -r boot.apparmor
+ %{stop_on_removal aaeventd}
+ %{stop_on_removal boot.apparmor}
%endif
%if %{distro} == "redhat" || %{distro} == "rhel4"
+ chkconfig --del aaeventd
chkconfig --del apparmor
%endif
fi
@@ -182,6 +185,9 @@
%endif
%changelog
+* Mon Aug 20 2007 - sbeattie@suse.de
+- disabled aaeventd initscript before uninstalling [#301418]
+- Fix double free bug
* Mon Aug 06 2007 - dreynolds@suse.de
- Added updated translations
- Fix turkish localization problem - patch
++++++ apparmor-parser-2.0.2-882.tar.gz -> apparmor-parser-2.1-936.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/apparmor-parser.spec new/apparmor-parser-2.1/apparmor-parser.spec
--- old/apparmor-parser-2.0.2/apparmor-parser.spec 2007-08-06 18:20:07.000000000 +0200
+++ new/apparmor-parser-2.1/apparmor-parser.spec 2007-08-20 06:44:27.000000000 +0200
@@ -33,10 +33,10 @@
Summary: AppArmor userlevel parser utility.
Name: apparmor-parser
-Version: 2.0.2
-Release: 882
+Version: 2.1
+Release: 936
Group: Applications/System
-Source0: %{name}-%{version}-882.tar.gz
+Source0: %{name}-%{version}-936.tar.gz
License: GPL
BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build
Url: http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -160,9 +160,11 @@
%preun
if [ "$1" = 0 ] ; then
%if %{distro} == "suse"
- /sbin/insserv -r boot.apparmor
+ %{stop_on_removal aaeventd}
+ %{stop_on_removal boot.apparmor}
%endif
%if %{distro} == "redhat" || %{distro} == "rhel4"
+ chkconfig --del aaeventd
chkconfig --del apparmor
%endif
fi
@@ -173,6 +175,8 @@
%endif
%changelog
+* Fri Aug 17 2007 - sbeattie@suse.de
+- disable aaeventd before uninstall [#301418]
* Fri Jul 27 2007 - sbeattie@suse.de
- Allow inverted character classes in unquoted pathnames
- Fix return code propogation in initscripts
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/apparmor-parser.spec.in new/apparmor-parser-2.1/apparmor-parser.spec.in
--- old/apparmor-parser-2.0.2/apparmor-parser.spec.in 2007-07-29 05:05:43.000000000 +0200
+++ new/apparmor-parser-2.1/apparmor-parser.spec.in 2007-08-20 06:43:32.000000000 +0200
@@ -160,9 +160,11 @@
%preun
if [ "$1" = 0 ] ; then
%if %{distro} == "suse"
- /sbin/insserv -r boot.apparmor
+ %{stop_on_removal aaeventd}
+ %{stop_on_removal boot.apparmor}
%endif
%if %{distro} == "redhat" || %{distro} == "rhel4"
+ chkconfig --del aaeventd
chkconfig --del apparmor
%endif
fi
@@ -173,6 +175,8 @@
%endif
%changelog
+* Fri Aug 17 2007 - sbeattie@suse.de
+- disable aaeventd before uninstall [#301418]
* Fri Jul 27 2007 - sbeattie@suse.de
- Allow inverted character classes in unquoted pathnames
- Fix return code propogation in initscripts
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/common/Make.rules new/apparmor-parser-2.1/common/Make.rules
--- old/apparmor-parser-2.0.2/common/Make.rules 2007-07-13 20:23:47.000000000 +0200
+++ new/apparmor-parser-2.1/common/Make.rules 2007-08-17 01:11:01.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Make.rules 633 2007-04-26 22:20:02Z steve-beattie $
+# $Id: Make.rules 927 2007-08-16 23:11:01Z steve-beattie $
# ------------------------------------------------------------------
#
# Copyright (C) 2002-2005 Novell/SUSE
@@ -25,7 +25,7 @@
# directories
DISTRIBUTION=AppArmor
-VERSION=2.0.2
+VERSION=2.1
# OVERRIDABLE variables
# Set these variables before including Make.rules to change its behavior
@@ -140,8 +140,10 @@
$(TAR) -f $@ $(RELEASE_DIR)
rm -rf $(RELEASE_DIR)
+ifndef OVERRIDE_TARBALL
.PHONY: tarball
tarball: clean $(TARBALL)
+endif
.PHONY: dist
dist: clean $(SPECFILE)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/Makefile new/apparmor-parser-2.1/Makefile
--- old/apparmor-parser-2.0.2/Makefile 2007-08-06 18:20:03.000000000 +0200
+++ new/apparmor-parser-2.1/Makefile 2007-08-06 21:48:26.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile 875 2007-08-02 16:19:36Z steve-beattie $
+# $Id: Makefile 886 2007-08-06 19:48:26Z DominicReynolds_ $
# ----------------------------------------------------------------------
# Copyright (c) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
# NOVELL (All rights reserved)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/parser_include.c new/apparmor-parser-2.1/parser_include.c
--- old/apparmor-parser-2.0.2/parser_include.c 2007-07-29 05:05:43.000000000 +0200
+++ new/apparmor-parser-2.1/parser_include.c 2007-08-15 23:24:58.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: parser_include.c 696 2007-05-24 23:07:39Z steve-beattie $ */
+/* $Id: parser_include.c 918 2007-08-15 21:24:58Z jrjohansen $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -359,15 +359,18 @@
if (*inc == '\"') {
buf = strdup(inc + 1);
- newf = fopen(buf, "r");
+ if (buf)
+ newf = fopen(buf, "r");
} else {
int i;
for (i = 0; i < npath; i++) {
- asprintf(&buf, "%s/%s", path[i], inc + 1);
- newf = fopen(buf, "r");
- if (newf)
- break;
- free(buf);
+ if (asprintf(&buf, "%s/%s", path[i], inc + 1) != -1) {
+ newf = fopen(buf, "r");
+ if (newf)
+ break;
+ free(buf);
+ }
+ buf = NULL;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-parser-2.0.2/rc.apparmor.functions new/apparmor-parser-2.1/rc.apparmor.functions
--- old/apparmor-parser-2.0.2/rc.apparmor.functions 2007-07-29 05:05:43.000000000 +0200
+++ new/apparmor-parser-2.1/rc.apparmor.functions 2007-08-14 22:19:59.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: rc.apparmor.functions 835 2007-07-27 22:31:10Z steve-beattie $
+# $Id: rc.apparmor.functions 908 2007-08-14 20:19:59Z steve-beattie $
#
# ----------------------------------------------------------------------
# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -101,6 +101,8 @@
# keep exit status from parser during profile load. 0 is good, 1 is bad
STATUS=0
+# This set of patterns to skip needs to be kept in sync with
+# SubDomain.pm::isSkippableFile()
skip_profile() {
local profile=$1
if [ "${profile%.rpmnew}" != "${profile}" -o \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org