- Pacman-dev - lists.archlinux.org

[pacman-dev] RFC: 'repo-add' command for repository discovery
by Tim Groeneveld 21 Jul '15

21 Jul '15

Hi Everyone, I have been thinking about the creation of a tool similar to Ubuntu's add-apt-repository, allowing some automation of the repository adding process inside Arch Linux. My thoughts at the moment would be to create a simple bash script (`repo-add`?) that would get the TXT record for the second command line argument. For example, I could run: repo-add packages.timg.ws The script would then get the TXT record for packages.timg.ws. That TXT record would point to a .conf file that contains all of the configuration for the "packages.timg.ws" repository. That .conf file would be downloaded, and then placed into /etc/pacman.d My thinking is that this command would set up the pacman configuration, and check that everything is OK. If the .conf file contains as a comment with the fingerprint and location of a public key, then `pacman-key` can additionally be automated, maybe showing a message showing what the fingerprint is and that the gpg key downloaded from the comment on the .conf file matches that of the public key. Additionally, a .conf file from the TXT record could also suggest that packages get installed straight after the repo-add command has been ran. If the second command is a URI, then either that file could be downloaded (skipping the "discovery" of a repository), or just the host could be extracted from the URI allowing the discovery to go back to the TXT record. Having this command use the TXT record has two awesome advantages: 1. My site (eg, packges.timg.ws) could be hosted on a different server to where the packages are. 2. No more copying & pasting a whole bunch of configuration to add a repository. Example Run: # repo-add packages.timg.ws 1. The script dig's the hostname that was entered as the second argument on the script: # dig TXT packages.timg.ws +short "http://timg.ws/archlinux/repo/timgws.conf" 2. The .conf file is downloaded. 3. The GPG key shown in the .conf file is downloaded 4. Fingerprint matched, OK (here there would be a warning if the fingerprint of key != fingerprint in conf) 5. Fingerprint shown, confirmation requested 6. conf added to pacman, if packages are suggested, show what they are, ask to run pacman -Su <packages> 7. ??? 8. Profit! Please let me know your thoughts. Tim

4 5

[pacman-dev] [PATCH] libmakepkg: move color settings to function
by Allan McRae 20 Jul '15

20 Jul '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/util/message.sh | 20 ++++++++++++++++++++ scripts/makepkg.sh.in | 22 ++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/libmakepkg/util/message.sh b/scripts/libmakepkg/util/message.sh index c2c1982..41a105a 100644 --- a/scripts/libmakepkg/util/message.sh +++ b/scripts/libmakepkg/util/message.sh @@ -23,6 +23,26 @@ LIBMAKEPKG_UTIL_MESSAGE_SH=1 +colorize() { + # prefer terminal safe colored and bold text when tput is supported + if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + RED="${BOLD}$(tput setaf 1)" + YELLOW="${BOLD}$(tput setaf 3)" + else + ALL_OFF="\e[0m" + BOLD="\e[1m" + BLUE="${BOLD}\e[34m" + GREEN="${BOLD}\e[32m" + RED="${BOLD}\e[31m" + YELLOW="${BOLD}\e[33m" + fi + readonly ALL_OFF BOLD BLUE GREEN RED YELLOW +} + plain() { local mesg=$1; shift printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8b6557e..ec8218f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1892,26 +1892,12 @@ PACMAN=${PACMAN:-pacman} PACMAN_PATH=$(type -P $PACMAN) # check if messages are to be printed using color -unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && $USE_COLOR != "n" ]] && check_buildenv "color" "y"; then - # prefer terminal safe colored and bold text when tput is supported - if tput setaf 0 &>/dev/null; then - ALL_OFF="$(tput sgr0)" - BOLD="$(tput bold)" - BLUE="${BOLD}$(tput setaf 4)" - GREEN="${BOLD}$(tput setaf 2)" - RED="${BOLD}$(tput setaf 1)" - YELLOW="${BOLD}$(tput setaf 3)" - else - ALL_OFF="\e[0m" - BOLD="\e[1m" - BLUE="${BOLD}\e[34m" - GREEN="${BOLD}\e[32m" - RED="${BOLD}\e[31m" - YELLOW="${BOLD}\e[33m" - fi + colorize +else + unset ALL_OFF BOLD BLUE GREEN RED YELLOW fi -readonly ALL_OFF BOLD BLUE GREEN RED YELLOW + # override settings with an environment variable for batch processing BUILDDIR=${_BUILDDIR:-$BUILDDIR} -- 2.4.6

1 0

[pacman-dev] [PATCH] pacman/files.c: fix memory leak on regex error
by Allan McRae 20 Jul '15

20 Jul '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/files.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/files.c b/src/pacman/files.c index 2250994..ceec342 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -102,6 +102,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { /* TODO: error message */ + free(targ); goto notfound; } } -- 2.4.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-184-gdeac973
by allan＠archlinux.org 20 Jul '15

20 Jul '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via deac9731884a83ad91eab9f27b288f406f56c87b (commit) via 445aa3b52cfcd5630ec10d2ae2c8eeffa2b5c5de (commit) via bbab90836b2f7d8b03c862f35bc6e3ff2bd628d2 (commit) via 3c410309644ecc4800a9aa6d96693a5630515701 (commit) via fd9ff672b0010650297e645c4fd1bd1cc320e3ef (commit) via acf95f6b3b6e2bef174da51e799bd07ce9f4cfd0 (commit) via 137a4086de310e2d31cb719806e01cd9eb414ec0 (commit) via 488ca2426568163721153822af8269447e481c7d (commit) via 5782b8356c9b9d2c5e21694de22b1441277574b7 (commit) via e49abc9860cfe9470a5828d3bb0ad38fd57a0fad (commit) via b0dac754d27b45e4346b010e674f7faa466e0025 (commit) via 289fdf0d1d9c88f0c8a6502cc311599c63a04723 (commit) via f6c55b3c3f395839c0973c36b7a7e05984636a61 (commit) via 1ada16f0177f9bfcaed95cf3b71b7029290a5f1d (commit) via 2d7a41539b73b373b63d7e2d61ed519e19878799 (commit) from 94204d108984c46966c681a05f232d830812d440 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit deac9731884a83ad91eab9f27b288f406f56c87b Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Jul 18 17:58:23 2015 +0200 ensure matching database and package version While loading each package ensure that the internal version matches the expected database version to avoid the possibility to circumvent the version check. This issue can be used by an attacker to trick the software into installing an older version. The behavior can be exploited by a man-in-the-middle attack through specially crafted database tarball containing a higher version, yet actually delivering an older and vulnerable version, which was previously shipped. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> Signed-off-by: Remi Gacogne <rgacogne(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 445aa3b52cfcd5630ec10d2ae2c8eeffa2b5c5de Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 19 09:50:40 2015 -0400 dont remove x bit when marking pkgdir RO f170a94c137d355 potentially causes $pkgdirbase/$pkg to be undeleteable with -R or -C if a previous build was interrupted. We simply can't traverse to this directory, and rm blows up. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bbab90836b2f7d8b03c862f35bc6e3ff2bd628d2 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 20 11:43:27 2015 +1000 libmakepkg: lint_package requires cd_safe Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c410309644ecc4800a9aa6d96693a5630515701 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 20 17:26:22 2015 +1000 Handle repo/pkg style arguments to sync repo file listing Passing "-Fl pkg" will print the filelist for the first occurance of "pkg" in the sync repos. Other version of the package can be printed using "-Fl repo/pkg". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fd9ff672b0010650297e645c4fd1bd1cc320e3ef Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 19:27:51 2015 +1000 Add regex search option to sync database file searching e.g. pacman -Fsx kcm.*print.*\.so Signed-off-by: Allan McRae <allan(a)archlinux.org> commit acf95f6b3b6e2bef174da51e799bd07ce9f4cfd0 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 18:28:13 2015 +1000 Implement searching for a file in the sync databases Locates all packages that contain the listed file e.g. pacman -Fs libpng.so Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 137a4086de310e2d31cb719806e01cd9eb414ec0 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 13:19:09 2015 +1000 Implement listing files from sync packages Does the equivalent of the -Ql option for local packages e.g. pacman -Fl glibc Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 488ca2426568163721153822af8269447e481c7d Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 01:57:38 2015 +1000 Implement locating file owner in sync files database Equivalent to -Qo but for packages in the sync database e.g. pacman -Fo /usr/bin/pacman Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5782b8356c9b9d2c5e21694de22b1441277574b7 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 17 23:56:21 2015 +1000 Prototype pacman files database operations Add the -F/--files operations, -s/--sync support and nd provide dummy functions for -s/--search, -l/-list and -o/--owns. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e49abc9860cfe9470a5828d3bb0ad38fd57a0fad Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 00:12:14 2015 +1000 pacman: move database syncing to util.c Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b0dac754d27b45e4346b010e674f7faa466e0025 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 17 22:27:50 2015 +1000 Add pacman support for .files databases Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 289fdf0d1d9c88f0c8a6502cc311599c63a04723 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 14 22:00:38 2015 +1000 Read file lists from databases If a sync database contains a "files" file, the file list will be read. Currently, there is no known demand for the file list to be lazy loaded by any libalpm frontend, so these files are read whenever present. Lazy loading can be implemented when a demand exists. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f6c55b3c3f395839c0973c36b7a7e05984636a61 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 14 21:45:59 2015 +1000 Allow frontends to specify the sync database extension This allows frontends to select between the .db and .files databases currently supplied by repo-add or any other compatible database. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1ada16f0177f9bfcaed95cf3b71b7029290a5f1d Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 18 00:15:44 2015 +1000 Fix formatting in parsearg_upgrade Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d7a41539b73b373b63d7e2d61ed519e19878799 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 17 22:17:55 2015 +1000 Simplify sync_cleandb 1) Remove checks for removing pre-tardb files 2) Remove the long redundant keep_used parameter 3) Fix pacman error due to removing .sig file along with database Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.c | 3 + lib/libalpm/alpm.h | 3 + lib/libalpm/be_sync.c | 55 ++++++- lib/libalpm/db.c | 6 +- lib/libalpm/handle.c | 22 +++ lib/libalpm/handle.h | 1 + lib/libalpm/sync.c | 18 +++ scripts/libmakepkg/lint_package.sh.in | 1 + scripts/makepkg.sh.in | 2 +- src/pacman/Makefile.am | 1 + src/pacman/callback.c | 2 +- src/pacman/conf.c | 4 + src/pacman/conf.h | 6 +- src/pacman/files.c | 271 ++++++++++++++++++++++++++++++++++ src/pacman/pacman.c | 88 ++++++++++- src/pacman/pacman.h | 2 + src/pacman/sync.c | 86 +++-------- src/pacman/util.c | 33 +++++ src/pacman/util.h | 1 + 19 files changed, 520 insertions(+), 85 deletions(-) create mode 100644 src/pacman/files.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: lint_package requires cd_safe
by Allan McRae 20 Jul '15

20 Jul '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_package.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/libmakepkg/lint_package.sh.in b/scripts/libmakepkg/lint_package.sh.in index 6255639..0f1c738 100644 --- a/scripts/libmakepkg/lint_package.sh.in +++ b/scripts/libmakepkg/lint_package.sh.in @@ -24,6 +24,7 @@ LIBMAKEPKG_LINT_PACKAGE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/util.sh" declare -a lint_package_functions -- 2.4.6

1 0

[pacman-dev] [PATCH] dont remove x bit when marking pkgdir RO
by Dave Reisner 19 Jul '15

19 Jul '15

f170a94c137d355 potentially causes $pkgdirbase/$pkg to be undeleteable with -R or -C if a previous build was interrupted. We simply can't traverse to this directory, and rm blows up. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..ffe7fe5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2235,7 +2235,7 @@ else unset pkg fi mkdir -p "$pkgdirbase" - chmod a-srwx "$pkgdirbase" + chmod a-srw "$pkgdirbase" cd_safe "$startdir" if (( ! REPKG )); then -- 2.4.6

1 0

[pacman-dev] [PATCH] ensure matching database and package version
by Levente Polyak 18 Jul '15

18 Jul '15

While loading each package ensure that the internal version matches the expected database version to avoid the possibility to circumvent the version check. This issue can be used by an attacker to trick the software into installing an older version. The behavior can be exploited by a man-in-the-middle attack through specially crafted database tarball containing a higher version, yet actually delivering an older and vulnerable version, which was previously shipped. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> Signed-off-by: Remi Gacogne <rgacogne(a)archlinux.org> --- lib/libalpm/sync.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 888ae15..8504e02 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1212,6 +1212,7 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, EVENT(handle, &event); for(i = handle->trans->add; i; i = i->next, current++) { + int error = 0; alpm_pkg_t *spkg = i->data; char *filepath; int percent = (int)(((double)current_bytes / total_bytes) * 100); @@ -1232,6 +1233,21 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, spkg->name); alpm_pkg_t *pkgfile =_alpm_pkg_load_internal(handle, filepath, 1); if(!pkgfile) { + _alpm_log(handle, ALPM_LOG_DEBUG, "failed to load pkgfile internal\n"); + error = 1; + } else { + if(strcmp(spkg->name, pkgfile->name) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "internal package name missmatch, expected: '%s', actual: '%s'\n", + spkg->name, pkgfile->name); + error = 1; + } + if(alpm_pkg_vercmp(spkg->version, pkgfile->version) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "internal package version missmatch, expected: '%s', actual: '%s'\n", + spkg->version, pkgfile->version); + error = 1; + } + } + if(error != 0) { errors++; *data = alpm_list_add(*data, strdup(spkg->filename)); free(filepath); -- 2.4.6

4 4

[pacman-dev] Incremental builds
by Yomi Ogunwumi 17 Jul '15

17 Jul '15

Hello. I have several software projects I end up building frequently. For quite awhile I had an alias, mkpkg that would do makepkg -sfiC. But then I came across a blog post about the pacman/makepkg 4.2.0 release supporting incremental builds. So I've since changed that alias to makepkg -sife. Eventually I realized that maybe it was enabled automatically.Though it would seem that it still isn't building incrementally. To confirm that I built mpv, once from the AUR and again directly from github. (I waited for some commits to be made to the master branch in both cases.) Building mpv from the AUR seemed to start from the beginning despite no messages being printed about the $srcdir being removed. Building directly from github was quicker (after being built once in both cases). So, are there some options I need to pass to makepkg enable incremental builds? -- *Yomi*

2 2

[pacman-dev] [PATCH 03/12] Allow frontends to specify the sync database extension
by Allan McRae 14 Jul '15

14 Jul '15

This allows frontends to select between the .db and .files databases currently supplied by repo-add or any other compatible database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.c | 4 ++++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/be_sync.c | 15 ++++++++++----- lib/libalpm/db.c | 6 ++++-- lib/libalpm/handle.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + 6 files changed, 50 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 2110286..6fd3932 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -64,6 +64,10 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, goto cleanup; } + /* set default database extension */ + myhandle->dbext = calloc(4, sizeof(char)); + snprintf(myhandle->dbext, 4, "%s", ".db"); + lockfilelen = strlen(myhandle->dbpath) + strlen(lf) + 1; myhandle->lockfile = calloc(lockfilelen, sizeof(char)); snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 06e080b..594f0b6 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -859,6 +859,9 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +const char *alpm_option_get_dbext(alpm_handle_t *handle); +int alpm_option_set_dbext(alpm_handle_t *handle, const char *dbext); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ea979e6..5783f64 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -174,6 +174,7 @@ valid: int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) { char *syncpath; + const char *dbext; alpm_list_t *i; int ret = -1; mode_t oldmask; @@ -208,6 +209,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1); } + dbext = db->handle->dbext; + for(i = db->servers; i; i = i->next) { const char *server = i->data, *final_db_url = NULL; struct dload_payload payload; @@ -220,10 +223,10 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.max_size = 25 * 1024 * 1024; /* print server + filename into a buffer */ - len = strlen(server) + strlen(db->treename) + 5; + len = strlen(server) + strlen(db->treename) + strlen(dbext) + 2; /* TODO fix leak syncpath and umask unset */ MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(payload.fileurl, len, "%s/%s.db", server, db->treename); + snprintf(payload.fileurl, len, "%s/%s%s", server, db->treename, dbext); payload.handle = handle; payload.force = force; payload.unlink_on_fail = 1; @@ -244,7 +247,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* check if the final URL from internal downloader looks reasonable */ if(final_db_url != NULL) { - if(strlen(final_db_url) < 3 || strcmp(final_db_url + strlen(final_db_url) - 3, ".db") != 0) { + if(strlen(final_db_url) < 3 + || strcmp(final_db_url + strlen(final_db_url) - strlen(dbext), + dbext) != 0) { final_db_url = NULL; } } @@ -255,7 +260,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) len = strlen(final_db_url) + 5; } else { /* print server + filename into a buffer (leave space for separator and .db.sig) */ - len = strlen(server) + strlen(db->treename) + 9; + len = strlen(server) + strlen(db->treename) + strlen(dbext) + 5; } /* TODO fix leak syncpath and umask unset */ @@ -264,7 +269,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) if(final_db_url != NULL) { snprintf(payload.fileurl, len, "%s.sig", final_db_url); } else { - snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); + snprintf(payload.fileurl, len, "%s/%s%s.sig", server, db->treename, dbext); } payload.handle = handle; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index fe208be..b94d334 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -375,10 +375,12 @@ const char *_alpm_db_path(alpm_db_t *db) CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL)); sprintf(db->_path, "%s%s/", dbpath, db->treename); } else { - pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 4; + const char *dbext = db->handle->dbext; + + pathsize = strlen(dbpath) + 5 + strlen(db->treename) + strlen(dbext) + 1; CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL)); /* all sync DBs now reside in the sync/ subdir of the dbpath */ - sprintf(db->_path, "%ssync/%s.db", dbpath, db->treename); + sprintf(db->_path, "%ssync/%s%s", dbpath, db->treename, dbext); } _alpm_log(db->handle, ALPM_LOG_DEBUG, "database path for tree %s set to %s\n", db->treename, db->_path); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 4915d0b..2b43e25 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -81,6 +81,7 @@ void _alpm_handle_free(alpm_handle_t *handle) _alpm_trans_free(handle->trans); FREE(handle->root); FREE(handle->dbpath); + FREE(handle->dbext); FREELIST(handle->cachedirs); FREE(handle->logfile); FREE(handle->lockfile); @@ -284,6 +285,12 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dbext; +} + int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) { CHECK_HANDLE(handle, return -1); @@ -664,6 +671,27 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_dbext(alpm_handle_t *handle, const char *dbext) +{ + char *olddbext = handle->dbext; + + CHECK_HANDLE(handle, return -1); + if(!dbext) { + handle->pm_errno = ALPM_ERR_WRONG_ARGS; + return -1; + } + + STRDUP(handle->dbext, dbext, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + + /* free the old dbext path string */ + if(olddbext) { + FREE(olddbext); + } + + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'dbext' = %s\n", handle->dbext); + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5893139..315d987 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -95,6 +95,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + char *dbext; /* Sync DB extension */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file upgrade operations */ -- 2.4.5

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-169-g94204d1
by allan＠archlinux.org 14 Jul '15

14 Jul '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 94204d108984c46966c681a05f232d830812d440 (commit) via ff487212a2701c6a9755acb3ea8e75764eed9488 (commit) via 2e5e496eb0936cae7ea8d2b38417feae3ba56881 (commit) via a187fa4562dc2f43f10134092056c2a9a6862d59 (commit) via 4b0bc2cf9724e3c9592c045349a38b426148e3b2 (commit) via aa9aa343cbb391ccc2c2c1a3917f37a98e47105e (commit) via 2bed2090fbf9777f60bdc33eb44daf94c8c2a973 (commit) via 53d963344964550c0ed02532016867ee84ad1aa8 (commit) via 0f302df5edf40eabfa28724f8b4e1cc2f3fa176b (commit) from 3d4529335c598e79b5a483fedc4c9d5c12ef10f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 94204d108984c46966c681a05f232d830812d440 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 5 17:33:07 2015 +1000 Do not warn about packages that optionally require a removal when ignoring deps If a transaction is removing a package while ignoring all dependencies, there should not be any warning about other packages optionally requiring it. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ff487212a2701c6a9755acb3ea8e75764eed9488 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 5 14:32:35 2015 +1000 Do not warn about downgrades when only downloading package Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e5e496eb0936cae7ea8d2b38417feae3ba56881 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Jun 10 00:48:01 2015 -0400 Fix overflow warnings Fix new warnings generated by gcc-5 about potential overflows. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a187fa4562dc2f43f10134092056c2a9a6862d59 Author: Lukas Fleischer <lfleischer(a)archlinux.org> Date: Wed May 20 13:10:32 2015 +0200 Match providers when showing optdep install status Use alpm_find_satisfier() instead of alpm_db_get_pkg() when retrieving the install status of a package to make sure we spot providers as well. Fixes FS#36412 Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b0bc2cf9724e3c9592c045349a38b426148e3b2 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Sat Jun 13 15:45:45 2015 +0200 repo-add: Reject armored signatures Pacman cannot handle armored signatures, so make repo-add error out if one is detected. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa9aa343cbb391ccc2c2c1a3917f37a98e47105e Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon May 25 23:46:37 2015 +0200 makepkg: Add flag for printing SRCINFO to stdout This commit adds a makepkg option to generate and print the SRCINFO file for a PKGBUILD, required by the new AUR, to stdout. AUR 4.0 will use Git instead of source tarballs for uploading packages, so making makepkg capable of printing the SRCINFO would simplify package management, instead of having to extract it from a source tarball. It is also useful for scripting other things, so that instead of having to parse PKGBUILDs, one can make makepkg generate the SRCINFO and then you can parse that instead, which is much simpler and less error-prone. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bed2090fbf9777f60bdc33eb44daf94c8c2a973 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue May 26 11:46:08 2015 +0200 repo-add: Generate unarmored DB signature Pacman cannot handle armored signatures, so use gpg's --no-armor flag to force an unarmored signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 53d963344964550c0ed02532016867ee84ad1aa8 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Jun 9 15:05:03 2015 +0200 util.c: table_display: Fix incorrect docstring Commit 7b8f8753 removed the title parameter but forgot to remove it from the docstring. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f302df5edf40eabfa28724f8b4e1cc2f3fa176b Author: Wieland Hoffmann <themineo(a)gmail.com> Date: Wed Jun 3 11:04:13 2015 +0200 makepkg-template.1: Clarify which file version-less markers use The old text could be interpreted such that makepkg-template compares the version numbers of the templates to find the most recent one. Rephrase this to make it explicit that "$template_name.template" is used. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> ----------------------------------------------------------------------- Summary of changes: doc/makepkg-template.1.txt | 4 ++-- doc/makepkg.8.txt | 3 +++ lib/libalpm/add.c | 2 +- lib/libalpm/remove.c | 4 +++- scripts/makepkg.sh.in | 9 ++++++++- scripts/repo-add.sh.in | 6 +++++- src/pacman/callback.c | 4 ++-- src/pacman/package.c | 3 ++- src/pacman/util.c | 11 +++++------ 9 files changed, 31 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0