Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src fix duplicated chunk from merge
details: https://anonhg.NetBSD.org/src/rev/1b2ffd88f1a9
branches: trunk
changeset: 447868:1b2ffd88f1a9
user: dholland <dholland%NetBSD.org@localhost>
date: Sun Jan 27 04:33:29 2019 +0000
description:
fix duplicated chunk from merge
diffstat:
external/mpl/bind/dist/lib/isc/tests/regex_test.c | 4 +-
external/public-domain/xz/Makefile.inc | 4 +-
lib/csu/Makefile | 5 +--
lib/libc/time/difftime.c | 6 +--
lib/libc/time/localtime.c | 6 +--
lib/libnpf/Makefile | 4 +-
libexec/httpd/CHANGES | 35 +----------------------
rescue/Makefile | 5 +--
8 files changed, 10 insertions(+), 59 deletions(-)
diffs (146 lines):
diff -r 697913a359e5 -r 1b2ffd88f1a9 external/mpl/bind/dist/lib/isc/tests/regex_test.c
--- a/external/mpl/bind/dist/lib/isc/tests/regex_test.c Sun Jan 27 04:21:26 2019 +0000
+++ b/external/mpl/bind/dist/lib/isc/tests/regex_test.c Sun Jan 27 04:33:29 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: regex_test.c,v 1.4 2019/01/27 02:08:35 pgoyette Exp $ */
+/* $NetBSD: regex_test.c,v 1.5 2019/01/27 04:33:29 dholland Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1132,8 +1132,6 @@
}
assert_int_equal(r, tests[i].expect);
}
-
- return (cmocka_run_group_tests(tests, NULL, NULL));
}
int
diff -r 697913a359e5 -r 1b2ffd88f1a9 external/public-domain/xz/Makefile.inc
--- a/external/public-domain/xz/Makefile.inc Sun Jan 27 04:21:26 2019 +0000
+++ b/external/public-domain/xz/Makefile.inc Sun Jan 27 04:33:29 2019 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/01/27 02:08:35 pgoyette Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile.inc,v 1.6 2019/01/27 04:34:35 dholland Exp $
.include <bsd.own.mk>
diff -r 697913a359e5 -r 1b2ffd88f1a9 lib/csu/Makefile
--- a/lib/csu/Makefile Sun Jan 27 04:21:26 2019 +0000
+++ b/lib/csu/Makefile Sun Jan 27 04:33:29 2019 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/01/27 02:08:35 pgoyette Exp $
-
-NOLIBCSANITIZER= # defined
-NOSANITIZER= # defined
+# $NetBSD: Makefile,v 1.39 2019/01/27 04:35:25 dholland Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
diff -r 697913a359e5 -r 1b2ffd88f1a9 lib/libc/time/difftime.c
--- a/lib/libc/time/difftime.c Sun Jan 27 04:21:26 2019 +0000
+++ b/lib/libc/time/difftime.c Sun Jan 27 04:33:29 2019 +0000
@@ -1,6 +1,4 @@
-/* $NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Return the difference between two timestamps. */
+/* $NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $ */
/* Return the difference between two timestamps. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)difftime.c 8.1";
#else
-__RCSID("$NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
diff -r 697913a359e5 -r 1b2ffd88f1a9 lib/libc/time/localtime.c
--- a/lib/libc/time/localtime.c Sun Jan 27 04:21:26 2019 +0000
+++ b/lib/libc/time/localtime.c Sun Jan 27 04:33:29 2019 +0000
@@ -1,6 +1,4 @@
-/* $NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Convert timestamp from time_t to struct tm. */
+/* $NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
diff -r 697913a359e5 -r 1b2ffd88f1a9 lib/libnpf/Makefile
--- a/lib/libnpf/Makefile Sun Jan 27 04:21:26 2019 +0000
+++ b/lib/libnpf/Makefile Sun Jan 27 04:33:29 2019 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/01/27 02:08:35 pgoyette Exp $
-
-USE_SHLIBDIR= yes
+# $NetBSD: Makefile,v 1.10 2019/01/27 04:39:33 dholland Exp $
USE_SHLIBDIR= yes
diff -r 697913a359e5 -r 1b2ffd88f1a9 libexec/httpd/CHANGES
--- a/libexec/httpd/CHANGES Sun Jan 27 04:21:26 2019 +0000
+++ b/libexec/httpd/CHANGES Sun Jan 27 04:33:29 2019 +0000
@@ -1,37 +1,4 @@
-$NetBSD: CHANGES,v 1.38 2019/01/27 02:08:36 pgoyette Exp $
-
-changes in bozohttpd 20190121:
- o don't display special files in the directory index. they aren't
- served, but links to them are generated.
-
-changes in bozohttpd 20190116:
- o fix CGI '+' parameter handling, some error checking, and a double
- free. from rajeev_v_pillai%yahoo.com@localhost
- o more directory indexing clean up. from rajeev_v_pillai%yahoo.com@localhost
-
-changes in bozohttpd 20181215:
- o fix .htpasswd bypass for authenticated users. reported by JP,
- from leot%netbsd.org@localhost
- o avoid possible null dereference when receiving a big request that
- timeout. reported by maya%netbsd.org@localhost, from leot%netbsd.org@localhost
- o fix handling of -T option, from leot%netbsd.org@localhost
- o cleanups and portability improvements, from maya%netbsd.org@localhost
- o change directory indexing to use html tables, from
- rajeev_v_pillai%yahoo.com@localhost
-
-changes in bozohttpd 20181125:
- o fixes for option parsing introduced in bozohttpd 20181123
-
-changes in bozohttpd 20181121:
- o add url remap support via .bzremap file, from martin%netbsd.org@localhost
- o handle redirections for any protocol, not just http:
- o fix a denial of service attack against header contents, which
- is now bounded at 16KiB. reported by JP
- o reduce default timeouts, and add expand timeouts to handle the
- initial line, each header, and the total time spent
- o add -T option to expose new timeout settings
- o minor RFC fixes related to timeout handling
- o fix special file (.htpasswd, .bz*) bypass. reported by JP
+$NetBSD: CHANGES,v 1.39 2019/01/27 04:40:57 dholland Exp $
changes in bozohttpd 20190121:
o don't display special files in the directory index. they aren't
diff -r 697913a359e5 -r 1b2ffd88f1a9 rescue/Makefile
--- a/rescue/Makefile Sun Jan 27 04:21:26 2019 +0000
+++ b/rescue/Makefile Sun Jan 27 04:33:29 2019 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/01/27 02:08:36 pgoyette Exp $
-
-NOLIBCSANITIZER= # defined
-NOSANITIZER= # defined
+# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
Home |
Main Index |
Thread Index |
Old Index