the bitrig patrick_stable branch has been created by patrick. it is 4 commits behind master, and 6 commits ahead.
commit a970eaa1204732ad0b7a6981a9857466bf624f84 diff: https://github.com/bitrig/bitrig/commit/a970eaa author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:31:18 2014 +0100 Implement a fix from OpenBSD 5.6-stable: httpd was developed very rapidly in the weeks before 5.6 release, and it has a few flaws. It would be nice to get these flaws fully remediated before the next release, and that requires the community to want to use it. Therefore here is a "jumbo" patch that brings in the most important fixes. committing on behalf of reyk@ M usr.sbin/httpd/config.c M usr.sbin/httpd/http.h M usr.sbin/httpd/httpd.c M usr.sbin/httpd/httpd.h M usr.sbin/httpd/logger.c M usr.sbin/httpd/parse.y M usr.sbin/httpd/server.c M usr.sbin/httpd/server_fcgi.c M usr.sbin/httpd/server_file.c M usr.sbin/httpd/server_http.c commit 3667e050f1e91cc547fc7305b2fe0fea70d73242 diff: https://github.com/bitrig/bitrig/commit/3667e05 author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:27:10 2014 +0100 Implement a fix from OpenBSD 5.6-stable: backport the correct fix for overlapping memcpy which caused corrupt MACs M sys/net/if_ethersubr.c commit eff6998f63ea143858711af7dd6245aa1861552f diff: https://github.com/bitrig/bitrig/commit/eff6998 author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:26:35 2014 +0100 Implement a fix from OpenBSD 5.6-stable: Check the header fields of GRE and MPPE packets strictly. M sys/net/pipex.c M sys/net/pipex_local.h commit e3c95f2c72f10892f5537d0764ac20738108457e diff: https://github.com/bitrig/bitrig/commit/e3c95f2 author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:21:14 2014 +0100 Implement a fix from OpenBSD 5.6-stable: backport fix to avoid null deref with invalid hostnames M lib/libc/asr/gethostnamadr_async.c M lib/libc/asr/getnetnamadr_async.c commit 5286f088f228b5ce3586b696be8873c57652ffe1 diff: https://github.com/bitrig/bitrig/commit/5286f08 author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:20:28 2014 +0100 Implement a fix from OpenBSD 5.6-stable: backport 1.34. Don't crash without HTTP version. M usr.sbin/relayd/relay_http.c commit 89d78401f3954a59c47fbd80a9ec30ccff3be4c1 diff: https://github.com/bitrig/bitrig/commit/89d7840 author: Patrick Wildt <patr...@blueri.se> date: Wed Dec 3 20:18:32 2014 +0100 Implement a fix from OpenBSD 5.6-stable: backport 1.100: support for $2b$ hashes. ok deraadt M usr.sbin/user/user.c
