- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] makepkg: add hg url support
by Allan McRae 23 Jul '12

23 Jul '12

Supported fragments are branch, revision and tag. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 7 ++++-- scripts/makepkg.sh.in | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index db10041..c49007e 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -396,8 +396,8 @@ Using VCS Sources[[VCS]] ------------------------ Building a developmental version of a package using sources from a version control system (VCS) is enabled by specifying the source in the form -`source=('folder::url#fragment')`. Currently makepkg supports the `git` and `svn` -protocols. +`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg` and +`svn` protocols. The source URL is divided into three components: @@ -421,6 +421,9 @@ The source URL is divided into three components: *git*;; branch, commit, tag + *hg*;; + branch, revision, tag + *svn*;; revision diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4fe7f06..014ba3c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -199,7 +199,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - git*|svn*) + git*|hg*|svn*) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then @@ -235,7 +235,7 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - git*|svn*) + git*|hg*|svn*) filename=${netfile##*/} filename=${filename%%#*} # fall-through @@ -450,6 +450,66 @@ download_git() { popd &>/dev/null } +download_hg() { + local netfile=$1 + + local fragment=${netfile##*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + local repo=${netfile##*/} + repo=${repo%%#*} + + local url=$(get_url "$netfile") + url=${url##*hg+} + url=${url%%#*} + + if [[ ! -d "$dir" ]]; then + msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" + if ! hg clone "$url" "$dir"; then + error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 + fi + elif (( ! HOLDVER )); then + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "hg" + cd_safe "$dir" + if ! hg pull -u; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "hg" + fi + fi + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + branch|revision|tag) + ref=('-u' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! hg clone $(ref[@]) "$dir" "${dir##*/}"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} + download_svn() { local netfile=$1 @@ -535,6 +595,9 @@ download_sources() { git*) (( GET_VCS )) && download_git "$netfile" ;; + hg*) + (( GET_VCS )) && download_hg "$netfile" + ;; svn*) (( GET_VCS )) && download_svn "$netfile" ;; @@ -909,7 +972,7 @@ generate_checksums() { proto="$(get_protocol "$netfile")" case $proto in - git*|svn*) + git*|hg*|svn*) sum="SKIP" ;; *) -- 1.7.11.2

1 0

[pacman-dev] [PATCH 1/4] doc: Document using VCS sources in a PKGBUILD
by Allan McRae 23 Jul '12

23 Jul '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 956179a..2ca3c98 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -109,6 +109,10 @@ It is also possible to change the name of the downloaded file, which is helpful with weird URLs and for handling multiple source files with the same name. The syntax is: `source=('filename::url')`. + +makepkg also supports building developmental versions of packages using sources +downloaded from version control systems (VCS). For more information, see +<<VCS,Using VCS Sources>> below. ++ Files in the source array with extensions `.sig`, `.sign` or `.asc` are recognized by makepkg as PGP signatures and will be automatically used to verify the integrity of the corresponding source file. @@ -383,6 +387,34 @@ The install script does not need to be specified in the source array. A template install file is available in '{pkgdatadir}' as 'proto.install' for reference with all of the available functions defined. +Using VCS Sources[[VCS]] +------------------------ +Building a developmental version of a package using sources from a version control +system (VCS) is enabled by specifying the source in the form +`source=('folder::url#fragment')`. Currently makepkg supports the `git` protocol. + +The source URL is divided into three components: + +*folder*:: + (optional) Specifies an alternate folder name for makepkg to download the VCS + source into. + +*url*:: + The url to the VCS repo. This must include the the vcs in the URL protocol for + makepkg to recognize this as a VCS source. If the protocol does not include + the VCS name, it can be added by prefixing the URL with `vcs+`. For example, + using a git repository over `http` would have a source URL in the form + `git+http://...`. + +*fragment*:: + (optional) Allows specifying a revision number or branch for makepkg to checkout + from the VCS. For example, to checkout a given revision, the source line would + have the format `source=(url#revision=123)`. The available fragments depends on + the VCS being used: + + *git*;; + branch, commit, tag + Example ------- The following is an example PKGBUILD for the 'patch' package. For more -- 1.7.11.2

1 4

[pacman-dev] [PATCH] Document that -dd is different from -d in a clear and concise way.
by Micahel J. Evans 20 Jul '12

20 Jul '12

From: "Micahel J. Evans" <mjevans1983(a)gmail.com> Signed-off-by: Micahel J. Evans <mjevans1983(a)gmail.com> --- doc/pacman.8.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0ad8188..926d6e1 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -171,6 +171,8 @@ Options Transaction Options (apply to '-S', '-R' and '-U') -------------------------------------------------- +*-dd, --nodeps --nodeps*:: + Skips all dependency checks. *-d, \--nodeps*:: Skips dependency version checks. Package names are still checked. Normally, pacman will always check a package's dependency fields to ensure that all -- 1.7.11.2

3 3

[pacman-dev] [PATCH] Document that -dd is different from -d in a clear and concise way.
by Micahel J. Evans 20 Jul '12

20 Jul '12

From: "Micahel J. Evans" <mjevans1983(a)gmail.com> Signed-off-by: Micahel J. Evans <mjevans1983(a)gmail.com> --- doc/pacman.8.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0ad8188..926d6e1 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -171,6 +171,8 @@ Options Transaction Options (apply to '-S', '-R' and '-U') -------------------------------------------------- +*-dd, --nodeps --nodeps*:: + Skips all dependency checks. *-d, \--nodeps*:: Skips dependency version checks. Package names are still checked. Normally, pacman will always check a package's dependency fields to ensure that all -- 1.7.11.2

1 0

[pacman-dev] [PATCH] util: fix line length calc in _alpm_archive_fgets
by Dave Reisner 20 Jul '12

20 Jul '12

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> --- Allan noticed that PHP was reporting an invalid sig and bisected it back to me, (of course). This was lucky enough to only affect about .1% of the sync DB, and mostly the PGPSIG field, naturally due to it being the largest field in the DB by a wide margin. lib/libalpm/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c2b5d44..721125a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1011,15 +1011,16 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) } if(eol) { - size_t len = b->real_line_size = (size_t)(eol - b->block_offset); + size_t len = (size_t)(eol - b->block_offset); memcpy(b->line_offset, b->block_offset, len); b->line_offset[len] = '\0'; b->block_offset = eol + 1; + b->real_line_size = b->line_offset + len - b->line; /* this is the main return point; from here you can read b->line */ return ARCHIVE_OK; } else { /* we've looked through the whole block but no newline, copy it */ - size_t len = b->real_line_size = (size_t)(b->block + b->block_size - b->block_offset); + size_t len = (size_t)(b->block + b->block_size - b->block_offset); memcpy(b->line_offset, b->block_offset, len); b->line_offset += len; b->block_offset = b->block + b->block_size; -- 1.7.11.2

3 4