CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 16:00:20 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.55 src/doc/CHANGES-7.3:1.1.2.56 --- src/doc/CHANGES-7.3:1.1.2.55 Sat Jun 15 15:55:39 2019 +++ src/doc/CHANGES-7.3 Sat Jun 15 16:00:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.55 2019/06/15 15:55:39 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.56 2019/06/15 16:00:20 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -612,5 +612,5 @@ libexec/httpd/testsuite/test-simple 1.6 in the slashdir too. Avoid possible NULL dereference when sending a big request that timeout. Avoid an assertion failure when using cgihandler (-C option). - [mrg, ticket #1699} + [mrg, ticket #1699]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 16:00:20 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:59:55 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:59:55 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.53 src/doc/CHANGES-7.1.3:1.1.2.54 --- src/doc/CHANGES-7.1.3:1.1.2.53 Sat Jun 15 15:56:50 2019 +++ src/doc/CHANGES-7.1.3 Sat Jun 15 15:59:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.53 2019/06/15 15:56:50 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.54 2019/06/15 15:59:55 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -545,5 +545,5 @@ libexec/httpd/testsuite/test-simple 1.6 in the slashdir too. Avoid possible NULL dereference when sending a big request that timeout. Avoid an assertion failure when using cgihandler (-C option). - [mrg, ticket #1699} + [mrg, ticket #1699]
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:59:33 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:59:33 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Fix typo in last entry To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.146 src/doc/CHANGES-7.0.3:1.1.2.147 --- src/doc/CHANGES-7.0.3:1.1.2.146 Sat Jun 15 15:58:02 2019 +++ src/doc/CHANGES-7.0.3 Sat Jun 15 15:59:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.146 2019/06/15 15:58:02 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.147 2019/06/15 15:59:33 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5853,5 +5853,5 @@ libexec/httpd/testsuite/test-simple 1.6 in the slashdir too. Avoid possible NULL dereference when sending a big request that timeout. Avoid an assertion failure when using cgihandler (-C option). - [mrg, ticket #1699} + [mrg, ticket #1699]
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:58:02 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.145 src/doc/CHANGES-7.0.3:1.1.2.146 --- src/doc/CHANGES-7.0.3:1.1.2.145 Fri May 31 08:15:50 2019 +++ src/doc/CHANGES-7.0.3 Sat Jun 15 15:58:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.145 2019/05/31 08:15:50 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.146 2019/06/15 15:58:02 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5825,3 +5825,33 @@ sys/dev/scsipi/scsipi_ioctl.c 1.72 (pa Use correct size when copying outgoing sense data. [mlelstv, ticket #1698] +libexec/httpd/CHANGES1.31-1.40 +libexec/httpd/Makefile1.28 +libexec/httpd/auth-bozo.c 1.23-1.24 +libexec/httpd/bozohttpd.8 1.75-1.79 +libexec/httpd/bozohttpd.c 1.100-1.113 +libexec/httpd/bozohttpd.h 1.58-1.60 +libexec/httpd/cgi-bozo.c 1.46-1.48 +libexec/httpd/daemon-bozo.c 1.20-1.21 +libexec/httpd/dir-index-bozo.c 1.29-1.32 +libexec/httpd/ssl-bozo.c 1.26 +libexec/httpd/testsuite/Makefile 1.12-1.13 +libexec/httpd/testsuite/t11.out 1.2 +libexec/httpd/testsuite/test-bigfile 1.6 +libexec/httpd/testsuite/test-simple 1.6 + + Don't display special files in the directory index. + Use html tables for directory index. + Don't include "index.html" in html headers. + Fix CGI '+' param and error handling. + Remove unused parameter to daemon_poll_err(). + Avoid sign extension in % handling + Fix a few problems pointed out by clang static analyzer. + Add ssl specific timeout value (30s).--- + Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing). + Avoid .htpasswd exposure to authenticated users when .htpasswd is + in the slashdir too. + Avoid possible NULL dereference when sending a big request that timeout. + Avoid an assertion failure when using cgihandler (-C option). + [mrg, ticket #1699} +
CVS commit: [netbsd-7-0] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:57:32 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7-0]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7-0]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.1.2.5 -r1.19.2.1.2.6 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.1.2.2 -r1.22.2.1.2.3 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.1.2.2 -r1.13.2.1.2.3 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.4.2.4 -r1.46.4.4.2.5 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.4.2.5 -r1.56.2.4.2.6 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.2.2.5 -r1.33.2.2.2.6 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.2.2.7 -r1.25.2.2.2.8 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.1.2.2 -r1.19.4.1.2.3 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.4.2 -r1.18.4.3 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.26.4 -r1.4.26.5 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.32.4 -r1.1.1.1.32.5 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.6.4 -r1.2.6.5 src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:58:02 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:57:32 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7-0]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7-0]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.1.2.5 -r1.19.2.1.2.6 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.1.2.2 -r1.22.2.1.2.3 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.1.2.2 -r1.13.2.1.2.3 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.4.2.4 -r1.46.4.4.2.5 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.4.2.5 -r1.56.2.4.2.6 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.2.2.5 -r1.33.2.2.2.6 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.2.2.7 -r1.25.2.2.2.8 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.1.2.2 -r1.19.4.1.2.3 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.4.2 -r1.18.4.3 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.26.4 -r1.4.26.5 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.32.4 -r1.1.1.1.32.5 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.6.4 -r1.2.6.5 src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.19.2.1.2.5 src/libexec/httpd/CHANGES:1.19.2.1.2.6 --- src/libexec/httpd/CHANGES:1.19.2.1.2.5 Wed Nov 28 19:57:50 2018 +++ src/libexec/httpd/CHANGES Sat Jun 15 15:57:32 2019 @@ -1,4 +1,24 @@ -$NetBSD: CHANGES,v 1.19.2.1.2.5 2018/11/28 19:57:50 martin Exp $ +$NetBSD: CHANGES,v 1.19.2.1.2.6 2019/06/15 15:57:32 martin Exp $ + +changes in bozohttpd 20190228: + o extend timeout facility to ssl and stop servers hanging forever + if the client never sends anything. reported by Steffen in netbsd + PR#50655. + o don't display special files in the directory index. they aren't + served, but links to them are generated. + o fix CGI '+' parameter handling, some error checking, and a double + free. from rajeev_v_pil...@yahoo.com + o more directory indexing clean up. from rajeev_v_pil...@yahoo.com + +changes in bozohttpd 20181215: + o fix .htpasswd bypass for authenticated users. reported by JP, + from l...@netbsd.org + o avoid possible null
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:56:50 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:56:50 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.52 src/doc/CHANGES-7.1.3:1.1.2.53 --- src/doc/CHANGES-7.1.3:1.1.2.52 Fri May 31 08:15:11 2019 +++ src/doc/CHANGES-7.1.3 Sat Jun 15 15:56:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.52 2019/05/31 08:15:11 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.53 2019/06/15 15:56:50 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -517,3 +517,33 @@ sys/dev/scsipi/scsipi_ioctl.c 1.72 (pa Use correct size when copying outgoing sense data. [mlelstv, ticket #1698] +libexec/httpd/CHANGES1.31-1.40 +libexec/httpd/Makefile1.28 +libexec/httpd/auth-bozo.c 1.23-1.24 +libexec/httpd/bozohttpd.8 1.75-1.79 +libexec/httpd/bozohttpd.c 1.100-1.113 +libexec/httpd/bozohttpd.h 1.58-1.60 +libexec/httpd/cgi-bozo.c 1.46-1.48 +libexec/httpd/daemon-bozo.c 1.20-1.21 +libexec/httpd/dir-index-bozo.c 1.29-1.32 +libexec/httpd/ssl-bozo.c 1.26 +libexec/httpd/testsuite/Makefile 1.12-1.13 +libexec/httpd/testsuite/t11.out 1.2 +libexec/httpd/testsuite/test-bigfile 1.6 +libexec/httpd/testsuite/test-simple 1.6 + + Don't display special files in the directory index. + Use html tables for directory index. + Don't include "index.html" in html headers. + Fix CGI '+' param and error handling. + Remove unused parameter to daemon_poll_err(). + Avoid sign extension in % handling + Fix a few problems pointed out by clang static analyzer. + Add ssl specific timeout value (30s).--- + Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing). + Avoid .htpasswd exposure to authenticated users when .htpasswd is + in the slashdir too. + Avoid possible NULL dereference when sending a big request that timeout. + Avoid an assertion failure when using cgihandler (-C option). + [mrg, ticket #1699} +
CVS commit: [netbsd-7-1] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:56:22 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7-1]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7-1]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.5.2.2 -r1.19.2.5.2.3 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.2.4.1 -r1.22.2.2.4.2 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.2.4.1 -r1.13.2.2.4.2 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.8.2.1 -r1.46.4.8.2.2 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.8.2.2 -r1.56.2.8.2.3 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.6.2.2 -r1.33.2.6.2.3 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.7.2.3 -r1.25.2.7.2.4 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.4.1.4.1 -r1.16.4.1.4.2 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.2.4.1 -r1.19.4.2.4.2 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.2.1.4.1 -r1.18.2.1.4.2 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.24.3.2.1 -r1.4.24.3.2.2 \ src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.4.2 -r1.1.4.2.2.1 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.30.3.2.1 -r1.1.1.1.30.3.2.2 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.4.3.2.1 -r1.2.4.3.2.2 \ src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:56:22 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7-1]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7-1]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.5.2.2 -r1.19.2.5.2.3 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.2.4.1 -r1.22.2.2.4.2 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.2.4.1 -r1.13.2.2.4.2 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.8.2.1 -r1.46.4.8.2.2 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.8.2.2 -r1.56.2.8.2.3 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.6.2.2 -r1.33.2.6.2.3 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.7.2.3 -r1.25.2.7.2.4 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.4.1.4.1 -r1.16.4.1.4.2 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.2.4.1 -r1.19.4.2.4.2 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.2.1.4.1 -r1.18.2.1.4.2 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.24.3.2.1 -r1.4.24.3.2.2 \ src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.4.2 -r1.1.4.2.2.1 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.30.3.2.1 -r1.1.1.1.30.3.2.2 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.4.3.2.1 -r1.2.4.3.2.2 \ src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.19.2.5.2.2 src/libexec/httpd/CHANGES:1.19.2.5.2.3 --- src/libexec/httpd/CHANGES:1.19.2.5.2.2 Wed Nov 28 19:56:09 2018 +++ src/libexec/httpd/CHANGES Sat Jun 15 15:56:21 2019 @@ -1,4 +1,24 @@ -$NetBSD: CHANGES,v 1.19.2.5.2.2 2018/11/28 19:56:09 martin Exp $ +$NetBSD: CHANGES,v 1.19.2.5.2.3 2019/06/15 15:56:21 martin Exp $ + +changes in bozohttpd 20190228: + o extend timeout facility to ssl and stop servers hanging forever + if the client never sends anything. reported by Steffen in netbsd + PR#50655. + o don't display special files in the directory index. they aren't + served, but links to them are generated. + o fix CGI '+' parameter handling, some error checking, and a double + free. from rajeev_v_pil...@yahoo.com + o more directory indexing clean up. from rajeev_v_pil...@yahoo.com + +changes in bozohttpd 20181215: + o fix .htpasswd bypass for authenticated users. reported b
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:55:39 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.54 src/doc/CHANGES-7.3:1.1.2.55 --- src/doc/CHANGES-7.3:1.1.2.54 Fri May 31 08:14:35 2019 +++ src/doc/CHANGES-7.3 Sat Jun 15 15:55:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.54 2019/05/31 08:14:35 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.55 2019/06/15 15:55:39 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -584,3 +584,33 @@ sys/dev/scsipi/scsipi_ioctl.c 1.72 (pa Use correct size when copying outgoing sense data. [mlelstv, ticket #1698] +libexec/httpd/CHANGES1.31-1.40 +libexec/httpd/Makefile1.28 +libexec/httpd/auth-bozo.c 1.23-1.24 +libexec/httpd/bozohttpd.8 1.75-1.79 +libexec/httpd/bozohttpd.c 1.100-1.113 +libexec/httpd/bozohttpd.h 1.58-1.60 +libexec/httpd/cgi-bozo.c 1.46-1.48 +libexec/httpd/daemon-bozo.c 1.20-1.21 +libexec/httpd/dir-index-bozo.c 1.29-1.32 +libexec/httpd/ssl-bozo.c 1.26 +libexec/httpd/testsuite/Makefile 1.12-1.13 +libexec/httpd/testsuite/t11.out 1.2 +libexec/httpd/testsuite/test-bigfile 1.6 +libexec/httpd/testsuite/test-simple 1.6 + + Don't display special files in the directory index. + Use html tables for directory index. + Don't include "index.html" in html headers. + Fix CGI '+' param and error handling. + Remove unused parameter to daemon_poll_err(). + Avoid sign extension in % handling + Fix a few problems pointed out by clang static analyzer. + Add ssl specific timeout value (30s).--- + Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing). + Avoid .htpasswd exposure to authenticated users when .htpasswd is + in the slashdir too. + Avoid possible NULL dereference when sending a big request that timeout. + Avoid an assertion failure when using cgihandler (-C option). + [mrg, ticket #1699} +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jun 15 15:55:39 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1699 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:54:58 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.7 -r1.19.2.8 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.3 -r1.22.2.4 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.9 -r1.46.4.10 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.11 -r1.56.2.12 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.8 -r1.33.2.9 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.10 -r1.25.2.11 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.4.2 -r1.16.4.3 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.3 -r1.19.4.4 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.24.4 -r1.4.24.5 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.30.4 -r1.1.1.1.30.5 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.19.2.7 src/libexec/httpd/CHANGES:1.19.2.8 --- src/libexec/httpd/CHANGES:1.19.2.7 Wed Nov 28 19:54:18 2018 +++ src/libexec/httpd/CHANGES Sat Jun 15 15:54:58 2019 @@ -1,4 +1,24 @@ -$NetBSD: CHANGES,v 1.19.2.7 2018/11/28 19:54:18 martin Exp $ +$NetBSD: CHANGES,v 1.19.2.8 2019/06/15 15:54:58 martin Exp $ + +changes in bozohttpd 20190228: + o extend timeout facility to ssl and stop servers hanging forever + if the client never sends anything. reported by Steffen in netbsd + PR#50655. + o don't display special files in the directory index. they aren't + served, but links to them are generated. + o fix CGI '+' parameter handling, some error checking, and a double + free. from rajeev_v_pil...@yahoo.com + o more directory indexing clean up. from rajeev_v_pil...@yahoo.com + +changes in bozohttpd 20181215: + o fix .htpasswd bypass for authenticated users. reported by JP, + from l...@netbsd.org + o avoid possible null dereference when receiving a big request that + timeout. reported by m...@netb
CVS commit: [netbsd-7] src/libexec/httpd
Module Name:src Committed By: martin Date: Sat Jun 15 15:54:58 UTC 2019 Modified Files: src/libexec/httpd [netbsd-7]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-7]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1699: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.19.2.7 -r1.19.2.8 src/libexec/httpd/CHANGES cvs rdiff -u -r1.22.2.3 -r1.22.2.4 src/libexec/httpd/Makefile cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.46.4.9 -r1.46.4.10 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.56.2.11 -r1.56.2.12 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.33.2.8 -r1.33.2.9 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.25.2.10 -r1.25.2.11 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.16.4.2 -r1.16.4.3 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.19.4.3 -r1.19.4.4 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.4.24.4 -r1.4.24.5 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.1.1.1.30.4 -r1.1.1.1.30.5 \ src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Jun 15 15:22:56 UTC 2019 Modified Files: src/etc: services Log Message: - sync with latest from iana - add ttcp To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Jun 15 15:22:56 UTC 2019 Modified Files: src/etc: services Log Message: - sync with latest from iana - add ttcp To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
re: CVS commit: src/usr.sbin/postinstall
> Modified Files: > src/usr.sbin/postinstall: postinstall.in > > Log Message: > exclude shared libraries that are currently in use from removal. thank you! this has bitten me a number of times. .mrg.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Sat Jun 15 13:07:09 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
exclude shared libraries that are currently in use from removal.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.4 src/usr.sbin/postinstall/postinstall.in:1.5
--- src/usr.sbin/postinstall/postinstall.in:1.4 Fri Jun 14 10:39:49 2019
+++ src/usr.sbin/postinstall/postinstall.in Sat Jun 15 09:07:09 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.4 2019/06/14 14:39:49 christos Exp $
+# $NetBSD: postinstall.in,v 1.5 2019/06/15 13:07:09 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -566,6 +566,37 @@ obsolete_libs()
_obsolete_libs "/usr/libdata/debug/${dir}"
}
+exclude()
+{
+ local dollar
+ case "$1" in
+ -t)
+ dollar='$'
+ shift
+ ;;
+ *)
+ dollar=
+ ;;
+ esac
+ if [ -z "$*" ]; then
+ cat
+ else
+ eval ${GREP} -v -E "'(^$(echo $* | \
+ ${SED} -e s/\\././g -e 's/ /'${dollar}'|^/'g)${dollar})'"
+ fi
+}
+
+#
+# find all the target symlinks of shared libaries and exclude them
+# from consideration for removal
+#
+exclude_libs() {
+ local target="$(ls -l lib*.so.* \
+ | ${AWK} '{ print $11; }' \
+ | ${SED} -e 's@.*/@@' | ${SORT} -u)"
+ exclude -t ${target}
+}
+
_obsolete_libs()
{
dir="$1"
@@ -622,7 +653,7 @@ function checklib(results, line, regex)
checklib(major, $0, "^lib.*\\.so\\.")
}
-#}'
+#}' | exclude_libs
)
}
@@ -1437,14 +1468,6 @@ select_obsolete_files()
${SED} -n -e "/obsolete/s@\.$1$2[[:space:]].*@\1@p" $3
}
-exclude()
-{
- if [ -z "$*" ]; then
- cat
- else
- eval ${GREP} -v -E "'(^$(echo $* | sed -e 's/ /|^/'g))'"
- fi
-}
getetcsets()
{
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Sat Jun 15 13:07:09 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: exclude shared libraries that are currently in use from removal. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 15 08:20:34 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c disks.c install.c mbr.c part_edit.c partitions.h target.c Log Message: When setting up a "use whole disk" single outer partition, force an empty set of inner partitions immediately, This avoids reading old (stale) partitions (e.g. disklabel that survived cleaning and re-creating the MBR with the MBR NetBSD partition starting at the same offset) later. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/bsddisklabel.c cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/install.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/mbr.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/part_edit.c \ src/usr.sbin/sysinst/partitions.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/target.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Jun 15 08:20:34 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c disks.c install.c mbr.c
part_edit.c partitions.h target.c
Log Message:
When setting up a "use whole disk" single outer partition, force an
empty set of inner partitions immediately,
This avoids reading old (stale) partitions (e.g. disklabel that
survived cleaning and re-creating the MBR with the MBR NetBSD partition
starting at the same offset) later.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/install.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/mbr.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/part_edit.c \
src/usr.sbin/sysinst/partitions.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.11 src/usr.sbin/sysinst/bsddisklabel.c:1.12
--- src/usr.sbin/sysinst/bsddisklabel.c:1.11 Thu Jun 13 12:44:20 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Sat Jun 15 08:20:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.11 2019/06/13 12:44:20 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.12 2019/06/15 08:20:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1458,7 +1458,7 @@ make_bsd_partitions(struct install_parti
if (pscheme->secondary_partitions) {
struct disk_partitions *p;
- p = pscheme->secondary_partitions(parts, pm->ptstart);
+ p = pscheme->secondary_partitions(parts, pm->ptstart, false);
if (p) {
parts = p;
pscheme = parts->pscheme;
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.31 src/usr.sbin/sysinst/disks.c:1.32
--- src/usr.sbin/sysinst/disks.c:1.31 Thu Jun 13 19:13:05 2019
+++ src/usr.sbin/sysinst/disks.c Sat Jun 15 08:20:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.31 2019/06/13 19:13:05 martin Exp $ */
+/* $NetBSD: disks.c,v 1.32 2019/06/15 08:20:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -777,7 +777,7 @@ convert_copy(struct disk_partitions *old
struct disk_partitions *sec_part =
old_parts->pscheme->
secondary_partitions(
- old_parts, oinfo.start);
+ old_parts, oinfo.start, false);
if (sec_part)
convert_copy(sec_part, new_parts);
}
@@ -946,7 +946,7 @@ again:
if (pm->parts->pscheme->secondary_partitions) {
const struct disk_partitions *sparts =
pm->parts->pscheme->secondary_partitions(
-pm->parts, pm->ptstart);
+pm->parts, pm->ptstart, false);
if (sparts != NULL)
dump_parts(sparts);
}
Index: src/usr.sbin/sysinst/install.c
diff -u src/usr.sbin/sysinst/install.c:1.6 src/usr.sbin/sysinst/install.c:1.7
--- src/usr.sbin/sysinst/install.c:1.6 Wed Jun 12 06:20:17 2019
+++ src/usr.sbin/sysinst/install.c Sat Jun 15 08:20:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: install.c,v 1.6 2019/06/12 06:20:17 martin Exp $ */
+/* $NetBSD: install.c,v 1.7 2019/06/15 08:20:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -185,7 +185,7 @@ do_install(void)
if (parts->pscheme->secondary_scheme != NULL &&
parts->pscheme->secondary_partitions != NULL) {
parts = parts->pscheme->secondary_partitions(
-parts, pm->ptstart);
+parts, pm->ptstart, false);
if (parts == NULL)
parts = pm->parts;
}
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.12 src/usr.sbin/sysinst/mbr.c:1.13
--- src/usr.sbin/sysinst/mbr.c:1.12 Sat Jun 15 07:57:38 2019
+++ src/usr.sbin/sysinst/mbr.c Sat Jun 15 08:20:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.12 2019/06/15 07:57:38 martin Exp $ */
+/* $NetBSD: mbr.c,v 1.13 2019/06/15 08:20:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1603,12 +1603,15 @@ mbr_find_netbsd(const struct mbr_info_t
}
static struct disk_partitions *
-mbr_read_disklabel(struct disk_partitions *arg, daddr_t start)
+mbr_read_disklabel(struct disk_partitions *arg, daddr_t start, bool force_empty)
{
struct mbr_disk_partitions *myparts =
(struct mbr_disk_partitions*)arg;
struct disk_part_info part;
+ if (force_empty && myparts->dlabel)
+ myparts->dlabel->pscheme->delete_all_partitions(myparts->dlabel);
+
if (myparts->dlabel == NULL) {
/*
* Find the NetBSD MBR partition
@@ -1616,8 +1619,9 @@ mbr_read_disklabel(struct disk_partition
if (!mbr_find_netbsd(&myparts->mbr, start, &part))
return NULL;
- myparts->dlabel = disklabel_parts.read_from_disk(
- myparts->dp.disk, part.start, part.size);
+ if (!force_empty)
+ myparts->dlabel = disklabel_parts.read_from_disk(
+ myparts->dp.disk, part.start,
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 15 07:57:39 UTC 2019 Modified Files: src/usr.sbin/sysinst: mbr.c Log Message: After deleting all partitions, reset alignment to the values we would have used on an empty disk. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/mbr.c diff -u src/usr.sbin/sysinst/mbr.c:1.11 src/usr.sbin/sysinst/mbr.c:1.12 --- src/usr.sbin/sysinst/mbr.c:1.11 Wed Jun 12 06:20:17 2019 +++ src/usr.sbin/sysinst/mbr.c Sat Jun 15 07:57:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mbr.c,v 1.11 2019/06/12 06:20:17 martin Exp $ */ +/* $NetBSD: mbr.c,v 1.12 2019/06/15 07:57:38 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -1684,6 +1684,15 @@ mbr_delete_all(struct disk_partitions *a #ifdef BOOTSEL memset(&mbri->mbrb, 0, sizeof mbri->mbrb); #endif + + /* + * We may have changed alignment settings due to partitions + * ending on an MB boundary - undo that, now that the partitions + * are gone. + */ + mbr_change_disk_geom(arg, myparts->geo_cyl, myparts->geo_head, + myparts->geo_sec); + return true; }
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 15 07:57:39 UTC 2019 Modified Files: src/usr.sbin/sysinst: mbr.c Log Message: After deleting all partitions, reset alignment to the values we would have used on an empty disk. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
