edouard@37: Binary files pacman-6.0.0.orig/lib/libalpm/.dload.c.swp and pacman-6.0.0/lib/libalpm/.dload.c.swp differ edouard@37: Binary files pacman-6.0.0.orig/lib/libalpm/.error.c.swp and pacman-6.0.0/lib/libalpm/.error.c.swp differ edouard@37: Binary files pacman-6.0.0.orig/lib/libalpm/.hook.c.swp and pacman-6.0.0/lib/libalpm/.hook.c.swp differ edouard@37: Binary files pacman-6.0.0.orig/lib/libalpm/.trans.c.swp and pacman-6.0.0/lib/libalpm/.trans.c.swp differ edouard@37: diff -ruN pacman-6.0.0.orig/lib/libalpm/util.c pacman-6.0.0/lib/libalpm/util.c edouard@37: --- pacman-6.0.0.orig/lib/libalpm/util.c 2021-05-20 03:38:45.948119900 +0000 edouard@37: +++ pacman-6.0.0/lib/libalpm/util.c 2021-08-26 17:26:09.719703392 +0000 edouard@37: @@ -652,6 +652,11 @@ edouard@37: /* use fprintf instead of _alpm_log to send output through the parent */ edouard@37: if(chroot(handle->root) != 0) { edouard@37: fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); edouard@37: + fprintf(stderr, "cmd : %s", cmd); edouard@37: + for(int i=0; argv[i]; i++){ edouard@37: + fprintf(stderr, " %s", argv[i]); edouard@37: + } edouard@37: + fprintf(stderr, "\n"); edouard@37: exit(1); edouard@37: } edouard@37: if(chdir("/") != 0) { edouard@37: Binary files pacman-6.0.0.orig/lib/libalpm/.util.c.swp and pacman-6.0.0/lib/libalpm/.util.c.swp differ edouard@37: Binary files pacman-6.0.0.orig/.meson.build.swp and pacman-6.0.0/.meson.build.swp differ edouard@37: diff -ruN pacman-6.0.0.orig/src/pacman/conf.c pacman-6.0.0/src/pacman/conf.c edouard@37: --- pacman-6.0.0.orig/src/pacman/conf.c 2021-05-20 03:38:45.964786500 +0000 edouard@37: +++ pacman-6.0.0/src/pacman/conf.c 2021-08-26 17:27:32.228666450 +0000 edouard@37: @@ -477,7 +477,7 @@ edouard@37: } edouard@37: edouard@37: /* now parse out and store actual flag if it is valid */ edouard@37: - if(strcmp(value, "Never") == 0) { edouard@37: + if(1 || strcmp(value, "Never") == 0) { edouard@37: if(package) { edouard@37: SLUNSET(ALPM_SIG_PACKAGE); edouard@37: } edouard@37: @@ -1071,9 +1071,11 @@ edouard@37: break; edouard@37: default: edouard@37: for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) { edouard@37: + char buf[1024]; edouard@37: + snprintf(buf, 1023, "%s%s",ROOTDIR, globbuf.gl_pathv[gindex]); edouard@37: pm_printf(ALPM_LOG_DEBUG, "config file %s, line %d: including %s\n", edouard@37: - file, linenum, globbuf.gl_pathv[gindex]); edouard@37: - ret = parse_ini(globbuf.gl_pathv[gindex], _parse_directive, data); edouard@37: + file, linenum, buf); edouard@37: + ret = parse_ini(buf, _parse_directive, data); edouard@37: if(ret) { edouard@37: goto cleanup; edouard@37: } edouard@37: Binary files pacman-6.0.0.orig/src/pacman/.conf.c.swp and pacman-6.0.0/src/pacman/.conf.c.swp differ