OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jun-2006 22:56:09
Branch: HEAD Handle: 2006061721560900
Modified files:
openpkg-src/samhain samhain.patch samhain.spec
Log:
fix building under GCC 4.1 -fstack-protector
Summary:
Revision Changes Path
1.13 +14 -2 openpkg-src/samhain/samhain.patch
1.97 +2 -2 openpkg-src/samhain/samhain.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/samhain.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 samhain.patch
--- openpkg-src/samhain/samhain.patch 2 Nov 2004 11:52:54 -0000 1.12
+++ openpkg-src/samhain/samhain.patch 17 Jun 2006 20:56:09 -0000 1.13
@@ -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)
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/samhain.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 samhain.spec
--- openpkg-src/samhain/samhain.spec 16 Mar 2006 21:40:39 -0000 1.96
+++ openpkg-src/samhain/samhain.spec 17 Jun 2006 20:56:09 -0000 1.97
@@ -33,7 +33,7 @@
Group: System
License: GPL
Version: 2.1.3
-Release: 20060316
+Release: 20060617
# package options
%option with_fsl yes
@@ -47,7 +47,7 @@
# 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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
