Accepting request 102658 from Base:System

- Fixed rpmlint warning - added -fpie and -pie to compilation and linking of consaver

OBS-URL: https://build.opensuse.org/request/show/102658
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2012-02-06 14:55:01 +00:00 committed by Git OBS Bridge
commit c9d60a8e2f
3 changed files with 23 additions and 6 deletions

12
mc-pie.patch Normal file
View File

@ -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

View File

@ -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 Wed Nov 23 09:28:21 UTC 2011 - coolo@suse.com

12
mc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package mc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,16 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: mc Name: mc
Summary: Midnight Commander Summary: Midnight Commander
License: GPL-2.0+
Group: Productivity/File utilities Group: Productivity/File utilities
License: GPLv2+
Url: http://www.midnight-commander.org/ Url: http://www.midnight-commander.org/
Version: 4.7.5.3 Version: 4.7.5.3
Release: 1 Release: 0
Source: mc-%{version}.tar.lzma Source: mc-%{version}.tar.lzma
Source1: x11_browser Source1: x11_browser
Source2: %{name}.desktop Source2: %{name}.desktop
@ -49,6 +46,8 @@ Patch41: mc-multi-press-f-keys.patch
# Patches from Fedora # Patches from Fedora
Patch50: mc-extensions.patch Patch50: mc-extensions.patch
Patch51: mc-mcviewsegfault.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: docbook-toys BuildRequires: docbook-toys
@ -115,6 +114,7 @@ target directory.
%patch41 %patch41
%patch50 %patch50
%patch51 %patch51
%patch52 -p1
pushd doc/hints pushd doc/hints
iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint