Index: etc/rc.d/localpkg
===================================================================
RCS file: /import/FreeBSD-CVS/src/etc/rc.d/localpkg,v
retrieving revision 1.10
diff -u -p -u -r1.10 localpkg
--- etc/rc.d/localpkg	23 Jun 2008 03:49:30 -0000	1.10
+++ etc/rc.d/localpkg	3 Jul 2008 09:15:25 -0000
@@ -66,6 +66,8 @@ pkg_stop()
 				(set -T
 				trap 'exit 1' 2
 				${script} stop)
+			elif [ -f "${script}" -o -L "${script}" ]; then
+				echo -n " (skipping ${script##*/}, not executable)"
 			fi
 		done
 		[ -n "${initdone}" ] && echo '.'
Index: sys/i386/i386/sys_machdep.c
===================================================================
RCS file: /import/FreeBSD-CVS/src/sys/i386/i386/sys_machdep.c,v
retrieving revision 1.113
diff -u -p -u -r1.113 sys_machdep.c
--- sys/i386/i386/sys_machdep.c	12 Mar 2008 10:11:57 -0000	1.113
+++ sys/i386/i386/sys_machdep.c	3 Jul 2008 09:18:52 -0000
@@ -549,8 +549,8 @@ i386_set_ldt(td, uap, descs)
 	if (!(uap->start == LDT_AUTO_ALLOC && uap->num == 1)) {
 		/* complain a for a while if using old methods */
 		if (ldt_warnings++ < NUM_LDT_WARNINGS) {
-			printf("Warning: pid %d used static ldt allocation.\n",
-			    td->td_proc->p_pid);
+			printf("Warning: pid %d (%s) used static ldt allocation.\n",
+			    td->td_proc->p_pid, td->td_proc->p_comm);
 			printf("See the i386_set_ldt man page for more info\n");
 		}
 		/* verify range of descriptors to modify */
Index: sys/kern/vfs_aio.c
===================================================================
RCS file: /import/FreeBSD-CVS/src/sys/kern/vfs_aio.c,v
retrieving revision 1.239
diff -u -p -u -r1.239 vfs_aio.c
--- sys/kern/vfs_aio.c	21 Jun 2008 11:34:34 -0000	1.239
+++ sys/kern/vfs_aio.c	3 Jul 2008 09:19:11 -0000
@@ -141,8 +141,8 @@ static int target_aio_procs = TARGET_AIO
 SYSCTL_INT(_vfs_aio, OID_AUTO, target_aio_procs, CTLFLAG_RW, &target_aio_procs,
 	0, "Preferred number of ready kernel threads for async IO");
 
-static int max_queue_count = MAX_AIO_QUEUE;
-SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue, CTLFLAG_RW, &max_queue_count, 0,
+int max_aio_queue_count = MAX_AIO_QUEUE;
+SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue, CTLFLAG_RW, &max_aio_queue_count, 0,
     "Maximum number of aio requests to queue, globally");
 
 static int num_queue_count = 0;
@@ -174,7 +174,7 @@ static int max_aio_per_proc = MAX_AIO_PE
 SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_per_proc, CTLFLAG_RW, &max_aio_per_proc,
     0, "Maximum active aio requests per process (stored in the process)");
 
-static int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC;
+int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC;
 SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue_per_proc, CTLFLAG_RW,
     &max_aio_queue_per_proc, 0,
     "Maximum queued aio requests per process (stored in the process)");
@@ -259,19 +259,6 @@ struct aiothreadlist {
 	struct thread *aiothread;		/* (*) the AIO thread */
 };
 
-/*
- * data-structure for lio signal management
- */
-struct aioliojob {
-	int	lioj_flags;			/* (a) listio flags */
-	int	lioj_count;			/* (a) listio flags */
-	int	lioj_finished_count;		/* (a) listio flags */
-	struct	sigevent lioj_signal;		/* (a) signal on all I/O done */
-	TAILQ_ENTRY(aioliojob) lioj_list;	/* (a) lio list */
-	struct  knlist klist;			/* (a) list of knotes */
-	ksiginfo_t lioj_ksi;			/* (a) Realtime signal info */
-};
-
 #define	LIOJ_SIGNAL		0x1	/* signal on all done (lio) */
 #define	LIOJ_SIGNAL_POSTED	0x2	/* signal has been posted */
 #define LIOJ_KEVENT_POSTED	0x4	/* kevent triggered */
@@ -315,13 +302,10 @@ static struct mtx aio_sock_mtx;
 static TAILQ_HEAD(,aiocblist) aio_jobs;			/* (c) Async job list */
 static struct unrhdr *aiod_unr;
 
-void		aio_init_aioinfo(struct proc *p);
 static void	aio_onceonly(void);
 static int	aio_free_entry(struct aiocblist *aiocbe);
 static void	aio_process(struct aiocblist *aiocbe);
 static int	aio_newproc(int *);
-int		aio_aqueue(struct thread *td, struct aiocb *job,
-			struct aioliojob *lio, int type, int osigev);
 static void	aio_physwakeup(struct buf *bp);
 static void	aio_proc_rundown(void *arg, struct proc *p);
 static void	aio_proc_rundown_exec(void *arg, struct proc *p, struct image_params *imgp);
@@ -1351,7 +1335,7 @@ aio_aqueue(struct thread *td, struct aio
 	suword(&job->_aiocb_private.error, 0);
 	suword(&job->_aiocb_private.kernelinfo, -1);
 
-	if (num_queue_count >= max_queue_count ||
+	if (num_queue_count >= max_aio_queue_count ||
 	    ki->kaio_count >= ki->kaio_qallowed_count) {
 		suword(&job->_aiocb_private.error, EAGAIN);
 		return (EAGAIN);
Index: sys/netinet/ip_fw2.c
===================================================================
RCS file: /import/FreeBSD-CVS/src/sys/netinet/ip_fw2.c,v
retrieving revision 1.186
diff -u -p -u -r1.186 ip_fw2.c
--- sys/netinet/ip_fw2.c	9 May 2008 23:02:57 -0000	1.186
+++ sys/netinet/ip_fw2.c	3 Jul 2008 09:19:41 -0000
@@ -3363,7 +3363,7 @@ done:
 
 pullup_failed:
 	if (fw_verbose)
-		printf("ipfw: pullup failed\n");
+		printf("ipfw: pullup failed, packet too short (network problem or malicious packet)\n");
 	return (IP_FW_DENY);
 }