- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Use LOGDEST for logpipe
by Allan McRae 18 May '13

18 May '13

If LOGDEST is set, we may not check that $startdir is writable. Store the log pipe in LOGDEST instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- For maint. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c311c30..9f7707c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1463,7 +1463,7 @@ run_function() { fi # ensure overridden package variables survive tee with split packages - logpipe=$(mktemp -u "$startdir/logpipe.XXXXXXXX") + logpipe=$(mktemp -u "$LOGDEST/logpipe.XXXXXXXX") mkfifo "$logpipe" tee "$BUILDLOG" < "$logpipe" & local teepid=$! -- 1.8.2.3

1 0

[pacman-dev] [PATCH] Fix comment typo
by Allan McRae 18 May '13

18 May '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 96c49a9..6d43dd0 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -488,7 +488,7 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep) /* These parameters are messy. We check if this package, given a list of * targets and a db is safe to remove. We do NOT remove it if it is in the - * target list, or if if the package was explicitly installed and + * target list, or if the package was explicitly installed and * include_explicit == 0 */ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, alpm_list_t *targets, int include_explicit) -- 1.8.2.3

1 0

[pacman-dev] [RFC][PATCH] makepkg: remove sourcing PKGBUILD from stdin
by Allan McRae 18 May '13

18 May '13

Using PKGBUILDs from stdin means that we can not use pkgver() in packages. Given we have the "-p" option to pass any file to makepkg and passing a PKGBUILD in the form "cat foo | makepkg" does not work, this feature is unneeded. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Any objections to this? scripts/makepkg.sh.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..c311c30 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2760,14 +2760,8 @@ unset makedepends optdepends options noextract BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} if [[ ! -f $BUILDFILE ]]; then - if [[ -t 0 ]]; then - error "$(gettext "%s does not exist.")" "$BUILDFILE" - exit 1 - else - # PKGBUILD passed through a pipe - BUILDFILE=/dev/stdin - source_safe "$BUILDFILE" - fi + error "$(gettext "%s does not exist.")" "$BUILDFILE" + exit 1 else if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" -- 1.8.2.3

1 0

[pacman-dev] [PATCH] contrib: Remove harcoded /etc/pacman.conf
by William Giokas 18 May '13

18 May '13

Signed-off-by: William Giokas <1007380(a)gmail.com> --- contrib/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 9244d85..b41dfa0 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -32,7 +32,7 @@ fi trap 'rm -f $CHECKUPDATE_DB/db.lck' INT TERM EXIT DBPath="${DBPath:-@localstatedir@/lib/pacman/}" -eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' /etc/pacman.conf) +eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.conf) mkdir -p "$CHECKUPDATE_DB" ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null -- 1.8.3.rc2

2 1

[pacman-dev] [PATCH 1/2] makepkg: fixup broken revision and repo references
by Dave Reisner 18 May '13

18 May '13

bzr support "worked", but didn't handle any of the actual features we wanted with makepkg. This moves the revision specification to the proper place (extraction, rather than download), and fixes an additional broken reference to $repo which was never set. Fixes FS#35281. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I tested this on a fresh clone, an existing clone, and an existing clone with a revision fragment, but anyone who actually uses bzr might want to play with this to make sure I haven't fubar'd things even further. scripts/makepkg.sh.in | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..9ebfdf3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -448,29 +448,14 @@ download_bzr() { url=${url%%#*} local repo=$(get_filename "$netfile") - local displaylocation="$url" - local revision=('-r-1') - - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - revision=("-r${fragment##*=}") - displaylocation="$url -r ${fragment##*=}" - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Branching %s ...")" "${displaylocation}" - if ! bzr branch "$url" "$dir" ${revision[@]} --no-tree --use-existing-dir; then + if ! bzr branch "$url" "$dir" --no-tree --use-existing-dir; then error "$(gettext "Failure while branching %s")" "${displaylocation}" plain "$(gettext "Aborting...")" exit 1 @@ -495,7 +480,7 @@ download_bzr() { fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" - if ! bzr pull "$url" ${revision[@]} --overwrite; then + if ! bzr pull "$url" --overwrite; then # only warn on failure to allow offline builds warning "$(gettext "Failure while pulling %s")" "${displaylocation}" fi @@ -505,11 +490,25 @@ download_bzr() { extract_bzr() { local netfile=$1 + local repo=$(get_filename "$netfile") local fragment=${netfile#*#} if [[ $fragment = "$netfile" ]]; then unset fragment fi + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + revision=("-r" "${fragment#*=}") + displaylocation="$url -r ${fragment#*=}" + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -517,7 +516,8 @@ extract_bzr() { pushd "$srcdir" &>/dev/null rm -rf "${dir##*/}" - if ! bzr checkout "$dir" --lightweight; then + if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && + ( cd "$repo" && bzr pull "$dir" -q --overwrite "${revision[@]}" ); }; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "bzr" plain "$(gettext "Aborting...")" exit 1 -- 1.8.2.3

2 3

[pacman-dev] [suggestion] Sandboxed package building
by BlissSam 16 May '13

16 May '13

It is well known that Gentoo builds packages in a sandbox environment. It protects from badly written build scripts [1] as well as some other threats. I suggest that ArchLinux can build packages in such a sandbox, and this behavior can be easily configured via makepkg.conf. It seems that sandbox and lib32-sandbox ported from Gentoo in AUR works fine on Arch.[2] So why don't Arch build packages in a sandbox? I admit that sandbox is not always safe, but it does protects. Notes: [1]: scripts like this: rm -Rf ${pkgdirr}/home since ${pkgdirr} is mistyped, it will be `rm -Rf /home` [2]: https:///aur.archlinux.org/packages/sandbox/ ... and https:///aur.archlinux.org/packages/lib32-sandbox/

5 5

[pacman-dev] [PATCH] makepkg: assign fragment for bzr revision
by Dave Reisner 15 May '13

15 May '13

Fixes FS#35281 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..88f3e2a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -452,7 +452,8 @@ download_bzr() { local displaylocation="$url" local revision=('-r-1') - if [[ -n $fragment ]]; then + if [[ $netfile = *\#* ]]; then + local fragment=${netfile#*#} case ${fragment%%=*} in revision) revision=("-r${fragment##*=}") -- 1.8.2.3

2 1

[pacman-dev] [RFC] support for URL query strings and fragments
by Xyne 10 May '13

10 May '13

Hi, pacman/libalpm currently only supports "bare" server URIs of the form <scheme name> : <hierarchical part> whereas a full URI is <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ] Support for query strings would allow for more flexible server configurations using dynamic content. For the sake of a concrete example, I'm in the middle of rewriting Pacserve and I could really use "?repo=$repo&arch=$arch" to keep all packages in one apparent server directory while still being able to correctly redirect to external mirrors. Redirection requires both values to determine and interpolate the server URL before returning it to Pacman with a 307. At first I thought this would be relatively easy to do. I took a quick look at the code but I didn't find a common function to affix the file name to the URL (although I did see "sanitize_url" in db.c). I see two ways of doing this: 1) Support a "$file" variable in the URL. If the URL doesn't contain the variable, add the file name to the end as usual. 2) Remove the query and fragment, treat the URL as usual, then restore the query and fragment. The first would allow for file names in query strings (e.g. "?file=$file"). It could be used for a build server, for example. Of course, you can extract the file name from the request path but that requires hacking the server code or using something like mod_rewrite to mangle URLS. Having the file name sent in a get variable is much more convenient for server-side programming. In either case, it should be enough to have a single, central function that accepts the template URL and the filename (pkg or db) and returns the full URL. The sanitize_url function would also need to handle query strings and fragments. Would there be any objection to this if a patch were submitted?

2 2

[pacman-dev] [PATCH] pmtest: set LC_ALL=C in subprocess.call
by Andrew Gregory 10 May '13

10 May '13

LC_ALL=C is required to force pacman's output to English for tests that rely on that output, but setting it in Makefile.am results in those tests breaking under different locales when pactest.py is run directly. This will also ease an eventual transition to python3 which LC_ALL=C causes to default to ascii encoded strings, creating problems for tests with unicode strings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Makefile.am | 2 +- test/pacman/pmtest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7b53fd0..28f7f8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ dist_pkgdata_DATA = \ check-local: test-pacman test-pacsort test-vercmp test-parseopts test-pacman: test/pacman src/pacman - LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ + $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ --scriptlet-shell $(SCRIPTLET_SHELL) \ --ldconfig $(LDCONFIG) \ diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 2eafe68..f5a9680 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -241,7 +241,7 @@ def run(self, pacman): # archives are made available more easily. time_start = time.time() self.retcode = subprocess.call(cmd, stdout=output, stderr=output, - cwd=os.path.join(self.root, util.TMPDIR)) + cwd=os.path.join(self.root, util.TMPDIR), env={'LC_ALL': 'C'}) time_end = time.time() vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) -- 1.8.2.2

1 0

[pacman-dev] [PATCH] pacman/util.c: Fix negative Installed size
by Peter Wu 09 May '13

09 May '13

Commit ce5ee8a065a590564982191c76cb325ab05e04e2 separated the display of Download, Installed/Removed and Upgrade size such that the output can nicely be formatted. However, it also changed the data type for storing the actual size. Previously it was off_t (sizeof == 8), after that commit is became int (sizeof == 4). This patch restores the previous behaviour and shows the expected (non-negative) values again. Signed-off-by: Peter Wu <lekensteyn(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..643b6fe 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,7 @@ struct table_row_t { const char *label; - int size; + off_t size; }; int trans_init(alpm_transflag_t flags, int check_valid) @@ -828,7 +828,7 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) return ret; } -static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) +static void add_transaction_sizes_row(alpm_list_t **table, const char *label, off_t size) { struct table_row_t *row = malloc(sizeof(struct table_row_t)); -- 1.8.2.2

2 2