[meego-commits] 5767: Changes to Trunk/meego-rpm-config

[Anas Nashif]

Hi,
I have made the following changes to meego-rpm-config in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5767:

  submit:   Trunk:Testing/meego-rpm-config(r7) -> Trunk/meego-rpm-config


Message:
    Move to Trunk

State:   new          2010-07-15T01:52:28 nashif
Comment: None



changes files:
--------------
--- meego-rpm-config.changes
+++ meego-rpm-config.changes
@@ -0,0 +1,3 @@
+* Thu Jul 08 2010 Austin Zhang <austin.zhang at intel.com> - 0.7
+- Add global flags for security 
+

new:
----
  meego-rpm-config-correct-flags.patch

spec files:
-----------
--- meego-rpm-config.spec
+++ meego-rpm-config.spec
@@ -15,6 +15,7 @@
 URL:        http://meego.com
 Source0:    meego-rpm-config-%{version}.tar.bz2
 Source100:  meego-rpm-config.yaml
+Patch0:     meego-rpm-config-correct-flags.patch
 Provides:   moblin-rpm-config
 Obsoletes:   moblin-rpm-config =< 2.1.92-3.8
 
@@ -27,6 +28,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# meego-rpm-config-correct-flags.patch
+%patch0 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ meego-rpm-config-correct-flags.patch (new)
--- meego-rpm-config-correct-flags.patch
+++ meego-rpm-config-correct-flags.patch
+diff -Naurp meego-rpm-config-0.7-orig/macros meego-rpm-config-0.7/macros
+--- meego-rpm-config-0.7-orig/macros	2010-07-08 09:09:16.000000000 -0400
++++ meego-rpm-config-0.7/macros	2010-07-08 09:42:13.000000000 -0400
+@@ -256,7 +256,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex
+ %__find_provides        /usr/lib/rpm/meego/find-provides
+ %__find_requires        /usr/lib/rpm/meego/find-requires
+ 
+-%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
++%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Wl,-z,relro,-z,now
+ 
+ # Disable lookups
+ %_hkp_keyserver  %{nil}

++++++ meego-rpm-config.yaml
--- meego-rpm-config.yaml
+++ meego-rpm-config.yaml
@@ -8,7 +8,8 @@
 Sources:
     - meego-rpm-config-%{version}.tar.bz2
 Description: MeeGo specific rpm configuration files.
-
+Patches:
+    - meego-rpm-config-correct-flags.patch 
 Provides:
     - moblin-rpm-config
 Obsoletes: