Author: cieciwa Date: Mon Sep 18 09:27:21 2006 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - updated to version 2.6.18-rc7, - _rel 0.0, - commented all patches, exepts tahoe and squashfs, - cutting Changelog.
---- Files affected: SPECS: kernel.spec (1.441.2.1613 -> 1.441.2.1614) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1613 SPECS/kernel.spec:1.441.2.1614 --- SPECS/kernel.spec:1.441.2.1613 Mon Sep 18 09:05:40 2006 +++ SPECS/kernel.spec Mon Sep 18 11:27:15 2006 @@ -94,7 +94,7 @@ %define _udev_ver 071 %define _mkvmlinuz_ver 1.3 -%define _rel 1 +%define _rel 0.0 %define _old_netfilter_snap 20060504 %define _netfilter_snap 20060829 @@ -117,18 +117,18 @@ Summary(fr): Le Kernel-Linux (La partie centrale du systeme) Summary(pl): JÄ…dro Linuksa Name: kernel%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU} -%define _basever 2.6.17 -%define _postver .13 -#define _postver %{nil} +%define _basever 2.6.18 +#define _postver .13 +%define _postver %{nil} Version: %{_basever}%{_postver} Release: %{_rel} Epoch: 3 License: GPL v2 Group: Base/Kernel -%define _rc %{nil} -#define _rc -rc5 -#Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2 -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2 +#define _rc %{nil} +%define _rc -rc7 +Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2 +#Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2 # Source0-md5: 37ddefe96625502161f075b9d907f21e %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2 @@ -136,14 +136,14 @@ %endif Source3: kernel-autoconf.h Source4: kernel-config.h -Source5: kernel-ppclibs.Makefile +#Source5: kernel-ppclibs.Makefile Source7: kernel-module-build.pl -Source10: http://suspend2.net/downloads/all/suspend2-%{suspend_version}-for-2.6.17.tar.bz2 +#Source10: http://suspend2.net/downloads/all/suspend2-%{suspend_version}-for-2.6.17.tar.bz2 # Source10-md5: 93c5fff0ce771cd547043db91718706f -Source12: ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.17/reiser4-for-2.6.17-3.patch.gz +#Source12: ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.17/reiser4-for-2.6.17-3.patch.gz # Source12-md5: 593c3296ddf40c5b116ee129781da341 -Source14: http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz +#Source14: http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz # Source14-md5: f2563a2d748c7480559e8d3ff77eb18a Source20: kernel-i386.config @@ -179,112 +179,112 @@ # PATA ports on SATA Promise controller; patch based on: # http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch # -Patch1: linux-2.6-sata-promise-pata-ports.patch +#Patch1: linux-2.6-sata-promise-pata-ports.patch # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch Patch2: tahoe9xx-2.6.11.5.patch # ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.15.diff -Patch3: bootsplash-3.1.6-2.6.15.diff +#Patch3: bootsplash-3.1.6-2.6.15.diff # http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.16.patch -Patch4: fbsplash-0.9.2-r5-2.6.16.patch -Patch5: linux-2.6-vesafb-tng.patch +#Patch4: fbsplash-0.9.2-r5-2.6.16.patch +#Patch5: linux-2.6-vesafb-tng.patch # directly from http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.0.tar.gz # from linux-2.6.15 Patch6: squashfs%{squashfs_version}-patch -Patch7: linux-alpha-isa.patch -Patch8: linux-fbcon-margins.patch -Patch9: linux-static-dev.patch +#Patch7: linux-alpha-isa.patch +#Patch8: linux-fbcon-margins.patch +#Patch9: linux-static-dev.patch # netfilter snap ## submitted ## base -Patch10: pom-ng-IPV4OPTSSTRIP-%{_old_netfilter_snap}.patch -Patch12: pom-ng-expire-%{_old_netfilter_snap}.patch -Patch13: pom-ng-fuzzy-%{_old_netfilter_snap}.patch -Patch14: pom-ng-ipv4options-%{_netfilter_snap}.patch -Patch15: pom-ng-nth-%{_old_netfilter_snap}.patch -Patch16: pom-ng-osf-%{_old_netfilter_snap}.patch -Patch17: pom-ng-psd-%{_old_netfilter_snap}.patch -Patch18: pom-ng-quota-%{_old_netfilter_snap}.patch -Patch19: pom-ng-random-%{_old_netfilter_snap}.patch -Patch20: pom-ng-set-%{_netfilter_snap}.patch -Patch22: pom-ng-u32-%{_netfilter_snap}.patch - +#Patch10: pom-ng-IPV4OPTSSTRIP-%{_old_netfilter_snap}.patch +#Patch12: pom-ng-expire-%{_old_netfilter_snap}.patch +#Patch13: pom-ng-fuzzy-%{_old_netfilter_snap}.patch +#Patch14: pom-ng-ipv4options-%{_netfilter_snap}.patch +#Patch15: pom-ng-nth-%{_old_netfilter_snap}.patch +#Patch16: pom-ng-osf-%{_old_netfilter_snap}.patch +#Patch17: pom-ng-psd-%{_old_netfilter_snap}.patch +#Patch18: pom-ng-quota-%{_old_netfilter_snap}.patch +#Patch19: pom-ng-random-%{_old_netfilter_snap}.patch +#Patch20: pom-ng-set-%{_netfilter_snap}.patch +#Patch22: pom-ng-u32-%{_netfilter_snap}.patch +# ## extra -Patch30: pom-ng-ACCOUNT-%{_old_netfilter_snap}.patch -Patch32: pom-ng-ROUTE-%{_netfilter_snap}.patch -Patch33: pom-ng-TARPIT-%{_old_netfilter_snap}.patch -Patch34: pom-ng-XOR-%{_old_netfilter_snap}.patch -Patch35: pom-ng-account-%{_old_netfilter_snap}.patch -Patch37: pom-ng-rpc-%{_old_netfilter_snap}.patch -Patch38: pom-ng-unclean-%{_old_netfilter_snap}.patch - - +#Patch30: pom-ng-ACCOUNT-%{_old_netfilter_snap}.patch +#Patch32: pom-ng-ROUTE-%{_netfilter_snap}.patch +#Patch33: pom-ng-TARPIT-%{_old_netfilter_snap}.patch +#Patch34: pom-ng-XOR-%{_old_netfilter_snap}.patch +#Patch35: pom-ng-account-%{_old_netfilter_snap}.patch +#Patch37: pom-ng-rpc-%{_old_netfilter_snap}.patch +#Patch38: pom-ng-unclean-%{_old_netfilter_snap}.patch +# +# ##external -Patch40: pom-ng-IPMARK-%{_netfilter_snap}.patch -Patch41: pom-ng-condition-%{_netfilter_snap}.patch -Patch42: pom-ng-connlimit-%{_netfilter_snap}.patch -Patch43: pom-ng-ipp2p-%{_netfilter_snap}.patch -Patch44: pom-ng-time-%{_netfilter_snap}.patch - +#Patch40: pom-ng-IPMARK-%{_netfilter_snap}.patch +#Patch41: pom-ng-condition-%{_netfilter_snap}.patch +#Patch42: pom-ng-connlimit-%{_netfilter_snap}.patch +#Patch43: pom-ng-ipp2p-%{_netfilter_snap}.patch +#Patch44: pom-ng-time-%{_netfilter_snap}.patch +# ### # End netfilter ### # from http://www.linuximq.net/patchs/linux-2.6.16-imq2.diff -Patch50: linux-2.6.16-imq2.diff +#Patch50: linux-2.6.16-imq2.diff # from http://bluetooth-alsa.sourceforge.net/sco-mtu.patch -Patch51: sco-mtu.patch +#Patch51: sco-mtu.patch # decode OEM Strings -Patch52: linux-dmi-decode-and-save-oem-string-information.patch +#Patch52: linux-dmi-decode-and-save-oem-string-information.patch # esfq # from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch -Patch53: esfq-kernel.patch +#Patch53: esfq-kernel.patch -Patch54: linux-iforce-trust_ffrm.patch +#Patch54: linux-iforce-trust_ffrm.patch # by Baggins request: # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs -Patch55: linux-2.6-atm-vbr.patch -Patch56: linux-2.6-atmdd.patch +#Patch55: linux-2.6-atm-vbr.patch +#Patch56: linux-2.6-atmdd.patch -Patch57: linux-2.6-cpuset_virtualization.patch +#Patch57: linux-2.6-cpuset_virtualization.patch # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_32.tar.bz2 -Patch60: linux-2.6-sk98lin-8.32.2.3.patch +#Patch60: linux-2.6-sk98lin-8.32.2.3.patch -Patch70: linux-2.6-suspend2-avoid-redef.patch -Patch71: linux-2.6-suspend2-page.patch +#Patch70: linux-2.6-suspend2-avoid-redef.patch +#Patch71: linux-2.6-suspend2-page.patch # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.17.11-vs2.1.1-rc31.diff -Patch100: linux-2.6-vs2.1.patch -Patch101: linux-2.6-vs2.1-suspend2.patch -Patch102: linux-2.6-vs2.1-128IPs.patch +#Patch100: linux-2.6-vs2.1.patch +#Patch101: linux-2.6-vs2.1-suspend2.patch +#Patch102: linux-2.6-vs2.1-128IPs.patch # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz -Patch120: xen-3.0-2.6.16.patch +#Patch120: xen-3.0-2.6.16.patch -Patch200: linux-2.6-ppc-ICE-hacks.patch +#Patch200: linux-2.6-ppc-ICE-hacks.patch -Patch1000: linux-2.6-grsec-minimal.patch +#Patch1000: linux-2.6-grsec-minimal.patch -Patch2000: kernel-small_fixes.patch +#Patch2000: kernel-small_fixes.patch # http://lkml.org/lkml/2006/7/22/98 -Patch2001: kernel-2.6-pnpbios.patch +#Patch2001: kernel-2.6-pnpbios.patch #wanpipe #Patch3000: wanpipe-beta7-2.3.4.patch # official grsecurity for 2.6.17.7 # based on http://www.grsecurity.net/grsecurity-2.1.9-2.6.17.11-200608282236.patch.gz -Patch9999: grsecurity-2.1.9-2.6.17.11.patch +#Patch9999: grsecurity-2.1.9-2.6.17.11.patch URL: http://www.kernel.org/ BuildRequires: binutils >= 3:2.14.90.0.7 @@ -787,134 +787,134 @@ %prep %setup -q -n linux-%{_basever}%{_rc} -a10 %{?with_abi:-a14} - -%ifarch ppc -install %{SOURCE5} Makefile.ppclibs -%endif +# +#%ifarch ppc +#install %{SOURCE5} Makefile.ppclibs +#%endif %if "%{_postver}" != "%{nil}" %{__bzip2} -dc %{SOURCE1} | patch -p1 -s %endif -%patch1 -p1 +#%patch1 -p1 # TEMPORARY - review if it's still needed after upgrade!! -rm suspend2-2.2.7.3-for-2.6.17/9930-pdflush-fix.patch +#rm suspend2-2.2.7.3-for-2.6.17/9930-pdflush-fix.patch ## suspend2: -for i in suspend2-%{suspend_version}-for-2.6.17/[0-9]*; do -patch -p1 -s < $i -done -%patch70 -p1 -%patch71 -p1 +#for i in suspend2-%{suspend_version}-for-2.6.17/[0-9]*; do +#patch -p1 -s < $i +#done +#%patch70 -p1 +#%patch71 -p1 # reiserfs4 -%{__gzip} -dc %{SOURCE12} | %{__patch} -s -p1 +#%{__gzip} -dc %{SOURCE12} | %{__patch} -s -p1 %patch2 -p1 -%patch8 -p1 +#%patch8 -p1 -%if %{without fbsplash} -%patch3 -p1 -%else -%patch4 -p1 -%endif - -%ifarch %{ix86} -%{?with_vesafb_tng:%patch5 -p1} -%endif +#%if %{without fbsplash} +#%patch3 -p1 +#%else +#%patch4 -p1 +#%endif + +#%ifarch %{ix86} +#%{?with_vesafb_tng:%patch5 -p1} +#%endif %patch6 -p1 -%patch7 -p1 -%patch9 -p1 +#%patch7 -p1 +#%patch9 -p1 ## netfilter # submitted # base -%{!?without_old_netfilter:%patch10 -p1} -%{!?without_old_netfilter:%patch12 -p1} -%{!?without_old_netfilter:%patch13 -p1} -%patch14 -p1 -%{!?without_old_netfilter:%patch15 -p1} -%{!?without_old_netfilter:%patch16 -p1} -%{!?without_old_netfilter:%patch17 -p1} -%{!?without_old_netfilter:%patch18 -p1} -%{!?without_old_netfilter:%patch19 -p1} -%patch20 -p1 -%patch22 -p1 +#%{!?without_old_netfilter:%patch10 -p1} +#%{!?without_old_netfilter:%patch12 -p1} +#%{!?without_old_netfilter:%patch13 -p1} +#%patch14 -p1 +#%{!?without_old_netfilter:%patch15 -p1} +#%{!?without_old_netfilter:%patch16 -p1} +#%{!?without_old_netfilter:%patch17 -p1} +#%{!?without_old_netfilter:%patch18 -p1} +#%{!?without_old_netfilter:%patch19 -p1} +#%patch20 -p1 +#%patch22 -p1 ## extra -%{!?without_old_netfilter:%patch30 -p1} -%patch32 -p1 -%{!?without_old_netfilter:%patch33 -p1} -%{!?without_old_netfilter:%patch34 -p1} -%{!?without_old_netfilter:%patch35 -p1} -%{!?without_old_netfilter:%patch37 -p1} -%{!?without_old_netfilter:%patch38 -p1} - +#%{!?without_old_netfilter:%patch30 -p1} +#%patch32 -p1 +#%{!?without_old_netfilter:%patch33 -p1} +#%{!?without_old_netfilter:%patch34 -p1} +#%{!?without_old_netfilter:%patch35 -p1} +#%{!?without_old_netfilter:%patch37 -p1} +#%{!?without_old_netfilter:%patch38 -p1} +# ## external -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 - +#%patch40 -p1 +#%patch41 -p1 +#%patch42 -p1 +#%patch43 -p1 +#%patch44 -p1 +# ## # end of netfilter -%patch50 -p1 +#%patch50 -p1 -%patch51 -p1 +#%patch51 -p1 -%patch52 -p1 +#%patch52 -p1 -%patch53 -p1 +#%patch53 -p1 -%patch54 -p1 +#%patch54 -p1 -%patch55 -p1 -%patch56 -p1 +#%patch55 -p1 +#%patch56 -p1 -%ifarch %{ix86} %{x8664} ia64 -%patch57 -p1 -%endif +#%ifarch %{ix86} %{x8664} ia64 +#%patch57 -p1 +#%endif -%patch60 -p1 +#%patch60 -p1 # vserver: -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 - -%if %{with xen0} || %{with xenU} -%ifarch %{ix86} %{x8664} ia64 -%patch120 -p1 -%endif -%endif - -%if %{with grsec_minimal} -%patch1000 -p1 -%endif -%if %{with grsec_full} -%patch9999 -p1 -%endif - -%ifarch ppc ppc64 -%patch200 -p1 -%endif +#%patch100 -p1 +#%patch101 -p1 +#%patch102 -p1 + +#%if %{with xen0} || %{with xenU} +#%ifarch %{ix86} %{x8664} ia64 +#%patch120 -p1 +#%endif +#%endif + +#%if %{with grsec_minimal} +#%patch1000 -p1 +#%endif +#%if %{with grsec_full} +#%patch9999 -p1 +#%endif + +#%ifarch ppc ppc64 +#%patch200 -p1 +#%endif ##Small fixes: -%patch2000 -p1 -%patch2001 -p1 +#%patch2000 -p1 +#%patch2001 -p1 -%if %{with abi} -patch -p1 -s < kernel-patch-linuxabi-20060404/linuxabi-2.6.17-0.patch -%endif +#%if %{with abi} +#patch -p1 -s < kernel-patch-linuxabi-20060404/linuxabi-2.6.17-0.patch +#%endif # wanpipe #patch3000 -p1 @@ -1757,734 +1757,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.441.2.1613 2006/09/18 07:05:40 blues -- typo - -Revision 1.441.2.1612 2006/09/18 06:50:14 cieciwa -- _rel 1, -- added info abut netfiler to description. - -Revision 1.441.2.1611 2006/09/17 21:20:23 cieciwa -- fixed mistake in bcond. - -Revision 1.441.2.1610 2006/09/17 21:11:04 cieciwa -- _rel 0.2, -- added %bcond_without old_netfilter - to build old netfilter module - not supported now may NOT WORK ! - -Revision 1.441.2.1609 2006/09/17 19:43:31 zbyniu -- try missing NF modules from old snap - -Revision 1.441.2.1608 2006/09/15 06:51:24 cieciwa -- removed ieee80211 patch - broken. - -Revision 1.441.2.1607 2006/09/14 12:57:03 cieciwa -- added [for test] ieee80211.h from ieee80211-1.2.15 package. - -Revision 1.441.2.1606 2006/09/12 12:58:15 cieciwa -- updated to version 2.6.17.13, -- _rel 0.1, -- updated MD5 sum. - -Revision 1.441.2.1605 2006/09/08 09:19:02 cieciwa -- updated for ABI. - -Revision 1.441.2.1604 2006/09/08 09:02:42 cieciwa -- _rel 0.10, -- added ABI support for ix86, -- small changes in %description. - -Revision 1.441.2.1603 2006/09/06 08:52:03 cieciwa -- _rel 0.9, -- wanpipe is off [brooken], -- grsecurity in back to kernel-source package. - -Revision 1.441.2.1602 2006/09/06 06:49:47 hawk -- vserver patch was updated some time ago to 2.6.17-11-vs2.1.1-rc31 -- release 0.8 (are we ready for release 1?) - -Revision 1.441.2.1601 2006/09/03 16:22:17 paszczus -- ppc configs updated, rel 0.7 - -Revision 1.441.2.1600 2006/09/03 08:42:23 paszczus -- fixed SMP modules directory (thx to pepe (at) apollo.pl) - -Revision 1.441.2.1599 2006/08/31 19:10:19 glen -- drop O/P: kernel-i2c-devel from -headers - -Revision 1.441.2.1598 2006/08/31 08:56:28 cieciwa -- _rel 0.6, -- updated wanpipe to version 2.3.4-beta7 - -Revision 1.441.2.1597 2006/08/30 12:06:39 cieciwa -- _rel 0.5, -- added grsecurity-2.1.9-2.6.17.11 - NFY - -Revision 1.441.2.1596 2006/08/29 15:03:17 cieciwa -- grsecurity in kernel-source is OFF. - -Revision 1.441.2.1595 2006/08/29 12:01:42 cieciwa -- _rel 0.4, -- vserver is back [testing required]. - -Revision 1.441.2.1594 2006/08/29 10:47:04 cieciwa -- _rel 0.3, -- added external netfilter module: -- - IPMARK, -- - condition, -- - connlimit, -- - ipp2p, -- - time. - -Revision 1.441.2.1593 2006/08/29 10:18:02 cieciwa -- added: ROUTE, ipv4options, set netfilter module. - -Revision 1.441.2.1592 2006/08/29 10:02:16 cieciwa -- _rel 0.2, -- updated netfilter to snap 20060829, -- removed all netfilter module with OLD API, -- added u32 netfilter [new API]. - -Revision 1.441.2.1591 2006/08/28 09:55:35 havner -- squashfs 3.1 - -Revision 1.441.2.1590 2006/08/24 22:18:06 cieciwa -- external netfiler from netfilter.org - OFF, -- - all pom-ng modules requires ABI change. - -Revision 1.441.2.1589 2006/08/24 21:50:30 cieciwa -- updated to version 2.6.17.11, -- updated MD5 sum, -- VS - OFF [fix required], -- grsecurity - OFF [fix required], -- netfilter [snap 20060504 - ON][fix required]. - -Revision 1.441.2.1588 2006/08/19 09:43:12 adamg -- updated to 2.6.17.9 (CVE-2006-4093, ppc only) - -Revision 1.441.2.1587 2006/08/16 09:44:05 adamg -- dmi-decode-and-save-oem-string-information patch from tp_smapi added - (consult the patch for details) -- release 0.8 - -Revision 1.441.2.1586 2006/08/15 17:12:38 cieciwa -- _rel 0.7, -- starting netfilter update - NFY - don't touch - -Revision 1.441.2.1585 2006/08/15 16:23:01 havner -- pnpbios patch -- rel 0.6 - -Revision 1.441.2.1584 2006/08/15 11:12:13 adamg -- hdaps_protect.patch dropped - it is provided as a kernel module by - kernel-misc-tp_smapi.spec (and has to be, otherwise it conflicts with - thinkpad_ec module) - -Revision 1.441.2.1583 2006/08/08 09:24:25 hawk -- updated grsecurity patch (official grsecurity-2.1.9-2.6.17.7.patch) - -Revision 1.441.2.1582 2006/08/08 09:13:17 havner -- bootsplash config - -Revision 1.441.2.1581 2006/08/08 08:41:39 havner -- bootsplash added (default as its better supported by PLD userspace) -- test build - -Revision 1.441.2.1580 2006/08/07 23:34:00 cieciwa -- don't touch kernel.spec - netfilter in progress. - -Revision 1.441.2.1579 2006/08/07 11:32:55 hawk -- 2.6.17.8 -- cleanup - -Revision 1.441.2.1578 2006/08/07 10:49:23 sparky -- fixed %if (looks like this part of code was never used) - -Revision 1.441.2.1577 2006/08/02 09:27:32 blues -- TODO - -Revision 1.441.2.1576 2006/08/01 21:46:10 blues <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1613&r2=1.441.2.1614&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit