From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2019 23:29:30 +0000 (-0800)
Subject: Merge branch 'cb/openbsd-allows-reading-directory'
X-Git-Tag: v2.21.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0890c8aa0dd2f535196babc6846941fdf52e49ba?hp=-c

Merge branch 'cb/openbsd-allows-reading-directory'

BSD port update.

* cb/openbsd-allows-reading-directory:
config.mak.uname: OpenBSD uses BSD semantics with fread for directories
---

0890c8aa0dd2f535196babc6846941fdf52e49ba
diff --combined config.mak.uname
index 3ee7da0e23,14077994a5..378ca0a582
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -233,6 -233,7 +233,7 @@@ ifeq ($(uname_S),OpenBSD
  	HAVE_BSD_SYSCTL = YesPlease
  	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
  	PROCFS_EXECUTABLE_PATH = /proc/curproc/file
+ 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
  endif
  ifeq ($(uname_S),MirBSD)
  	NO_STRCASESTR = YesPlease
@@@ -370,6 -371,7 +371,6 @@@ ifeq ($(uname_S),Windows
  	RUNTIME_PREFIX = YesPlease
  	HAVE_WPGMPTR = YesWeDo
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 -	NO_NSEC = YesPlease
  	USE_WIN32_MMAP = YesPlease
  	MMAP_PREVENTS_DELETE = UnfortunatelyYes
  	# USE_NED_ALLOCATOR = YesPlease
@@@ -380,6 -382,8 +381,6 @@@
  	NO_PYTHON = YesPlease
  	BLK_SHA1 = YesPlease
  	ETAGS_TARGET = ETAGS
 -	NO_INET_PTON = YesPlease
 -	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	NATIVE_CRLF = YesPlease
  	DEFAULT_HELP_FORMAT = html
@@@ -430,6 -434,8 +431,6 @@@ ifeq ($(uname_S),Minix
  	NO_NSEC = YesPlease
  	NEEDS_LIBGEN =
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
 -	NEEDS_IDN_WITH_CURL = YesPlease
 -	NEEDS_SSL_WITH_CURL = YesPlease
  	NEEDS_RESOLV =
  	NO_HSTRERROR = YesPlease
  	NO_MMAP = YesPlease
@@@ -455,6 -461,7 +456,6 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	# Missdetected, hence commented out, see below.
  	#NO_CURL = YesPlease
  	# Added manually, see above.
 -	NEEDS_SSL_WITH_CURL = YesPlease
  	HAVE_LIBCHARSET_H = YesPlease
  	HAVE_STRINGS_H = YesPlease
  	NEEDS_LIBICONV = YesPlease
@@@ -514,6 -521,7 +515,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	RUNTIME_PREFIX = YesPlease
  	HAVE_WPGMPTR = YesWeDo
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 -	NO_NSEC = YesPlease
  	USE_WIN32_MMAP = YesPlease
  	MMAP_PREVENTS_DELETE = UnfortunatelyYes
  	USE_NED_ALLOCATOR = YesPlease
@@@ -522,6 -530,8 +523,6 @@@
  	NO_REGEX = YesPlease
  	NO_PYTHON = YesPlease
  	ETAGS_TARGET = ETAGS
 -	NO_INET_PTON = YesPlease
 -	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	DEFAULT_HELP_FORMAT = html
  	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32