- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] util.c: coding style fix
by Florian Pritz 01 Aug '12

01 Aug '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0196f3b..33cef71 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -65,9 +65,9 @@ * @return pointer to the first token in str if str is not NULL, NULL if * str is NULL */ -char* strsep(char** str, const char* delims) +char *strsep(char** str, const char* delims) { - char* token; + char *token; if(*str==NULL) { /* No more tokens */ -- 1.7.11.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-332-g7193ce1
by dan＠archlinux.org 01 Aug '12

01 Aug '12

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 7193ce1ecd0089545d100fd11647cb346d15331b (commit) via 647b9ea6d9e7ff084d3c59c1005aac2670bd469f (commit) via eb25a18571d97c20046784f7c8a9815dc40512c7 (commit) via 065b7f863a25dac3699c23258b986312f4caac1c (commit) via b782388f1670d9ff819461cfa7e365f7e8178173 (commit) via 52550a2a0a4e6858680828e3fcdf0b12b16c273b (commit) via d2669b47812aebfe3ada7df4c7d7525790ef9c33 (commit) via e94876089a934fde13984b59e735b35f92837d96 (commit) via f619bc61f562d0dd08c502787347b31601f89be8 (commit) via cc6fb2e8a78e6d0ca9bfc778298b1dc095af7db4 (commit) via 3fb934b59a2a29c69214ef2578844340cfcde9f9 (commit) via a6bd14285dfac06ffd88d2a3bc2461c084bd0a7b (commit) via 958b41fa5fcbb6ac806bd969d6333019ba3c6441 (commit) via ddbd36103df95b3fbd199466f3203242ab9ed8f2 (commit) via 35ac4e7ef31898b4d8a090c687aad63df1436083 (commit) via c5e7eeece75e2774d304116bc5003371cc8f1e8e (commit) via 8fe383860e4406d0becf34d2410155e8c93dd494 (commit) via 7520c0facb23887fe93057736834061c6dedfdec (commit) from e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (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 7193ce1ecd0089545d100fd11647cb346d15331b Merge: 647b9ea b782388 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 1 09:21:33 2012 -0500 Merge branch 'maint' commit 647b9ea6d9e7ff084d3c59c1005aac2670bd469f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:01:35 2012 +1000 contrib/updpkgsums: Fix error message Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb25a18571d97c20046784f7c8a9815dc40512c7 Author: Enjolras <0enjolras0(a)laposte.net> Date: Sat Jul 28 11:20:11 2012 +0200 Add documentation for the prepare() function Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 065b7f863a25dac3699c23258b986312f4caac1c Author: Enjolras <0enjolras0(a)laposte.net> Date: Sat Jul 28 11:20:10 2012 +0200 Add a function prepare() to PKGBUILD prepare is run after the source extraction, and is not run with --noextract option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52550a2a0a4e6858680828e3fcdf0b12b16c273b Author: Daniel Wallace <daniel.wallace12(a)gmail.com> Date: Mon Jul 9 01:55:58 2012 -0400 asdeps flag passed from makepkg to pacman add the asdeps flag for makepkg so that it does pacman -U --asdeps [Allan: clean-up whitespace] Signed-off-by: Daniel Wallace <daniel.wallace12(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2669b47812aebfe3ada7df4c7d7525790ef9c33 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 14:24:29 2012 +1000 Do not enable _FORTIFY_SOURCE without optimization With glibc-2.16, using -D_FORTIFY_SOURCE requires that optimization (-O) be used or it will prodice a warning message. Enable -Werror in our test for _FORTIFY_SOURCE support to catch when a users specifies CFLAGS without optimization. The line to set CFLAGS="" when no CFLAGS are specified (either due to being unset or geniunely empty) is required as autoconf will use "-O2 -g" for its tests by defult when CFLAGS is unset, but will not add them to the CFLAGS used... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e94876089a934fde13984b59e735b35f92837d96 Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Sat Jul 28 11:26:06 2012 +0300 Fix wrong parameter name in alpm_db_update's signature Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit f619bc61f562d0dd08c502787347b31601f89be8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 14:00:44 2012 -0500 Clean up exclusion list in sync cache cleanup Make an array out of our various glob skip patterns and loop through them looking for items to skip. Additionally, when doing a full clean, delete all objects rather than respect this skip list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc6fb2e8a78e6d0ca9bfc778298b1dc095af7db4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 10 23:14:40 2012 -0500 Skip deltas and partial downloads in package cleanup This affects -Sc only, not -Scc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3fb934b59a2a29c69214ef2578844340cfcde9f9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 2 22:51:08 2012 -0400 pactree: show tree vertical "limbs" Showing vertical limbs makes the tree easier to follow. Old: New: |--pkg |--pkg |--dep1 |--dep1 |--dep2 | |--dep2 |--dep3 |--dep3 |--dep4 |--dep4 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: fix shadow warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a6bd14285dfac06ffd88d2a3bc2461c084bd0a7b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 2 22:51:07 2012 -0400 pactree: consolidate both walk_deps functions Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: fix shadow warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ddbd36103df95b3fbd199466f3203242ab9ed8f2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 19 10:37:56 2012 -0400 util: fix line length calc in _alpm_archive_fgets 74274b5dc347ba70 which added the real_line_size to the buffer struct didn't properly account for what happens when archive_fgets has to loop more than once to find the end of a line. In most cases, this isn't a problem, but could potentially cause a longer line such as PGP signature to be improperly read. This patch fixes the oversight and focuses on only calculating the line length when we hit the end of line marker. The effective length is then calculated via pointer arithmetic as: (start_of_last_read + read_length) - start_of_line Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 35ac4e7ef31898b4d8a090c687aad63df1436083 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 10 22:51:41 2012 -0400 lib/conflict: use a binary search within filelists Take advantage of the fact that our filelists are arrays sorted by filename with a known length and use a binary search. This should speed up file conflict checking, particularly when larger packages are involved. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5e7eeece75e2774d304116bc5003371cc8f1e8e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 12 14:50:56 2012 -0400 lib/be_local: ensure local filelists are sorted This may very well be a no-op, but better safe than sorry. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8fe383860e4406d0becf34d2410155e8c93dd494 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 11 09:59:49 2012 -0400 lib/be_package: use qsort instead of our own msort On the assumption that these arrays are already mostly sorted, use the standard quicksort method to sort the files arrays. The files_msort function name is tweaked to give it a more general name to reflect this change. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 ++ contrib/bacman.sh.in | 8 +-- contrib/bash_completion.in | 6 +- contrib/updpkgsums.sh.in | 2 +- contrib/zsh_completion.in | 1 + doc/PKGBUILD.5.txt | 9 +++ doc/makepkg.8.txt | 20 +++--- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_local.c | 2 + lib/libalpm/be_package.c | 52 +------------- lib/libalpm/conflict.c | 22 +++--- lib/libalpm/util.c | 6 +- m4/acinclude.m4 | 12 +++- scripts/makepkg.sh.in | 19 +++++- src/pacman/sync.c | 37 ++++++---- src/util/pactree.c | 163 +++++++++++++++++++++++--------------------- 16 files changed, 195 insertions(+), 171 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-25-gb782388
by dan＠archlinux.org 01 Aug '12

01 Aug '12

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 b782388f1670d9ff819461cfa7e365f7e8178173 (commit) via 958b41fa5fcbb6ac806bd969d6333019ba3c6441 (commit) via 7520c0facb23887fe93057736834061c6dedfdec (commit) from 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (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 b782388f1670d9ff819461cfa7e365f7e8178173 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:28:00 2012 +1000 makepkg: remove unnecessary formatting This extra newline leaves a gap that looks strange in of itself, but is highlighted when piping -g output to a PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 958b41fa5fcbb6ac806bd969d6333019ba3c6441 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 11 11:10:56 2012 +1000 contrib/bacman: fix package architecture in filename Give the generated package the correct architecture in its filename rather than assuming the system architecture. Also add updated copyright notice. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7520c0facb23887fe93057736834061c6dedfdec Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 10 20:16:37 2012 -0500 Add more debug logging to dir_belongsto_pkg() function Now that we pass in the handle, we might as well add logging. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 8 ++++---- lib/libalpm/conflict.c | 9 ++++++++- scripts/makepkg.sh.in | 1 - 3 files changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/3] Code and docs enhancements
by Barbu Paul - Gheorghe 31 Jul '12

31 Jul '12

Some small code and documentation enhancements. Barbu Paul - Gheorghe (3): fixed coding standard violation fixed typo added coding standard HACKING | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/db.c | 7 ++++++- test/pacman/README | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 5

[pacman-dev] FS#30582 : add a postextract() to PKGBUILD
by Enjolras 29 Jul '12

29 Jul '12

Hi A lot of PKGBUILD calls patch in build(), causing errors when you run makepkg --noextract. Patchs/sed and other non-idempotent operations on the sources should be run in another function, which whould only been called after extracting the sources, and not all the times build() is run. Patch attached : diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index abfabdf..cf4b542 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -70,6 +70,7 @@ LOGGING=0 SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 +POSTEXTRACTFUNC=0 BUILDFUNC=0 CHECKFUNC=0 PKGFUNC=0 @@ -1004,6 +1005,10 @@ run_function() { eval "$shellopts" } +run_postextract() { + run_function_safe "postextract" +} + run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) if check_buildenv "distcc" "y" && ! check_option "distc" "n"; then @@ -2280,6 +2285,9 @@ if (( ${#pkgname[@]} > 1 )); then fi # test for available PKGBUILD functions +if declare -f postextract >/dev/null; then + POSTEXTRACTFUNC=1 +fi if declare -f build >/dev/null; then BUILDFUNC=1 fi @@ -2491,6 +2499,9 @@ else download_sources check_source_integrity extract_sources + if (( POSTEXTRACTFUNC )); then + run_postextract + fi fi if (( NOBUILD )); then

3 6

[pacman-dev] [PATCH] fixed wrong parameter name in alpm_db_update's signature
by Barbu Paul Gheorghe 28 Jul '12

28 Jul '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..dd01a41 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -626,7 +626,7 @@ int alpm_db_add_server(alpm_db_t *db, const char *url); int alpm_db_remove_server(alpm_db_t *db, const char *url); /** @} */ -int alpm_db_update(int level, alpm_db_t *db); +int alpm_db_update(int force, alpm_db_t *db); /** Get a package entry from a package database. * @param db pointer to the package database to get the package from -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 2

[pacman-dev] [PATCH 1/3] query_fileowner: remove resolve_path function
by Andrew Gregory 26 Jul '12

26 Jul '12

resolve_path is a equivalent to calling realpath(path, NULL) except that the returned string is guaranteed to be PATH_MAX long. We never append to the returned string, so this is unnecessary. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 9b1ea6f..bb75465 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -38,23 +38,6 @@ #define LOCAL_PREFIX "local/" -static char *resolve_path(const char *file) -{ - char *str = NULL; - - str = calloc(PATH_MAX, sizeof(char)); - if(!str) { - return NULL; - } - - if(!realpath(file, str)) { - free(str); - return NULL; - } - - return str; -} - /* check if filename exists in PATH */ static int search_path(char **filename, struct stat *bufptr) { @@ -178,7 +161,7 @@ static int query_fileowner(alpm_list_t *targets) if(strcmp(dname, "") == 0) { rpath = NULL; } else { - rpath = resolve_path(dname); + rpath = realpath(dname, NULL); if(!rpath) { pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), @@ -202,7 +185,7 @@ static int query_fileowner(alpm_list_t *targets) char *ppath, *pdname; const char *pkgfile = file->name; - /* avoid the costly resolve_path usage if the basenames don't match */ + /* avoid the costly realpath usage if the basenames don't match */ if(strcmp(mbasename(pkgfile), bname) != 0) { continue; } @@ -223,7 +206,7 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path + rootlen, pkgfile); pdname = mdirname(path); - ppath = resolve_path(pdname); + ppath = realpath(pdname, NULL); free(pdname); if(ppath && strcmp(ppath, rpath) == 0) { -- 1.7.11.2

2 9

[pacman-dev] pacman -Qo with different root
by Allan McRae 25 Jul '12

25 Jul '12

Does this even work or am I missing something completely... > mkdir -p ~/root/var/lib/pacman > sudo pacman-maint -r ~/root -Sy bash > pacman-maint -r ~/root -Qo /bin/bash error: No package owns /bin/bash That is using pacman 4.0.x from the maint branch. Allan

1 1

[pacman-dev] [PATCH] Inform the user to generate entropy
by Daniel Wallace 23 Jul '12

23 Jul '12

FS#30286 Inform the user that entropy is needed Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- scripts/pacman-key.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ae491d2..41498c6 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -144,6 +144,7 @@ generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF %echo Generating pacman keyring master key... +%echo Please do something to help gather entropy Key-Type: RSA Key-Length: 2048 Key-Usage: sign -- 1.7.11.2

4 3

[pacman-dev] Help adding support for BZR, CVZ, DARCS to makepkg
by Allan McRae 23 Jul '12

23 Jul '12

On my VCS branch, makepkg now supports git, svn and hg. That accounts for ~91.5% of all VCS PKGBUILDs in the AUR. Here are rough AUR package counts for those that are interested: git: 4002 svn: 1771 hg: 498 bzr: 364 cvs: 186 darcs: 29 I will write the code to add bzr, cvs and darcs support back, but I need help given I know nothing about these systems. What I will need: 1) How to checkout a repo to a given folder 2) What url "fragments" need supported (e.g. git can build from a branch, tag or commit; svn can build from a given revision). 3) How to create a working copy of the checked out repo (i.e. "copy" the primary checkout folder) and how to get it to the specified branch/tag/commit/whatever. That can be in all one step. makepkg will not support these protocols with pacman-4.1 if I don't get that information (or someone else does not provide a patch). Allan

1 0