packages: ipsec-tools/ipsec-tools.spec, ipsec-tools/ipsec-tools-gssapi.patc...

[baggins]

Author: baggins                      Date: Fri Jul  3 23:19:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- prevent multiple inclusions of gssapi.h

---- Files affected:
packages/ipsec-tools:
   ipsec-tools.spec (1.65 -> 1.66) , ipsec-tools-gssapi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ipsec-tools/ipsec-tools.spec
diff -u packages/ipsec-tools/ipsec-tools.spec:1.65 packages/ipsec-tools/ipsec-tools.spec:1.66
--- packages/ipsec-tools/ipsec-tools.spec:1.65	Fri Jul  3 00:28:33 2009
+++ packages/ipsec-tools/ipsec-tools.spec	Sat Jul  4 01:19:52 2009
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika dla linuksowej implementacji IPsec
 Name:		ipsec-tools
 Version:	0.7.2
-Release:	2
+Release:	3
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://dl.sourceforge.net/ipsec-tools/%{name}-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 URL:		http://ipsec-tools.sourceforge.net/
 # http://downloads.sourceforge.net/openhip/ipsec-tools-0.6.6-hip.patch
 Patch0:		%{name}-hip.patch
+Patch1:		%{name}-gssapi.patch
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
@@ -94,6 +95,7 @@
 %prep
 %setup -q
 %{?with_hip:%patch0 -p1}
+%patch1 -p1
 
 %{__sed} -i 's!@INCLUDE_GLIBC@!!g' src/Makefile.am
 %{__sed} -i 's/-Werror//' configure.ac
@@ -208,6 +210,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2009/07/03 23:19:52  baggins
+- rel 3
+- prevent multiple inclusions of gssapi.h
+
 Revision 1.65  2009/07/02 22:28:33  baggins
 - rel 2
 - switch to heimdal kerberos

================================================================
Index: packages/ipsec-tools/ipsec-tools-gssapi.patch
diff -u /dev/null packages/ipsec-tools/ipsec-tools-gssapi.patch:1.1
--- /dev/null	Sat Jul  4 01:19:58 2009
+++ packages/ipsec-tools/ipsec-tools-gssapi.patch	Sat Jul  4 01:19:52 2009
@@ -0,0 +1,18 @@
+--- ipsec-tools-0.7.2/src/racoon/gssapi.h~	2009-07-04 01:16:04.049366223 +0200
++++ ipsec-tools-0.7.2/src/racoon/gssapi.h	2009-07-04 01:17:57.694617899 +0200
+@@ -34,6 +34,9 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifndef __IPSEC_GSSAPI_H
++#define __IPSEC_GSSAPI_H
++
+ #ifdef __FreeBSD__
+ #include "/usr/include/gssapi.h"
+ #else
+@@ -89,3 +92,5 @@
+ void gssapi_free_state __P((struct ph1handle *));
+ vchar_t *gssapi_get_id __P((struct ph1handle *));
+ vchar_t *gssapi_get_default_gss_id __P((void));
++
++#endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipsec-tools/ipsec-tools.spec?r1=1.65&r2=1.66&f=u