- Pacman-dev - lists.archlinux.org

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

15 Mar '10

1 0

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

15 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 1aa1d00248ac89fb02e762b96c58559a04679b2e (commit) from be2f43191d0d0cdf02d72ac72a013697b0f7e879 (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 1aa1d00248ac89fb02e762b96c58559a04679b2e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 01:50:09 2009 +0100 fix a few warnings reported by clang - remove unused variables - some more sanity checks - safer printf Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 ++ lib/libalpm/be_files.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.c | 3 +-- src/pacman/callback.c | 4 +++- src/pacman/pacman.c | 2 +- src/pacman/util.c | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

15 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 be2f43191d0d0cdf02d72ac72a013697b0f7e879 (commit) via 2f4ee4341d1f97d95a99147556888212d1cd4507 (commit) via 69b3a811a138a84aa09e8e81b2912f6fcd0b47b9 (commit) via d39b1dbe627af218e49be6424857089a5888903b (commit) via 67700b926a1eff745272975e7b089b80bf72cc30 (commit) via e4be3e06af7f96c279851c3f2d7f1d294b8b8e70 (commit) via e5dce888c09976f1ef4664613c742d0d015e534e (commit) from 087be2f1fbae2d7168732c7004d8963a3d9d21d8 (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 be2f43191d0d0cdf02d72ac72a013697b0f7e879 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 14 19:16:26 2010 -0500 Reduce duplicate code in DB extraction Follow-up to the previous "Only extract new DB entries" patch; move the partial extraction code inside one side of the loop so we can use the same code for actually doing file extraction. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2f4ee4341d1f97d95a99147556888212d1cd4507 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 03:11:27 2009 +1000 Only extract new DB entries This implements FS#15198. The idea apparently came from Csaba Henk <csaba-ml <at> creo.hu> which submitted a patch to Frugalware, so thanks to him, even though I did not look at the code :) The idea is to only extract folders for new packages into the package database and clean up the old directories. This is essentially implementing Xyne's "rebase" script within pacman. If using -Syy, just remove and extract everything. If using -Sy : 1. Generate list of directories in DB 2. Generate list of directories in archive 3. Compare both 4. Clean up old directories 5. Extract new directories Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: fix compile error, s/int/size_t/] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69b3a811a138a84aa09e8e81b2912f6fcd0b47b9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 14 18:47:40 2010 -0500 Mark two functions static These were just introduced in the `--print` patch, and don't need to be exposed outside of util.c. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d39b1dbe627af218e49be6424857089a5888903b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jul 19 11:15:11 2009 +0200 Add new --print operation for all operations And a new --print-format option to configure the output. This implements FS#14208 Example usage : pacman -Sp --print-format "%r/%n-%v : %l [%s]" kdelibs extra/kdelibs-4.3.2-4 : ftp://mir2.archlinuxfr.org/archlinux/extra/os/i686/kdelibs-4.3.2-4-i686.pkg… [0,00] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67700b926a1eff745272975e7b089b80bf72cc30 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Sep 4 20:18:49 2009 +0200 print installed packages Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e4be3e06af7f96c279851c3f2d7f1d294b8b8e70 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 16 02:38:32 2009 +0100 callback: use variable length for progressbar text This fixes FS#17523 We always used a fixed value of 50 for textlen, which is often not enough for download progress bar. At least we can use a bigger width on large terminal (e.g. 60% of width) and keep 50 as minimum. before: nautilus-2.28.4-1-x... 5.7M 789.2K/s 00:00:07 [####################################] 100% after: nautilus-2.28.4-1-x86_64 5.7M 770.7K/s 00:00:08 [##############################] 100% Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e5dce888c09976f1ef4664613c742d0d015e534e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 16 02:16:00 2009 +0100 callback.c : less magic progress bars 1 - Explain magic numbers 2 - There was a weird off by 1 mess in the progress bar. The code supposedly shared the width between 50 chars for text (textlen) and the rest for the progress bar (proglen = getcols() - textlen). But the code actually used textlen + 1 for the text and proglen - 1 for the progress bar (with haslen=1, the progress bar was actually empty), which was a bit confusing so I changed it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 9 ++- contrib/zsh_completion | 1 + doc/pacman.8.txt | 16 +++-- lib/libalpm/be_files.c | 167 ++++++++++++++++++++++++++++++++++++++++++----- lib/libalpm/util.c | 3 +- src/pacman/callback.c | 38 +++++++---- src/pacman/conf.c | 1 + src/pacman/conf.h | 6 +- src/pacman/pacman.c | 23 +++++-- src/pacman/remove.c | 6 ++ src/pacman/sync.c | 50 +++++++------- src/pacman/upgrade.c | 8 ++- src/pacman/util.c | 120 +++++++++++++++++++++++++++++++--- src/pacman/util.h | 1 + 14 files changed, 369 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add a "provided" field in PKGBUILD
by Diego Ferigo 14 Mar '10

14 Mar '10

Hi guys! I have a propose for pacman/makepkg...Now I'm going to explain my idea... In AUR there are some problems regarding the dependencies management...Particularly when a package, that from this moment I'll call * subpackage*, is a part of another package, that I'll call *main_package*(example gnome-python-desktop and python-wnck). It would be nice if the maintainer of the subpackage could add a field * provided* (or another name), that point out to the package that contains it... Obliviously the 2 packages go in conflict because they share the same files..Now the solution is to add a provides field in the main_package, done by his maintainer...The maintainer of the main_package has to add a new object in provides array, every new subpackage created. This new field, provided, get the main_package maintainer off to this change, and it give the duty to the subpackage maintainer. I opened a bug some weeks ago, requesting the add of provides= in a extra package, but the problem remained unsolved because AUR and repos are 2 different things. This method can solve a lot of dependencies problem that happened (to me) in this period...And it is more kiss imho.... What do you think? Diego Ferigo -- http://darchlinux.netsons.org

2 1

[pacman-dev] makepkg and VCS packages
by Allan McRae 12 Mar '10

12 Mar '10

Hi all, There are a number of bug reports about improving VCS support in makepkg. To address many of these, we really need to give this whole part of makepkg an overhaul. I have create a wiki page [1] where i have made some initial notes and will start filling out brainstorming for ideas on how this could be improved. Please add any ideas people have for how these could be improved. [1] http://wiki.archlinux.org/index.php/User:Allan/Makepkg_VCS_overhaul Allan

2 1

[pacman-dev] [PATCH] external debug symbols
by Bernhard Beschow 11 Mar '10

11 Mar '10

Hello pacman devs, I'm an Arch user and I really enjoy the tight integration of the KDE packages from the extra repository. Given that Arch seems to be one of the best KDE distros around, it's a pity that - unlike many other distros - Arch doesn't provide (external) debug symbols. However, these are critical for useful crash reports. Moreover, the KDE crash dialogue even prevents reporting crashes to bugzilla when no debug symbols are present. Sure, there are two obvious alternatives: 1) use kdemod, or 2) compile own packages with debug symbols. However, both have drawbacks: kdemod isn't integrated as tightly into Arch, wich means that things could break. The second option takes a lot of resources and a lot of time, especially on low-end hardware. That's why I propose that Arch should deliver extra packages with external debug symbols. To help you out, I've added support for external debug symbols to the makepkg tool [1]. BTW, my patch is based on the kdemod-version of makepkg. I've tested the patch with the kdeplasma-addons module and got a separate debug package for each split package without modifying the PKGBUILD. So I can say that it "works for me". However, it would be nice if there was a chance for the patch to get merged so it works for all Arch users. What do you think? Greetings, Bernhard [1] http://gitorious.org/pacman-shentey/pacman-shentey

2 1

[pacman-dev] [PATCH] makepkg: abort on missing or non-writable PKGDEST
by Allan McRae 07 Mar '10

07 Mar '10

When PKGDEST pointed to a non-writable location, makepkg would fail after completing the build process. This patch makes it abort as soon as PKGDEST is parsed. Also, move the SRCDEST check to the same point rather than right before downloading sources (which was after dependency checks). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5560c77..a087ee7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -454,12 +454,6 @@ remove_deps() { download_sources() { msg "$(gettext "Retrieving Sources...")" - if [[ ! -w $SRCDEST ]] ; then - error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" - plain "$(gettext "Aborting...")" - exit 1 - fi - pushd "$SRCDEST" &>/dev/null local netfile @@ -1644,8 +1638,20 @@ readonly ALL_OFF BOLD BLUE GREEN RED YELLOW # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $PKGDEST ]]; then + error "$(gettext "You do not have write permission to store packages in %s.")" "$PKGDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $SRCDEST ]] ; then + error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined -- 1.7.0.1

1 0

[pacman-dev] [PATCH] makepkg: fall back to su if sudo is not available
by Ray Kohler 06 Mar '10

06 Mar '10

There's a bit of a hack here with the "fullcmd" temporary variable to get around the need to pass the entire command line to su -c as one argument. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/makepkg.sh.in | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5bd294c..2dc9262 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -344,8 +344,13 @@ download_file() { run_pacman() { local ret=0 - if (( ! ASROOT )) && [[ $1 != "-T" ]] && sudo -l $PACMAN &>/dev/null; then - sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + if (( ! ASROOT )) && [[ $1 != "-T" ]]; then + if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + else + fullcmd="$PACMAN $PACMAN_OPTS $@" + su -c "$fullcmd" || ret=$? + fi else $PACMAN $PACMAN_OPTS "$@" || ret=$? fi @@ -1686,16 +1691,6 @@ else fi fi -# check for sudo if we will need it during makepkg execution -if (( ! ASROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if [ ! "$(type -p sudo)" ]; then - error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" - plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" - plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")" - exit 1 - fi -fi - unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -- 1.7.0

3 7

[pacman-dev] [PATCH] makepkg: always update symlinks to compressed man pages
by Allan McRae 05 Mar '10

05 Mar '10

When a man page has both symbolic and hard links, any symlink pointing to other than the alphabetically first hardlink was not "compressed" and left dangling towards the uncompressed man page. Fixes FS#18569. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3d987ac..f8072f9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -836,17 +836,18 @@ tidy_install() { local manpage ext file link hardlinks hl find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do - # check file still exists (potentially compressed with hard link) - if [[ -f ${manpage} ]]; then - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do - rm -f "$link" - ln -sf "${file}.gz" "${link}.gz" - done + ext="${manpage##*.}" + file="${manpage##*/}" + if [[ $ext != gz && $ext != bz2 ]]; then + # update symlinks to this manpage + find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | + while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" + done + + # check file still exists (potentially already compressed due to hardlink) + if [[ -f ${manpage} ]]; then # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist -- 1.7.0.1

1 1

Re: [pacman-dev] [arch-general] [arch-dev-public] Versioned dependency fun...
by Dan McGee 03 Mar '10

03 Mar '10

On Tue, Mar 2, 2010 at 4:40 PM, Xavier Chantry <chantry.xavier(a)gmail.com> wrote: > On Tue, Mar 2, 2010 at 7:32 PM, Pierre Schmitz <pierre(a)archlinux.de> wrote: >> Am Dienstag, 2. März 2010 14:06:57 schrieb Dan McGee: >>> > and here we have another reason to punish anybody using versioned >>> > dependencies. ;-) (of course upstream needs to be hit, too) >>> >>> Blaming this on versioned deps is punishing the messenger; this >>> package wouldn't upgrade without a force option either because the >>> same version comparison is used everywhere... >> >> You did notice the smiley? I know this wasn't fair in this case and not too >> serious. But anyway, I would prefer add the force flag and add the (stupid) >> upstream version instead of making your own up. >> > > The force flag is a big ugly crap. > I find sanitizing upstream version to be much.. saner. > Or figure out a way to have both a sane version for pacman and the > insane upstream version. I was actually thinking about this again and thinking epoch might not be a bad idea- I don't know if I had any legit objection to it before but I can't think of one anymore. If someone is interested in implementing, I'd be for it. -Dan

4 3