- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/1] dload: mark final_url as const
by Christian Hesse 16 Oct '14

16 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/be_sync.c | 3 +-- lib/libalpm/dload.c | 8 ++++---- lib/libalpm/dload.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 6572a8a..62fd0f0 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -209,8 +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; + const char *server = i->data, *final_db_url = NULL; struct dload_payload payload; size_t len; int sig_ret = 0; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 43c1503..e3409f9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -388,7 +388,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat #define HOSTNAME_SIZE 256 static int curl_download_internal(struct dload_payload *payload, - const char *localpath, char **final_file, char **final_url) + const char *localpath, char **final_file, const char **final_url) { int ret = -1; FILE *localf = NULL; @@ -622,7 +622,7 @@ cleanup: * @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0) */ int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file, char **final_url) + char **final_file, const char **final_url) { alpm_handle_t *handle = payload->handle; @@ -664,8 +664,8 @@ static char *filecache_find_url(alpm_handle_t *handle, const char *url) char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) { char *filepath; - const char *cachedir; - char *final_file = NULL, *final_pkg_url = NULL; + const char *cachedir, *final_pkg_url = NULL; + char *final_file = NULL; struct dload_payload payload; int ret = 0; diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 10c586e..512a376 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -49,7 +49,7 @@ struct dload_payload { void _alpm_dload_payload_reset(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file, char **final_url); + char **final_file, const char **final_url); #endif /* _ALPM_DLOAD_H */ -- 2.1.2

1 0

[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