Merge pull request #29 from dscho/fix-update-via-pacman.ps1

Fix update-via-pacman.ps1 and downgrade MSYS2 runtime to v3.5.4
git-for-windows · Dec 30, 2024 · 220e59b · 220e59b
2 parents af2793d + 44505c2
commit 220e59b
Show file tree

Hide file tree

Showing 96 changed files with 20 additions and 24 deletions.
diff --git a/etc/pacman.conf b/etc/pacman.conf
@@ -21,7 +21,7 @@ HoldPkg     = pacman
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = pacman
+IgnorePkg   = msys2-runtime
 #IgnoreGroup =
 
 #NoUpgrade   =

diff --git a/update-via-pacman.ps1 b/update-via-pacman.ps1
@@ -23,10 +23,10 @@ function die {
 Set-Location $PSScriptRoot
 if (!$?) { die "Could not switch directory to $PSScriptRoot" }
 
-$env:PATH = "$(Get-Location)\usr\bin;" + $env:PATH
+$env:PATH = "$(Get-Location)\clangarm64\bin;$(Get-Location)\usr\bin;" + $env:PATH
 
 # Set to MSYS mode
-$env:MSYSTEM = "MSYS"
+$env:MSYSTEM = "CLANGARM64"
 $env:MSYS2_PATH_TYPE = "minimal"
 
 # Create /var/log/ so that pacman.log is written
@@ -155,7 +155,8 @@ if ($pacnew.Length -gt 0) {
   }
   bash -lc @"
     set -x &&
-    . /var/lib/pacman/local/mingw-w64-*-git-extra-[0-9]*/install 2>/dev/null &&
+    . /var/lib/pacman/local/mingw-w64-*-git-extra-[0-9]*/install &&
+    cd / &&
     post_upgrade
 "@
 }

diff --git a/usr/bin/chattr.exe b/usr/bin/chattr.exe
diff --git a/usr/bin/cygcheck.exe b/usr/bin/cygcheck.exe
diff --git a/usr/bin/cygpath.exe b/usr/bin/cygpath.exe
diff --git a/usr/bin/cygwin-console-helper.exe b/usr/bin/cygwin-console-helper.exe
diff --git a/usr/bin/dumper.exe b/usr/bin/dumper.exe
diff --git a/usr/bin/gencat.exe b/usr/bin/gencat.exe
diff --git a/usr/bin/getconf.exe b/usr/bin/getconf.exe
diff --git a/usr/bin/getfacl.exe b/usr/bin/getfacl.exe
diff --git a/usr/bin/gmondump.exe b/usr/bin/gmondump.exe
diff --git a/usr/bin/kill.exe b/usr/bin/kill.exe
diff --git a/usr/bin/ldd.exe b/usr/bin/ldd.exe
diff --git a/usr/bin/ldh.exe b/usr/bin/ldh.exe
diff --git a/usr/bin/locale.exe b/usr/bin/locale.exe
diff --git a/usr/bin/lsattr.exe b/usr/bin/lsattr.exe
diff --git a/usr/bin/minidumper.exe b/usr/bin/minidumper.exe
diff --git a/usr/bin/mkgroup.exe b/usr/bin/mkgroup.exe
diff --git a/usr/bin/mkpasswd.exe b/usr/bin/mkpasswd.exe
diff --git a/usr/bin/mount.exe b/usr/bin/mount.exe
diff --git a/usr/bin/msys-2.0.dll b/usr/bin/msys-2.0.dll
diff --git a/usr/bin/newgrp.exe b/usr/bin/newgrp.exe
diff --git a/usr/bin/passwd.exe b/usr/bin/passwd.exe
diff --git a/usr/bin/pldd.exe b/usr/bin/pldd.exe
diff --git a/usr/bin/profiler.exe b/usr/bin/profiler.exe
diff --git a/usr/bin/ps.exe b/usr/bin/ps.exe
diff --git a/usr/bin/regtool.exe b/usr/bin/regtool.exe
diff --git a/usr/bin/setfacl.exe b/usr/bin/setfacl.exe
diff --git a/usr/bin/setmetamode.exe b/usr/bin/setmetamode.exe
diff --git a/usr/bin/ssp.exe b/usr/bin/ssp.exe
diff --git a/usr/bin/strace.exe b/usr/bin/strace.exe
diff --git a/usr/bin/tzset.exe b/usr/bin/tzset.exe
diff --git a/usr/bin/umount.exe b/usr/bin/umount.exe
diff --git a/usr/include/cygwin/version.h b/usr/include/cygwin/version.h
@@ -11,7 +11,7 @@ details. */
    changes to the DLL and is mainly informative in nature. */
 
 #define CYGWIN_VERSION_DLL_MAJOR 3005
-#define CYGWIN_VERSION_DLL_MINOR 5
+#define CYGWIN_VERSION_DLL_MINOR 4
 
 /* CYGWIN_VERSION_DLL_COMBINED gives us a single number representing the
    combined DLL major and minor numbers. */

diff --git a/usr/include/pthread.h b/usr/include/pthread.h
@@ -110,13 +110,10 @@ typedef struct _pthread_cleanup_handler
 void _pthread_cleanup_push (__pthread_cleanup_handler *handler);
 void _pthread_cleanup_pop (int execute);
 
-#define pthread_cleanup_push(_fn, _arg) \
-  do { \
-    __pthread_cleanup_handler __cleanup_handler = { _fn, _arg, NULL }; \
-    _pthread_cleanup_push(&__cleanup_handler)
-#define pthread_cleanup_pop(_execute) \
-    _pthread_cleanup_pop(_execute); \
-  } while (0)
+#define pthread_cleanup_push(_fn, _arg) { __pthread_cleanup_handler __cleanup_handler = \
+					 { _fn, _arg, NULL }; \
+					 _pthread_cleanup_push( &__cleanup_handler );
+#define pthread_cleanup_pop(_execute) _pthread_cleanup_pop( _execute ); }
 
 /* Condition variables */
 int pthread_cond_broadcast (pthread_cond_t *);
@@ -247,7 +244,7 @@ int pthread_getattr_np (pthread_t, pthread_attr_t *);
 int pthread_getname_np (pthread_t, char *, size_t) __attribute__((__nonnull__(2)));
 int pthread_setaffinity_np (pthread_t, size_t, const cpu_set_t *);
 int pthread_setname_np (pthread_t, const char *) __attribute__((__nonnull__(2)));
-int pthread_sigqueue (pthread_t, int, const union sigval);
+int pthread_sigqueue (pthread_t *, int, const union sigval);
 int pthread_timedjoin_np (pthread_t, void **, const struct timespec *);
 int pthread_tryjoin_np (pthread_t, void **);
 #endif

diff --git a/usr/lib/libacl.a b/usr/lib/libacl.a
diff --git a/usr/lib/libc.a b/usr/lib/libc.a
diff --git a/usr/lib/libdl.a b/usr/lib/libdl.a
diff --git a/usr/lib/libg.a b/usr/lib/libg.a
diff --git a/usr/lib/libgmon.a b/usr/lib/libgmon.a
diff --git a/usr/lib/libm.a b/usr/lib/libm.a
diff --git a/usr/lib/libmsys-2.0.a b/usr/lib/libmsys-2.0.a
diff --git a/usr/lib/libpthread.a b/usr/lib/libpthread.a
diff --git a/usr/lib/libresolv.a b/usr/lib/libresolv.a
diff --git a/usr/lib/librt.a b/usr/lib/librt.a
diff --git a/usr/lib/libssp.a b/usr/lib/libssp.a
diff --git a/usr/lib/libutil.a b/usr/lib/libutil.a
diff --git a/usr/libexec/getprocaddr32.exe b/usr/libexec/getprocaddr32.exe
diff --git a/usr/libexec/getprocaddr64.exe b/usr/libexec/getprocaddr64.exe
diff --git a/usr/share/man/man1/chattr.1.gz b/usr/share/man/man1/chattr.1.gz
diff --git a/usr/share/man/man1/cygcheck.1.gz b/usr/share/man/man1/cygcheck.1.gz
diff --git a/usr/share/man/man1/cygpath.1.gz b/usr/share/man/man1/cygpath.1.gz
diff --git a/usr/share/man/man1/dumper.1.gz b/usr/share/man/man1/dumper.1.gz
diff --git a/usr/share/man/man1/getconf.1.gz b/usr/share/man/man1/getconf.1.gz
diff --git a/usr/share/man/man1/getfacl.1.gz b/usr/share/man/man1/getfacl.1.gz
diff --git a/usr/share/man/man1/gmondump.1.gz b/usr/share/man/man1/gmondump.1.gz
diff --git a/usr/share/man/man1/intro.1.gz b/usr/share/man/man1/intro.1.gz
diff --git a/usr/share/man/man1/kill.1.gz b/usr/share/man/man1/kill.1.gz
diff --git a/usr/share/man/man1/ldd.1.gz b/usr/share/man/man1/ldd.1.gz
diff --git a/usr/share/man/man1/locale.1.gz b/usr/share/man/man1/locale.1.gz
diff --git a/usr/share/man/man1/lsattr.1.gz b/usr/share/man/man1/lsattr.1.gz
diff --git a/usr/share/man/man1/minidumper.1.gz b/usr/share/man/man1/minidumper.1.gz
diff --git a/usr/share/man/man1/mkgroup.1.gz b/usr/share/man/man1/mkgroup.1.gz
diff --git a/usr/share/man/man1/mkpasswd.1.gz b/usr/share/man/man1/mkpasswd.1.gz
diff --git a/usr/share/man/man1/mount.1.gz b/usr/share/man/man1/mount.1.gz
diff --git a/usr/share/man/man1/newgrp.1.gz b/usr/share/man/man1/newgrp.1.gz
diff --git a/usr/share/man/man1/passwd.1.gz b/usr/share/man/man1/passwd.1.gz
diff --git a/usr/share/man/man1/pldd.1.gz b/usr/share/man/man1/pldd.1.gz
diff --git a/usr/share/man/man1/profiler.1.gz b/usr/share/man/man1/profiler.1.gz
diff --git a/usr/share/man/man1/ps.1.gz b/usr/share/man/man1/ps.1.gz
diff --git a/usr/share/man/man1/regtool.1.gz b/usr/share/man/man1/regtool.1.gz
diff --git a/usr/share/man/man1/setfacl.1.gz b/usr/share/man/man1/setfacl.1.gz
diff --git a/usr/share/man/man1/setmetamode.1.gz b/usr/share/man/man1/setmetamode.1.gz
diff --git a/usr/share/man/man1/ssp.1.gz b/usr/share/man/man1/ssp.1.gz
diff --git a/usr/share/man/man1/strace.1.gz b/usr/share/man/man1/strace.1.gz
diff --git a/usr/share/man/man1/tzset.1.gz b/usr/share/man/man1/tzset.1.gz
diff --git a/usr/share/man/man1/umount.1.gz b/usr/share/man/man1/umount.1.gz
diff --git a/usr/share/man/man3/cygwin_attach_handle_to_fd.3.gz b/usr/share/man/man3/cygwin_attach_handle_to_fd.3.gz
diff --git a/usr/share/man/man3/cygwin_conv_path.3.gz b/usr/share/man/man3/cygwin_conv_path.3.gz
diff --git a/usr/share/man/man3/cygwin_conv_path_list.3.gz b/usr/share/man/man3/cygwin_conv_path_list.3.gz
diff --git a/usr/share/man/man3/cygwin_create_path.3.gz b/usr/share/man/man3/cygwin_create_path.3.gz
diff --git a/usr/share/man/man3/cygwin_internal.3.gz b/usr/share/man/man3/cygwin_internal.3.gz
diff --git a/usr/share/man/man3/cygwin_logon_user.3.gz b/usr/share/man/man3/cygwin_logon_user.3.gz
diff --git a/usr/share/man/man3/cygwin_posix_path_list_p.3.gz b/usr/share/man/man3/cygwin_posix_path_list_p.3.gz
diff --git a/usr/share/man/man3/cygwin_set_impersonation_token.3.gz b/usr/share/man/man3/cygwin_set_impersonation_token.3.gz
diff --git a/usr/share/man/man3/cygwin_split_path.3.gz b/usr/share/man/man3/cygwin_split_path.3.gz
diff --git a/usr/share/man/man3/cygwin_stackdump.3.gz b/usr/share/man/man3/cygwin_stackdump.3.gz
diff --git a/usr/share/man/man3/intro.3.gz b/usr/share/man/man3/intro.3.gz
diff --git a/...b/pacman/local/msys2-runtime-3.5.5-2/desc → ...b/pacman/local/msys2-runtime-3.5.4-5/desc b/...b/pacman/local/msys2-runtime-3.5.5-2/desc → ...b/pacman/local/msys2-runtime-3.5.4-5/desc
@@ -2,7 +2,7 @@
 msys2-runtime
 
 %VERSION%
-3.5.5-2
+3.5.4-5
 
 %BASE%
 msys2-runtime
@@ -17,16 +17,16 @@ https://www.cygwin.com/
 x86_64
 
 %BUILDDATE%
-1735474477
+1732528195
 
 %INSTALLDATE%
-1735495448
+1735591119
 
 %PACKAGER%
 Johannes Schindelin <[email protected]>
 
 %SIZE%
-26702503
+26671359
 
 %GROUPS%
 base
@@ -35,7 +35,6 @@ base
 GPL
 
 %VALIDATION%
-sha256
 pgp
 
 %REPLACES%

diff --git a/.../pacman/local/msys2-runtime-3.5.5-2/files → .../pacman/local/msys2-runtime-3.5.4-5/files b/.../pacman/local/msys2-runtime-3.5.5-2/files → .../pacman/local/msys2-runtime-3.5.4-5/files
diff --git a/var/lib/pacman/local/msys2-runtime-3.5.4-5/mtree b/var/lib/pacman/local/msys2-runtime-3.5.4-5/mtree
diff --git a/var/lib/pacman/local/msys2-runtime-3.5.5-2/mtree b/var/lib/pacman/local/msys2-runtime-3.5.5-2/mtree
diff --git a/...an/local/msys2-runtime-devel-3.5.5-2/desc → ...an/local/msys2-runtime-devel-3.5.4-5/desc b/...an/local/msys2-runtime-devel-3.5.5-2/desc → ...an/local/msys2-runtime-devel-3.5.4-5/desc
@@ -2,7 +2,7 @@
 msys2-runtime-devel
 
 %VERSION%
-3.5.5-2
+3.5.4-5
 
 %BASE%
 msys2-runtime
@@ -17,16 +17,16 @@ https://www.cygwin.com/
 x86_64
 
 %BUILDDATE%
-1735474477
+1732528195
 
 %INSTALLDATE%
-1735495448
+1735591119
 
 %PACKAGER%
 Johannes Schindelin <[email protected]>
 
 %SIZE%
-4310660
+4310644
 
 %GROUPS%
 msys2-devel
@@ -35,15 +35,14 @@ msys2-devel
 GPL
 
 %VALIDATION%
-sha256
 pgp
 
 %REPLACES%
 libcatgets-devel
 msys2-runtime-3.4-devel
 
 %DEPENDS%
-msys2-runtime=3.5.5
+msys2-runtime=3.5.4
 
 %CONFLICTS%
 libcatgets-devel

diff --git a/...n/local/msys2-runtime-devel-3.5.5-2/files → ...n/local/msys2-runtime-devel-3.5.4-5/files b/...n/local/msys2-runtime-devel-3.5.5-2/files → ...n/local/msys2-runtime-devel-3.5.4-5/files
diff --git a/var/lib/pacman/local/msys2-runtime-devel-3.5.4-5/mtree b/var/lib/pacman/local/msys2-runtime-devel-3.5.4-5/mtree
diff --git a/var/lib/pacman/local/msys2-runtime-devel-3.5.5-2/mtree b/var/lib/pacman/local/msys2-runtime-devel-3.5.5-2/mtree