SPECS (RA-branch_general): kernel24.spec - merged from HEAD: nopck...
hawk
hawk at pld-linux.org
Fri Nov 25 15:45:54 CET 2005
Author: hawk Date: Fri Nov 25 14:45:54 2005 GMT
Module: SPECS Tag: RA-branch_general
---- Log message:
- merged from HEAD: nopckeyb, openswan 2.3.1, qla2xxx drivers update,
update to 2.4.32
- avm_cs is built on alpha
- atiixp patch is now really added
---- Files affected:
SPECS:
kernel24.spec (1.706.2.7.4.9 -> 1.706.2.7.4.10)
---- Diffs:
================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.706.2.7.4.9 SPECS/kernel24.spec:1.706.2.7.4.10
--- SPECS/kernel24.spec:1.706.2.7.4.9 Sat Jun 11 08:46:20 2005
+++ SPECS/kernel24.spec Fri Nov 25 15:45:49 2005
@@ -35,12 +35,12 @@
Summary(pl): Jądro Linuksa
Summary(pt_BR): Kernel Linux (a parte central do sistema operacional Linux)
Name: kernel24
-Version: 2.4.31
-Release: 1%{?with_um:um}
+Version: 2.4.32
+Release: 0.1%{?with_um:um}
License: GPL v2
Group: Base/Kernel
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{version}.tar.bz2
-# Source0-md5: bf6e3843ca122e3ad9ad28b94f4b8ed5
+# Source0-md5: 38f4d0830e95a20f4bfed17622d5557c
Source1: %{name}-autoconf.h
Source2: %{name}-BuildASM.sh
Source3: http://www.garloff.de/kurt/linux/dc395/dc395-141.tar.gz
@@ -80,10 +80,9 @@
Patch10: patch-cryptoloop-jari-2.4.22-rc2.0
# OpenS/WAN patches
-Patch12: http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz
-# adjusted from http://www.openswan.org/download/openswan-2.2.0.kernel-2.4-natt.patch.gz
-Patch13: openswan-2.2.0.kernel-2.4-natt.patch
-
+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
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
@@ -199,8 +198,9 @@
Patch265: linux-2.4.20-e820.patch
# Syntax bug
Patch270: dc395-tab.patch
-# from http://download.qlogic.com/drivers/24996/qla2x00-v7.03.00-dist.tgz, with hacked makefiles
-Patch275: linux-2.4-qla2xxx-7.03.00.patch.gz
+# http://www.qlogic.com/
+# from http://download.qlogic.com/drivers/30771/qla2x00-v7.05.00-dist.tgz, with hacked makefiles
+Patch275: linux-2.4-qla2xxx-7.05.00.patch.gz
# TV stuff from http://bytesex.org/
Patch301: 20_v4l2-2.4.26.diff.gz
@@ -219,8 +219,7 @@
Patch350: linux-2.4-aic79xx-20040522.patch.gz
# from http://www.promise.com/support/file/driver/st6000src_1.30_01_0326.tgz
-Patch360: linux-2.4.26-promise-st6000.patch.bz2
-
+Patch360: linux-2.4.26-promise-st6000.patch.bz2
# I18N stuff
# Adds a sysctl for controlling the default iocharset
@@ -313,6 +312,10 @@
# alloc c,10,63 for /dev/mapper/control
Patch1425: linux-2.4-static-dev.patch
+# "nopckeyb" option from http://linux.asio.pl/files/nopckeyb/nopckeyb-2.4.31.patch
+# useful for PC Engines WRAP
+Patch1427: linux-2.4.31-nopckeyb.patch
+
Patch2000: linux-PPC-SMP.patch
Patch2002: kernel-2.4.18-SPARC64-PLD.patch
Patch2003: linux-2.4.20-AXP-avma1_cs.patch
@@ -328,6 +331,7 @@
Patch3015: linux24-cx88-noswitch.patch
Patch3016: linux-2.4-ppc-asm.patch
Patch3017: linux-2.4-alpha-fixes.patch
+Patch3018: linux-2.4-atiixp.patch
# Security patches/fixes
@@ -335,7 +339,8 @@
# since we already have some of these fixes applied
#Patch3500: http://www.hardrock.org/kernel/current-updates/linux-2.4.24-updates.patch
Patch3600: linux-2.4-sysctl-empty.patch
-Patch4000: grsecurity-2.1.5-2.4.30-200504082027.patch
+# adapted from http://www.grsecurity.net/grsecurity-2.1.7-2.4.32-200511131857.patch.gz
+Patch4000: grsecurity-2.1.7-2.4.32-200511131857.patch
Patch4001: linux-2.4-grsecurity-norandombrk.patch
# dst cache overflow fixes
@@ -862,6 +867,7 @@
%patch1420 -p1
%patch1422 -p1
%patch1425 -p1
+%patch1427 -p1
%patch2000 -p0
%patch2002 -p1
@@ -884,6 +890,7 @@
%patch3015 -p1
#%patch3016 -p1
%patch3017 -p1
+%patch3018 -p1
# security fixes
@@ -1526,7 +1533,7 @@
%ifnarch sparc sparc64
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/isdn/hisax/*_cs.o*
%endif
-%ifarch %{ix86} amd64 ppc
+%ifarch %{ix86} amd64 alpha ppc
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/isdn/avmb1/avm_cs.o*
%endif
%ifarch %{ix86} amd64
@@ -1552,7 +1559,7 @@
/lib/modules/%{version}-%{release}/kernel/drivers/parport/*_cs.o*
/lib/modules/%{version}-%{release}/kernel/drivers/bluetooth/*_cs.o*
/lib/modules/%{version}-%{release}/kernel/drivers/isdn/hisax/*_cs.o*
-%ifarch %{ix86} amd64 ppc
+%ifarch %{ix86} amd64 alpha ppc
/lib/modules/%{version}-%{release}/kernel/drivers/isdn/avmb1/avm_cs.o*
%endif
%ifarch %{ix86} amd64
@@ -1598,7 +1605,7 @@
%ifnarch sparc sparc64
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/isdn/hisax/*_cs.o*
%endif
-%ifarch %{ix86} amd64 ppc
+%ifarch %{ix86} amd64 alpha ppc
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/isdn/avmb1/avm_cs.o*
%endif
%ifarch %{ix86} amd64
@@ -1624,7 +1631,7 @@
/lib/modules/%{version}-%{release}smp/kernel/drivers/parport/*_cs.o*
/lib/modules/%{version}-%{release}smp/kernel/drivers/bluetooth/dtl1_cs.o*
/lib/modules/%{version}-%{release}smp/kernel/drivers/isdn/hisax/*_cs.o*
-%ifarch %{ix86} amd64 ppc
+%ifarch %{ix86} amd64 alpha ppc
/lib/modules/%{version}-%{release}smp/kernel/drivers/isdn/avmb1/avm_cs.o*
%endif
%ifarch %{ix86} amd64
@@ -1701,6 +1708,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
+- avm_cs is built on alpha
+- atiixp patch is now really added
+
Revision 1.706.2.7.4.9 2005/06/11 06:46:20 hawk
- doh, updated Source0-md5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.706.2.7.4.9&r2=1.706.2.7.4.10&f=u
More information about the pld-cvs-commit
mailing list