Accepting request 134899 from network:samba:STABLE

The PIE flags build fix merges back an older fix from a different branch
and therefore is placed at the particular position in time in the
package change log.

The same package content as this one got merged into openSUSE 12.2 as an
update.

The package change log is in chronological order.

The change dated from 'Wed Jun 13 10:23:35 UTC 2012' was merged from a
different repository.

The actual changes are:
- Ignore tdb run transaction expand check on ppc as well; (bnc#769268). 
- Build and link binaries with PIE flags.

OBS-URL: https://build.opensuse.org/request/show/134899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tdb?expand=0&rev=5
This commit is contained in:
Stephan Kulow 2012-09-23 19:15:49 +00:00 committed by Git OBS Bridge
commit 9aac9c1d7f
3 changed files with 48 additions and 1 deletions

40
build_pie.patch Normal file
View File

@ -0,0 +1,40 @@
Author: David Disseldorp <ddiss@samba.org>
Date: Wed Aug 15 18:33:08 CEST 2012
Build and link binaries with PIE flags.
Index: tdb-1.2.10/wscript
===================================================================
--- tdb-1.2.10.orig/wscript
+++ tdb-1.2.10/wscript
@@ -94,20 +94,27 @@ def build(bld):
bld.SAMBA_BINARY('tdbrestore',
'tools/tdbrestore.c',
- 'tdb', manpages='manpages/tdbrestore.8')
+ 'tdb',
+ cflags='-fPIE', ldflags='-pie',
+ manpages='manpages/tdbrestore.8')
bld.SAMBA_BINARY('tdbdump',
'tools/tdbdump.c',
- 'tdb', manpages='manpages/tdbdump.8')
+ 'tdb',
+ cflags='-fPIE', ldflags='-pie',
+ manpages='manpages/tdbdump.8')
bld.SAMBA_BINARY('tdbbackup',
'tools/tdbbackup.c',
'tdb',
+ cflags='-fPIE', ldflags='-pie',
manpages='manpages/tdbbackup.8')
bld.SAMBA_BINARY('tdbtool',
'tools/tdbtool.c',
- 'tdb', manpages='manpages/tdbtool.8')
+ 'tdb',
+ cflags='-fPIE', ldflags='-pie',
+ manpages='manpages/tdbtool.8')
# FIXME: This hardcoded list is stupid, stupid, stupid.
bld.SAMBA_SUBSYSTEM('tdb-test-helpers',

View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Sat Jul 7 15:42:23 UTC 2012 - dvaleev@suse.com
- Ignore tdb run transaction expand check on ppc as well
- Ignore tdb run transaction expand check on ppc as well; (bnc#769268).
-------------------------------------------------------------------
Thu Jun 28 21:19:51 UTC 2012 - lmuelle@suse.com
@ -13,6 +13,11 @@ Thu Jun 21 20:40:55 UTC 2012 - adrian@suse.de
- disable test suite on qemu emulated builds
-------------------------------------------------------------------
Wed Jun 13 10:23:35 UTC 2012 - ddiss@suse.com
- Build and link binaries with PIE flags.
-------------------------------------------------------------------
Tue Jun 5 12:08:57 UTC 2012 - lmuelle@suse.com

View File

@ -43,6 +43,7 @@ Source: http://download.samba.org/pub/tdb/tdb-%{version}.tar.gz
Source1: http://download.samba.org/pub/tdb/tdb-%{version}.tar.asc
Source4: baselibs.conf
Patch0: ignore-tdb1-run-transaction-expand.diff
Patch1: build_pie.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -118,6 +119,7 @@ This package contains the python bindings for the Tdb library.
%ifarch ppc ppc64
%patch0 -p1
%endif
%patch1 -p1
%build
%if 0%{?suse_version} && 0%{?suse_version} < 911