June 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] Alternatives system
by Allan McRae 06 Dec '20

06 Dec '20

Hi all, I plan to finish implementing an alternatives system for pacman post 5.2 release: https://wiki.archlinux.org/index.php/User:Allan/Alternatives Any comments or suggestions? Thanks, Allan

6 7

[pacman-dev] [PATCH 1/2] [WIP] move wordsplit into ini for sharing
by Andrew Gregory 17 Oct '19

17 Oct '19

Not technically related to INI parsing, but we use it with INI files. --- lib/libalpm/hook.c | 113 --------------------------------------------- src/common/ini.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ src/common/ini.h | 3 ++ 3 files changed, 116 insertions(+), 113 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 6143ea0f..c385b5d5 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -17,7 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <ctype.h> #include <dirent.h> #include <errno.h> #include <limits.h> @@ -71,17 +70,6 @@ static void _alpm_trigger_free(struct _alpm_trigger_t *trigger) } } -static void _alpm_wordsplit_free(char **ws) -{ - if(ws) { - char **c; - for(c = ws; *c; c++) { - free(*c); - } - free(ws); - } -} - static void _alpm_hook_free(struct _alpm_hook_t *hook) { if(hook) { @@ -158,107 +146,6 @@ static int _alpm_hook_validate(alpm_handle_t *handle, return ret; } -static char **_alpm_wordsplit(char *str) -{ - char *c = str, *end; - char **out = NULL, **outsave; - size_t count = 0; - - if(str == NULL) { - errno = EINVAL; - return NULL; - } - - for(c = str; isspace(*c); c++); - while(*c) { - size_t wordlen = 0; - - /* extend our array */ - outsave = out; - if((out = realloc(out, (count + 1) * sizeof(char*))) == NULL) { - out = outsave; - goto error; - } - - /* calculate word length and check for unbalanced quotes */ - for(end = c; *end && !isspace(*end); end++) { - if(*end == '\'' || *end == '"') { - char quote = *end; - while(*(++end) && *end != quote) { - if(*end == '\\' && *(end + 1) == quote) { - end++; - } - wordlen++; - } - if(*end != quote) { - errno = EINVAL; - goto error; - } - } else { - if(*end == '\\' && (end[1] == '\'' || end[1] == '"')) { - end++; /* skip the '\\' */ - } - wordlen++; - } - } - - if(wordlen == (size_t) (end - c)) { - /* no internal quotes or escapes, copy it the easy way */ - if((out[count++] = strndup(c, wordlen)) == NULL) { - goto error; - } - } else { - /* manually copy to remove quotes and escapes */ - char *dest = out[count++] = malloc(wordlen + 1); - if(dest == NULL) { goto error; } - while(c < end) { - if(*c == '\'' || *c == '"') { - char quote = *c; - /* we know there must be a matching end quote, - * no need to check for '\0' */ - for(c++; *c != quote; c++) { - if(*c == '\\' && *(c + 1) == quote) { - c++; - } - *(dest++) = *c; - } - c++; - } else { - if(*c == '\\' && (c[1] == '\'' || c[1] == '"')) { - c++; /* skip the '\\' */ - } - *(dest++) = *(c++); - } - } - *dest = '\0'; - } - - if(*end == '\0') { - break; - } else { - for(c = end + 1; isspace(*c); c++); - } - } - - outsave = out; - if((out = realloc(out, (count + 1) * sizeof(char*))) == NULL) { - out = outsave; - goto error; - } - - out[count++] = NULL; - - return out; - -error: - /* can't use wordsplit_free here because NULL has not been appended */ - while(count) { - free(out[--count]); - } - free(out); - return NULL; -} - static int _alpm_hook_parse_cb(const char *file, int line, const char *section, char *key, char *value, void *data) { diff --git a/src/common/ini.c b/src/common/ini.c index 30f1fac8..9cdd5c47 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <ctype.h> #include <errno.h> #include <limits.h> #include <stdlib.h> @@ -106,3 +107,115 @@ cleanup: free(section_name); return ret; } + +void _alpm_wordsplit_free(char **ws) +{ + if(ws) { + char **c; + for(c = ws; *c; c++) { + free(*c); + } + free(ws); + } +} + +char **_alpm_wordsplit(const char *str) +{ + const char *c = str, *end; + char **out = NULL, **outsave; + size_t count = 0; + + if(str == NULL) { + errno = EINVAL; + return NULL; + } + + for(c = str; isspace(*c); c++); + while(*c) { + size_t wordlen = 0; + + /* extend our array */ + outsave = out; + if((out = realloc(out, (count + 1) * sizeof(char*))) == NULL) { + out = outsave; + goto error; + } + + /* calculate word length and check for unbalanced quotes */ + for(end = c; *end && !isspace(*end); end++) { + if(*end == '\'' || *end == '"') { + char quote = *end; + while(*(++end) && *end != quote) { + if(*end == '\\' && *(end + 1) == quote) { + end++; + } + wordlen++; + } + if(*end != quote) { + errno = EINVAL; + goto error; + } + } else { + if(*end == '\\' && (end[1] == '\'' || end[1] == '"')) { + end++; /* skip the '\\' */ + } + wordlen++; + } + } + + if(wordlen == (size_t) (end - c)) { + /* no internal quotes or escapes, copy it the easy way */ + if((out[count++] = strndup(c, wordlen)) == NULL) { + goto error; + } + } else { + /* manually copy to remove quotes and escapes */ + char *dest = out[count++] = malloc(wordlen + 1); + if(dest == NULL) { goto error; } + while(c < end) { + if(*c == '\'' || *c == '"') { + char quote = *c; + /* we know there must be a matching end quote, + * no need to check for '\0' */ + for(c++; *c != quote; c++) { + if(*c == '\\' && *(c + 1) == quote) { + c++; + } + *(dest++) = *c; + } + c++; + } else { + if(*c == '\\' && (c[1] == '\'' || c[1] == '"')) { + c++; /* skip the '\\' */ + } + *(dest++) = *(c++); + } + } + *dest = '\0'; + } + + if(*end == '\0') { + break; + } else { + for(c = end + 1; isspace(*c); c++); + } + } + + outsave = out; + if((out = realloc(out, (count + 1) * sizeof(char*))) == NULL) { + out = outsave; + goto error; + } + + out[count++] = NULL; + + return out; + +error: + /* can't use wordsplit_free here because NULL has not been appended */ + while(count) { + free(out[--count]); + } + free(out); + return NULL; +} diff --git a/src/common/ini.h b/src/common/ini.h index 6d2b264a..b7c40f2c 100644 --- a/src/common/ini.h +++ b/src/common/ini.h @@ -25,4 +25,7 @@ typedef int (ini_parser_fn)(const char *file, int line, const char *section, int parse_ini(const char *file, ini_parser_fn cb, void *data); +void _alpm_wordsplit_free(char **ws); +char **_alpm_wordsplit(const char *str); + #endif /* PM_INI_H */ -- 2.21.0

5 18

[pacman-dev] [PATCH 0/5][RFC] Die delta, die!
by Allan McRae 17 Oct '19

17 Oct '19

Deltas are broken. So much so that I would strongly recommend never using a delta from a repo that you did not generate yourself. In short, we call "system(command)", with a command that includes the name of a delta file, and the name of the package file before and after applying the delta. The name of the delta and the package files is controlled by the information in the repo, and could contain a malicious command to be run as root. We could possibly work around this, but it is a very risky piece of code and I believe it would be very hard to fully secure. Instead, I propose to remove delta support completely. Allan McRae (5): Remove delta support from repo-add Remove pkgdelta Remove cleanupdelta Make pacman forget deltas exist Remove support for deltas from libalpm doc/Makefile.am | 2 - doc/index.asciidoc | 1 - doc/meson.build | 1 - doc/pacman.conf.5.asciidoc | 8 - doc/pkgdelta.8.asciidoc | 53 ------ doc/repo-add.8.asciidoc | 22 +-- lib/libalpm/Makefile.am | 1 - lib/libalpm/alpm.h | 53 ------ lib/libalpm/be_sync.c | 21 +-- lib/libalpm/delta.c | 361 ------------------------------------- lib/libalpm/delta.h | 33 ---- lib/libalpm/error.c | 5 - lib/libalpm/handle.c | 20 -- lib/libalpm/handle.h | 5 - lib/libalpm/meson.build | 1 - lib/libalpm/package.c | 14 -- lib/libalpm/package.h | 2 - lib/libalpm/po/POTFILES.in | 1 - lib/libalpm/sync.c | 207 +-------------------- meson.build | 8 - scripts/.gitignore | 1 - scripts/Makefile.am | 3 - scripts/meson.build | 1 - scripts/pkgdelta.sh.in | 234 ------------------------ scripts/po/POTFILES.in | 1 - scripts/repo-add.sh.in | 168 +---------------- src/pacman/callback.c | 19 -- src/pacman/conf.c | 25 --- src/pacman/conf.h | 1 - src/pacman/pacman-conf.c | 13 -- src/pacman/po/POTFILES.in | 1 - src/pacman/sync.c | 5 +- src/util/.gitignore | 2 - src/util/Makefile.am | 5 +- src/util/cleanupdelta.c | 135 -------------- src/util/meson.build | 1 - 36 files changed, 27 insertions(+), 1407 deletions(-) delete mode 100644 doc/pkgdelta.8.asciidoc delete mode 100644 lib/libalpm/delta.c delete mode 100644 lib/libalpm/delta.h delete mode 100644 scripts/pkgdelta.sh.in delete mode 100644 src/util/cleanupdelta.c -- 2.20.1

3 9

[pacman-dev] [PATCH] makepkg: propagate E_REMOVE_BUILD_DEPS
by Alad Wenter 07 Oct '19

07 Oct '19

remove_deps is called once, at the end of clean_up() before makepkg exit. If remove_deps returns >0 (e.g. when pressing "n" in the resulting prompt), the error is caught by the ERR signal handler. This in turns sends SIGUSR1 to the process group, with resulting exit code 138. In case remove_deps fails, this patch exits makepkg with E_REMOVE_DEPS if there was no previous error (that is, EXIT_CODE equals E_OK). Otherwise, makepkg exits with EXIT_CODE. --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c81dc801..fd459532 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -176,7 +176,11 @@ clean_up() { fi fi - remove_deps + if ! remove_deps && (( EXIT_CODE == E_OK )); then + exit $E_REMOVE_DEPS_FAILED + else + exit $EXIT_CODE + fi } enter_fakeroot() { -- 2.20.1

2 1

[pacman-dev] [PATCH 1/4] meson: drop checks for things we don't use
by Dave Reisner 05 Aug '19

05 Aug '19

This was ported over from the AC_CHECK_{FUNCS,HEADERS} lists in configure.ac, but I never actually checked if the resulting CPP defines are used. Turns out, lots of symbols, not a lot of define usage. --- meson.build | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/meson.build b/meson.build index 91f05031..c2ed707a 100644 --- a/meson.build +++ b/meson.build @@ -163,38 +163,13 @@ foreach header : [ endforeach foreach sym : [ - 'dup2', - 'fork', - 'getcwd', 'getmntent', 'getmntinfo', - 'gettimeofday', - 'memmove', - 'memset', - 'mkdir', - 'realpath', - 'regcomp', - 'rmdir', - 'setenv', - 'setlocale', - 'strcasecmp', - 'strchr', - 'strcspn', - 'strdup', - 'strerror', 'strndup', 'strnlen', - 'strnlen', - 'strrchr', - 'strsep', 'strsep', - 'strstr', - 'strtol', 'swprintf', 'tcflush', - 'tcflush', - 'uname', - 'wcwidth', ] have = cc.has_function(sym, args : '-D_GNU_SOURCE') conf.set10('HAVE_' + sym.to_upper(), have) -- 2.22.0

2 4

[pacman-dev] [PATCH 1/2] sighandler: block signals while handling SIGSEGV
by Andrew Gregory 05 Aug '19

05 Aug '19

If we get SIGSEGV we need to bail out quickly, leaving other signals unblocked could lead to other signal handlers getting triggered. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Signals are hard. I'd appreciate if somebody could double check my math on these patches. src/pacman/sighandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index ebcdebae..a4849a0c 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -96,7 +96,7 @@ void install_segv_handler(void) { struct sigaction new_action; new_action.sa_handler = segv_handler; - sigemptyset(&new_action.sa_mask); + sigfillset(&new_action.sa_mask); new_action.sa_flags = SA_RESTART; sigaction(SIGSEGV, &new_action, NULL); } -- 2.21.0

2 3

[pacman-dev] [PATCH] libalpm: fix documentation for alpm_pkg_mtree_next
by morganamilo 03 Jul '19

03 Jul '19

libarchive uses 1 for EOF, not 0. Instead of using the actual ints, use libarchive's error codes. --- By the way, not familiar with doxygen. Is my wording fine or is there some built in "see also" functionality? diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ffb2ad96..ece894cf 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1326,7 +1326,8 @@ struct archive *alpm_pkg_mtree_open(alpm_pkg_t *pkg); * @param pkg the package that the mtree file is being read from * @param archive the archive structure reading from the mtree file * @param entry an archive_entry to store the entry header information - * @return 0 if end of archive is reached, non-zero otherwise. + * @return ARCHIVE_OK on success, ARCHIVE_EOF if end of archive is reached, + * otherwise an error occured (see archive.h). */ int alpm_pkg_mtree_next(const alpm_pkg_t *pkg, struct archive *archive, struct archive_entry **entry); -- 2.21.0

5 6

[pacman-dev] [PATCH] doc: Add a man page describing PKGINFO
by Jelle van der Waa 01 Jul '19

01 Jul '19

From: Jelle van der Waa <jelle(a)archlinux.org> Describe the PKGINFO format which resides in a package produced makepkg. --- doc/Makefile.am | 4 +- doc/PKGINFO.5.asciidoc | 86 ++++++++++++++++++++++++++++++++++++++++++ doc/meson.build | 1 + 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 doc/PKGINFO.5.asciidoc diff --git a/doc/Makefile.am b/doc/Makefile.am index 5c575832..634388e8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,7 +16,8 @@ MANPAGES = \ pacman.conf.5 \ libalpm.3 \ BUILDINFO.5 \ - pacman-conf.8 + pacman-conf.8 \ + PKGINFO.5 DOXYGEN_MANS = $(wildcard man3/*.3) @@ -47,6 +48,7 @@ EXTRA_DIST = \ makepkg.conf.5.asciidoc \ pacman.conf.5.asciidoc \ BUILDINFO.5.asciidoc \ + PKGINFO.5.asciidoc \ libalpm.3.asciidoc \ footer.asciidoc \ index.asciidoc \ diff --git a/doc/PKGINFO.5.asciidoc b/doc/PKGINFO.5.asciidoc new file mode 100644 index 00000000..2da25c5b --- /dev/null +++ b/doc/PKGINFO.5.asciidoc @@ -0,0 +1,86 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +PKGINFO(5) +========== + +Name +---- +PKGINFO - package information file + + +Synopsis +-------- +This manual page describes the format of a PKGINFO file found in the root of +a package created by makepkg. The file contains a description of the package's +information. The information is formatted in key-value pairs separated by +a '=', one value per line. Arrays are represented multiple keys with the same +value. + + +Description +----------- + +*pkgname*:: + The name of the package. + +*pkgbase*:: + The base name of a package, usually the same as the pkgname except for + split packages. + +*pkgver*:: + The version of the package including pkgrel and epoch. + +*pkgdesc*:: + A description of the package. + +*url*:: + The upstream of the package. + +*builddate*:: + The build date of the package in epoch. + +*packager*:: + The packager of the package formatted Foo <foo(a)bar.com>. + +*size*:: + The size of the package. + +*arch*:: + The architecture of the package. + +*license*:: + The license of the package. + +*replaces (array)*:: + An array of packages this package should replace. + +*group (array)*:: + An array of symbolic names that represent groups of packages. + +*conflict (array)*:: + An array of packages that will conflict with this package. + +*provides (array)*:: + An array of "virtual provisions" this package provides. + +*backup (array)*:: + An array of file names. + +*depend (array)*:: + The dependencies of the package. + +*optdepend (array)*:: + The optional dependencies of the package. + +*makedepend (array)*:: + The make dependencies of the package. + +*checkdepend (array)*:: + The check dependencies of the package. + +See Also +-------- +linkman:makepkg[8], linkman:pkgbuild[5] + +include::footer.asciidoc[] diff --git a/doc/meson.build b/doc/meson.build index a5bcd5b3..2f966616 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -12,6 +12,7 @@ manpages = [ { 'name': 'libalpm.3' }, { 'name': 'BUILDINFO.5' }, { 'name': 'pacman-conf.8' }, + { 'name': 'PKGINFO.5' }, ] sitepages = [ -- 2.22.0

4 5

[pacman-dev] [PATCH] src/pacman/po/de.po: Missing whitespace
by Florian Knodt 30 Jun '19

30 Jun '19

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 src/pacman/po/de.po: Missing whitespace German translation for "installing x breaks dependency y required by z" is missing a whitespace character. Signed-off-by: Florian Knodt <adlerweb(a)adlerweb.info> - --- src/pacman/po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 24cc413f..074176ee 100644 - --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -1550,7 +1550,7 @@ msgstr "Unerfüllbare Abhängigkeit '%s', benötigt von %s\n" #: src/pacman/sync.c:724 #, c-format msgid "installing %s (%s) breaks dependency '%s' required by %s\n" - -msgstr "Installation von%s (%s) verletzt Abhängigkeit '%s', benötigt von %s\n" +msgstr "Installation von %s (%s) verletzt Abhängigkeit '%s', benötigt von %s\n" #: src/pacman/sync.c:728 #, c-format - -- 2.22.0 -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEriS8bvu0c2IMqvEEfjx1LSYH85UFAl0X6AAACgkQfjx1LSYH 85VgqAgAjyeQLxB4VkJ0p50KqtDTHP+mehkuE156YrN5ympxCyA8ZTFqhHCDLV5k bN0p4iJD6ZEZYN9WZWVx/MBw+egh+kjnI5J0skwwEGGAbWUChQ1WwBxMjnitSxUS FZC1JWT7Lhs69SoXwvgeN/4Zeg+/HnuScYBrr6YVWYDTzqLS8iN+/hW5JtBqDrKW 5A1HqmT8tzOPD3enHIZhEphDedcyNsw2Um1aMFCQyjlxu1vPoB5XBgu/ZQJX3B/u uF2F0MaW3OwbknDgxelKH2pdKMIRccniW3DTUBKCtpd40hricmifwMk8RD8VasxK iYM15zbv/8L+HzqpGuHpc1U+HpndIw== =iJ0l -----END PGP SIGNATURE-----

2 1

[pacman-dev] [PATCH] Correctly report a download failiure for 404s
by morganamilo 28 Jun '19

28 Jun '19

Currently when caling alpm_trans_commit, if fetching a package restults in a 404 (or other non 400 response code), the function returns -1 but errno is never set. Thish patch sets errno to ALPM_ERR_RETRIEVE. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 05813c40..e5696bb0 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -454,6 +454,7 @@ static int curl_download_internal(struct dload_payload *payload, if(payload->respcode >= 400) { payload->unlink_on_fail = 1; if(!payload->errors_ok) { + handle->pm_errno = ALPM_ERR_RETRIEVE; /* non-translated message is same as libcurl */ snprintf(error_buffer, sizeof(error_buffer), "The requested URL returned error: %ld", payload->respcode); -- 2.21.0

2 1