- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/1] dload: free final_pkg_url
by Christian Hesse 16 Oct '14

16 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1f8070c..6b803f2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -737,6 +737,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) filepath = _alpm_filecache_find(handle, final_file); } free(final_file); + free(final_pkg_url); return filepath; } -- 2.1.2

1 1

[pacman-dev] [PATCH v2 1/1] be_sync: use effective URL for db file
by Christian Hesse 16 Oct '14

16 Oct '14

From: Christian Hesse <mail(a)eworm.de> If download server is dynamic mirror chances are that db file download and db file signature download are redirected to different mirrors, resulting in invalid signature. This uses effective URL for db file signature download and makes the files always match. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/be_sync.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b03d273..653cb0e 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -209,6 +209,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } for(i = db->servers; i; i = i->next) { + char *final_db_url = NULL; const char *server = i->data; struct dload_payload payload; size_t len; @@ -228,7 +229,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.force = force; payload.unlink_on_fail = 1; - ret = _alpm_download(&payload, syncpath, NULL, NULL); + ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); _alpm_dload_payload_reset(&payload); if(ret == 0 && (level & ALPM_SIG_DATABASE)) { @@ -242,11 +243,11 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) free(sigpath); /* if we downloaded a DB, we want the .sig from the same server */ - /* print server + filename into a buffer (leave space for .sig) */ - len = strlen(server) + strlen(db->treename) + 9; + /* print final_db_url into a buffer (leave space for .sig) */ + len = strlen(final_db_url) + 5; /* 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.sig", server, db->treename); + snprintf(payload.fileurl, len, "%s.sig", final_db_url); payload.handle = handle; payload.force = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); @@ -260,6 +261,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) _alpm_dload_payload_reset(&payload); } + if (final_db_url != NULL) + free(final_db_url); + if(ret != -1 && sig_ret != -1) { break; } -- 2.1.2

2 4

[pacman-dev] [PATCH 1/1] be_sync: use effective URL for db file signature download
by Christian Hesse 16 Oct '14

16 Oct '14

From: Christian Hesse <mail(a)eworm.de> If download server is dynamic mirror chances are that db file download and db file signature download are redirected to different mirrors, resulting in invalid signature. This uses effective URL for db file signature download and makes the files always match. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/be_sync.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b03d273..6572a8a 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -209,6 +209,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } for(i = db->servers; i; i = i->next) { + char *final_db_url = NULL; const char *server = i->data; struct dload_payload payload; size_t len; @@ -228,7 +229,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.force = force; payload.unlink_on_fail = 1; - ret = _alpm_download(&payload, syncpath, NULL, NULL); + ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); _alpm_dload_payload_reset(&payload); if(ret == 0 && (level & ALPM_SIG_DATABASE)) { @@ -242,11 +243,11 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) free(sigpath); /* if we downloaded a DB, we want the .sig from the same server */ - /* print server + filename into a buffer (leave space for .sig) */ - len = strlen(server) + strlen(db->treename) + 9; + /* print final_db_url into a buffer (leave space for .sig) */ + len = strlen(final_db_url) + 5; /* 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.sig", server, db->treename); + snprintf(payload.fileurl, len, "%s.sig", final_db_url); payload.handle = handle; payload.force = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); -- 2.1.2

3 4

[pacman-dev] pacman -Ql option to print only files
by Christian Hesse 16 Oct '14

16 Oct '14

Hello everybody, I often need something like pacman -Ql package | grep -v '/$' to show only real files (no directories) in pacman -Ql output. Maybe having a modifier to make pacman only output real files would be worth it? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

2 1

[pacman-dev] [PATCH 2/2] doc/translation-help.txt: Removed out-of-date paragraph
by Miguel de Val-Borro 15 Oct '14

15 Oct '14

Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 7d80b5d..9b7def0 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -152,11 +152,6 @@ someone has experience with i18n man pages and how to best include them with our source, please contact the pacman-dev mailing list at mailto:pacman-dev@archlinux.org[]. -Some community efforts have been made to translate man pages, and these can be -found in the link:https://aur.archlinux.org[AUR] (Arch User Repository). Please -check there first before undergoing a translation effort to ensure you are not -duplicating efforts. - ///// vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// -- 2.1.2

1 0

[pacman-dev] [PATCH 1/2] doc/translation-help.txt: Minor rewording of Transifex usage
by Miguel de Val-Borro 15 Oct '14

15 Oct '14

Updated as per Allan's suggestion and fixed Transifex URLs. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 52c1e89..7d80b5d 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -4,10 +4,10 @@ Pacman - Translating This document is here to guide you in helping translate pacman messages, libalpm messages, and the manual pages for the entire pacman package. -We are currently using http://www.transifex.net/[Transifex] as the translation +We are currently using http://www.transifex.com/[Transifex] as the translation platform for pacman and libalpm. You will need to sign up for an account there and then register with a translation team on the -http://www.transifex.net/projects/p/archlinux-pacman/[pacman project page]. +http://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation @@ -31,11 +31,12 @@ either be hand-edited, or modified with a tool such as poedit, gtranslator or kbabel. Using a translation tool tends to make the job easier. Please read up on Transifex usage using the -http://help.transifex.net/[Transifex Help] if you are not familiar. +http://docs.transifex.com/[Transifex Help] if you are not familiar. -Here is an example set of commands if you have a source code checkout and are -not worried about any local translations being overwritten. The .tx/ directory -is checked into the git repository so is preconfigured with the two project +Transifex provides a command-line client to help with translations. Here is +an example set of commands if you have a source code checkout and are not +worried about any local translations being overwritten. The .tx/ directory is +checked into the git repository so is preconfigured with the two project resources (See `tx status` output for a quick overview). tx pull -f -- 2.1.2

1 0

[pacman-dev] [PATCH] paccache: avoid spurious blank line written to stderr
by Dave Reisner 15 Oct '14

15 Oct '14

this is just stylistic formatting, so write it to stdout. ref: https://bugs.archlinux.org/task/42389 --- contrib/paccache.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 71aee23..2133e34 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -164,7 +164,7 @@ summarize() { printf -v output 'finished dry run: %d candidates' "$filecount" fi - printf '\n' >&2 + echo msg "$output (disk space saved: %s)" "$(size_to_human "$totalsaved")" } -- 2.1.2

1 0

[pacman-dev] [PATCH] doc/translation-help.txt: Minor rewording of Transifex usage
by Miguel de Val-Borro 15 Oct '14

15 Oct '14

Add a link to the transifex-client package and fix Transifex URLs Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 52c1e89..7761ff4 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -4,10 +4,10 @@ Pacman - Translating This document is here to guide you in helping translate pacman messages, libalpm messages, and the manual pages for the entire pacman package. -We are currently using http://www.transifex.net/[Transifex] as the translation +We are currently using http://www.transifex.com/[Transifex] as the translation platform for pacman and libalpm. You will need to sign up for an account there and then register with a translation team on the -http://www.transifex.net/projects/p/archlinux-pacman/[pacman project page]. +http://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation @@ -31,12 +31,14 @@ either be hand-edited, or modified with a tool such as poedit, gtranslator or kbabel. Using a translation tool tends to make the job easier. Please read up on Transifex usage using the -http://help.transifex.net/[Transifex Help] if you are not familiar. - -Here is an example set of commands if you have a source code checkout and are -not worried about any local translations being overwritten. The .tx/ directory -is checked into the git repository so is preconfigured with the two project -resources (See `tx status` output for a quick overview). +http://docs.transifex.com/[Transifex Help] if you are not familiar. + +The https://aur.archlinux.org/packages/transifex-client/[Transifex command-line +tool] is available from the AUR. Here is an example set of commands if you +have a source code checkout and are not worried about any local translations +being overwritten. The .tx/ directory is checked into the git repository so is +preconfigured with the two project resources (See `tx status` output for a +quick overview). tx pull -f poedit po/<mylang>.po -- 2.1.2

2 5

[pacman-dev] [PATCH] testdb: ignore ALPM_DB_VERSION
by Andrew Gregory 15 Oct '14

15 Oct '14

Replaces the test for hidden files which appears to be leftover from 2e431e1cc before sync db checking was moved to a separate function. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/testdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index e3b331a..cd8c4d8 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -69,7 +69,7 @@ static int check_localdb_files(void) while((ent = readdir(dir)) != NULL) { if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0 - || ent->d_name[0] == '.') { + || strcmp(ent->d_name, "ALPM_DB_VERSION") == 0) { continue; } /* check for known db files in local database */ -- 2.1.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-460-ga0cfed7
by allan＠archlinux.org 14 Oct '14

14 Oct '14

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 a0cfed7df2ffac12df2bc935c53d273230f8aaa4 (commit) via 627ede877920d82ae6d1c9cc2d41c04cbc62ff25 (commit) via c1d6cec2e277eea7affa43601086c523311b58c0 (commit) via 42c859e4cc38f91a1236cd93eae9e9f9a1bc1e62 (commit) via 01beca5df717252c7c9aa59bc705dc10a25ebdc8 (commit) via 7ddc967d7cf2b8de73095cb841ee2c5973a669e4 (commit) via 6dd593c293bdc808b5e7040d06657c4f89e1a8bd (commit) via 19c3179b7ebfa4c35dff45792c922602d9322417 (commit) via 62c11e450a6f7d753fc997c20027472661de04e0 (commit) via 3f0303dc92634043d561ac9bbefa6c6e57578a65 (commit) via 926d998a750413399ca7abbe422a65ccbf09306e (commit) via faf0246437b47fb67f6adc3f2d039f6d787be1a0 (commit) via 5002227296b4de3c530690b38abab47dce83564d (commit) via 1e3c088c2e14c7211e77ad73201458418fd34091 (commit) via ca8319aec904c1f59b51bf642d730d646e50b170 (commit) from 7ee01c86669327b2af63c8ed9390bcbf071cdac5 (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 a0cfed7df2ffac12df2bc935c53d273230f8aaa4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 13 09:08:29 2014 -0400 makepkg: reorder args to pkgbuild_get_attribute for consistency In all other cases, this code gets the outvalue from the final parameter. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 627ede877920d82ae6d1c9cc2d41c04cbc62ff25 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 04:09:10 2014 -0400 add pacman-db-upgrade test Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1d6cec2e277eea7affa43601086c523311b58c0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 11 04:08:20 2014 -0400 sync.c: download packages before starting commit download_files sets the transaction state to STATE_DOWNLOADING. Modifying the state after it has already been set to STATE_COMMITTING created a brief window where SIGINT would fail to interrupt the process and caused interrupted downloads to result in a 'transaction started' message in the log with no matching transaction end. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 42c859e4cc38f91a1236cd93eae9e9f9a1bc1e62 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:01:40 2014 -0400 pmtest: allow tests to specify test binary Adds a cmd property to tests (defaults to pacman) which is resolved using directories specified with --bindir (defaults to PATH). The ability to manually specify a particular binary is preserved in order to allow running individual tests with differently named binaries such as lt-pacman. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 01beca5df717252c7c9aa59bc705dc10a25ebdc8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 16:45:10 2014 -0400 pacman: add --confirm option --confirm cancels the effect of a previous --noconfirm. This makes it easier for scripts to default to --noconfirm but allow users to override it. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ddc967d7cf2b8de73095cb841ee2c5973a669e4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:01:08 2014 -0400 pmtest: allow tests to specify db version Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6dd593c293bdc808b5e7040d06657c4f89e1a8bd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:55:06 2014 -0400 pmrule: make backup file test more robust This prevents an exception in the event backup entries are not in the correct format and brings the test in line with alpm's backup parsing which splits on the last tab rather than the first. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19c3179b7ebfa4c35dff45792c922602d9322417 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 03:00:25 2014 -0400 pmdb: include directories in package file lists Needed for checking directories with PKG_FILES. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62c11e450a6f7d753fc997c20027472661de04e0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 11 16:33:32 2014 -0400 makepkg: simplify attr matching in extract_function_var Interesting attributes created with 'local' or 'declare' won't be surfaced in .PKGINFO, so we shouldn't try to look for them. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f0303dc92634043d561ac9bbefa6c6e57578a65 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 3 08:39:13 2014 -0400 makepkg: show full fingerprint on pgp failure Rather than implementing suffix matching, which might clash, let's just print the full fingerprint of the err'ing key so that the user can copy/paste it into validpgpkeys. Also, make it clear in the manpage that validpgpkeys needs full fingerprints, and nothing else. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 926d998a750413399ca7abbe422a65ccbf09306e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Oct 2 13:00:55 2014 -0400 Revert "makepkg: allow less than the full fingerprint in validpgpkeys" This reverts commit 50296576d006d433fbfd4a6c57d5f95a942f7833. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit faf0246437b47fb67f6adc3f2d039f6d787be1a0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 10 10:02:05 2014 +1000 There are not hooks! Refer to install scripts as scripts and not hooks. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5002227296b4de3c530690b38abab47dce83564d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 6 04:16:36 2014 -0400 pacman-db-upgrade: do not mangle file lists grep'ing out blank lines and sorting output thoroughly breaks any file lists with %BACKUP% entries which must be separated from the file list by a blank line. Adds a custom function to ensure that all paths printed are non-empty and unique. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e3c088c2e14c7211e77ad73201458418fd34091 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Thu Jul 31 19:42:28 2014 +0200 alpm: Fix wrong xferred/total sizes when resuming downloads When a package is already partially downloaded in the cache, its download size will only be of what's left to be downloaded. Since pkg->download_size is what's used when calculating the total download size for the totaldl callback, same thing apply. However, the download progress callback was including this initial size, which would thus lead to invalid values (and percentage) used in frontends. That is, the progress bar could e.g. go further than 100% In the case of pacman, there is a sanity check for different historical reason (44a57c89), so before the possible "overflow" was noticed, the total download size/progress reported was wrong. Once caught, the TotalDownload option was ignored and it would use individual file download values as fallback instead. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ca8319aec904c1f59b51bf642d730d646e50b170 Author: Miguel de Val-Borro <miguel(a)archlinux.net> Date: Tue Sep 30 19:59:45 2014 -0400 doc/translation-help.txt: Remove link to tutorial on sarovar.org The website sarovar.org has been shut down and the tutorial is not relevant any more. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 +++- doc/PKGBUILD.5.txt | 5 ++--- doc/pacman.8.txt | 5 ++++- doc/translation-help.txt | 4 +--- lib/libalpm/dload.c | 4 +++- lib/libalpm/sync.c | 11 +++++++--- lib/libalpm/sync.h | 1 + lib/libalpm/trans.c | 10 +++++++++ scripts/makepkg.sh.in | 41 ++++++++++-------------------------- scripts/pacman-db-upgrade.sh.in | 29 +++++++++++++++++++------ src/pacman/conf.h | 1 + src/pacman/pacman.c | 5 +++++ test/pacman/pactest.py | 16 ++++++-------- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 3 ++- test/pacman/pmrule.py | 10 ++++----- test/pacman/pmtest.py | 32 ++++++++++++++++++++-------- test/pacman/util.py | 5 +++-- test/scripts/pacman-db-upgrade-v9.py | 21 ++++++++++++++++++ valgrind.supp | 18 ++++++++++++++++ 20 files changed, 149 insertions(+), 78 deletions(-) create mode 100644 test/scripts/pacman-db-upgrade-v9.py hooks/post-receive -- The official pacman repository

1 0