SPECS: openswan.spec - removed openswan-enable_des.patch - obsoleted in 2.6...

[mguevara]

Author: mguevara                     Date: Mon Apr 20 10:38:19 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed openswan-enable_des.patch - obsoleted in 2.6.x and replaced 
  by use of env variables USE_WEAKSTUFF (enables weak DH1) 
  and USE_NOCRYPTO (enables DES) so one can conect with a poor commercial 
  VPN box; also encountered some problems with parallel build.

---- Files affected:
SPECS:
   openswan.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/openswan.spec
diff -u SPECS/openswan.spec:1.38 SPECS/openswan.spec:1.39
--- SPECS/openswan.spec:1.38	Mon Apr 20 10:48:26 2009
+++ SPECS/openswan.spec	Mon Apr 20 12:38:13 2009
@@ -3,6 +3,9 @@
 # 32-bit tncfg and starter won't work on 64-bit kernels because of FUBAR ioctls
 # (only ifru_data pointer is supported in 32->64 conversion of SIOCDEVPRIV ioctl,
 #  but openswan puts some static data in structure there)
+#
+# crashes with "make -j8", builds fine with "make -j1"; enforce -j1 ???
+#
 Summary:	Open Source implementation of IPsec for the Linux operating system
 Summary(pl.UTF-8):	Otwarta implementacja IPseca dla systemu operacyjnego Linux
 Name:		openswan
@@ -16,7 +19,6 @@
 Source1:	%{name}.init
 Patch0:		%{name}-prefix.patch
 Patch1:		%{name}-bash.patch
-Patch2:		%{name}-enable_des.patch
 URL:		http://www.openswan.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -50,16 +52,17 @@
 %setup -q
 %patch0 -p1
 #%patch1 -p1
-#%patch2 -p1
 
 %{__sed} -i -e "s#/lib/ipsec#/%{_lib}/ipsec#g#" Makefile
 %{__sed} -i -e "s#/lib/freeswan$#/%{_lib}/freeswan#g#" Makefile
 %{__sed} -i -e "s#/lib/ipsec#/%{_lib}/ipsec#g#" Makefile.inc
 
 %build
-%{__make} programs \
-	CC="%{__cc}" \
-	USERCOMPILE="%{rpmcflags}"
+USE_WEAKSTUFF=true \
+USE_NOCRYPTO=true \
+	%{__make} programs \
+		CC="%{__cc}" \
+		USERCOMPILE="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +123,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2009/04/20 10:38:13  mguevara
+- removed openswan-enable_des.patch - obsoleted in 2.6.x and replaced
+  by use of env variables USE_WEAKSTUFF (enables weak DH1)
+  and USE_NOCRYPTO (enables DES) so one can conect with a poor commercial
+  VPN box; also encountered some problems with parallel build.
+
 Revision 1.38  2009/04/20 08:48:26  mguevara
 - up to 2.6.20
 - changes by Piotr 'peem' Gbyliczek <piotr.gbyliczek at wp.pl>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openswan.spec?r1=1.38&r2=1.39&f=u