[Glibc-bsd-commits] r3265 - in trunk/kfreebsd-8/debian: . arch/amd64 arch/i386 arch/mipsel patches
Petr Salinger
ps-guest at alioth.debian.org
Wed Feb 16 19:19:00 UTC 2011
Author: ps-guest
Date: 2011-02-16 19:18:59 +0000 (Wed, 16 Feb 2011)
New Revision: 3265
Removed:
trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
trunk/kfreebsd-8/debian/patches/918_delete_key.diff
Modified:
trunk/kfreebsd-8/debian/arch/amd64/amd64.config
trunk/kfreebsd-8/debian/arch/i386/486.config
trunk/kfreebsd-8/debian/arch/i386/686-smp.config
trunk/kfreebsd-8/debian/arch/i386/686.config
trunk/kfreebsd-8/debian/arch/i386/xen.config
trunk/kfreebsd-8/debian/arch/mipsel/malta.config
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-8/debian/rules
Log:
prepare for just tagged 8.2 release
Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -11,6 +11,7 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
# UTF-8 console support
options VESA
Modified: trunk/kfreebsd-8/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/486.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -11,6 +11,7 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
# UTF-8 console support
options VESA
Modified: trunk/kfreebsd-8/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -12,6 +12,7 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
# UTF-8 console support
options VESA
Modified: trunk/kfreebsd-8/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -9,6 +9,7 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
# UTF-8 console support
options VESA
Modified: trunk/kfreebsd-8/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/xen.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/i386/xen.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -26,6 +26,7 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
# raise shared memory limits
options SHMMAXPGS=4096
Modified: trunk/kfreebsd-8/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/mipsel/malta.config 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/arch/mipsel/malta.config 2011-02-16 19:18:59 UTC (rev 3265)
@@ -12,3 +12,4 @@
options LINSYSFS
options FDESCFS
options TMPFS
+options QUOTA
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/changelog 2011-02-16 19:18:59 UTC (rev 3265)
@@ -1,22 +1,6 @@
-kfreebsd-8 (8.2~rc3+dfsg-1) UNRELEASED; urgency=low
+kfreebsd-8 (8.2-1) UNRELEASED; urgency=low
- [ Petr Salinger ]
- * Add 000_tcp_usrreq.diff, fixes local DoS. Closes #611476.
- * Extend 108_teken_utf8_table.diff for middle-dot l/L.
- Closes: #609681. Thanks to Robert Millan.
- * Add xen flavor on i386.
-
[ Robert Millan ]
- * Make this package buildable on GNU/Linux. (Closes: #602768)
- * MIPS port (with malta flavor).
-
- -- Robert Millan <rmh at debian.org> Sat, 22 Jan 2011 12:14:04 +0100
-
-kfreebsd-8 (8.2~rc1+dfsg-0.1) experimental; urgency=low
-
- * Non-maintainer upload.
-
- [ Robert Millan ]
* New upstream release.
- 000_adaptive_machine_arch.diff: Remove (merged).
- 000_ata.diff: Remove (merged).
@@ -26,13 +10,19 @@
- 104_linprocfs.diff: Remove (merged).
- 904_dev_full.diff: Resync.
- 999_firmware.diff: Resync.
+ * Make this package buildable on GNU/Linux. Closes: #602768.
+ * MIPS port (with malta flavor).
[ Petr Salinger ]
- * New upstream release.
+ * New upstream release, fixes local DoS. Closes: #611476, #613312.
- 105_apm_amd64.diff: Resync.
- 907_cpu_class.diff: Resync.
+ * Extend 108_teken_utf8_table.diff for middle-dot l/L.
+ Closes: #609681. Thanks to Robert Millan.
+ * Add xen flavor on i386.
+ * Enable quota. Closes: #608995.
- -- Robert Millan <rmh at debian.org> Tue, 11 Jan 2011 15:49:06 +0100
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 21 Feb 2011 08:02:00 +0100
kfreebsd-8 (8.1+dfsg-7.1) unstable; urgency=high
Deleted: trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff 2011-02-16 19:18:59 UTC (rev 3265)
@@ -1,23 +0,0 @@
-HEAD: 218271
-URL: http://svn.freebsd.org/changeset/base/218271
-
-Log:
- When turning off TCP_NOPUSH, only call tcp_output() to immediately flush
- any pending data if the connection is established.
-
-
---- a/sys/netinet/tcp_usrreq.c
-+++ b/sys/netinet/tcp_usrreq.c
-@@ -1328,9 +1328,10 @@
- INP_WLOCK_RECHECK(inp);
- if (optval)
- tp->t_flags |= TF_NOPUSH;
-- else {
-+ else if (tp->t_flags & TF_NOPUSH) {
- tp->t_flags &= ~TF_NOPUSH;
-- error = tcp_output(tp);
-+ if (TCPS_HAVEESTABLISHED(tp->t_state))
-+ error = tcp_output(tp);
- }
- INP_WUNLOCK(inp);
- break;
Deleted: trunk/kfreebsd-8/debian/patches/918_delete_key.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/918_delete_key.diff 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/patches/918_delete_key.diff 2011-02-16 19:18:59 UTC (rev 3265)
@@ -1,34 +0,0 @@
-Debian Policy 9.8 Keyboard configuration
-
-The (Linux) console is configured to make <-- generate DEL, and Delete generate ESC [ 3 ~.
-
-
---- a/sys/dev/kbd/kbdtables.h
-+++ b/sys/dev/kbd/kbdtables.h
-@@ -56,7 +56,7 @@
- /*0b*/{{ '0', ')', NOP, NOP, '0', ')', NOP, NOP, }, 0x33,0x00 },
- /*0c*/{{ '-', '_', 0x1F, 0x1F, '-', '_', 0x1F, 0x1F, }, 0x00,0x00 },
- /*0d*/{{ '=', '+', NOP, NOP, '=', '+', NOP, NOP, }, 0x33,0x00 },
--/*0e*/{{ 0x08, 0x08, 0x7F, 0x7F, 0x08, 0x08, 0x7F, 0x7F, }, 0x00,0x00 },
-+/*0e*/{{ 0x7F, 0x7F, 0x7F, 0x7F, 0x08, 0x08, 0x7F, 0x7F, }, 0x00,0x00 },
- /*0f*/{{ 0x09, BTAB, NOP, NOP, 0x09, BTAB, NOP, NOP, }, 0x77,0x00 },
- /*10*/{{ 'q', 'Q', 0x11, 0x11, 'q', 'Q', 0x11, 0x11, }, 0x00,0x01 },
- /*11*/{{ 'w', 'W', 0x17, 0x17, 'w', 'W', 0x17, 0x17, }, 0x00,0x01 },
-@@ -125,7 +125,7 @@
- /*50*/{{ F(58), '2', '2', '2', '2', '2', '2', '2', }, 0x80,0x02 },
- /*51*/{{ F(59), '3', '3', '3', '3', '3', '3', '3', }, 0x80,0x02 },
- /*52*/{{ F(60), '0', '0', '0', '0', '0', '0', '0', }, 0x80,0x02 },
--/*53*/{{ 0x7F, '.', '.', '.', '.', '.', RBT, RBT, }, 0x03,0x02 },
-+/*53*/{{ F(61), '.', '.', '.', '.', '.', RBT, RBT, }, 0x83,0x02 },
- /*54*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
- /*55*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
- /*56*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
-@@ -226,7 +226,7 @@
- /* 49-52 */ {"\033[H", 3}, {"\033[A", 3}, {"\033[I", 3}, {"-" , 1},
- /* 53-56 */ {"\033[D", 3}, {"\033[E", 3}, {"\033[C", 3}, {"+" , 1},
- /* 57-60 */ {"\033[F", 3}, {"\033[B", 3}, {"\033[G", 3}, {"\033[L", 3},
--/* 61-64 */ {"\177", 1}, {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
-+/* 61-64 */ {"\033[3~",4}, {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
- /* 65-68 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
- /* 69-72 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
- /* 73-76 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/patches/series 2011-02-16 19:18:59 UTC (rev 3265)
@@ -1,6 +1,5 @@
000_coda.diff
000_t_delta_warning.diff
-000_tcp_usrreq.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
@@ -31,7 +30,6 @@
915_ip6.v6only.diff
916_NKPT_amd64.diff
917_track_alignment.diff
-#918_delete_key.diff
950_no_stack_protector.diff
999_config.diff
999_firmware.diff
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2011-02-13 21:21:00 UTC (rev 3264)
+++ trunk/kfreebsd-8/debian/rules 2011-02-16 19:18:59 UTC (rev 3265)
@@ -16,7 +16,7 @@
config_files := $(wildcard debian/arch/$(cpu)/*.config)
flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
configfile := DEBCUSTOM
-abiname := 0
+abiname := 1
ld_target := $(shell ld --help | sed -ne "s/^ld: supported targets: \([^ ]*\) .*/\1/p")
ifeq ($(cpu), mipsel)
@@ -25,8 +25,8 @@
kfreebsd_cpu := $(cpu)
endif
-#SVN := http://svn.freebsd.org/base/release/$(version).0
-SVN := http://svn.freebsd.org/base/releng/$(version)
+SVN := http://svn.freebsd.org/base/release/$(version).0
+#SVN := http://svn.freebsd.org/base/releng/$(version)
#SVN := http://svn.freebsd.org/base/stable/$(major)
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
More information about the Glibc-bsd-commits
mailing list