[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel linux-2.6-tux.patch, NONE, 1.1 kernel-2.6.spec, 1.1430, 1.1431



Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26476

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-tux.patch 
Log Message:
Welcome back Tux.


linux-2.6-tux.patch:
 linux-2.6.12/arch/ia64/kernel/ia64_ksyms.c |    4 
 linux/arch/alpha/kernel/systbls.S          |    8 
 linux/arch/i386/kernel/syscall_table.S     |   10 
 linux/arch/ia64/kernel/entry.S             |    8 
 linux/arch/ppc64/kernel/misc.S             |   20 
 linux/arch/x86_64/ia32/ia32entry.S         |   10 
 linux/fs/dcache.c                          |   36 
 linux/fs/exec.c                            |    2 
 linux/fs/fcntl.c                           |    4 
 linux/fs/namei.c                           |   18 
 linux/fs/namespace.c                       |    2 
 linux/fs/open.c                            |    4 
 linux/fs/pipe.c                            |    2 
 linux/fs/read_write.c                      |    2 
 linux/include/asm-alpha/fcntl.h            |    1 
 linux/include/asm-i386/fcntl.h             |    1 
 linux/include/asm-i386/unistd.h            |    5 
 linux/include/asm-ia64/fcntl.h             |    1 
 linux/include/asm-ia64/unistd.h            |    2 
 linux/include/asm-ppc/fcntl.h              |    1 
 linux/include/asm-ppc64/fcntl.h            |    1 
 linux/include/asm-s390/fcntl.h             |    1 
 linux/include/asm-sparc/fcntl.h            |    1 
 linux/include/asm-sparc64/fcntl.h          |    1 
 linux/include/asm-x86_64/fcntl.h           |    1 
 linux/include/asm-x86_64/unistd.h          |   10 
 linux/include/linux/buffer_head.h          |    1 
 linux/include/linux/dcache.h               |    8 
 linux/include/linux/errno.h                |    3 
 linux/include/linux/file.h                 |    2 
 linux/include/linux/fs.h                   |    7 
 linux/include/linux/kmod.h                 |    2 
 linux/include/linux/namei.h                |    2 
 linux/include/linux/net.h                  |    1 
 linux/include/linux/sched.h                |    5 
 linux/include/linux/skbuff.h               |    2 
 linux/include/linux/socket.h               |    5 
 linux/include/linux/sysctl.h               |   50 
 linux/include/net/sock.h                   |    6 
 linux/include/net/tcp.h                    |    3 
 linux/include/net/tux.h                    |  802 ++++++++++
 linux/include/net/tux_u.h                  |  163 ++
 linux/kernel/exit.c                        |   10 
 linux/kernel/fork.c                        |    1 
 linux/kernel/kmod.c                        |   30 
 linux/kernel/signal.c                      |    1 
 linux/mm/filemap.c                         |   19 
 linux/mm/truncate.c                        |    2 
 linux/net/Kconfig                          |    2 
 linux/net/Makefile                         |    1 
 linux/net/ipv4/tcp.c                       |    3 
 linux/net/ipv4/tcp_input.c                 |    1 
 linux/net/ipv4/tcp_ipv4.c                  |    5 
 linux/net/ipv4/tcp_minisocks.c             |    3 
 linux/net/ipv4/tcp_output.c                |    5 
 linux/net/socket.c                         |  137 +
 linux/net/tux/Kconfig                      |   25 
 linux/net/tux/Makefile                     |   12 
 linux/net/tux/abuf.c                       |  190 ++
 linux/net/tux/accept.c                     |  859 +++++++++++
 linux/net/tux/cachemiss.c                  |  265 +++
 linux/net/tux/cgi.c                        |  160 ++
 linux/net/tux/directory.c                  |  302 +++
 linux/net/tux/extcgi.c                     |  329 ++++
 linux/net/tux/gzip.c                       |   40 
 linux/net/tux/input.c                      |  640 ++++++++
 linux/net/tux/logger.c                     |  836 +++++++++++
 linux/net/tux/main.c                       | 1413 ++++++++++++++++++
 linux/net/tux/mod.c                        |  262 +++
 linux/net/tux/output.c                     |  352 ++++
 linux/net/tux/parser.h                     |  102 +
 linux/net/tux/postpone.c                   |   77 +
 linux/net/tux/proc.c                       | 1149 +++++++++++++++
 linux/net/tux/proto_ftp.c                  | 1549 ++++++++++++++++++++
 linux/net/tux/proto_http.c                 | 2197 +++++++++++++++++++++++++++++
 linux/net/tux/redirect.c                   |  167 ++
 linux/net/tux/times.c                      |  392 +++++
 linux/net/tux/times.h                      |   26 
 linux/net/tux/userspace.c                  |   27 
 79 files changed, 12737 insertions(+), 72 deletions(-)

--- NEW FILE linux-2.6-tux.patch ---
 arch/alpha/kernel/systbls.S      |    8 
 arch/i386/kernel/syscall_table.S |   10 
 arch/ia64/kernel/entry.S         |    8 
 arch/ia64/kernel/ia64_ksyms.c    |    3 
 arch/ppc64/kernel/misc.S         |   20 
 arch/x86_64/ia32/ia32entry.S     |   10 
 fs/dcache.c                      |   36 
 fs/exec.c                        |    2 
 fs/fcntl.c                       |    4 
 fs/namei.c                       |   18 
 fs/namespace.c                   |    2 
 fs/open.c                        |    4 
 fs/pipe.c                        |    2 
 fs/read_write.c                  |    2 
 include/asm-alpha/fcntl.h        |    1 
 include/asm-i386/fcntl.h         |    1 
 include/asm-i386/unistd.h        |    5 
 include/asm-ia64/fcntl.h         |    1 
 include/asm-ia64/unistd.h        |    2 
 include/asm-ppc/fcntl.h          |    1 
 include/asm-ppc64/fcntl.h        |    1 
 include/asm-s390/fcntl.h         |    1 
 include/asm-sparc/fcntl.h        |    1 
 include/asm-sparc64/fcntl.h      |    1 
 include/asm-x86_64/fcntl.h       |    1 
 include/asm-x86_64/unistd.h      |   10 
 include/linux/buffer_head.h      |    1 
 include/linux/dcache.h           |    8 
 include/linux/errno.h            |    3 
 include/linux/file.h             |    2 
 include/linux/fs.h               |    7 
 include/linux/kmod.h             |    2 
 include/linux/namei.h            |    2 
 include/linux/net.h              |    1 
 include/linux/sched.h            |    5 
 include/linux/skbuff.h           |    2 
 include/linux/socket.h           |    5 
 include/linux/sysctl.h           |   50 
 include/net/sock.h               |    6 
 include/net/tcp.h                |    8 
 include/net/tux.h                |  802 ++++++++++++++
 include/net/tux_u.h              |  163 ++
 kernel/exit.c                    |   10 
 kernel/fork.c                    |    1 
 kernel/kmod.c                    |   30 
 kernel/signal.c                  |    1 
 mm/filemap.c                     |   19 
 mm/truncate.c                    |    2 
 net/Kconfig                      |    2 
 net/Makefile                     |    1 
 net/ipv4/tcp.c                   |    3 
 net/ipv4/tcp_input.c             |    1 
 net/ipv4/tcp_ipv4.c              |    5 
 net/ipv4/tcp_minisocks.c         |    3 
 net/ipv4/tcp_output.c            |    5 
 net/socket.c                     |  137 +-
 net/tux/Kconfig                  |   25 
 net/tux/Makefile                 |   12 
 net/tux/abuf.c                   |  190 +++
 net/tux/accept.c                 |  859 +++++++++++++++
 net/tux/cachemiss.c              |  265 ++++
 net/tux/cgi.c                    |  160 ++
 net/tux/directory.c              |  302 +++++
 net/tux/extcgi.c                 |  329 +++++
 net/tux/gzip.c                   |   40 
 net/tux/input.c                  |  640 +++++++++++
 net/tux/logger.c                 |  836 ++++++++++++++
 net/tux/main.c                   | 1413 +++++++++++++++++++++++++
 net/tux/mod.c                    |  262 ++++
 net/tux/output.c                 |  352 ++++++
 net/tux/parser.h                 |  102 +
 net/tux/postpone.c               |   77 +
 net/tux/proc.c                   | 1149 ++++++++++++++++++++
 net/tux/proto_ftp.c              | 1549 +++++++++++++++++++++++++++
 net/tux/proto_http.c             | 2197 +++++++++++++++++++++++++++++++++++++++
 net/tux/redirect.c               |  167 ++
 net/tux/times.c                  |  392 ++++++
 net/tux/times.h                  |   26 
 net/tux/userspace.c              |   27 
 79 files changed, 12739 insertions(+), 74 deletions(-)

Index: linux/arch/alpha/kernel/systbls.S
===================================================================
--- linux.orig/arch/alpha/kernel/systbls.S
+++ linux/arch/alpha/kernel/systbls.S
@@ -240,7 +240,15 @@ sys_call_table:
 	.quad alpha_ni_syscall
 	.quad alpha_ni_syscall			/* 220 */
 	.quad alpha_ni_syscall
+#ifdef CONFIG_TUX
+	.quad __sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+	.quad sys_tux
+# else
 	.quad alpha_ni_syscall
+# endif
+#endif
 	.quad alpha_ni_syscall
 	.quad alpha_ni_syscall
 	.quad alpha_ni_syscall			/* 225 */
Index: linux/arch/i386/kernel/syscall_table.S
===================================================================
--- linux.orig/arch/i386/kernel/syscall_table.S
+++ linux/arch/i386/kernel/syscall_table.S
@@ -222,7 +222,15 @@ ENTRY(sys_call_table)
 	.long sys_madvise
 	.long sys_getdents64	/* 220 */
 	.long sys_fcntl64
-	.long sys_ni_syscall	/* reserved for TUX */
+#ifdef CONFIG_TUX
+	.long __sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+	.long sys_tux
+# else
+	.long sys_ni_syscall
+# endif
+#endif
 	.long sys_ni_syscall
 	.long sys_gettid
 	.long sys_readahead	/* 225 */
Index: linux/arch/ia64/kernel/entry.S
===================================================================
--- linux.orig/arch/ia64/kernel/entry.S
+++ linux/arch/ia64/kernel/entry.S
@@ -1423,7 +1423,15 @@ sys_call_table:
 	data8 sys_syslog
 	data8 sys_setitimer
 	data8 sys_getitimer
+#ifdef CONFIG_TUX
+	data8 __sys_tux				// 1120		/* was: ia64_oldstat */
+#else
+# ifdef CONFIG_TUX_MODULE
+	data8 sys_tux				// 1120		/* was: ia64_oldstat */
+# else
 	data8 sys_ni_syscall			// 1120		/* was: ia64_oldstat */
+# endif
+#endif
 	data8 sys_ni_syscall					/* was: ia64_oldlstat */
 	data8 sys_ni_syscall					/* was: ia64_oldfstat */
 	data8 sys_vhangup
Index: linux/arch/ia64/kernel/ia64_ksyms.c
===================================================================
--- linux-2.6.12/arch/ia64/kernel/ia64_ksyms.c~	2005-07-12 17:30:24.000000000 -0400
+++ linux-2.6.12/arch/ia64/kernel/ia64_ksyms.c	2005-07-12 17:30:45.000000000 -0400
@@ -58,6 +58,10 @@ EXPORT_SYMBOL(__strlen_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(__strnlen_user);
 
+#define __KERNEL_SYSCALLS__
+EXPORT_SYMBOL(sys_execve);
+EXPORT_SYMBOL(clone);
+
 /* from arch/ia64/lib */
 extern void __divsi3(void);
 extern void __udivsi3(void);
Index: linux/arch/ppc64/kernel/misc.S
===================================================================
--- linux.orig/arch/ppc64/kernel/misc.S
+++ linux/arch/ppc64/kernel/misc.S
@@ -1079,7 +1079,15 @@ _GLOBAL(sys_call_table32)
 	.llong .compat_sys_sched_setaffinity
 	.llong .compat_sys_sched_getaffinity
 	.llong .sys_ni_syscall
-	.llong .sys_ni_syscall		/* 225 - reserved for tux */
+#ifdef CONFIG_TUX
+        .llong .__sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+        .llong .sys_tux
+# else
+	.llong .sys_ni_syscall
+# endif
+#endif
 	.llong .sys32_sendfile64
 	.llong .compat_sys_io_setup
 	.llong .sys_io_destroy
@@ -1355,7 +1363,15 @@ _GLOBAL(sys_call_table)
 	.llong .sys_sched_setaffinity
 	.llong .sys_sched_getaffinity
 	.llong .sys_ni_syscall
-	.llong .sys_ni_syscall		/* 225 - reserved for tux */
+#ifdef CONFIG_TUX
+        .llong .__sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+        .llong .sys_tux
+# else
+	.llong .sys_ni_syscall
+# endif
+#endif
 	.llong .sys_ni_syscall		/* 32bit only sendfile64 */
 	.llong .sys_io_setup
 	.llong .sys_io_destroy
Index: linux/arch/x86_64/ia32/ia32entry.S
===================================================================
--- linux.orig/arch/x86_64/ia32/ia32entry.S
+++ linux/arch/x86_64/ia32/ia32entry.S
[...13497 lines suppressed...]
+	hour = tod / 3600;
+	tod %= 3600;
+	min = tod / 60;
+	sec = tod % 60;
+
+	wday = (day + 4) % 7;
+	if (wday < 0)
+		wday += 7;
+
+	day -= 11017;
+	/* day 0 is march 1, 2000 */
+	year = 5 + day / 146097;
+	day = day % 146097;
+	if (day < 0) {
+		day += 146097;
+		--year;
+	}
+	/* from now on, day is nonnegative */
+	year *= 4;
+	if (day == 146096) {
+		year += 3;
+		day = 36524;
+	} else {
+		year += day / 36524;
+		day %= 36524;
+	}
+	year *= 25;
+	year += day / 1461;
+	day %= 1461;
+	year *= 4;
+	if (day == 1460) {
+		year += 3;
+		day = 365;
+	} else {
+		year += day / 365;
+		day %= 365;
+	}
+
+	day *= 10;
+	mon = (day + 5) / 306;
+	day = day + 5 - 306 * mon;
+	day /= 10;
+	if (mon >= 10) {
+		++year;
+		mon -= 10;
+	} else
+		mon += 2;
+
+	return sprintf(curr, "213 %.4d%.2d%.2d%.2d%.2d%.2d\r\n",
+		year, mon+1, day+1, hour, min, sec);
+}
+
+static inline int make_num(const char *s)
+{
+	if (*s >= '0' && *s <= '9')
+		return 10 * (*s - '0') + *(s + 1) - '0';
+	else
+		return *(s + 1) - '0';
+}
+
+static inline int make_month(const char *s)
+{
+	int i;
+
+	for (i = 0; i < 12; i++)
+		if (!strncmp(monthName[i], s, 3))
+			return i+1;
+	return 0;
+}
+
+time_t parse_time(const char *str, const int str_len)
+{
+	int hour;
+	int min;
+	int sec;
+	int mday;
+	int mon;
+	int year;
+
+	if (str[3] == ',') {
+		/* Thu, 09 Jan 1993 01:29:59 GMT */
+
+		if (str_len < 29)
+			return -1;
+
+		mday = make_num(str+5);
+		mon = make_month(str + 8);
+		year = 100 * make_num(str + 12) + make_num(str + 14);
+		hour = make_num(str + 17);
+		min = make_num(str + 20);
+		sec = make_num(str + 23);
+	}
+	else {
+		const char *s;
+		s = strchr(str, ',');
+		if (!s || (str_len - (s - str) < 24)) {
+			/* Wed Jun  9 01:29:59 1993 */
+
+			if (str_len < 24)
+                        	return -1;
+
+			mon = make_month(str+4);
+			mday = make_num(str+8);
+			hour = make_num(str+11);
+			min = make_num(str+14);
+			sec = make_num(str+17);
+			year = make_num(str+20)*100 + make_num(str+22);
+		}
+		else {
+			/* Thursday, 10-Jun-93 01:29:59 GMT */
+
+			mday = make_num(s + 2);
+			mon = make_month(s + 5);
+			year = make_num(s + 9) + 1900;
+			if (year < 1970)
+				year += 100;
+			hour = make_num(s + 12);
+			min = make_num(s + 15);
+			sec = make_num(s + 18);
+		}
+	}
+
+	if (sec < 0 || sec > 59)
+		return -1;
+	if (min < 0 || min > 59)
+		return -1;
+	if (hour < 0 || hour > 23)
+		return -1;
+	if (mday < 1 || mday > 31)
+		return -1;
+	if (mon < 1 || mon > 12)
+		return -1;
+	if (year < 1970 || year > 2020)
+		return -1;
+
+	return mktime(year, mon, mday, hour, min, sec);
+}
Index: linux/net/tux/times.h
===================================================================
--- /dev/null
+++ linux/net/tux/times.h
@@ -0,0 +1,26 @@
+static time_t TimeDays[10][13] = {
+ { 852073200,	854751600,	857170800,	859849200,	862441200,	865119600,	867711600,	870390000,	873068400,	875660400,	878338800,	880930800,	883609200 } ,
+ { 883609200,	886287600,	888706800,	891385200,	893977200,	896655600,	899247600,	901926000,	904604400,	907196400,	909874800,	912466800,	915145200 } ,
+ { 915145200,	917823600,	920242800,	922921200,	925513200,	928191600,	930783600,	933462000,	936140400,	938732400,	941410800,	944002800,	946681200 } ,
+ { 946681200,	949359600,	951865200,	954543600,	957135600,	959814000,	962406000,	965084400,	967762800,	970354800,	973033200,	975625200,	978303600 } ,
+ { 978303600,	980982000,	983401200,	986079600,	988671600,	991350000,	993942000,	996620400,	999298800,	1001890800,	1004569200,	1007161200,	1009839600 } ,
+ { 1009839600,	1012518000,	1014937200,	1017615600,	1020207600,	1022886000,	1025478000,	1028156400,	1030834800,	1033426800,	1036105200,	1038697200,	1041375600 } ,
+ { 1041375600,	1044054000,	1046473200,	1049151600,	1051743600,	1054422000,	1057014000,	1059692400,	1062370800,	1064962800,	1067641200,	1070233200,	1072911600 } ,
+ { 1072911600,	1075590000,	1078095600,	1080774000,	1083366000,	1086044400,	1088636400,	1091314800,	1093993200,	1096585200,	1099263600,	1101855600,	1104534000 } ,
+ { 1104534000,	1107212400,	1109631600,	1112310000,	1114902000,	1117580400,	1120172400,	1122850800,	1125529200,	1128121200,	1130799600,	1133391600,	1136070000 } ,
+ { 1136070000,	1138748400,	1141167600,	1143846000,	1146438000,	1149116400,	1151708400,	1154386800,	1157065200,	1159657200,	1162335600,	1164927600,	1167606000 }
+};
+static int WeekDays[10][13] = {
+ { 3,	6,	6,	2,	4,	0,	2,	5,	1,	3,	6,	1,	4 } ,
+ { 4,	0,	0,	3,	5,	1,	3,	6,	2,	4,	0,	2,	5 } ,
+ { 5,	1,	1,	4,	6,	2,	4,	0,	3,	5,	1,	3,	6 } ,
+ { 6,	2,	3,	6,	1,	4,	6,	2,	5,	0,	3,	5,	1 } ,
+ { 1,	4,	4,	0,	2,	5,	0,	3,	6,	1,	4,	6,	2 } ,
+ { 2,	5,	5,	1,	3,	6,	1,	4,	0,	2,	5,	0,	3 } ,
+ { 3,	6,	6,	2,	4,	0,	2,	5,	1,	3,	6,	1,	4 } ,
+ { 4,	0,	1,	4,	6,	2,	4,	0,	3,	5,	1,	3,	6 } ,
+ { 6,	2,	2,	5,	0,	3,	5,	1,	4,	6,	2,	4,	0 } ,
+ { 0,	3,	3,	6,	1,	4,	6,	2,	5,	0,	3,	5,	1 }
+};
+#define TUX_YEAROFFSET   1997
+#define TUX_NUMYEARS     10
Index: linux/net/tux/userspace.c
===================================================================
--- /dev/null
+++ linux/net/tux/userspace.c
@@ -0,0 +1,27 @@
+/*
+ * TUX - Integrated Application Protocols Layer and Object Cache
+ *
+ * Copyright (C) 2000, 2001, Ingo Molnar <mingo redhat com>
+ *
+ * userspace.c: handle userspace-module requests
+ */
+
+#include <net/tux.h>
+
+/****************************************************************
+ *      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, or (at your option)
+ *      any later version.
+ *
+ *      This program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with this program; if not, write to the Free Software
+ *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ ****************************************************************/
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1430
retrieving revision 1.1431
diff -u -r1.1430 -r1.1431
--- kernel-2.6.spec	12 Jul 2005 21:28:21 -0000	1.1430
+++ kernel-2.6.spec	12 Jul 2005 21:34:07 -0000	1.1431
@@ -280,7 +280,7 @@
 Patch905: linux-2.6.7-modsign-include.patch
 
 # Tux http accelerator.
-# Patch910: linux-2.6.12-tux.patch
+Patch910: linux-2.6-tux.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -655,7 +655,7 @@
 %patch905 -p1
 
 # Tux
-#%patch910 -p1
+%patch910 -p1
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -1256,6 +1256,7 @@
 - 2.6.13-rc2-git5
 - Fix IDE locking bug de jour.
 - Workaround a usbmon deficiency.
+- Re-add Tux again.
 
 * Sun Jul 10 2005 Dave Jones <davej redhat com>
 - 2.6.13-rc2-git3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]