|
1 Binary files pacman-6.0.0.orig/lib/libalpm/.dload.c.swp and pacman-6.0.0/lib/libalpm/.dload.c.swp differ |
|
2 Binary files pacman-6.0.0.orig/lib/libalpm/.error.c.swp and pacman-6.0.0/lib/libalpm/.error.c.swp differ |
|
3 Binary files pacman-6.0.0.orig/lib/libalpm/.hook.c.swp and pacman-6.0.0/lib/libalpm/.hook.c.swp differ |
|
4 Binary files pacman-6.0.0.orig/lib/libalpm/.trans.c.swp and pacman-6.0.0/lib/libalpm/.trans.c.swp differ |
|
5 diff -ruN pacman-6.0.0.orig/lib/libalpm/util.c pacman-6.0.0/lib/libalpm/util.c |
|
6 --- pacman-6.0.0.orig/lib/libalpm/util.c 2021-05-20 03:38:45.948119900 +0000 |
|
7 +++ pacman-6.0.0/lib/libalpm/util.c 2021-08-26 17:26:09.719703392 +0000 |
|
8 @@ -652,6 +652,11 @@ |
|
9 /* use fprintf instead of _alpm_log to send output through the parent */ |
|
10 if(chroot(handle->root) != 0) { |
|
11 fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); |
|
12 + fprintf(stderr, "cmd : %s", cmd); |
|
13 + for(int i=0; argv[i]; i++){ |
|
14 + fprintf(stderr, " %s", argv[i]); |
|
15 + } |
|
16 + fprintf(stderr, "\n"); |
|
17 exit(1); |
|
18 } |
|
19 if(chdir("/") != 0) { |
|
20 Binary files pacman-6.0.0.orig/lib/libalpm/.util.c.swp and pacman-6.0.0/lib/libalpm/.util.c.swp differ |
|
21 Binary files pacman-6.0.0.orig/.meson.build.swp and pacman-6.0.0/.meson.build.swp differ |
|
22 diff -ruN pacman-6.0.0.orig/src/pacman/conf.c pacman-6.0.0/src/pacman/conf.c |
|
23 --- pacman-6.0.0.orig/src/pacman/conf.c 2021-05-20 03:38:45.964786500 +0000 |
|
24 +++ pacman-6.0.0/src/pacman/conf.c 2021-08-26 17:27:32.228666450 +0000 |
|
25 @@ -477,7 +477,7 @@ |
|
26 } |
|
27 |
|
28 /* now parse out and store actual flag if it is valid */ |
|
29 - if(strcmp(value, "Never") == 0) { |
|
30 + if(1 || strcmp(value, "Never") == 0) { |
|
31 if(package) { |
|
32 SLUNSET(ALPM_SIG_PACKAGE); |
|
33 } |
|
34 @@ -1071,9 +1071,11 @@ |
|
35 break; |
|
36 default: |
|
37 for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) { |
|
38 + char buf[1024]; |
|
39 + snprintf(buf, 1023, "%s%s",ROOTDIR, globbuf.gl_pathv[gindex]); |
|
40 pm_printf(ALPM_LOG_DEBUG, "config file %s, line %d: including %s\n", |
|
41 - file, linenum, globbuf.gl_pathv[gindex]); |
|
42 - ret = parse_ini(globbuf.gl_pathv[gindex], _parse_directive, data); |
|
43 + file, linenum, buf); |
|
44 + ret = parse_ini(buf, _parse_directive, data); |
|
45 if(ret) { |
|
46 goto cleanup; |
|
47 } |
|
48 Binary files pacman-6.0.0.orig/src/pacman/.conf.c.swp and pacman-6.0.0/src/pacman/.conf.c.swp differ |