From 36b273ac9d96ad72bdd00cff3339c59b70404b4f85a9b56cb9ca01a227c9c22e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 9 Feb 2016 09:44:11 +0000 Subject: [PATCH 1/2] Accepting request 353918 from home:StefanBruens:branches:Base:System internal beecrypct lacks debug symbols, as the makefile strips -g from the compile flags OBS-URL: https://build.opensuse.org/request/show/353918 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=364 --- beecrypt-4.1.2-build.diff | 41 +++++++++++++++++++++++++++++++++++++++ python3-rpm.spec | 2 +- rpm-python.spec | 2 +- rpm.changes | 6 ++++++ rpm.spec | 6 ++++-- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 beecrypt-4.1.2-build.diff diff --git a/beecrypt-4.1.2-build.diff b/beecrypt-4.1.2-build.diff new file mode 100644 index 0000000..fd276e8 --- /dev/null +++ b/beecrypt-4.1.2-build.diff @@ -0,0 +1,41 @@ +--- + acinclude.m4 | 4 ++-- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: beecrypt-4.1.2/configure.ac +=================================================================== +--- beecrypt-4.1.2.orig/configure.ac ++++ beecrypt-4.1.2/configure.ac +@@ -1,8 +1,8 @@ + # Process this file with autoconf to produce a configure script. + + AC_INIT([beecrypt],[4.1.2],[bob.deblier@telenet.be]) +-AM_INIT_AUTOMAKE + AC_CANONICAL_TARGET ++AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR(beecrypt.h) + AC_CONFIG_HEADERS([config.h]) + +Index: beecrypt-4.1.2/acinclude.m4 +=================================================================== +--- beecrypt-4.1.2.orig/acinclude.m4 ++++ beecrypt-4.1.2/acinclude.m4 +@@ -459,7 +459,7 @@ AC_DEFUN([BEECRYPT_GNU_CC],[ + CFLAGS="$CFLAGS -Wall -pedantic" + else + # Generic optimizations, including cpu tuning +- BEECRYPT_CFLAGS_REM([-g]) ++ #BEECRYPT_CFLAGS_REM([-g]) + CFLAGS="$CFLAGS -DNDEBUG -fomit-frame-pointer" + if test "$bc_cv_c_aggressive_opt" = yes; then + case $bc_target_cpu in +@@ -571,7 +571,7 @@ AC_DEFUN([BEECRYPT_GNU_CXX],[ + CXXFLAGS="$CXXFLAGS -Wall -pedantic" + else + # Generic optimizations, including cpu tuning +- BEECRYPT_CXXFLAGS_REM([-g]) ++ #BEECRYPT_CXXFLAGS_REM([-g]) + CXXFLAGS="$CXXFLAGS -DNDEBUG" + if test "$bc_cv_c_aggressive_opt" = yes; then + case $bc_target_cpu in diff --git a/python3-rpm.spec b/python3-rpm.spec index 24e7bc9..5886323 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python3-rpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/rpm-python.spec b/rpm-python.spec index 0a4c513..868a500 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -1,7 +1,7 @@ # # spec file for package rpm-python # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/rpm.changes b/rpm.changes index 426a289..aec4bf7 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 15 19:20:15 UTC 2016 - stefan.bruens@rwth-aachen.de + +- make sure debug info is not stripped from internal beecrypt + (taken from libbeecrypt6 package) + ------------------------------------------------------------------- Sat Oct 17 10:34:53 UTC 2015 - schwab@linux-m68k.org diff --git a/rpm.spec b/rpm.spec index 034073f..506031f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,6 +62,7 @@ Source12: baselibs.conf Patch1: beecrypt-4.1.2.diff Patch2: db.diff Patch3: rpm-4.12.0.1-fix-bashisms.patch +Patch4: beecrypt-4.1.2-build.diff # quilt patches start here Patch11: debugedit.diff Patch13: ignore-auxv.diff @@ -217,6 +218,7 @@ chmod -R u+w db/* rm -f rpmdb/db.h %patch -P 1 %patch3 -p1 +%patch -P 4 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 @@ -224,7 +226,7 @@ rm -f rpmdb/db.h %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 85 +%patch -P 85 %patch -P 92 -P 93 -P 94 -P 95 -P 96 %patch97 -p1 %patch98 -p1 From ee30576c407a7264b3161dbf7835ec8fc3e975352472fa1eff67077c82f94055 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 29 Mar 2016 22:30:00 +0000 Subject: [PATCH 2/2] - add beecrypt-4.1.2-build.diff: * make sure debug info is not stripped from internal beecrypt OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=365 --- rpm.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm.changes b/rpm.changes index aec4bf7..d345406 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Jan 15 19:20:15 UTC 2016 - stefan.bruens@rwth-aachen.de -- make sure debug info is not stripped from internal beecrypt - (taken from libbeecrypt6 package) +- add beecrypt-4.1.2-build.diff: + * make sure debug info is not stripped from internal beecrypt ------------------------------------------------------------------- Sat Oct 17 10:34:53 UTC 2015 - schwab@linux-m68k.org