Ver código fonte

fix building under GCC 4.1 -fstack-protector

Ralf S. Engelschall 19 anos atrás
pai
commit
34922278ba
2 arquivos alterados com 16 adições e 4 exclusões
  1. 14 2
      samhain/samhain.patch
  2. 2 2
      samhain/samhain.spec

+ 14 - 2
samhain/samhain.patch

@@ -1,6 +1,18 @@
+Index: Makefile.in
+--- Makefile.in.orig	2005-11-30 22:59:11 +0100
++++ Makefile.in	2006-06-17 22:54:09 +0200
+@@ -66,7 +66,7 @@
+ DEFS = $(DBGDEF) @DEFS@ -I. -I$(top_srcdir)/include
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS_TRY = @LIBS@
++LIBS_TRY = @LIBS@ -lssp
+ LIBS_SOCK = @sh_libsocket@
+ LIBS_KVM = @sh_libkvm@
+ CFLAGS = @CFLAGS@
 Index: src/sh_err_syslog.c
---- src/sh_err_syslog.c.orig	2004-10-07 07:52:44 +0200
-+++ src/sh_err_syslog.c	2004-11-02 12:47:15 +0100
+--- src/sh_err_syslog.c.orig	2005-04-24 21:50:26 +0200
++++ src/sh_err_syslog.c	2006-06-17 22:51:49 +0200
 @@ -167,7 +167,7 @@
    if (init == 0)
      {

+ 2 - 2
samhain/samhain.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        System
 License:      GPL
 Version:      2.1.3
-Release:      20060316
+Release:      20060617
 
 #   package options
 %option       with_fsl  yes
@@ -47,7 +47,7 @@ Patch0:       samhain.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc >= 4.1
 PreReq:       OpenPKG, openpkg >= 20040130
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl >= 1.2.0