Update to v6.1.0

.github/workflows/build.yaml

@@ -0,0 +1,55 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MSYS
+          update: true
+          install: >-
+            msys2-devel
+            base-devel
+            asciidoc
+            doxygen
+            git
+            meson
+            ninja
+            gettext-devel
+            heimdal-devel
+            libarchive-devel
+            libcurl-devel
+            libgpgme-devel
+            libsqlite-devel
+            libunistring-devel
+
+      - name: Build
+        shell: msys2 {0}
+        run: |
+          meson _build \
+            --auto-features=enabled \
+            --default-library=static \
+            -Dbuildstatic=true \
+            -Ddoxygen=enabled \
+            -Dfile-seccomp=disabled
+
+          meson compile -C _build
+
+      - name: Install
+        shell: msys2 {0}
+        run: |
+          DESTDIR="$(pwd)"/_dest meson install -C _build
+
+      - name: Upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: install
+          path: _dest/

doc/meson.build

@@ -59,7 +59,7 @@ foreach page : manpages
       '-f', 'manpage',
       '--xsltproc-opts', '-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0',
       '-D', '@OUTDIR@',
-      '--asciidoc-opts', ' '.join(asciidoc_opts),
+      '--asciidoc-opts=' + ' '.join(asciidoc_opts),
       '@INPUT@',
     ],
     input : input,

lib/libalpm/add.c

@@ -266,6 +266,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 					"filesystem: %o  package: %o\n", filename, lsbuf.st_mode & mask,
 					entrymode & mask);
 		}
+#ifndef __MSYS__
 
 #if 0
 		/* Disable this warning until our user management in packages has improved.
@@ -283,6 +284,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 		}
 #endif
 
+#endif
 		_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
 				filename);
 		archive_read_data_skip(archive);
@@ -655,7 +657,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 int _alpm_upgrade_packages(alpm_handle_t *handle)
 {
 	size_t pkg_count, pkg_current;
-	int skip_ldconfig = 0, ret = 0;
+#ifndef __MSYS__
+	int skip_ldconfig = 0;
+#endif
+	int ret = 0;
 	alpm_list_t *targ;
 	alpm_trans_t *trans = handle->trans;
 
@@ -678,18 +683,22 @@ int _alpm_upgrade_packages(alpm_handle_t *handle)
 			/* something screwed up on the commit, abort the trans */
 			trans->state = STATE_INTERRUPTED;
 			handle->pm_errno = ALPM_ERR_TRANS_ABORT;
+#ifndef __MSYS__
 			/* running ldconfig at this point could possibly screw system */
 			skip_ldconfig = 1;
+#endif
 			ret = -1;
 		}
 
 		pkg_current++;
 	}
 
+#ifndef __MSYS__
 	if(!skip_ldconfig) {
 		/* run ldconfig if it exists */
 		_alpm_ldconfig(handle);
 	}
+#endif
 
 	return ret;
 }

lib/libalpm/alpm.h

@@ -2852,6 +2852,15 @@ int alpm_trans_release(alpm_handle_t *handle);
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
 int alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade);
+#ifdef __MSYS__
+int alpm_sync_sysupgrade_core(alpm_handle_t *handle, int enable_downgrade);
+
+/** Informs whether a package is a core package.
+ * @param pkg the package to check
+ * @return non-zero if this is a core package, zero otherwise
+ */
+int alpm_pkg_is_core_package(const alpm_pkg_t *pkg);
+#endif
 
 /** Add a package to the transaction.
  * If the package was loaded by alpm_pkg_load(), it will be freed upon

lib/libalpm/conflict.c

@@ -518,6 +518,32 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 
 			_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);
 
+#ifdef __MSYS__
+			/* In case a file "foo.exe" gets renamed to "foo" the msys2 .exe
+			 * interpolation makes pacman think an untracker file is replaced.
+			 * In case foo and foo.exe are the same file and foo.exe existed
+			 * in the old package version we can be sure it's handled by the
+			 * old package and ignore the conflict */
+			if(dbpkg) {
+				char path_exe[PATH_MAX];
+				struct stat lsbuf2;
+
+				strncpy(path_exe, path, sizeof(path_exe) - 4);
+				strcat(path_exe, ".exe");
+				if(llstat(path, &lsbuf) == 0 && llstat(path_exe, &lsbuf2) == 0) {
+					int old_contains_exe = (alpm_filelist_contains(alpm_pkg_get_files(dbpkg), path_exe + rootlen) != NULL);
+					int same_file = (lsbuf.st_dev == lsbuf2.st_dev && lsbuf.st_ino == lsbuf2.st_ino);
+
+					if(same_file && old_contains_exe) {
+						_alpm_log(handle, ALPM_LOG_DEBUG,
+								"MSYS2 special case: Found %s which is the same file and included in the old package\n",
+								path_exe);
+						continue;
+					}
+				}
+			}
+#endif
+
 			pfile_isdir = path[pathlen - 1] == '/';
 			if(pfile_isdir) {
 				if(S_ISDIR(lsbuf.st_mode)) {

lib/libalpm/filelist.c

@@ -25,6 +25,43 @@
 #include "filelist.h"
 #include "util.h"
 
+#ifdef __MSYS__
+
+#define TOLOWER(c) (((c) >= 'A' && (c) <= 'Z') ? (c) - 'A' + 'a' : (c))
+
+static int _cmppath(const char *s1, const char *s2)
+{
+	int c1, c2;
+
+	while(*s1 && *s2)
+	{
+		c1 = TOLOWER(*s1);
+		c2 = TOLOWER(*s2);
+		if(c1 != c2)
+			return c1 - c2;
+		s1++;
+		s2++;
+	}
+
+	return *s1 - *s2;
+}
+
+static int _cmpchar(char c1, char c2)
+{
+	return TOLOWER(c1) - TOLOWER(c2);
+}
+#else
+static int _cmppath(const char *s1, const char *s2)
+{
+	return strcmp(s1, s2);
+}
+
+static int _cmpchar(char c1, char c2)
+{
+	return c1 - c2;
+}
+#endif
+
 /* Returns the difference of the provided two lists of files.
  * Pre-condition: both lists are sorted!
  * When done, free the list but NOT the contained data.
@@ -39,7 +76,7 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA,
 		char *strA = filesA->files[ctrA].name;
 		char *strB = filesB->files[ctrB].name;
 
-		int cmp = strcmp(strA, strB);
+		int cmp = _cmppath(strA, strB);
 		if(cmp < 0) {
 			/* item only in filesA, qualifies as a difference */
 			ret = alpm_list_add(ret, strA);
@@ -63,7 +100,7 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA,
 
 static int _alpm_filelist_pathcmp(const char *p1, const char *p2)
 {
-	while(*p1 && *p1 == *p2) {
+	while(*p1 && _cmpchar(*p1, *p2) == 0) {
 		p1++;
 		p2++;
 	}
@@ -75,7 +112,7 @@ static int _alpm_filelist_pathcmp(const char *p1, const char *p2)
 		p1++;
 	}
 
-	return *p1 - *p2;
+	return _cmpchar(*p1, *p2);
 }
 
 /* Returns the intersection of the provided two lists of files.
@@ -115,7 +152,7 @@ static int _alpm_files_cmp(const void *f1, const void *f2)
 {
 	const alpm_file_t *file1 = f1;
 	const alpm_file_t *file2 = f2;
-	return strcmp(file1->name, file2->name);
+	return _cmppath(file1->name, file2->name);
 }
 
 alpm_file_t SYMEXPORT *alpm_filelist_contains(const alpm_filelist_t *filelist,
@@ -137,7 +174,7 @@ void _alpm_filelist_sort(alpm_filelist_t *filelist)
 {
 	size_t i;
 	for(i = 1; i < filelist->count; i++) {
-		if(strcmp(filelist->files[i - 1].name, filelist->files[i].name) > 0) {
+		if(_cmppath(filelist->files[i - 1].name, filelist->files[i].name) > 0) {
 			/* filelist is not pre-sorted */
 			qsort(filelist->files, filelist->count,
 					sizeof(alpm_file_t), _alpm_files_cmp);

lib/libalpm/package.c

@@ -900,3 +900,21 @@ int _alpm_pkg_check_meta(alpm_pkg_t *pkg)
 
 	return error_found;
 }
+
+#ifdef __MSYS__
+int SYMEXPORT alpm_pkg_is_core_package(const alpm_pkg_t *pkg)
+{
+	if (pkg == NULL)
+		return 0;
+	return
+		strcmp(pkg->name, "bash")                == 0 ||
+		strcmp(pkg->name, "filesystem")          == 0 ||
+		strcmp(pkg->name, "mintty")              == 0 ||
+		strcmp(pkg->name, "msys2-runtime")       == 0 ||
+		strcmp(pkg->name, "msys2-runtime-devel") == 0 ||
+		strncmp(pkg->name, "msys2-runtime-",
+				strlen("msys2-runtime-"))        == 0 ||
+		strcmp(pkg->name, "pacman")              == 0 ||
+		strcmp(pkg->name, "pacman-mirrors")      == 0;
+}
+#endif

lib/libalpm/remove.c

@@ -767,18 +767,22 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig)
 		if(_alpm_remove_single_package(handle, pkg, NULL,
 					targ_count, pkg_count) == -1) {
 			handle->pm_errno = ALPM_ERR_TRANS_ABORT;
+#ifndef __MSYS__
 			/* running ldconfig at this point could possibly screw system */
 			run_ldconfig = 0;
+#endif
 			ret = -1;
 		}
 
 		targ_count++;
 	}
 
+#ifndef __MSYS__
 	if(run_ldconfig) {
 		/* run ldconfig if it exists */
 		_alpm_ldconfig(handle);
 	}
+#endif
 
 	return ret;
 }

lib/libalpm/sync.c

@@ -197,7 +197,13 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg,
 	return replacers;
 }
 
+/** Search for packages to upgrade and add them to the transaction. */
+#ifdef __MSYS__
+static
+int SYMEXPORT do_alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade, int core_update)
+#else
 int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
+#endif
 {
 	alpm_list_t *i, *j;
 	alpm_trans_t *trans;
@@ -211,6 +217,13 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
 	for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
 		alpm_pkg_t *lpkg = i->data;
 
+#ifdef __MSYS__
+		/* Skip regular packages in core update, and core packages in regular update */
+		if(core_update != alpm_pkg_is_core_package(lpkg)) {
+			continue;
+		}
+#endif
+
 		if(alpm_pkg_find(trans->remove, lpkg->name)) {
 			_alpm_log(handle, ALPM_LOG_DEBUG, "%s is marked for removal -- skipping\n", lpkg->name);
 			continue;
@@ -252,6 +265,18 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
 	return 0;
 }
 
+#ifdef __MSYS__
+int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
+{
+	return do_alpm_sync_sysupgrade(handle, enable_downgrade, 0);
+}
+
+int SYMEXPORT alpm_sync_sysupgrade_core(alpm_handle_t *handle, int enable_downgrade)
+{
+	return do_alpm_sync_sysupgrade(handle, enable_downgrade, 1);
+}
+#endif
+
 alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs,
 		const char *name)
 {