From 2c43a5f15581a385025ec8963fd1588a0aa8647d7b3c091fd16aae2e28c0c157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 12 Jul 2012 15:26:16 +0000 Subject: [PATCH 1/3] Add bnc reference to the package change log. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=23 --- tdb.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdb.changes b/tdb.changes index b68c994..8d52da7 100644 --- a/tdb.changes +++ b/tdb.changes @@ -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 From aecc9cf7fa6babad7baeebd6883f07fc083304f4907677bfa292d49d5e2405eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 15 Aug 2012 17:14:48 +0000 Subject: [PATCH 2/3] Build and link binaries with PIE flags. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=24 --- build_pie.patch | 35 +++++++++++++++++++++++++++++++++++ tdb.changes | 5 +++++ tdb.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 build_pie.patch diff --git a/build_pie.patch b/build_pie.patch new file mode 100644 index 0000000..900877f --- /dev/null +++ b/build_pie.patch @@ -0,0 +1,35 @@ +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', diff --git a/tdb.changes b/tdb.changes index 8d52da7..3d37b07 100644 --- a/tdb.changes +++ b/tdb.changes @@ -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 diff --git a/tdb.spec b/tdb.spec index 699bec6..08f2b84 100644 --- a/tdb.spec +++ b/tdb.spec @@ -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 From 1f16f92a120a9870a929f355bf994ffbdeb5f22627a99ca67bb703211f6c0e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 15 Aug 2012 18:25:16 +0000 Subject: [PATCH 3/3] Add patch header. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=25 --- build_pie.patch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_pie.patch b/build_pie.patch index 900877f..d3b749c 100644 --- a/build_pie.patch +++ b/build_pie.patch @@ -1,3 +1,8 @@ +Author: David Disseldorp +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