- Pacman-dev - lists.archlinux.org

[pacman-dev] FS#42482 - [paccache] No candidates should not be an error
by Eric Schultz 27 Oct '14

27 Oct '14

Good evening... I've implemented this feature request in paccache (as a flag that turns off error reporting when there's no candidates), and I've been using it locally without any issues. I was wondering how I should share the change - should I post the git diff here? Attach the changed paccache.sh.in file? Submit a git pull request? Thanks, -- Headed for the second star to the right and straight on 'til morning... Eric Schultz <http://schultzter.ca> (aka schultzter <http://twitter.com/schultzter>) Read more at 2FatDads <http://2fatdads.com/author/schultzter/>

2 1

[pacman-dev] [PATCH 1/6] pmdb: include directories in package file lists
by Andrew Gregory 23 Oct '14

23 Oct '14

Needed for checking directories with PKG_FILES. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 60e0e9c..aa14dff 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -172,7 +172,7 @@ def db_read(self, name): if line == "%FILES%": while line: line = fd.readline().strip("\n") - if line and line[-1] != "/": + if line: pkg.files.append(line) if line == "%BACKUP%": pkg.backup = _getsection(fd) -- 2.1.2

2 12

[pacman-dev] [PATCH] makepkg: always look for sources in source=()
by Dave Reisner 18 Oct '14

18 Oct '14

This regression snuck in during some reviewing of 963f7fe02fcb14 (arch-specific sources). We must always check the source=() array for sources. --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a67d94..86f8a77 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1309,6 +1309,8 @@ verify_integrity_sums() { have_sources() { local a + (( ${#source[*]} )) && return 0 + case $1 in all) for a in "${arch[@]}"; do @@ -1316,9 +1318,7 @@ have_sources() { done ;; *) - if (( ${#source[*]} )) || array_build _ source_"$CARCH"; then - return 0 - fi + array_build _ source_"$CARCH" && return 0 ;; esac -- 2.1.2

1 0

[pacman-dev] Pacman-4.2 release plans
by Allan McRae 17 Oct '14

17 Oct '14

Hi all, We release pacman-4.1 ages ago and there are many bug fixes sitting on master that I am too lazy to backport. So I would like to see a push towards pacman-4.2. I propose the following. 2014-08-01: Feature freeze 2014-08-15: Code freeze 2014-08-31: Release I have the glibc release scheduled for the end of July, so that is where the feature freeze comes from. We have a number of bugs in the tracker and patches in patchwork fixing bugs or providing some polishing that need dealt with. The two (or more) week gap before the code freeze is dedicated to dealing with those. In preparation, can bugs be filed for anything that needs done before 4.2? The major thing that I know needs finished is figuring out how to adjust databases that have packages installed using the old directory symlink method. Our current roadmap (with several bugs that will be pushed further back) is here: https://bugs.archlinux.org/roadmap/proj3 Cheers, Allan @Lukáš: note the VCS incremental builds is listed in the roadmap so your patches will be dealt with soon! @Andrew: Do you need your ini/config reading patches in, or would it be OK to hold back until the next release (which I intend to focus only on adding hooks support and call pacman-5.0).

4 4

[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