- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: place signature symlink in build dir
by Allan McRae 31 Mar '10

31 Mar '10

Be consistent in package and signature placements when using PKGDEST. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch is on top of Dan's gpg-more branch which has been rebased onto master (thanks to Xavier for finding my mistake). As part of the rebase, I have also gone back through the makepkg/repo-add patches and changed the style of the tests to what is now used. All this has been pushed to the "gpg" branch on my repo. 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 70cf09d..1c02392 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1039,16 +1039,17 @@ create_package() { exit 1 # TODO: error code fi + create_signature "$pkg_file" + if (( ! ret )) && [[ "$PKGDEST" != "${startdir}" ]]; then ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" ret=$? + [[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" fi if (( ret )); then warning "$(gettext "Failed to create symlink to package file.")" fi - - create_signature "$pkg_file" } create_signature() { -- 1.7.0.3

1 0

[pacman-dev] mmerge with dupe removal
by dave reisner 30 Mar '10

30 Mar '10

Hey all. I've been working on a AUR agent in C, and I ended up modifying some of the alpm_list methods for my own purposes. At toofishes' request, I'm posting them here to see if anyone finds them useful. The first finds and deletes duplicate entries during a mergesort. The latter is implemented by the modified merge to remove a specific node in a list, given that you already have a pointer to it. As I noticed there was a recent discussion regarding something of this nature, I hope it proves useful. It should be easily modifiable to allow for populating a new duplicate list if you choose to go that route. -dave reisner /** * @brief merge sort with duplicate deletion * * @param left left side of merge * @param right right side of merge * @param fn callback function for comparing data * @param fnf callback function for deleting data * * @return the merged list */ alpm_list_t *alpm_list_mmerge_dedupe(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_fn_free fnf) { alpm_list_t *lp, *newlist; int compare; if (left == NULL) return right; if (right == NULL) return left; do { compare = fn(left->data, right->data); if (compare > 0) { newlist = right; right = right->next; } else if (compare < 0) { newlist = left; left = left->next; } else { left = alpm_list_remove_item(left, left, fnf); } } while (compare == 0); newlist->prev = NULL; newlist->next = NULL; lp = newlist; while ((left != NULL) && (right != NULL)) { compare = fn(left->data, right->data); if (compare < 0) { lp->next = left; left->prev = lp; left = left->next; } else if (compare > 0) { lp->next = right; right->prev = lp; right = right->next; } else { left = alpm_list_remove_item(left, left, fnf); continue; } lp = lp->next; lp->next = NULL; } if (left != NULL) { lp->next = left; left->prev = lp; } else if (right != NULL) { lp->next = right; right->prev = lp; } while(lp && lp->next) { lp = lp->next; } newlist->prev = lp; return(newlist); } /** * @brief Remove a specific node from a list * * @param listhead list to remove from * @param target node within list to remove * @param fn comparison function * * @return the node following the removed node */ alpm_list_t *alpm_list_remove_item(alpm_list_t *listhead, alpm_list_t *target, alpm_list_fn_free fn) { alpm_list_t *next = NULL; if (target == listhead) { listhead = target->next; if (listhead) { listhead->prev = target->prev; } target->prev = NULL; } else if (target == listhead->prev) { if (target->prev) { target->prev->next = target->next; listhead->prev = target->prev; target->prev = NULL; } } else { if (target->next) { target->next->prev = target->prev; } if (target->prev) { target->prev->next = target->next; } } next = target->next; if (target->data) { fn(target->data); } free(target); return next; }

1 0

[pacman-dev] [PATCH] makepkg: BSD find compatibility fix
by Allan McRae 29 Mar '10

29 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9623ffa..b2b449c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -868,7 +868,7 @@ tidy_install() { if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" local binary - find ${STRIP_DIRS[@]} -type f -writable 2>/dev/null | while read binary ; do + find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *compressed-encoding*) # Skip compressed binaries ;; -- 1.7.0.3

1 0

[pacman-dev] Fwd: [PATCH] makepkg.conf: Added .svn to PURGE_TARGETS
by Daenyth Blank 26 Mar '10

26 Mar '10

--- etc/makepkg.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..c721209 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -85,7 +85,7 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod .svn) ######################################################################### # PACKAGE OUTPUT -- 1.7.0

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-150-g21abae9
by dan＠archlinux.org 26 Mar '10

26 Mar '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 21abae98cbd382d8fab4427109776d983cd07c9f (commit) via 98ee520907f7f2a50fa43edfd213dfc8eae07033 (commit) via 526806e7acf07f625da3a2a31de94b7ca150e4b7 (commit) via bf7c3eb17f4de35f6639b2f3f0c1c06a27b5242b (commit) from cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 (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 21abae98cbd382d8fab4427109776d983cd07c9f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 25 21:36:30 2010 -0500 Update -Si docs to reflect new -Sii operation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98ee520907f7f2a50fa43edfd213dfc8eae07033 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 24 15:59:04 2010 +1000 Sort and avoid duplicates in -Sii output Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 526806e7acf07f625da3a2a31de94b7ca150e4b7 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 24 15:22:23 2010 +1000 alpm_list_diff_sorted - make some arguments const Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf7c3eb17f4de35f6639b2f3f0c1c06a27b5242b Author: Matthias Lanzinger <mlaenz(a)gmail.com> Date: Thu Mar 25 11:03:00 2010 +0100 Fix cross-compilation issues with git and libfetch This patch fixes 2 issues I encountered when cross-compiling pacman. First is the test for libfetch which requires explicit linking to all libraries libfetch depends on. The other problem results from the AC_CHECK_PROGS test for git. This test will stop configure with an error when cross-compiling. The fix moves the call to AC_CHECK_PROG so that is only called of --enable-git is actually set. Signed-off-by: Matthias Lanzinger <mlaenz(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 8 ++++---- doc/pacman.8.txt | 5 +++-- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/package.c | 5 ++++- 5 files changed, 16 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix cross-compilation issues with git and libfetch
by Matthias Lanzinger 26 Mar '10

26 Mar '10

This patch fixes 2 issues I encountered when cross-compiling pacman. First is the test for libfetch which requires explicit linking to all libraries libfetch depends on. The other problem results from the AC_CHECK_PROGS test for git. This test will stop configure with an error when cross-compiling. The fix moves the call to AC_CHECK_PROG so that is only called of --enable-git is actually set. Signed-off-by: Matthias Lanzinger <mlaenz(a)gmail.com> --- configure.ac | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index faf774f..d0fed48 100644 --- a/configure.ac +++ b/configure.ac @@ -142,8 +142,8 @@ if test "x$internaldownload" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library]) # Check for a download library if it was actually requested - AC_CHECK_LIB([fetch], [fetchParseURL], , - AC_MSG_ERROR([libfetch is needed to compile with internal download support]) ) + AC_CHECK_LIB([fetch], [fetchParseURL], [AC_SUBST([LIBS], ["-lfetch -lssl -lcrypto -ldl $LIBS"])], + AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lssl -lcrypto -ldl] ) # Check if libfetch supports conditional GET # (version >=2.21, struct url has member last_modified) AC_CHECK_MEMBER(struct url.last_modified, , @@ -305,10 +305,10 @@ else fi # Enable or disable use of git version in pacman version string -AC_CHECK_PROGS([GIT], [git]) -AC_CHECK_FILE([.git/], hasgitdir=yes) AC_MSG_CHECKING(whether to use git version if available) if test "x$wantgitver" = "xyes" ; then + AC_CHECK_PROGS([GIT], [git]) + AC_CHECK_FILE([.git/], hasgitdir=yes) if test $GIT -a "x$hasgitdir" = "xyes"; then AC_MSG_RESULT([yes]) usegitver=yes -- 1.7.0.2

3 2

[pacman-dev] Fwd: [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth Blank 26 Mar '10

26 Mar '10

--- scripts/rankmirrors.sh.in | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..9838a2a 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ $TARGETREPO = auto ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -156,6 +164,7 @@ done [[ $NUM ]] || NUM=0 [[ $FILE && $CHECKURL ]] && err "Cannot specify a url and mirrorfile." [[ $FILE || $CHECKURL || $STDIN ]] || err "Must specify url, mirrorfile, or stdin." +[[ $TARGETREPO ]] || TARGETREPO=auto # Single url handling if [[ $CHECKURL ]]; then @@ -182,6 +191,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server=$(echo $server | awk '{print $1}') url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.0

2 1

[pacman-dev] [PATCH] Sort and avoid duplicates in -Sii output
by Allan McRae 24 Mar '10

24 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/package.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index f1682cb..ed6d71d 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -565,7 +565,9 @@ static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs) pmpkg_t *cachepkg = i->data; if(_alpm_dep_edge(cachepkg, pkg)) { const char *cachepkgname = cachepkg->name; - *reqs = alpm_list_add(*reqs, strdup(cachepkgname)); + if(alpm_list_find_str(*reqs, cachepkgname) == 0) { + *reqs = alpm_list_add(*reqs, strdup(cachepkgname)); + } } } } @@ -595,6 +597,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) for(i = handle->dbs_sync; i; i = i->next) { db = i->data; find_requiredby(pkg, db, &reqs); + reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp); } } } -- 1.7.0.3

4 5

[pacman-dev] [RFC][PATCH] Introduce Include key globing for pacman.conf
by Marc - A. Dahlhaus 24 Mar '10

24 Mar '10

This patch adds the ability to use Include filenames containing wildcards and also expands the tilde to the homedirectory of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) { This patch addes the ability to use Include filenames containing wildcards and also expands the tilde to the homedir of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) {

4 15

[pacman-dev] [PATCH] alpm_list_diff_sorted - make some arguements const
by Allan McRae 24 Mar '10

24 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80aa558..80ba1ee 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -657,12 +657,12 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack, * @param onlyright pointer to the second result list * */ -void SYMEXPORT alpm_list_diff_sorted(alpm_list_t *left, - alpm_list_t *right, alpm_list_fn_cmp fn, +void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left, + const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright) { - alpm_list_t *l = left; - alpm_list_t *r = right; + const alpm_list_t *l = left; + const alpm_list_t *r = right; if(!onlyleft && !onlyright) { return; diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index fcab301..bd639f7 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -78,7 +78,7 @@ void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_ void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); -void alpm_list_diff_sorted(alpm_list_t *left, alpm_list_t *right, +void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright); #ifdef __cplusplus -- 1.7.0.3

1 0