From 4dd2c1be5a412582cb314e42c69ed1c7bf135e1f44d27c870a2ccd716266cda0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 3 Feb 2012 09:21:26 +0000 Subject: [PATCH 1/2] Accepting request 102578 from home:dlovasko:branches:Base:System Fixed rpmlint warning - added -fpie and -pie to compilation and linking of consaver OBS-URL: https://build.opensuse.org/request/show/102578 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=33 --- mc-pie.patch | 12 ++++++++++++ mc.changes | 5 +++++ mc.spec | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mc-pie.patch diff --git a/mc-pie.patch b/mc-pie.patch new file mode 100644 index 0000000..764d8b3 --- /dev/null +++ b/mc-pie.patch @@ -0,0 +1,12 @@ +Index: mc-4.7.5.3/src/consaver/Makefile.am +=================================================================== +--- mc-4.7.5.3.orig/src/consaver/Makefile.am ++++ mc-4.7.5.3/src/consaver/Makefile.am +@@ -4,4 +4,6 @@ pkglibexec_PROGRAMS = cons.saver + + cons_saver_SOURCES = cons.saver.c + +-cons_saver_CFLAGS= -I$(top_srcdir) ++cons_saver_CFLAGS= -fpie -I$(top_srcdir) ++ ++cons_saver_LDFLAGS= -pie diff --git a/mc.changes b/mc.changes index 9886c36..d64a64e 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 3 09:00:29 UTC 2012 - dlovasko@suse.com + +- Fixed rpmlint warning - added -fpie and -pie to compilation and linking of consaver + ------------------------------------------------------------------- Wed Nov 23 09:28:21 UTC 2011 - coolo@suse.com diff --git a/mc.spec b/mc.spec index 24234f0..48f2e4b 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,8 @@ Patch41: mc-multi-press-f-keys.patch # Patches from Fedora Patch50: mc-extensions.patch Patch51: mc-mcviewsegfault.patch +#Patch adding -fpie and -pie to compilation and linking of setuid binaries +Patch52: mc-pie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audiofile-devel BuildRequires: docbook-toys @@ -115,6 +117,7 @@ target directory. %patch41 %patch50 %patch51 +%patch52 -p1 pushd doc/hints iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint From 21c1c458e00e334804ac572bc34a535e3f6382fddc8f2e4caf21f0e3d498a592 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 4 Feb 2012 09:38:23 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=34 --- mc.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mc.spec b/mc.spec index 48f2e4b..a583289 100644 --- a/mc.spec +++ b/mc.spec @@ -15,16 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: mc Summary: Midnight Commander +License: GPL-2.0+ Group: Productivity/File utilities -License: GPLv2+ Url: http://www.midnight-commander.org/ Version: 4.7.5.3 -Release: 1 +Release: 0 Source: mc-%{version}.tar.lzma Source1: x11_browser Source2: %{name}.desktop