October 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-76-g6c635d7
by dan＠archlinux.org 20 Oct '09

20 Oct '09

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 6c635d76a042add78f65f732928c2f10c2e5567a (commit) via c7e4d10df378ec12e9e47bb05120778ea98015e1 (commit) via 2020e6297b021946c31c1e46b6ede3c4734ef85d (commit) via 2c2596177d88a60cbef8154927f847ca214aadd0 (commit) via 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 (commit) via 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (commit) via 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b (commit) via da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (commit) from f9582c7df223e1eb4078e6db4e2d35dc0f2bf9be (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 6c635d76a042add78f65f732928c2f10c2e5567a Merge: c7e4d10df378ec12e9e47bb05120778ea98015e1 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 20 22:29:20 2009 -0500 Merge branch 'maint' commit c7e4d10df378ec12e9e47bb05120778ea98015e1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 12 00:13:16 2009 +1000 makepkg: allow overriding arch in split packages This allows building a mixture of binary and arch=any packages. Fixes FS#15955. The value of CARCH is no longer overridden to "any" in when arch=any is used and the assigning of the "any" arch is delayed to during the packaging stage. Adjustments were required to fix installing and checking for pre-built packages of varing arches. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2020e6297b021946c31c1e46b6ede3c4734ef85d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 22:32:22 2009 +1000 makepkg: allow overriding pkgver and pkgrel in split packages Fixing a single package within a split package requires the overriding or pkgrel. In very rare (but existing) cases, it is useful to override pkgver. Partial fix for FS#15955. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c2596177d88a60cbef8154927f847ca214aadd0 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Oct 12 23:05:36 2009 +0200 dload.c : clear sigaction flag to make valgrind happy This fixes the following valgrind warning : ==26831== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc04 is on thread 1's stack ==26831== ==26831== Syscall param rt_sigaction(act->sa_restorer) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc08 is on thread 1's stack ==26831== Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Oct 20 15:44:00 2009 +0200 makepkg, repo-add: replace external commands with bash substitutions where possible This also removes the awk dependency from makepkg and repo-add. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Sat Oct 17 23:12:19 2009 +0200 Size handling was changed in fgets() functions Pacman's fgets function in the API used hardcoded numbers to identify the size. This is not good practice, so replace them with sizeof handling. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 3 ++ doc/PKGBUILD.5.txt | 6 ++-- lib/libalpm/be_files.c | 49 +++++++++++++------------- lib/libalpm/dload.c | 1 + lib/libalpm/trans.c | 3 +- po/el.po | 8 ++-- po/zh_CN.po | 4 +- scripts/makepkg.sh.in | 91 +++++++++++++++++++++++++++-------------------- scripts/repo-add.sh.in | 6 ++- src/pacman/util.c | 3 +- 10 files changed, 98 insertions(+), 76 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] zh_CN issues in makepkg
by Allan McRae 20 Oct '09

20 Oct '09

Hi, Currently makepkg can not run in zh_CN due to (at least) this translated string: msgid "Extracting %s with %s" msgstr "正在使用 %2$s 解压缩 %1$s" The issue is due to bash not being able to handle positional parameters (1$ and 2$) as "$" are special characters to bash. Is there a way to translate this string without changing the order of the strings? Allan

2 2

[pacman-dev] [PATCH] makepkg: use basename instead of a sed command
by Cedric Staniewski 20 Oct '09

20 Oct '09

The basename command is easier to understand than a sed command and it is even slightly faster than sed. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- or if you prefer bashisms, see next patch scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 24fddf6..62d0923 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -190,7 +190,7 @@ get_filename() { # if a filename is specified, use it local filename=$(echo $1 | sed 's|::.*||') # if it is just an URL, we only keep the last component - echo "$filename" | sed 's|^.*://.*/||g' + basename "$filename" } # extract the URL from a source entry @@ -321,7 +321,7 @@ download_file() { # destination file local file=$3 # temporary download file, default to last component of the URL - local dlfile=$(echo "$url" | sed 's|^.*://.*/||g') + local dlfile=$(basename "$url") # replace %o by the temporary dlfile if it exists if echo "$dlcmd" | grep -q "%o" ; then -- 1.6.5

4 12

[pacman-dev] Is -Suu supposed to also update packages?
by Cedric Staniewski 20 Oct '09

20 Oct '09

Hi, while implementing pacman's downgrade operation in bash, I noticed that pacman also includes upgradeable package in the list of downgradeable ones. I did not complete the downgrade, but I would assume that it would have actually updated some of the packages. In my bash function I filter the upgradeable packages out of the installed ones and this is what I expected pacman would do, too. Apparently, this is not the case and I wonder, if this is the intended behavior or if it should be considered as a bug. According to the documentation, I would say this is intended, so the term "downgrade" is a little bit misleading in my opinion. > Pass this option twice to enable package downgrade; in this case pacman will select sync packages whose version does not match with > the local version. This can be useful when the user switches from a testing repo to a stable one. Thanks for clarification, Cedric

2 2

[pacman-dev] [PATCH] makepkg: fix --allsource when remote source files do not reside in SRCDEST
by Cedric Staniewski 20 Oct '09

20 Oct '09

When using the --allsource option, it was assumed that remote source files reside in SRCDEST which is not necessarily always the case. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 24fddf6..806a325 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1074,9 +1074,10 @@ create_srcpackage() { if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif [ "$SOURCEONLY" -eq 2 -a -f "$SRCDEST/$file" ]; then + elif [ "$SOURCEONLY" -eq 2 ] && [ -f "$file" -o -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + [ ! -f "$file" ] && file="$SRCDEST/$file" + ln -s "$file" "${srclinks}/${pkgbase}/" fi done -- 1.6.5

4 5

[pacman-dev] Build issues with the maint branch of pacman
by Ciprian Dorin, Craciun 20 Oct '09

20 Oct '09

Hello all! While trying to build (a patched version) of the latest maint branch in the Git repository I get the following error: ~~~~ $ autoconf configure.ac:60: error: possibly undefined macro: AM_INIT_AUTOMAKE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:128: error: possibly undefined macro: AC_PROG_LIBTOOL configure.ac:132: error: possibly undefined macro: AM_GNU_GETTEXT configure.ac:133: error: possibly undefined macro: AM_GNU_GETTEXT_VERSION configure.ac:155: error: possibly undefined macro: AM_CONDITIONAL ~~~~ (My patch is only adding a git-dlagent script, and is not touching otherwise the configure.ac file.) Any ideas? (I'm using the latest up-to-date version of ArchLinux.) Thanks, Ciprian.

3 13

[pacman-dev] makepkg test suite
by Allan McRae 20 Oct '09

20 Oct '09

Hi all, I am starting to write a test suite for makepkg. Hopefully this will make it more difficult to break things in the future... I have written a brief outline of how I have started implementing this here: http://wiki.archlinux.org/index.php/User:Allan/Makepkg_Test_Suite I realize that most issues with the implementation will be discovered as it goes on but any comments at this stage would be useful. Allan

2 3

[pacman-dev] [PATCH] Size handling was changed in fgets() functions
by Laszlo Papp 19 Oct '09

19 Oct '09

./src/pacman/util.c: - response size handling was changed in fgets() function, because it's easier to handle the source modification after a size modification ./lib/libalp/be_files.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification ./lib/libalpm/trans.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- lib/libalpm/be_files.c | 48 ++++++++++++++++++++++++------------------------ lib/libalpm/trans.c | 2 +- src/pacman/util.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 03a1463..01be4a2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -409,7 +409,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); + memset(line, 0, sizeof(line)); pkgpath = get_pkgpath(db, info); @@ -433,7 +433,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->name) != 0) { @@ -441,7 +441,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->version) != 0) { @@ -449,39 +449,39 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->filename, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->desc, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->groups = alpm_list_add(info->groups, linedup); } } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->url, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->licenses = alpm_list_add(info->licenses, linedup); } } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->arch, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -497,7 +497,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->builddate = atol(line); } } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -513,12 +513,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->installdate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->packager, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); @@ -528,7 +528,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->size = atol(_alpm_strtrim(line)); @@ -539,19 +539,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%ISIZE%") == 0) { /* ISIZE (installed size) tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->isize = atol(_alpm_strtrim(line)); } else if(strcmp(line, "%MD5SUM%") == 0) { /* MD5SUM tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->md5sum, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->replaces = alpm_list_add(info->replaces, linedup); @@ -574,13 +574,13 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->files = alpm_list_add(info->files, linedup); } } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->backup = alpm_list_add(info->backup, linedup); @@ -602,24 +602,24 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); info->depends = alpm_list_add(info->depends, dep); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->optdepends = alpm_list_add(info->optdepends, linedup); } } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->conflicts = alpm_list_add(info->conflicts, linedup); } } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->provides = alpm_list_add(info->provides, linedup); @@ -638,7 +638,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1 fp) && strlen(_alpm_strtrim(line))) { pmdelta_t *delta = _alpm_delta_parse(line); if(delta) { info->deltas = alpm_list_add(info->deltas, delta); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c99f596..c182510 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -320,7 +320,7 @@ static int grep(const char *fn, const char *needle) } while(!feof(fp)) { char line[1024]; - fgets(line, 1024, fp); + fgets(line, sizeof(line), fp); if(feof(fp)) { continue; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 353aae3..c931bb2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -638,7 +638,7 @@ static int question(short preset, char *fmt, va_list args) return(preset); } - if(fgets(response, 32, stdin)) { + if(fgets(response, sizeof(response), stdin)) { strtrim(response); if(strlen(response) == 0) { return(preset); -- 1.6.4.4

6 10

[pacman-dev] about vercmp tools
by mcu GPS 19 Oct '09

19 Oct '09

usage: vercmp <ver1> <ver2> return values: < 0 : if ver1 < ver2 0 : if ver1 == ver2 > 0 : if ver1 > ver2 [arch@myarchtp mkarchlive] $ vercmp 0.1 0.1_rc1 -1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1_r1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_r1 0.1_rc1 -1 0.1_rc1 > 0.1 ? 0.1_rc1 > 0.1_r1 ? this is a bug?

2 2

[pacman-dev] [PATCH 4/4] Change strcat function using for strncat
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 553591d..41a5783 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -105,7 +105,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) /* we have another path component- append the newest component to * existing string and create one more level of dir structure */ strcat(incr, "/"); - strcat(incr, ptr); + strncat(incr, ptr, strlen(ptr)); if(access(incr, F_OK)) { if(mkdir(incr, mode)) { ret = 1; -- 1.6.4.4

3 3