- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-12-g7bb9c40
by dan＠archlinux.org 08 Aug '09

08 Aug '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 7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881 (commit) via e8806748ec6efdf62fd1210873dc2fd38cccdf2a (commit) via 619d1fcf7f6a834d6bf5eda846ce39cc2ca5a8f3 (commit) via 6d00025c18e837f57a4f78ee232fe3d8f244f143 (commit) via 3cf0ee98c02e1f40954f0c2c508e16d33ca299ca (commit) via 68200676d2828f159d5dbdf184c3ad7de42c66d6 (commit) via d7675e393ff3cecb5408c243898ebaae80c5988d (commit) via ee43e75ed2e8b852f1ae140d8a619a39a90d8481 (commit) via 839bb562693d83aa61e996b492b731ff452a2bcd (commit) via f16c7a4343c2e82d7ead0423c70495de5441b1ef (commit) via 4fa6f262a66336240b6e792955dcd38f04753bf2 (commit) via 8152077f6d923f5ff432175a3f86f232fd75919f (commit) from aba58e95abbeef2a9145ec702338def1e4912898 (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 7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881 Merge: e8806748ec6efdf62fd1210873dc2fd38cccdf2a 6d00025c18e837f57a4f78ee232fe3d8f244f143 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 8 11:23:38 2009 -0500 Merge branch 'maint' commit e8806748ec6efdf62fd1210873dc2fd38cccdf2a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 8 11:23:21 2009 -0500 Fix nonsensical replace Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 619d1fcf7f6a834d6bf5eda846ce39cc2ca5a8f3 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 8 11:22:52 2009 -0500 Pass all xsltproc-opts in one argument Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3cf0ee98c02e1f40954f0c2c508e16d33ca299ca Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Aug 8 15:20:24 2009 +0200 dload.c : only call fwrite once I assume the loop was never iterated more than once, because the write location was not updated at each loop iteration (buffer instead of buffer + nwritten), yet we never had reports of corrupted download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68200676d2828f159d5dbdf184c3ad7de42c66d6 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Aug 7 16:40:04 2009 +1000 Be consistent with naming of handle_deps function All other "dep" functions (check_deps, resolve_deps, remove_deps) have underscores separating words. Being consistent, convert handledeps to handle_deps. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7675e393ff3cecb5408c243898ebaae80c5988d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Aug 7 16:58:01 2009 +0200 dload.c : change the way to check for mtimes libfetch supports checking mtime so we do not need to do it manually. when the databases are already up-to-date, initiating a connection with fetchXGet and closing it right after with fetchIO_close took a very long time (up to 10min!) on some network. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 4 ++-- etc/makepkg.conf.in | 2 +- lib/libalpm/dload.c | 32 +++++++++++++++++--------------- lib/libalpm/util.c | 4 ++-- scripts/makepkg.sh.in | 14 +++++++------- scripts/repo-add.sh.in | 2 +- src/pacman/sync.c | 26 +++++++++++++++++--------- 7 files changed, 47 insertions(+), 37 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-6-g6d00025
by dan＠archlinux.org 08 Aug '09

08 Aug '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, maint has been updated via 6d00025c18e837f57a4f78ee232fe3d8f244f143 (commit) via ee43e75ed2e8b852f1ae140d8a619a39a90d8481 (commit) via 839bb562693d83aa61e996b492b731ff452a2bcd (commit) from f16c7a4343c2e82d7ead0423c70495de5441b1ef (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 10 +++++----- src/pacman/sync.c | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: change to pkgdir before creating PKGINFO file
by Allan McRae 08 Aug '09

08 Aug '09

Commit 01f9ae63 moved that creation of the PKGINFO file to before changing to pkgdir. This causes issues when using the -R option (FS#15851). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 94779bc..daa9585 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -953,6 +953,9 @@ create_package() { exit 1 # $E_MISSING_PKGDIR fi + cd "$pkgdir" + msg "$(gettext "Creating package...")" + if [ -z "$1" ]; then nameofpkg="$pkgname" else @@ -961,9 +964,6 @@ create_package() { write_pkginfo $nameofpkg - cd "$pkgdir" - msg "$(gettext "Creating package...")" - local comp_files=".PKGINFO" # check for an install script -- 1.6.4

1 0

[pacman-dev] [PATCH] Be consistend with naming of handle_deps function
by Allan McRae 07 Aug '09

07 Aug '09

All other "dep" functions (check_deps, resolve_deps, remove_deps) have underscores separating words. Being consistent, convert handledeps to handle_deps. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 b314bb6..94779bc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -354,7 +354,7 @@ check_deps() { fi } -handledeps() { +handle_deps() { local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 @@ -402,7 +402,7 @@ resolve_deps() { return $R_DEPS_SATISFIED fi - if handledeps $deplist; then + if handle_deps $deplist; then pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" -- 1.6.4

1 0

[pacman-dev] [PATCH] Remove builddeps from option parser
by Allan McRae 07 Aug '09

07 Aug '09

Leftover from commit ae5ef3b9 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 56ad2c0..b314bb6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1444,8 +1444,8 @@ fi ARGLIST=$@ # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" +OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" -- 1.6.4

1 0

[pacman-dev] yesno -> noyes for PM_TRANS_CONV_REMOVE_PKGS?
by Nagy Gabor 06 Aug '09

06 Aug '09

Hi! IMHO the default no answer is better. If pacman is invoked with --noconfirm (see scripts), it is unpredictable what will happen. By the way, I _want_ to install the specified packages, so by default, I would say no. However, then it is not possible to test the remove_unresolvable feature with pactest :-(. [In fact, this problem appeared when I tested "-S and -U merge" with our testsuite (I proudly announce, that it seems to work and the patch sum is -100 lines), and the unresolvable targets were removed with -U as well.] Opinions?

2 1

[pacman-dev] [PATCH] makepkg: Fix xz extraction
by Cedric Staniewski 05 Aug '09

05 Aug '09

Yesterday, I wanted to use a xz compressed source in a PKGBUILD and had to notice that xz extraction is currently broken in makepkg (not .tar.xz though) even if the file is actually extracted. This is caused by xz's attempt to remove the symlink to the source in the src directory. It fails (because it is a symlink) and therefore xz returns an error code. Luckily, it is fairly simple to fix this by adding an additional flag to the xz extraction command. $ ln -s ../test.xz $ ls test.xz $ xz -d test.xz xz: test.xz: Is a symbolic link, skipping $ echo $? 2 $ ls test.xz $ xz -d -f test.xz xz: test.xz: File seems to be moved, not removing $ echo $? 1 $ ls test test.xz $ rm test $ ls test.xz $ xz -d -f -k test.xz $ echo $? 0 $ ls test test.xz >From b2acc55fdf7da81a7581ed10c6351aed234285c5 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue, 4 Aug 2009 15:10:17 +0200 Subject: [PATCH] makepkg: Fix xz extraction xz cannot remove symlinks and therefore it returns an error code after the (successful) extraction. $ ln -s ../test.xz $ xz -d -f test.xz xz: test.xz: File seems to be moved, not removing $ echo $? 1 $ ls test test.xz $ rm test $ xz -d -f -k test.xz $ echo $? 0 $ ls test test.xz Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- 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 56ad2c0..d4b03a0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -650,7 +650,7 @@ extract_sources() { *application/x-bzip*) cmd="bunzip2 -f" ;; *application/x-xz*) - cmd="xz -d -f" ;; + cmd="xz -d -f -k" ;; *) # Don't know what to use to extract this file, # skip to the next file -- 1.6.4

4 19

Re: [pacman-dev] [aur-general] The KDE 4.3 update for packagers
by Roman Kyrylych 04 Aug '09

04 Aug '09

On Tue, Aug 4, 2009 at 11:08, Pierre Schmitz<pierre(a)archlinux.de> wrote: > Am Dienstag 04 August 2009 08:58:18 schrieb Pierre Schmitz: >> Hi Devs and TUs, >> >> with the recent KDE update the packages were split up. All packages in >> extra should be updated but if you maintain a KDE related package please >> check. >> >> Try to reduce the deps (use namcap) and replace a dep to kdegraphics with >> the needed sub packages. >> >> At least a KDE pacakges which has some standalone app should depend on >> kdebase-runtime (namcap wont tell you) >> >> In addition to this phonon is included into Qt now. > > I had to remove the provides from the meta packages; pacman seems to have > problems when there are groups with the same name. That means that pacakges > having deps to the old KDE packages are broken atm; sorry. Moving this to pacman-dev... The relevant bug is http://bugs.archlinux.org/task/15779 -- Roman Kyrylych (Роман Кирилич)

3 4

[pacman-dev] [PATCH] libalpm: Explicitly run install scriptlets in bash.
by Loui Chang 03 Aug '09

03 Aug '09

I was experimenting using dash as /bin/sh and noticed that a lot of packages were having errors in their install scriptlets. popen passes commands to /bin/sh so we need to explicitly invoke bash, which the scriptlets are written for. WOO! Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- lib/libalpm/trans.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index d1c0e93..5e63326 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -435,6 +435,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, { char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; + char cmdargs[PATH_MAX]; char tmpdir[PATH_MAX]; char *scriptpath; int clean_tmpdir = 0; @@ -486,13 +487,16 @@ int _alpm_runscriptlet(const char *root, const char *installfn, } if(oldver) { - snprintf(cmdline, PATH_MAX, ". %s; %s %s %s", + snprintf(cmdargs, PATH_MAX, "%s; %s %s %s", scriptpath, script, ver, oldver); } else { - snprintf(cmdline, PATH_MAX, ". %s; %s %s", + snprintf(cmdargs, PATH_MAX, "%s; %s %s", scriptpath, script, ver); } + /* Explicitly run scriptlets in bash */ + snprintf(cmdline, PATH_MAX, "/bin/bash -c 'source %s'", cmdargs); + retval = _alpm_run_chroot(root, cmdline); cleanup: -- 1.6.3.3

3 6

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-3-gf16c7a4
by dan＠archlinux.org 03 Aug '09

03 Aug '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, maint has been updated via f16c7a4343c2e82d7ead0423c70495de5441b1ef (commit) via 4fa6f262a66336240b6e792955dcd38f04753bf2 (commit) via 8152077f6d923f5ff432175a3f86f232fd75919f (commit) from aba58e95abbeef2a9145ec702338def1e4912898 (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 f16c7a4343c2e82d7ead0423c70495de5441b1ef Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 2 23:00:04 2009 +0200 repo-add: clarify one message Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4fa6f262a66336240b6e792955dcd38f04753bf2 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Jul 28 17:07:51 2009 +0200 Add a missing newline. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8152077f6d923f5ff432175a3f86f232fd75919f Author: Marc - A. Dahlhaus <mad(a)wol.de> Date: Mon Aug 3 13:59:43 2009 +0200 Use full path to ldconfig If /sbin is not in the PATH and sudo is used, ldconfig cannot be found. So use /sbin/ldconfig instead. The code checked for the existence of /sbin/ldconfig anyway.. Signed-off-by: Marc - A. Dahlhaus <mad(a)wol.de> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 4 ++-- scripts/repo-add.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0