August 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-28-g281bc72
by dan＠archlinux.org 18 Aug '10

18 Aug '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, maint has been updated via 281bc725342e07d314f412ba6c930c3efb8f623c (commit) via 5908992e4730263edb8255439560d5411d28c895 (commit) via c3f537538029285cca2ebb22975db60033a78c40 (commit) via b02bda75f14f35817d1757863d0b3c4cf09a0677 (commit) from 0d6efb35ce445747cdc37b4f58cdf63463de6e1a (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 281bc725342e07d314f412ba6c930c3efb8f623c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 18 13:17:46 2010 -0500 repo-add: create relative DB symlinks As noted in FS#20498, if an absolute path is used for specifying the database when invoking repo-add, the symlink generated will point to the absolute path instead of being relative to the directory. Fix this for the two linking cases, but leave the copy untouched so that will still work. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5908992e4730263edb8255439560d5411d28c895 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 20:16:56 2010 +1000 makepkg: add file to the list of needed utilities Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c3f537538029285cca2ebb22975db60033a78c40 Author: Mateusz Herych <heniekk(a)gmail.com> Date: Wed Aug 4 14:09:26 2010 +1000 Updates for Polish translations Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b02bda75f14f35817d1757863d0b3c4cf09a0677 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 3 14:29:26 2010 +1000 makepkg: check tput support before using Prevent makepkg aborting whe colors are enabled and the terminal does not support setting colors by tput. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/pl.po | 99 +++------------------------ po/pl.po | 172 +++++++++++++++++++++--------------------------- scripts/makepkg.sh.in | 24 +++++-- scripts/repo-add.sh.in | 5 +- 4 files changed, 107 insertions(+), 193 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add: create relative DB symlinks
by Dan McGee 18 Aug '10

18 Aug '10

As noted in FS#20498, if an absolute path is used for specifying the database when invoking repo-add, the symlink generated will point to the absolute path instead of being relative to the directory. Fix this for the two linking cases, but leave the copy untouched so that will still work. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2838f81..283ad07 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -488,8 +488,9 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" dblink="${REPO_DB_FILE%.tar.*}" - ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ - ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + target=${REPO_DB_FILE##*/} + ln -sf "$target" "$dblink" 2>/dev/null || \ + ln -f "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" else msg "$(gettext "No packages modified, nothing to do.")" -- 1.7.2.1

1 0

[pacman-dev] pyalpmm in version 0.3
by Markus Meissner 18 Aug '10

18 Aug '10

Hey Guys, just wanted to announce the 0.3 release of pyalpmm including transparent AUR support (searching, dependency resolving between AUR and regular repos), a new highest-possible-level API class called System, which allows you to add/remove/build/search/upgrade/update in mostly just one line of code and many more features and a now (nearly) frozen API. The bbs thread: https://bbs.archlinux.org/viewtopic.php?id=60711 should give you a little insight what happend, and also the project homepage of course: http://www.infolexikon.de/code/pyalpmm/ If you've any questions/feedback feel free to write me. regards Markus Meissner

1 0

[pacman-dev] [PATCH 1/2] redirect scriptlet stderr synchronously through alpm
by Jonathan Conder 18 Aug '10

18 Aug '10

Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. For simplicity it redirects all scriptlet output through SCRIPTLET_INFO, and all callbacks in the child process have been replaced for thread-safety. Also adds a shell to the fake root set up for pactests, which was not needed previously due to a bug (debian #582847) in fakechroot. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/util.c | 91 +++++++++++++++++++++++++++++------------------- test/pacman/pmtest.py | 5 ++- 2 files changed, 59 insertions(+), 37 deletions(-) I noticed the list has been quiet for a while, so I thought this would be a good time to resubmit. Only change here is the location of the pactest, which git moved automagically :). I am nearly certain now that this will fix the deadlock in my frontend (for details see the RATIONALE section of man pthread_atfork). diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index ffebe9e..46460f0 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -456,6 +456,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int pipefd[2]; int restore_cwd = 0; int retval = 0; @@ -479,6 +480,12 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + if(pipe(pipefd) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -488,55 +495,67 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(1); + close(2); + while(dup2(pipefd[1], 1) == -1 && errno == EINTR); + while(dup2(pipefd[1], 2) == -1 && errno == EINTR); + close(pipefd[0]); + close(pipefd[1]); + + /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + fprintf(stderr, _("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { /* this code runs for the parent only (wait on the child) */ - pid_t retpid; int status; - do { - retpid = waitpid(pid, &status, 0); - } while(retpid == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); + FILE *pipe; + + close(pipefd[1]); + pipe = fdopen(pipefd[0], "r"); + if(pipe == NULL) { + close(pipefd[0]); retval = 1; - goto cleanup; } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; - } + while(!feof(pipe)) { + char line[PATH_MAX]; + if(fgets(line, PATH_MAX, pipe) == NULL) + break; + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } + fclose(pipe); + } + + while(waitpid(pid, &status, 0) == -1) { + if(errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* report error from above after the child has exited */ + if(retval != 0) { + _alpm_log(PM_LOG_ERROR, _("could not open pipe (%s)\n"), strerror(errno)); + goto cleanup; + } + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; } } } diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index b1d778e..5c8881c 100755 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -110,10 +110,13 @@ def generate(self): tmpdir = os.path.join(self.root, TMPDIR) logdir = os.path.join(self.root, os.path.dirname(LOGFILE)) etcdir = os.path.join(self.root, os.path.dirname(PACCONF)) - for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir]: + bindir = os.path.join(self.root, "bin") + for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir]: if not os.path.isdir(dir): vprint("\t%s" % dir[len(self.root)+1:]) os.makedirs(dir, 0755) + # Only the dynamically linked binary is needed for fakechroot + shutil.copy("/bin/sh", bindir) # Configuration file vprint(" Creating configuration file") -- 1.7.2.1

1 0

[pacman-dev] replaces vs conflicts
by Allan McRae 13 Aug '10

13 Aug '10

Has something changed in the handling of provides/conflicts/replaces. :: Synchronizing package databases... core 35.7K 30.4K/s 00:00:01 [######################] 100% extra 458.8K 52.5K/s 00:00:09 [######################] 100% community 380.4K 40.4K/s 00:00:09 [######################] 100% :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... :: elfutils and libelf are in conflict. Remove libelf? [y/N] > pacman -Si elfutils Repository : core Name : elfutils Version : 0.148-1 URL : https://fedorahosted.org/elfutils/ Licenses : GPL2 Groups : None Provides : libelf Depends On : glibc Optional Deps : None Conflicts With : libelf Replaces : libelf So the elfutils PKGBUILD has provides/conflicts/replaces=libelf. Didn't this use to replace the package rather than causing a conflict? Allan

3 9

[pacman-dev] Fwd: [makepkg patch - generate .SRCINFO file when running "--source"]
by vlad 10 Aug '10

10 Aug '10

Hello, Here is a mail I sent to the arch-general list containing a patch for makepkg which generates a .SRCINFO file when running "makepkg --source". Below I'll make some more comments, present some more ideas on this topic. ----- Forwarded message from vlad <vla(a)uni-bonn.de> ----- Date: Tue, 27 Jul 2010 15:25:55 +0200 From: vlad <vla(a)uni-bonn.de> Subject: makepkg patch - generate .SRCINFO file when running "--source" To: arch-general <arch-general(a)archlinux.org> User-Agent: Mutt/1.5.20 (2009-06-14) Hello list, Here is a patch against makepkg from git which introduces a new function "write_srcinfo()". This generates a file .SRCINFO - like the .PKGINFO one - when "makepkg --source" is run and then it is added to the src.tar.gz archive. I think having such a file is an important step for getting split packages to the AUR. It is also useful for third party applications. Since this file is generated during making the source archive, there is no need for parsing/sourcing the PKGBUILD everytime meta infos are needed afterwards. This is also a way of standardizing the source archive. .SRCINFO looks like (generated for gcc from core): " # Generated by makepkg 3.4.0 # Tue Jul 27 12:56:38 UTC 2010 global pkgbase = gcc global pkgname = gcc global pkgname = gcc-libs global pkgname = gcc-fortran global pkgname = gcc-objc global pkgname = gcc-ada global pkgver = 4.5.0-6 global pkgdesc = The GNU Compiler Collection global url = http://gcc.gnu.org global packager = Vlad George <donvla(a)users.sourceforge.net> global builddate = 1280235398 global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-core-4.5-20100610.tar.… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-g++-4.5-20100610.tar.b… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-fortran-4.5-20100610.t… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-objc-4.5-20100610.tar.… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-ada-4.5-20100610.tar.b… global source = ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.20100312.tar.bz2 global source = gcc_pure64.patch global source = gcc-hash-style-both.patch global source = r160561.patch global license = GPL global license = LGPL global license = custom global arch = i686 global arch = x86_64 global makedepends = binutils>=2.20.1 global makedepends = libmpc>=0.8.2-2 global makedepends = cloog-ppl>=0.15.8 global makedepends = libelf global makedepends = gcc-ada gcc depends = binutils>=2.20.1 gcc depends = libmpc>=0.8.1-2 gcc depends = cloog-ppl>=0.15.8 gcc depends = libelf gcc groups = base-devel gcc install = gcc.install gcc-libs pkgdesc = Runtime libraries shipped by GCC for C and C++ languages gcc-libs groups = base gcc-libs depends = glibc>=2.11.1-2 gcc-libs install = gcc-libs.install gcc-fortran pkgdesc = Fortran front-end for GCC gcc-fortran depends = gcc=4.5.0-6 gcc-fortran install = gcc-fortran.install gcc-objc pkgdesc = Objective-C front-end for GCC gcc-objc depends = gcc=4.5.0-6 gcc-ada pkgdesc = Ada front-end for GCC (GNAT) gcc-ada depends = gcc=4.5.0-6 gcc-ada install = gcc-ada.install " As you see this file consists of different parts separated by a leading tag. "global" denotes the global PKGBUILD vars and the name of the split package denotes the local package variables. However, this is just a first formatting approach. This can be changed according to further needs. I think this is a clear and easily readable/parseable output. Note that "packager" defaults to the person who actually build the source archive. Perhaps this has to be changed to AUR user name, not to the makepkg.conf PACKAGER entry. ----- End forwarded message ----- The main idea behind this is to unify and standardize how PKGBUILDs are handled (mainly AUR). For now information about a package has to be parsed from the PKGBUILD which creates a big overhead and has many security holes. There are some more problems with this. As a user said, there is a problem with if clauses for different arches. Imo there is no sane way to handle this. So we should try a different approach. A possible one is to restrict the way architecture specific variables are written to PKGBUILDs; perhaps only smth like: "[[ $CARCH == "i686" ]] && sources= ... " Though this is quite restrictive, and I see a discussion coming up why this and not the other way. A more elegant way - which I personally prefer - is to introduce a new function "arch_$CARCH" to PKGBUILDs. Actually these are two functions, arch_i686 and arch_x86_64, one for each architecture. These functions appear in the first (global) part of the PKGBUILD before the build/package functions and contain arch specific variables. This may look like (eg for new wine PKGBUILD): " arch=(i686 x86_64) license=(LGPL) arch_i686() { depends=(fontconfig mesa libxcursor libxrandr libxdamage libxxf86dga alsa-lib) makedepends=(autoconf ncurses bison perl fontforge flex prelink 'gcc>=4.5.0-2' cross32-gcc libgphoto2 giflib libxpm libpng libxinerama libxcomposite \ libxmu libxxf86vm libxml2 libxslt libldap lcms mpg123 openal esound jack cups sane samba) optdepends=(libgphoto2 giflib libpng libldap lcms libxml2 mpg123 openal esound jack cups sane samba) } arch_x86_64() { depends=(...) } source=("stuff") md5sums=("numbers") build() { .... } " You get the point. Note that only vars are allowed in these functions; other entries are ignored. There should also be a list/array of allowed vars (like "splitpkg_overrides"). There are: depends, makedepends, optdepends, source, checksums. Note that this does not affect the build/package functions in any way. The main advantages are: * This is a unified way to handle arch specific vars in PKGBUILDs. There are no dirty hacks, no barely readable if clauses, etc. * This is easy to parse - if needed - and easily integrable into makepkg. After sourcing the buildfile, you can first check if there is such a function and than simply run it (eg: "declare -F arch_$CARCH && arch_$CARCH"). In combination with .SRCINFO there is no need to parse the PKGBUILD at all afterwards. * And for the .SRCINFO file: with these functions you can expand (only an example - as I said above, this formatting is just one possibility) the separation tags to "global_i686" and "global_x86_64" which point to the arch specific vars. This completes the output/writing of this file. And now to the AUR. Every "taurball" which is uploaded to the AUR has to be built with "makepkg --source". It contains then a .SRCINFO file which makes the information about this package easy readable. So there is a sane and consistent way to provide and get information for wanted purposes (AUR web interface, third party apps, etc). Thank you for reading, Vlad --

3 4

[pacman-dev] [PATCH] makepkg: add option to skip archive compression
by Christian Himpel 09 Aug '10

09 Aug '10

hi pacman developers, i currently have to `makepkg' a huge package (go-hg) again and again. since compression takes very long (and pacman can handle uncompressed archives very well), i implemented an option to makepkg that skips the compression of the (tar)archive. this speeds-up my workflow enormously. btw, this option might be useful in packages like yaourt as well.. if you find this patch useful, feel free to include it :) thanks for developing this great package manager! cheers, chressie

2 3

[pacman-dev] [PATCH] makepkg: Allow creation of uncompressed packages
by Thomas Bächler 09 Aug '10

09 Aug '10

When performing local testing, it may be useful to add PKGEXT='.pkg.tar' to the PKGBUILD to save time, especially with big packages. --- scripts/makepkg.sh.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 32528b0..1b788ef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1031,6 +1031,7 @@ create_package() { *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; *tar.xz) EXT=${PKGEXT%.xz} ;; + *tar) EXT=${PKGEXT} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac @@ -1050,6 +1051,7 @@ create_package() { *tar.gz) gzip -f -n "$tar_file" ;; *tar.bz2) bzip2 -f "$tar_file" ;; *tar.xz) xz -z -f "$tar_file" ;; + *tar) true ;; esac ret=$? fi @@ -1125,6 +1127,7 @@ create_srcpackage() { *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; *tar.xz) TAR_OPT="J" ;; + *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; esac -- 1.7.2.1

3 4

[pacman-dev] [PATCH] repo-add: make --quiet output more quiet
by Allan McRae 08 Aug '10

08 Aug '10

Fixes FS#20403. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2838f81..2293c46 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -37,6 +37,7 @@ startdir="$PWD" umask 0022 msg() { + (( QUIET )) && return local mesg=$1; shift printf "==> ${mesg}\n" "$@" >&1 } -- 1.7.2.1

1 0

[pacman-dev] Updates for Polish translations of pacman and libalpm
by Mateusz Herych 04 Aug '10

04 Aug '10

Hello, Here are updated .po files for Polish translations of pacman and libalpm. Regards, Mateusz.

2 1