[Glibc-bsd-commits] r5468 - in trunk/kfreebsd-11/debian: . patches

Sun May 4 12:10:53 UTC 2014

Author: rmh
Date: 2014-05-04 12:10:53 +0000 (Sun, 04 May 2014)
New Revision: 5468

Removed:
   trunk/kfreebsd-11/debian/patches/904_dev_full.diff
Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
   trunk/kfreebsd-11/debian/patches/userland.diff
   trunk/kfreebsd-11/debian/patches/vxge_no_ctf.diff
Log:
  * New upstream snapshot.
    - Fix for SA-14:08 / CVE-2014-3000 (TCP reassembly vulnerability).
      (Closes: #746954)
    - 904_dev_full.diff: Remove (superceded by upstream).

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================

--- trunk/kfreebsd-11/debian/changelog	2014-05-04 09:57:36 UTC (rev 5467)
+++ trunk/kfreebsd-11/debian/changelog	2014-05-04 12:10:53 UTC (rev 5468)
@@ -1,9 +1,15 @@
-kfreebsd-11 (11.0~svn264364-1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn265310-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot.
+    - Fix for SA-14:08 / CVE-2014-3000 (TCP reassembly vulnerability).
+      (Closes: #746954)
+    - 904_dev_full.diff: Remove (superceded by upstream).
+
+  [ Christoph Egger ]
   * Increase firmware size limit to 1MiB. This should be enough for at
     least iwlwifi firmware to safely load
 
- -- Christoph Egger <christoph at debian.org>  Fri, 18 Apr 2014 15:51:39 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 04 May 2014 12:04:51 +0200
 
 kfreebsd-11 (11.0~svn264364-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-11/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/904_dev_full.diff	2014-05-04 09:57:36 UTC (rev 5467)
+++ trunk/kfreebsd-11/debian/patches/904_dev_full.diff	2014-05-04 12:10:53 UTC (rev 5468)
@@ -1,64 +0,0 @@
-
-Status: rejected in upstream (kern/68961)
-
---- a/sys/dev/null/null.c
-+++ b/sys/dev/null/null.c
-@@ -46,9 +46,11 @@
- 
- /* For use with destroy_dev(9). */
- static struct cdev *null_dev;
-+static struct cdev *full_dev;
- static struct cdev *zero_dev;
- 
- static d_write_t null_write;
-+static d_write_t full_write;
- static d_ioctl_t null_ioctl;
- static d_ioctl_t zero_ioctl;
- static d_read_t zero_read;
-@@ -61,6 +63,14 @@
- 	.d_name =	"null",
- };
- 
-+static struct cdevsw full_cdevsw = {
-+	.d_version =	D_VERSION,
-+	.d_read =	(d_read_t *)nullop,
-+	.d_write =	full_write,
-+	.d_ioctl =	null_ioctl,
-+	.d_name =	"full",
-+};
-+
- static struct cdevsw zero_cdevsw = {
- 	.d_version =	D_VERSION,
- 	.d_read =	zero_read,
-@@ -81,6 +91,15 @@
- 
- /* ARGSUSED */
- static int
-+full_write(struct cdev *dev __unused, struct uio *uio, int flags __unused)
-+{
-+	uio->uio_resid = 0;
-+
-+	return (ENOSPC);
-+}
-+
-+/* ARGSUSED */
-+static int
- null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
-     int flags __unused, struct thread *td)
- {
-@@ -158,12 +177,15 @@
- 			printf("null: <null device, zero device>\n");
- 		null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
- 		    NULL, UID_ROOT, GID_WHEEL, 0666, "null");
-+		full_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
-+		    NULL, UID_ROOT, GID_WHEEL, 0666, "full");
- 		zero_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &zero_cdevsw, 0,
- 		    NULL, UID_ROOT, GID_WHEEL, 0666, "zero");
- 		break;
- 
- 	case MOD_UNLOAD:
- 		destroy_dev(null_dev);
-+		destroy_dev(full_dev);
- 		destroy_dev(zero_dev);
- 		break;
- 

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2014-05-04 09:57:36 UTC (rev 5467)
+++ trunk/kfreebsd-11/debian/patches/series	2014-05-04 12:10:53 UTC (rev 5468)
@@ -19,7 +19,6 @@
 vxge_no_ctf.diff
 firmware_load.diff
 902_version.diff
-904_dev_full.diff
 906_grow_sysv_ipc_limits.diff
 908_linprocfs_is_not_proc.diff
 910_GENERIC_hints.diff

Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff	2014-05-04 09:57:36 UTC (rev 5467)
+++ trunk/kfreebsd-11/debian/patches/userland.diff	2014-05-04 12:10:53 UTC (rev 5468)
@@ -809,7 +809,7 @@
  struct bintime {
  	time_t	sec;
  	uint64_t frac;
-@@ -281,7 +287,7 @@
+@@ -282,7 +288,7 @@
  
  #endif /* _KERNEL */
  
@@ -818,7 +818,7 @@
  
  #define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
  #define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-@@ -309,6 +315,7 @@
+@@ -310,6 +316,7 @@
  	} while (0)
  #endif
  
@@ -826,7 +826,7 @@
  /*
   * Names of the interval timers, and structure
   * defining a timer setting.
-@@ -361,6 +368,8 @@
+@@ -362,6 +369,8 @@
  #define	CPUCLOCK_WHICH_TID	1
  #endif
  
@@ -835,7 +835,7 @@
  #ifdef _KERNEL
  
  /*
-@@ -472,6 +481,7 @@
+@@ -473,6 +482,7 @@
  #include <sys/cdefs.h>
  #include <sys/select.h>
  
@@ -843,7 +843,7 @@
  __BEGIN_DECLS
  int	setitimer(int, const struct itimerval *, struct itimerval *);
  int	utimes(const char *, const struct timeval *);
-@@ -491,6 +501,7 @@
+@@ -492,6 +502,7 @@
  #endif
  
  __END_DECLS

Modified: trunk/kfreebsd-11/debian/patches/vxge_no_ctf.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/vxge_no_ctf.diff	2014-05-04 09:57:36 UTC (rev 5467)
+++ trunk/kfreebsd-11/debian/patches/vxge_no_ctf.diff	2014-05-04 12:10:53 UTC (rev 5468)
@@ -5,7 +5,7 @@
 
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -546,7 +546,9 @@
+@@ -547,7 +547,9 @@
  _stg=		stg
  _streams=	streams
  _svr4=		svr4
@@ -15,7 +15,7 @@
  _wbwd=		wbwd
  _wi=		wi
  _xe=		xe
-@@ -758,7 +760,9 @@
+@@ -760,7 +762,9 @@
  _viawd=		viawd
  _virtio=	virtio
  _vmm=		vmm


