- Pacman-dev - lists.archlinux.org

[pacman-dev] Series of patches for package signing
by Denis A. Altoé Falqueto 07 Jul '10

07 Jul '10

Guys, I've lingered a little more than what I would like, but here I am again. I'll start to send a series of 6 patches, which were made from that big one from the other day. Maybe you'll find that some are still big, but I tried to keep each patch as the smaller logical unit that I could find. For example, I don't think would make sense to split a new script (pacman-key). Anyway, the patches will follow this message and I'll wait your evaluation. And thanks for your tips about git, I'm loving it :) -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-48-ga835599
by dan＠archlinux.org 07 Jul '10

07 Jul '10

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 a83559949622992faafb628b742893891ead8390 (commit) via 68dcabdfbeadc43c74eccf395a9f04565c5d682e (commit) via 60de8ec932984f1374501c3f11ad1bcfba5c7d5c (commit) from 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (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 a83559949622992faafb628b742893891ead8390 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 7 16:10:10 2010 +1000 Download sync db into DBPath/sync The sync db should be stored in the sync/ folder. This cleans up DBPath to only have local/ and sync/ directories in it. A nice side effect is that the db are now in the right place so we can implement directly reading from them. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68dcabdfbeadc43c74eccf395a9f04565c5d682e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jun 4 00:10:50 2010 +1000 Remove DBEXT usage With commit 5dffef78, the repo database always has a symlink of the form reponame.db. Use that filename and let libarchive determine the compression type. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 60de8ec932984f1374501c3f11ad1bcfba5c7d5c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 21:44:36 2010 +1000 Check return value of fgets calls Prevents compiler warnings with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 --------- lib/libalpm/be_files.c | 24 ++++++++++++++++-------- lib/libalpm/trans.c | 3 +-- scripts/Makefile.am | 1 - scripts/rankmirrors.sh.in | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/util.py | 1 - 8 files changed, 20 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [PATCH] Fix some whitespace issues
by Allan McRae 07 Jul '10

07 Jul '10

The combination of tabs and spaces is annoying in any editor that does not use a tab width of 2 spaces. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.h | 6 +++--- src/pacman/util.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 7b77ae6..3d8c4e3 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -230,7 +230,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) goto pkg_invalid; } - archive_read_finish(archive); + archive_read_finish(archive); /* internal fields for package struct */ newpkg->origin = PKG_FROM_FILE; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 236ec1d..694c38d 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -321,7 +321,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) */ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, - const char* name1, const char* name2) + const char* name1, const char* name2) { pmfileconflict_t *conflict; MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c894644..14f81f9 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -67,10 +67,10 @@ struct __pmpkg_t { /* internal */ pmpkgfrom_t origin; /* Replaced 'void *data' with this union as follows: - origin == PKG_FROM_CACHE, use pkg->origin_data.db - origin == PKG_FROM_FILE, use pkg->origin_data.file + origin == PKG_FROM_CACHE, use pkg->origin_data.db + origin == PKG_FROM_FILE, use pkg->origin_data.file */ - union { + union { pmdb_t *db; char *file; } origin_data; diff --git a/src/pacman/util.c b/src/pacman/util.c index de1b162..f2cb67f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -823,7 +823,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar #if defined(PACMAN_DEBUG) /* If debug is on, we'll timestamp the output */ - if(config->logmask & PM_LOG_DEBUG) { + if(config->logmask & PM_LOG_DEBUG) { time_t t; struct tm *tmp; char timestr[10] = {0}; -- 1.7.1.1

1 0

[pacman-dev] [PATCH] Download sync db into DBPath/sync
by Allan McRae 07 Jul '10

07 Jul '10

The sync db should be stored in the sync/ folder. This cleans up DBPath to only have local/ and sync/ directories in it. A nice side effect is that the db are now in the right place so we can implement directly reading from them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_files.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index e2bbe28..adf41aa 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -208,7 +208,7 @@ static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) */ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) { - char *dbfile, *dbfilepath; + char *dbfile, *dbfilepath, *syncpath; const char *dbpath, *syncdbpath; alpm_list_t *newdirlist = NULL, *olddirlist = NULL; alpm_list_t *onlynew = NULL, *onlyold = NULL; @@ -236,9 +236,13 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) sprintf(dbfile, "%s.db", db->treename); dbpath = alpm_option_get_dbpath(); + len = strlen(dbpath) + 6; + MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1)); + sprintf(syncpath, "%s%s", dbpath, "sync/"); - ret = _alpm_download_single_file(dbfile, db->servers, dbpath, force); + ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force); free(dbfile); + free(syncpath); if(ret == 1) { /* files match, do nothing */ @@ -253,9 +257,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) syncdbpath = _alpm_db_path(db); /* form the path to the db location */ - len = strlen(dbpath) + strlen(db->treename) + 4; + len = strlen(dbpath) + strlen(db->treename) + 9; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s.db", dbpath, db->treename); + sprintf(dbfilepath, "%ssync/%s.db", dbpath, db->treename); if(force) { /* if forcing update, remove the old dir and extract the db */ -- 1.7.1.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-45-g686b8c1
by dan＠archlinux.org 02 Jul '10

02 Jul '10

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 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (commit) via 1a9db4cac7cf308188298db48dde5d80ce86a7e9 (commit) via 9ebb596805309076237cb5dd09836cfd2e38745d (commit) via fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) via 3d8be4291cb7e1df69d99741404e7bd1856c3bad (commit) via 622326bb37a9f7eb1db27ac0166e791d7a949e0c (commit) via 68dff73463dd06d2055bcbd48be9bc74e786be5c (commit) from 5a3aae02fed68379b5ede7abc9c7675632ce403a (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 686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 Merge: 1a9db4c fcb4f02 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:29:37 2010 -0500 Merge branch 'maint' Conflicts: scripts/makepkg.sh.in commit 1a9db4cac7cf308188298db48dde5d80ce86a7e9 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:36 2010 -0430 makepkg: undeclared local variables Variables that are only meaningful within the function they are declared in are now prefixed by "local". Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: fix whitespace] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9ebb596805309076237cb5dd09836cfd2e38745d Author: Nico Schottelius <nico(a)kr.ethz.ch> Date: Thu Jul 1 09:07:04 2010 +0200 manpage: add real world examples Signed-off-by: Nico Schottelius <nico(a)kr.ethz.ch> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 36 +++++++++++----------- doc/.gitignore | 1 + doc/Makefile.am | 14 +++++++- doc/pacman.8.txt | 19 +++++++++++ po/zh_CN.po | 82 ++++++++++++++++++++++++------------------------ scripts/makepkg.sh.in | 41 +++++++++++++++--------- 6 files changed, 117 insertions(+), 76 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-17-gfcb4f02
by dan＠archlinux.org 02 Jul '10

02 Jul '10

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, maint has been updated via fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) via 3d8be4291cb7e1df69d99741404e7bd1856c3bad (commit) from 622326bb37a9f7eb1db27ac0166e791d7a949e0c (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 fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:20:36 2010 -0500 docs: Add a 'website' target This will allow me to be not quite as lazy in getting website changes out to the Arch Linux server by making it trivial to get everything packaged up and working correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d8be4291cb7e1df69d99741404e7bd1856c3bad Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 2 18:18:58 2010 -0500 Fix some incorrect asciidoc syntax Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 36 ++++++++++++++++++------------------ doc/.gitignore | 1 + doc/Makefile.am | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Transifex
by 甘露(Gan Lu) 02 Jul '10

02 Jul '10

I see there is a page [1] in Transifex for pacman/libpalm, could any dev gives me a permission to submit my translation from there? I am used to maintain Chinese simplified translation, thanks. [1] http://www.transifex.net/projects/p/archlinux-pacman/

2 2

[pacman-dev] [PATCH] makepkg: fix sudo/su calling of pacman
by Allan McRae 01 Jul '10

01 Jul '10

This fixes two issues: 1) using "sudo -l" results in excess password asking under certian configurations. Revert to the pre 3.4 behaviour of always using sudo if it is installed. 2) Properly escape the command so that that versioned dependencies, such as "foo>4", do not get treated as output redirection. This also unifies the generation of the pacman line and its privilege escalation. Based on patches supplied by Andres P <aepd87(a)gmail.com> with minor adjustments for suitability for the maint branch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a fix for the maint branch. The reworking of the privilege escalation to a configurable option will need to go on the master branch at a later date. scripts/makepkg.sh.in | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f3c7217..25bbc74 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -368,17 +368,15 @@ download_file() { } run_pacman() { - local ret=0 + local cmd=$(printf "%q " "$PACMAN" $PACMAN_OPTS "$@") if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then - if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then - sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + if [ "$(type -p sudo)" ]; then + cmd="sudo $cmd" else - su -c "$PACMAN $PACMAN_OPTS $*" || ret=$? + cmd="su -c '$cmd'" fi - else - $PACMAN $PACMAN_OPTS "$@" || ret=$? fi - return $ret + eval "$cmd" } check_deps() { -- 1.7.1

4 4

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-15-g622326b
by dan＠archlinux.org 01 Jul '10

01 Jul '10

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, maint has been updated via 622326bb37a9f7eb1db27ac0166e791d7a949e0c (commit) via 68dff73463dd06d2055bcbd48be9bc74e786be5c (commit) from 0ea52e3a4f698ce3b1c90881a2b2eaa56625f261 (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 622326bb37a9f7eb1db27ac0166e791d7a949e0c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 30 20:42:30 2010 +1000 makepkg: fix sudo/su calling of pacman This fixes two issues: 1) using "sudo -l" results in excess password asking under certian configurations. Revert to the pre 3.4 behaviour of always using sudo if it is installed. 2) Properly escape the command so that that versioned dependencies, such as "foo>4", do not get treated as output redirection when using su. This also unifies the generation of the pacman line and its privilege escalation. Based on patches supplied by Andres P <aepd87(a)gmail.com> with minor adjustments for suitability for the maint branch. Original-work-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 68dff73463dd06d2055bcbd48be9bc74e786be5c Author: 甘露(Gan Lu) <rhythm.gan(a)gmail.com> Date: Thu Jul 1 00:21:08 2010 -0500 Update Chinese translation to fix gettext positional params Because the shell gettext doesn't allow for positional gettext substitution, be more careful about where we use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 82 ++++++++++++++++++++++++------------------------ scripts/makepkg.sh.in | 13 +++---- 2 files changed, 47 insertions(+), 48 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-38-g5a3aae0
by dan＠archlinux.org 01 Jul '10

01 Jul '10

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 5a3aae02fed68379b5ede7abc9c7675632ce403a (commit) via 41724cbcdef11cb00fcd720c75d399288ea41fd0 (commit) from 96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c (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 5a3aae02fed68379b5ede7abc9c7675632ce403a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 20:32:11 2010 +1000 Check return value of chdir and getcwd Prevents compiler warnings when building with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41724cbcdef11cb00fcd720c75d399288ea41fd0 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 27 21:13:01 2010 +1000 Check return value of fwrite when copying files Check that writing to destination file actually occurs in _alpm_copyfile. Required adding a new error (PM_ERR_WRITE) as none of the others appeared appropriate. Prevents compiler warning when using -D_FORTIFY_SOURCE=2. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 16 +++++++++++----- lib/libalpm/alpm.h | 1 + lib/libalpm/util.c | 18 +++++++++++++----- src/pacman/pacman.c | 15 +++++++++++++-- 4 files changed, 38 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0