diff --git a/package/powerpc/linux24benh-header/linux24benh-header.conf b/package/powerpc/linux24benh-header/linux24benh-header.conf index bad6ff197..ff6c23b9f 100644 --- a/package/powerpc/linux24benh-header/linux24benh-header.conf +++ b/package/powerpc/linux24benh-header/linux24benh-header.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh-header/linux24benh-header.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/powerpc/linux24benh-header/linux24benh-header.desc b/package/powerpc/linux24benh-header/linux24benh-header.desc index 95d87b867..2fd3c5fcb 100644 --- a/package/powerpc/linux24benh-header/linux24benh-header.desc +++ b/package/powerpc/linux24benh-header/linux24benh-header.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-header/linux24benh-header.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -38,12 +38,12 @@ [E] group kernel-src -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" +[O] vanilla_ver="2.4.25" +[O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2" [L] GPL [S] Stable -[V] 2.4.22-benh2 +[V] 2.4.25-benh1-rxr [P] X 01-------9 104.000 [R] + powerpc diff --git a/package/powerpc/linux24benh-src/linux24benh-src.conf b/package/powerpc/linux24benh-src/linux24benh-src.conf index 4597de19e..3353acbf7 100644 --- a/package/powerpc/linux24benh-src/linux24benh-src.conf +++ b/package/powerpc/linux24benh-src/linux24benh-src.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh-src/linux24benh-src.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/powerpc/linux24benh-src/linux24benh-src.desc b/package/powerpc/linux24benh-src/linux24benh-src.desc index 125aa20cc..08c9cfcfa 100644 --- a/package/powerpc/linux24benh-src/linux24benh-src.desc +++ b/package/powerpc/linux24benh-src/linux24benh-src.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-src/linux24benh-src.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -38,12 +38,12 @@ [E] group kernel-src -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" +[O] vanilla_ver="2.4.25" +[O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2" [L] GPL [S] Stable -[V] 2.4.22-benh2 +[V] 2.4.25-benh1-rxr [P] X -1---5---9 106.000 [R] + powerpc diff --git a/package/powerpc/linux24benh/05-devfs-not-exp.patch b/package/powerpc/linux24benh/05-devfs-not-exp.patch index 0f63aa460..c4b22d12d 100644 --- a/package/powerpc/linux24benh/05-devfs-not-exp.patch +++ b/package/powerpc/linux24benh/05-devfs-not-exp.patch @@ -6,28 +6,37 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/05-devfs-not-exp.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- ---- linux/fs/Config.in.orig Thu Oct 25 11:52:25 2001 -+++ linux/fs/Config.in Thu Oct 25 11:53:16 2001 -@@ -52,7 +52,7 @@ +Currently (at version 2.0.x) ROCK Linux required DevFS. It is highly +useful. Later version of ROCK Linux are planed to support other variants +(like old-style device nodes or udevfs). + + - Rene Rebe + +--- linux-2.4.23/fs/Config.in.orig 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.23/fs/Config.in 2003-12-09 00:55:11.000000000 +0100 +@@ -72,13 +72,9 @@ bool '/proc file system support' CONFIG_PROC_FS +-# For some reason devfs corrupts memory badly on x86-64. Disable it +-# for now. +-if [ "$CONFIG_X86_64" != "y" ] ; then -dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL -+bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS ++dep_bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL dep_bool ' Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS dep_bool ' Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS +-fi + # It compiles as a module for testing only. It should not be used + # as a module in general. If we make this "tristate", a bunch of people diff --git a/package/powerpc/linux24benh/06-devfs-default.patch b/package/powerpc/linux24benh/06-devfs-default.patch index 56bc4c1eb..7a6b89fb0 100644 --- a/package/powerpc/linux24benh/06-devfs-default.patch +++ b/package/powerpc/linux24benh/06-devfs-default.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/06-devfs-default.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch b/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch index 7e8eaee49..d06de944e 100644 --- a/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch +++ b/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/12-conf-hacks.patch b/package/powerpc/linux24benh/12-conf-hacks.patch index 3fb3126e5..6099b803c 100644 --- a/package/powerpc/linux24benh/12-conf-hacks.patch +++ b/package/powerpc/linux24benh/12-conf-hacks.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/12-conf-hacks.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/15-install-in-boot.patch b/package/powerpc/linux24benh/15-install-in-boot.patch index 57091f869..16557b68a 100644 --- a/package/powerpc/linux24benh/15-install-in-boot.patch +++ b/package/powerpc/linux24benh/15-install-in-boot.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/15-install-in-boot.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/20-kernel-cc.patch b/package/powerpc/linux24benh/20-kernel-cc.patch index 448cf14bf..8c9630437 100644 --- a/package/powerpc/linux24benh/20-kernel-cc.patch +++ b/package/powerpc/linux24benh/20-kernel-cc.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/20-kernel-cc.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/80-ext23fs-suiddir.patch b/package/powerpc/linux24benh/80-ext23fs-suiddir.patch index 32c21318b..973796bbb 100644 --- a/package/powerpc/linux24benh/80-ext23fs-suiddir.patch +++ b/package/powerpc/linux24benh/80-ext23fs-suiddir.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/80-ext23fs-suiddir.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/82-raid5-niceer-output.patch b/package/powerpc/linux24benh/82-raid5-niceer-output.patch index be0617974..3925a96ab 100644 --- a/package/powerpc/linux24benh/82-raid5-niceer-output.patch +++ b/package/powerpc/linux24benh/82-raid5-niceer-output.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/82-raid5-niceer-output.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch b/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch index 67c327f38..1d0238faf 100644 --- a/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch +++ b/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/92-nforce-bugfix.patch b/package/powerpc/linux24benh/92-nforce-bugfix.patch index 8cd14a51a..b868f8a51 100644 --- a/package/powerpc/linux24benh/92-nforce-bugfix.patch +++ b/package/powerpc/linux24benh/92-nforce-bugfix.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/92-nforce-bugfix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/95-inet-for-userspace.patch b/package/powerpc/linux24benh/95-inet-for-userspace.patch index 1394af7e5..4b7561dbc 100644 --- a/package/powerpc/linux24benh/95-inet-for-userspace.patch +++ b/package/powerpc/linux24benh/95-inet-for-userspace.patch @@ -5,18 +5,15 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/base/linux24/95-inet-for-userspace.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux: rock-src/package/powerpc/linux24benh/95-inet-for-userspace.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/96-quota-for-userspace.patch b/package/powerpc/linux24benh/96-quota-for-userspace.patch index 58a7e59a4..ac7c1bbd2 100644 --- a/package/powerpc/linux24benh/96-quota-for-userspace.patch +++ b/package/powerpc/linux24benh/96-quota-for-userspace.patch @@ -1,23 +1,20 @@ # --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# +# # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/linux24/95-inet-for-userspace.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# +# +# ROCK Linux: rock-src/package/powerpc/linux24benh/96-quota-for-userspace.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# # --- ROCK-COPYRIGHT-NOTE-END --- Samba needs the struct ... diff --git a/package/powerpc/linux24benh/README b/package/powerpc/linux24benh/README deleted file mode 100644 index 59eb423ef..000000000 --- a/package/powerpc/linux24benh/README +++ /dev/null @@ -1,25 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/powerpc/linux24benh/README -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -This directory contains all the stuff used by ROCK Linux -to build the Kernel (in addition to the official Kernel Sources). - diff --git a/package/powerpc/linux24benh/arch-ppc-config.patch b/package/powerpc/linux24benh/arch-ppc-config.patch index f1b9d5603..f5f03bea7 100644 --- a/package/powerpc/linux24benh/arch-ppc-config.patch +++ b/package/powerpc/linux24benh/arch-ppc-config.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/arch-ppc-config.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch b/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch index 50ea256f8..a478292ec 100644 --- a/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch +++ b/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/powerpc/linux24benh/linux24benh.conf b/package/powerpc/linux24benh/linux24benh.conf index 34f24b669..8ec860ef1 100644 --- a/package/powerpc/linux24benh/linux24benh.conf +++ b/package/powerpc/linux24benh/linux24benh.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/powerpc/linux24benh/linux24benh.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/powerpc/linux24benh/linux24benh.desc b/package/powerpc/linux24benh/linux24benh.desc index e377a05f1..9c29a36ff 100644 --- a/package/powerpc/linux24benh/linux24benh.desc +++ b/package/powerpc/linux24benh/linux24benh.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh/linux24benh.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -37,13 +37,13 @@ [L] GPL [S] Stable -[V] 2.4.22-benh2 +[V] 2.4.25-benh1-rxr [P] X -1---5---9 108.000 [R] + powerpc -[O] vanilla_ver="2.4.22" -[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2" +[O] vanilla_ver="2.4.25" +[O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2" -[D] 1991898119 linux-2.4.22.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ -[D] 1280675239 patch-2.4.22-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/ +[D] 653653278 linux-2.4.25.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ +[D] 1092952665 patch-2.4.25-ben1-rxr.bz2 http://dl.rocklinux-consulting.de/oss/linux24/ diff --git a/package/powerpc/linux24benh/port-2.4.24-majors.patch b/package/powerpc/linux24benh/port-2.4.24-majors.patch deleted file mode 100644 index 1e31306da..000000000 --- a/package/powerpc/linux24benh/port-2.4.24-majors.patch +++ /dev/null @@ -1,210 +0,0 @@ -diff -urN linux-2.4.23/arch/cris/drivers/ds1302.c linux-2.4.24/arch/cris/drivers/ds1302.c ---- linux-2.4.23/arch/cris/drivers/ds1302.c 2003-08-25 04:44:39.000000000 -0700 -+++ linux-2.4.24/arch/cris/drivers/ds1302.c 2004-01-05 05:53:56.000000000 -0800 -@@ -346,6 +346,7 @@ - { - struct rtc_time rtc_tm; - -+ memset(&rtc_tm, 0, sizeof (struct rtc_time)); - get_rtc_time(&rtc_tm); - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) - return -EFAULT; -diff -urN linux-2.4.23/arch/cris/drivers/pcf8563.c linux-2.4.24/arch/cris/drivers/pcf8563.c ---- linux-2.4.23/arch/cris/drivers/pcf8563.c 2003-08-25 04:44:39.000000000 -0700 -+++ linux-2.4.24/arch/cris/drivers/pcf8563.c 2004-01-05 05:53:56.000000000 -0800 -@@ -220,6 +220,7 @@ - { - struct rtc_time tm; - -+ memset(&tm, 0, sizeof (struct rtc_time)); - get_rtc_time(&tm); - - if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) { -diff -urN linux-2.4.23/arch/m68k/bvme6000/rtc.c linux-2.4.24/arch/m68k/bvme6000/rtc.c ---- linux-2.4.23/arch/m68k/bvme6000/rtc.c 2003-06-13 07:51:31.000000000 -0700 -+++ linux-2.4.24/arch/m68k/bvme6000/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -54,6 +54,7 @@ - /* Ensure clock and real-time-mode-register are accessible */ - msr = rtc->msr & 0xc0; - rtc->msr = 0x40; -+ memset(&wtime, 0, sizeof(struct rtc_time)); - do { - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); -diff -urN linux-2.4.23/arch/m68k/mvme16x/rtc.c linux-2.4.24/arch/m68k/mvme16x/rtc.c ---- linux-2.4.23/arch/m68k/mvme16x/rtc.c 2003-06-13 07:51:31.000000000 -0700 -+++ linux-2.4.24/arch/m68k/mvme16x/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -52,6 +52,7 @@ - cli(); - /* Ensure clock and real-time-mode-register are accessible */ - rtc->ctrl = RTC_READ; -+ memset(&wtime, 0, sizeof(struct rtc_time)); - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); - wtime.tm_hour = BCD2BIN(rtc->bcd_hr); -diff -urN linux-2.4.23/arch/ppc64/kernel/rtc.c linux-2.4.24/arch/ppc64/kernel/rtc.c ---- linux-2.4.23/arch/ppc64/kernel/rtc.c 2003-06-13 07:51:32.000000000 -0700 -+++ linux-2.4.24/arch/ppc64/kernel/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -96,6 +96,7 @@ - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ppc_md.get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/acorn/char/i2c.c linux-2.4.24/drivers/acorn/char/i2c.c ---- linux-2.4.23/drivers/acorn/char/i2c.c 2003-08-25 04:44:40.000000000 -0700 -+++ linux-2.4.24/drivers/acorn/char/i2c.c 2004-01-05 05:53:56.000000000 -0800 -@@ -166,6 +166,7 @@ - break; - - case RTC_RD_TIME: -+ memset(&rtctm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_raw, &year); - rtctm.tm_sec = rtc_raw.secs; - rtctm.tm_min = rtc_raw.mins; -diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c ---- linux-2.4.23/drivers/char/ds1286.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/ds1286.c 2004-01-05 05:53:56.000000000 -0800 -@@ -173,7 +173,7 @@ - * means "don't care" or "match all". Only the tm_hour, - * tm_min, and tm_sec values are filled in. - */ -- -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_alm_time(&wtime); - break; - } -@@ -216,6 +216,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/char/efirtc.c linux-2.4.24/drivers/char/efirtc.c ---- linux-2.4.23/drivers/char/efirtc.c 2003-06-13 07:51:32.000000000 -0700 -+++ linux-2.4.24/drivers/char/efirtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -118,6 +118,7 @@ - static void - convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) - { -+ memset(wtime, 0, sizeof(struct rtc_time)); - wtime->tm_sec = eft->second; - wtime->tm_min = eft->minute; - wtime->tm_hour = eft->hour; -diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c ---- linux-2.4.23/drivers/char/ip27-rtc.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/ip27-rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -83,6 +83,7 @@ - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c ---- linux-2.4.23/drivers/char/mips_rtc.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/mips_rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -82,6 +82,7 @@ - - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - curr_time = rtc_get_time(); - to_tm(curr_time, &rtc_tm); - rtc_tm.tm_year -= 1900; -diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c ---- linux-2.4.23/drivers/char/rtc.c 2003-11-28 10:26:20.000000000 -0800 -+++ linux-2.4.24/drivers/char/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -362,7 +362,7 @@ - * means "don't care" or "match all". Only the tm_hour, - * tm_min, and tm_sec values are filled in. - */ -- -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_alm_time(&wtime); - break; - } -@@ -406,6 +406,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/hil/hp_sdc_rtc.c linux-2.4.24/drivers/hil/hp_sdc_rtc.c ---- linux-2.4.23/drivers/hil/hp_sdc_rtc.c 2003-06-13 07:51:33.000000000 -0700 -+++ linux-2.4.24/drivers/hil/hp_sdc_rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -561,6 +561,7 @@ - } - case RTC_ALM_READ: /* Read the present alarm time */ - { -+ memset(&ttime, 0, sizeof(struct timeval)); - if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT; - break; - } -@@ -609,6 +610,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT; - break; - } -diff -urN linux-2.4.23/drivers/macintosh/rtc.c linux-2.4.24/drivers/macintosh/rtc.c ---- linux-2.4.23/drivers/macintosh/rtc.c 2002-02-25 11:37:58.000000000 -0800 -+++ linux-2.4.24/drivers/macintosh/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -64,6 +64,7 @@ - case RTC_RD_TIME: - if (ppc_md.get_rtc_time) - { -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) -diff -urN linux-2.4.23/drivers/sbus/char/rtc.c linux-2.4.24/drivers/sbus/char/rtc.c ---- linux-2.4.23/drivers/sbus/char/rtc.c 2001-10-10 23:42:47.000000000 -0700 -+++ linux-2.4.24/drivers/sbus/char/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -89,6 +89,7 @@ - switch (cmd) - { - case RTCGET: -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) -diff -urN linux-2.4.23/mm/mremap.c linux-2.4.24/mm/mremap.c ---- linux-2.4.23/mm/mremap.c 2003-08-25 04:44:44.000000000 -0700 -+++ linux-2.4.24/mm/mremap.c 2004-01-05 05:53:56.000000000 -0800 -@@ -241,6 +241,13 @@ - - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len) - goto out; -+ /* -+ * Allow new_len == 0 only if new_addr == addr -+ * to preserve truncation in place (that was working -+ * safe and some app may depend on it). -+ */ -+ if (unlikely(!new_len && new_addr != addr)) -+ goto out; - - /* Check if the location we're moving into overlaps the - * old location at all, and fail if it does. -diff -urN linux-2.4.23/net/ipv4/netfilter/ip_fw_compat_masq.c linux-2.4.24/net/ipv4/netfilter/ip_fw_compat_masq.c ---- linux-2.4.23/net/ipv4/netfilter/ip_fw_compat_masq.c 2002-11-28 15:53:15.000000000 -0800 -+++ linux-2.4.24/net/ipv4/netfilter/ip_fw_compat_masq.c 2004-01-05 05:53:56.000000000 -0800 -@@ -91,9 +91,6 @@ - WRITE_UNLOCK(&ip_nat_lock); - return ret; - } -- -- place_in_hashes(ct, info); -- info->initialized = 1; - } else - DEBUGP("Masquerading already done on this conn.\n"); - WRITE_UNLOCK(&ip_nat_lock); diff --git a/package/powerpc/linux24benh/port-2.4.25-majors.patch b/package/powerpc/linux24benh/port-2.4.25-majors.patch deleted file mode 100644 index dcceebacf..000000000 --- a/package/powerpc/linux24benh/port-2.4.25-majors.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN linux-2.4.24/mm/mremap.c linux-2.4.25/mm/mremap.c ---- linux-2.4.24/mm/mremap.c 2004-01-05 05:53:56.000000000 -0800 -+++ linux-2.4.25/mm/mremap.c 2004-02-18 05:36:32.000000000 -0800 -@@ -258,16 +258,20 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret && new_len) -+ goto out; - } - - /* - * Always allow a shrinking remap: that just unmaps - * the unnecessary pages.. - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - } - diff --git a/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch b/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch index afe7d20fd..91e74ac2b 100644 --- a/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch +++ b/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch @@ -1,3 +1,22 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + --- orinoco-0.13e/drivers/net/wireless/hermes.c 2003-05-11 23:22:27.000000000 -0700 +++ orinoco-0.13e-patched/drivers/net/wireless/hermes.c 2003-08-07 04:16:04.000000000 -0700 @@ -183,6 +183,10 @@