From 220fd3fa8538be268c863f014592c9d1348199de6fd983c991e15b1fbb25ca56 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 12 Feb 2011 10:44:10 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/aaa_base revision 262.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=8c570d52d13f74057aa5066770d5070a --- aaa_base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aaa_base.spec b/aaa_base.spec index aa55ef7..f7cb387 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 27 +Release: 28 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger From 057e6a86f36a29cbae61818d0dd14d8b9484c1c17d3bd9016ffa16fb852189ab Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 14 Feb 2011 13:15:26 +0000 Subject: [PATCH 2/3] - don't time out waiting for tmpfs (bnc#671468) OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=214 --- aaa_base.changes | 5 +++++ aaa_base.tar.bz2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 63fc0fd..92ca9da 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 14 13:12:11 UTC 2011 - lnussel@suse.de + +- don't time out waiting for tmpfs (bnc#671468) + ------------------------------------------------------------------- Fri Feb 11 18:39:04 CET 2011 - werner@suse.de diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 461b302..f4ad470 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26fb1ee885e68f4ee96406677b507266001b2f117b67baa2f6a1161b7265894c -size 82163 +oid sha256:f2dad652bf5613664c79a5a18e08959bad633c189f3819b381b810762b7683c9 +size 82211 From 3cf1116db1d7dd07527ad1737bc9cd19fde7bcc2b549a2dd8f6f955b55e95f2a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 14 Feb 2011 13:26:31 +0000 Subject: [PATCH 3/3] - make malloc checking configurable OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=215 --- aaa_base.changes | 3 ++- aaa_base.spec | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 92ca9da..20478e7 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Feb 14 13:12:11 UTC 2011 - lnussel@suse.de +Mon Feb 14 13:23:35 UTC 2011 - lnussel@suse.de - don't time out waiting for tmpfs (bnc#671468) +- make malloc checking configurable ------------------------------------------------------------------- Fri Feb 11 18:39:04 CET 2011 - werner@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index f7cb387..a0454b1 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -17,6 +17,7 @@ # norootforbuild +%bcond_with aaa_base_malloc_debug Name: aaa_base Version: 11.4 @@ -75,7 +76,9 @@ install -d -m 700 root test -d ../aaa_base/root/.gnupg && exit 1 cp -a ../aaa_base/* $RPM_BUILD_ROOT # for the release -#rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* +%if !%{with aaa_base_malloc_debug} +rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* +%endif cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do @@ -137,8 +140,10 @@ 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