SPECS (RA-branch_general): kernel24.spec - merged from HEAD: ip_co...

[hawk]

Author: hawk                         Date: Sun Dec  4 16:22:13 2005 GMT
Module: SPECS                         Tag: RA-branch_general
---- Log message:
- merged from HEAD: ip_conntrack_oracle-endian patch, openswan 2.4.4,
  i2c update to 2.9.2, sparc64 fixes
- release 0.2

---- Files affected:
SPECS:
   kernel24.spec (1.706.2.7.4.10 -> 1.706.2.7.4.11) 

---- Diffs:

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.706.2.7.4.10 SPECS/kernel24.spec:1.706.2.7.4.11
--- SPECS/kernel24.spec:1.706.2.7.4.10	Fri Nov 25 15:45:49 2005
+++ SPECS/kernel24.spec	Sun Dec  4 17:22:06 2005
@@ -25,7 +25,7 @@
 #
 %define		pre_version		%{nil}
 %define		netfilter_snap		20040302
-%define		i2c_version		2.9.1
+%define		i2c_version		2.9.2
 %define		drm_xfree_version	4.3.0
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -36,7 +36,7 @@
 Summary(pt_BR):	Kernel Linux (a parte central do sistema operacional Linux)
 Name:		kernel24
 Version:	2.4.32
-Release:	0.1%{?with_um:um}
+Release:	0.2%{?with_um:um}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{version}.tar.bz2
@@ -80,9 +80,9 @@
 Patch10:	patch-cryptoloop-jari-2.4.22-rc2.0
 
 # OpenS/WAN patches
-Patch12:	http://www.openswan.org/download/openswan-2.3.1.kernel-2.4-klips.patch.gz
-# adjusted from http://www.openswan.org/download/openswan-2.3.1.kernel-2.4-natt.patch.gz
-Patch13:	openswan-2.3.1.kernel-2.4-natt.patch
+Patch12:	http://www.openswan.org/download/openswan-2.4.4.kernel-2.4-klips.patch.gz
+# adjusted from http://www.openswan.org/download/openswan-2.4.4.kernel-2.4-natt.patch.gz
+Patch13:	openswan-2.4.4.kernel-2.4-natt.patch
 Patch15:	linux-2.4.25-sched-O1.patch
 # http://dl.sourceforge.net/user-mode-linux/uml-patch-2.4.27-1.bz2 updated for 2.4.29
 Patch20:	uml-patch-2.4.27-1
@@ -140,6 +140,7 @@
 # http://www.goldenhope.com.cn/source/050_conntrack_nat_oracle.patch
 Patch103:	050_conntrack_nat_oracle.patch
 Patch104:	%{name}-netfilter_pptp.patch
+Patch105:	linux-2.4-ip_conntrack_oracle-endian.patch
 
 # http://ebtables.sourceforge.net/
 Patch110:	ebtables-brnf-6_vs_2.4.26.diff.gz
@@ -191,8 +192,7 @@
 Patch240:	linux-2.4.20-ecc.patch
 # i2c - http://secure.netroedge.com/~lm78/
 # http://khali.linux-fr.org/devel/i2c/
-# http://khali.linux-fr.org/devel/i2c/linux-2.4.31/linux-2.4.31-i2c-2.9.1-drivers-i2c.diff
-Patch255:	linux-2.4.31-i2c-%{i2c_version}-drivers-i2c.diff
+Patch255:	http://khali.linux-fr.org/devel/i2c/linux-2.4.31/linux-2.4.31-i2c-%{i2c_version}-drivers-i2c.diff
 Patch256:	linux-2.4.21-i2c-headers.patch
 Patch257:	linux-2.4.21-i2c-sparc64.patch
 Patch265:	linux-2.4.20-e820.patch
@@ -324,7 +324,6 @@
 Patch3000:	linux-2.4.1-compilefailure.patch
 Patch3002:	linux-2.4.20-EXPORT_SYMBOL.patch
 Patch3003:	linux-2.4.20-missing-license-tags.patch
-Patch3010:	linux-2.4.21-ipsec-sparc64.patch
 Patch3011:	linux-2.4.22-gcc33-inline.patch
 Patch3013:	linux-2.4.23-ppc-symbols.patch
 Patch3014:	linux-2.4.26-fixes.patch
@@ -775,6 +774,7 @@
 %patch100 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 %patch110 -p1
 %patch120 -p1
 %patch101 -p1
@@ -880,10 +880,6 @@
 %patch3002 -p1
 %patch3003 -p1
 
-%ifarch sparc64
-%patch3010 -p1
-%endif
-
 %patch3011 -p1
 %patch3013 -p1
 %patch3014 -p1
@@ -1032,8 +1028,6 @@
 %ifarch sparc64
 	echo -e ',s/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g\n,w' | \
 		ed arch/%{base_arch}/defconfig
-	echo -e ',s/CONFIG_IPSEC_AUTH_HMAC_SHA1=y/# CONFIG_IPSEC_AUTH_HMAC_SHA1 is not set/g\n,w' | \
-		ed arch/%{base_arch}/defconfig
 %endif
 
 	if [ "$BOOT" = "yes" ] ; then
@@ -1274,8 +1268,6 @@
 %ifarch sparc64
 	echo -e ',s/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g\n,w' | \
 		ed .config
-	echo -e ',s/CONFIG_IPSEC_AUTH_HMAC_SHA1=y/# CONFIG_IPSEC_AUTH_HMAC_SHA1 is not set/g\n,w' | \
-		ed .config
 %endif
 
 %ifarch %{ix86}
@@ -1324,8 +1316,6 @@
 %ifarch sparc64
 	echo -e ',s/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g\n,w' | \
 		ed .config
-	echo -e ',s/CONFIG_IPSEC_AUTH_HMAC_SHA1=y/# CONFIG_IPSEC_AUTH_HMAC_SHA1 is not set/g\n,w' | \
-		ed .config
 %endif
 
 %ifarch %{ix86}
@@ -1708,6 +1698,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.706.2.7.4.11  2005/12/04 16:22:06  hawk
+- merged from HEAD: ip_conntrack_oracle-endian patch, openswan 2.4.4,
+  i2c update to 2.9.2, sparc64 fixes
+- release 0.2
+
 Revision 1.706.2.7.4.10  2005/11/25 14:45:49  hawk
 - merged from HEAD: nopckeyb, openswan 2.3.1, qla2xxx drivers update,
   update to 2.4.32
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.706.2.7.4.10&r2=1.706.2.7.4.11&f=u