RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2...@rpm5.org
  Module: rpm                              Date:   28-Sep-2009 17:17:08
  Branch: HEAD                             Handle: 2009092815170800

  Modified files:
    rpm                     configure.ac

  Log:
    rework security CFLAGS without autofu. Add also some other

  Summary:
    Revision    Changes     Path
    2.405       +6  -9      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.404 -r2.405 configure.ac
  --- rpm/configure.ac  28 Sep 2009 14:38:50 -0000      2.404
  +++ rpm/configure.ac  28 Sep 2009 15:17:08 -0000      2.405
  @@ -187,15 +187,12 @@
           fi
       fi
   ])
  -AC_ARG_ENABLE(build-optimization,
  -    AS_HELP_STRING([--enable-build-optimization], [build RPM instrumented 
for extra optimization/security (GCC only)]), [dnl
  -    if test ".$enableval" = .yes; then
  -        if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
  -            dnl # GNU GCC (usually "gcc")
  -            CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
  -        fi
  -    fi
  -])
  +dnl # build RPM instrumented for extra optimization/security (GCC only)
  +dnl # -fno-delete-null-pointer as the kernel does 
http://patchwork.kernel.org/patch/36060/
  +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
  +dnl # GNU GCC (usually "gcc")
  +    CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 
-fexceptions -fstack-protector"
  +fi
   AC_ARG_ENABLE(build-gcov,
       AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for 
gcov]), [dnl
       if test ".$enableval" = .yes; then
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to