From e72a036973f878eeb423e7cac210b2c375daad6c Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 29 Jun 2012 08:22:54 +0000 Subject: [PATCH 1/3] - move scripts malloc check scripts to separate subpackage for easier handling of the feature via patterns OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=370 --- aaa_base.changes | 6 ++++++ aaa_base.spec | 14 ++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 3c12646..d5d9e78 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 29 08:20:45 UTC 2012 - lnussel@suse.de + +- move scripts malloc check scripts to separate subpackage for easier handling + of the feature via patterns + ------------------------------------------------------------------- Mon Jun 25 09:03:20 CEST 2012 - vuntz@opensuse.org diff --git a/aaa_base.spec b/aaa_base.spec index 0b90e3b..74f2b4b 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -16,8 +16,6 @@ # -%bcond_with aaa_base_malloc_debug - Name: aaa_base Version: 12.2 Release: 0 @@ -84,10 +82,6 @@ make DESTDIR=$RPM_BUILD_ROOT install # make sure it does not creep in again test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 # -# for the release -%if !%{with aaa_base_malloc_debug} -rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* -%endif # # mark these as ghost for i in passwd group shadow gshadow ; do @@ -127,10 +121,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %config /etc/profile.d/csh.utf8 %config /etc/profile.d/lang.csh %config /etc/profile.d/lang.sh -%if %{with aaa_base_malloc_debug} -%config /etc/profile.d/malloc-debug.sh -%config /etc/profile.d/malloc-debug.csh -%endif %config /etc/profile.d/profile.csh %config /etc/profile.d/profile.sh %config /etc/profile.d/sh.ssh @@ -250,4 +240,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/share/man/man8/resolv+.8* /usr/share/man/man8/quick_halt.8* +%files malloccheck +%config /etc/profile.d/malloc-debug.sh +%config /etc/profile.d/malloc-debug.csh + %changelog From 44f6c572e3509709684106781e90a7fefc9c0468 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 29 Jun 2012 08:28:36 +0000 Subject: [PATCH 2/3] fix OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=371 --- aaa_base.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/aaa_base.spec b/aaa_base.spec index 74f2b4b..6dde629 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -61,6 +61,16 @@ The parts of aaa_base that should be installed by default but are not strictly required to run a system. (Shell aliases, bash completions and convenience hacks). +%package malloccheck +Summary: SUSE Linux Base Package (malloc checking) +Group: System/Fhs +Requires: %{name} = %{version} + +%description malloccheck +This package sets environment variables that enable stricter +malloc checks to catch potential heap corruptions. It's not +installed by default as it may abort programs. + %prep %setup -n aaa_base From 6d7e1bf4e47dd88d1505106994e8ab50b9dc2341 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 29 Jun 2012 09:03:06 +0000 Subject: [PATCH 3/3] reword OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=372 --- aaa_base.changes | 4 ++-- aaa_base.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index d5d9e78..00881e5 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Jun 29 08:20:45 UTC 2012 - lnussel@suse.de -- move scripts malloc check scripts to separate subpackage for easier handling - of the feature via patterns +- move environment settings for malloc checking to separate + subpackage for easier handling of the feature via patterns ------------------------------------------------------------------- Mon Jun 25 09:03:20 CEST 2012 - vuntz@opensuse.org diff --git a/aaa_base.spec b/aaa_base.spec index 6dde629..25d8123 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -69,7 +69,7 @@ Requires: %{name} = %{version} %description malloccheck This package sets environment variables that enable stricter malloc checks to catch potential heap corruptions. It's not -installed by default as it may abort programs. +installed by default as it may degrade performance. %prep %setup -n aaa_base