Update 2 packages

mingw-w64-i686-ca-certificates (20240203-1 -> 20241223-1) mingw-w64-i686-ncurses (6.5.20240831-1 -> 6.5.20241228-2) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
git-for-windows · Jan 5, 2025 · a814d67 · a814d67
1 parent 2746269
commit a814d67
Show file tree

Hide file tree

Showing 1,043 changed files with 2,881 additions and 713 deletions.
diff --git a/etc/rebase.db.i386 b/etc/rebase.db.i386
diff --git a/mingw32/bin/captoinfo.exe b/mingw32/bin/captoinfo.exe
diff --git a/mingw32/bin/i686-w64-mingw32-clear.exe → mingw32/bin/clear.exe b/mingw32/bin/i686-w64-mingw32-clear.exe → mingw32/bin/clear.exe
diff --git a/mingw32/bin/i686-w64-mingw32-captoinfo.exe b/mingw32/bin/i686-w64-mingw32-captoinfo.exe
diff --git a/mingw32/bin/i686-w64-mingw32-infocmp.exe b/mingw32/bin/i686-w64-mingw32-infocmp.exe
diff --git a/mingw32/bin/i686-w64-mingw32-infotocap.exe b/mingw32/bin/i686-w64-mingw32-infotocap.exe
diff --git a/mingw32/bin/i686-w64-mingw32-reset.exe b/mingw32/bin/i686-w64-mingw32-reset.exe
diff --git a/mingw32/bin/i686-w64-mingw32-tic.exe b/mingw32/bin/i686-w64-mingw32-tic.exe
diff --git a/mingw32/bin/i686-w64-mingw32-tput.exe b/mingw32/bin/i686-w64-mingw32-tput.exe
diff --git a/mingw32/bin/i686-w64-mingw32-tset.exe b/mingw32/bin/i686-w64-mingw32-tset.exe
diff --git a/mingw32/bin/infocmp.exe b/mingw32/bin/infocmp.exe
diff --git a/mingw32/bin/infotocap.exe b/mingw32/bin/infotocap.exe
diff --git a/mingw32/bin/libformw6.dll b/mingw32/bin/libformw6.dll
diff --git a/mingw32/bin/libmenuw6.dll b/mingw32/bin/libmenuw6.dll
diff --git a/mingw32/bin/libncurses++w6.dll b/mingw32/bin/libncurses++w6.dll
diff --git a/mingw32/bin/libncursesw6.dll b/mingw32/bin/libncursesw6.dll
diff --git a/mingw32/bin/libpanelw6.dll b/mingw32/bin/libpanelw6.dll
diff --git a/mingw32/bin/ncursesw6-config b/mingw32/bin/ncursesw6-config
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
+# $Id: ncurses-config.in,v 1.57 2024/09/28 20:18:19 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
@@ -50,8 +50,6 @@ THIS="ncursesw"
 TINFO_LIB="ncursesw"
 RPATH_LIST="${libdir}"
 
-includesubdir="${prefix}/include/${THIS}"
-
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
 # in some special cases of installation using a relative path.
@@ -65,9 +63,6 @@ then
 		case "$item" in
 		./*|../*|*/..|*/../*)
 			;;
-		$libdir) # skip standard libdir
-			continue
-			;;
 		*)
 			[ -n "$filtered" ] && filtered="${filtered}:"
 			filtered="${filtered}${item}"
@@ -83,11 +78,14 @@ fi
 # the headers to include like this:
 #	<ncursesw/curses.h>
 if [ xno = xno ]; then
+	includesubdir="${prefix}/include/${THIS}"
 	case $includedir in
 	$prefix/include/ncursesw)
 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
 		;;
 	esac
+else
+	includesubdir="${prefix}/include"
 fi
 
 LIBS="-lsystre -ltre -lintl -liconv "
@@ -98,20 +96,10 @@ else
 fi
 
 CFLAGS=" -DNCURSES_WIDECHAR"
-if [ "$includedir" != "/usr/include" ]; then
-	if [ "xno" = xno ]
-	then
-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-		CFLAGS="$CFLAGS -I${includesubdir}"
-	fi
-	[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-	CFLAGS="$CFLAGS-I${includedir}"
-	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
-	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
-	if [ "x$includetop" != "x$includedir" ]
-	then
-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-		CFLAGS="$CFLAGS-I$includetop"
+if [ "$includesubdir" != "/usr/include" ]; then
+	CFLAGS="$CFLAGS -I${includesubdir}"
+	if [ "$includedir" != "/usr/include" ]; then
+		[ xno = xno ] && CFLAGS="$CFLAGS -I${includedir}"
 	fi
 fi
 
@@ -144,19 +132,19 @@ do
 		/mingw32/i686-w64-mingw32/lib|/mingw32/lib|/usr/lib) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
 			then
-				lib_first=yes
+				lib_first=no
 				IFS_save="$IFS"
 				IFS='|'
 				LIBDIRS="/mingw32/i686-w64-mingw32/lib|/mingw32/lib|/usr/lib"
 				for lib_check in $LIBDIRS
 				do
 					if [ -d "$lib_check" ]
 					then
-						if [ "$lib_check" != "$libdir" ]
+						if [ "$lib_check" = "$libdir" ]
 						then
-							lib_first=no
+							lib_first=yes
+							break
 						fi
-						break
 					fi
 				done
 				IFS="$IFS_save"
@@ -176,6 +164,9 @@ do
 				continue
 			fi
 			;;
+		$libdir) # skip standard libdir
+			continue
+			;;
 		*)
 			found=no
 			for check in $lib_flags
@@ -211,7 +202,7 @@ while [ $# -gt 0 ]; do
 		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[OW]*)
+			x-[fgOW]*)
 				opt=
 				;;
 			esac
@@ -247,7 +238,7 @@ while [ $# -gt 0 ]; do
 		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[I]*|x-[OW]*)
+			x-[I]*|x-[fgOW]*)
 				opt=
 				;;
 			esac
@@ -311,7 +302,7 @@ while [ $# -gt 0 ]; do
 		;;
 	# identification
 	--version)
-		echo "6.5.20240831"
+		echo "6.5.20241228"
 		;;
 	--abi-version)
 		echo "6"

diff --git a/mingw32/bin/reset.exe b/mingw32/bin/reset.exe
diff --git a/mingw32/bin/i686-w64-mingw32-tabs.exe → mingw32/bin/tabs.exe b/mingw32/bin/i686-w64-mingw32-tabs.exe → mingw32/bin/tabs.exe
diff --git a/mingw32/bin/tic.exe b/mingw32/bin/tic.exe
diff --git a/mingw32/bin/i686-w64-mingw32-toe.exe → mingw32/bin/toe.exe b/mingw32/bin/i686-w64-mingw32-toe.exe → mingw32/bin/toe.exe
diff --git a/mingw32/bin/tput.exe b/mingw32/bin/tput.exe
diff --git a/mingw32/bin/tset.exe b/mingw32/bin/tset.exe
diff --git a/mingw32/etc/pki/ca-trust/extracted/java/cacerts b/mingw32/etc/pki/ca-trust/extracted/java/cacerts