- Pacman-dev - lists.archlinux.org

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

26 Apr '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 90aca75cb92c12419f2998cf54caa8ef5fe59f99 (commit) via 753599b5046392477449ed550cd99c41631145ed (commit) via 652762488a1fbe70b073588dc5f88412ff952fb7 (commit) via 6995aed9aeae1e95d9de3b2f539f904dbde4e165 (commit) via 7608dd74d73b66595ad34c861491fc86be335e8c (commit) via 88254d762d68f93b2be04e686abbc126e2afcf11 (commit) via 7965345d435870a47073fffafa2a429744aa2deb (commit) from 21abae98cbd382d8fab4427109776d983cd07c9f (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 90aca75cb92c12419f2998cf54caa8ef5fe59f99 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 29 15:17:22 2010 +1000 makepkg: BSD find compatibility fix Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 753599b5046392477449ed550cd99c41631145ed Author: Christophe Chapuis <chris.chapuis(a)gmail.com> Date: Tue Apr 20 16:21:00 2010 +1000 contrib/pactree: generate reverse dependency trees Add an option to show the tree of packages which depend on a given package Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 652762488a1fbe70b073588dc5f88412ff952fb7 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Apr 24 16:48:14 2010 +0200 New pactests for the phonon/qt issue Original-work-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6995aed9aeae1e95d9de3b2f539f904dbde4e165 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Apr 14 16:22:43 2010 +1000 makepkg: deprecate repackaging without a package function File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avoided when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: touched up message for translation purposes] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7608dd74d73b66595ad34c861491fc86be335e8c Author: Serge Ziryukin <ftrvxmtrx(a)gmail.com> Date: Sun Apr 25 19:48:03 2010 +0300 check for valid optarg before using strdup Signed-off-by: Serge Ziryukin <ftrvxmtrx(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 88254d762d68f93b2be04e686abbc126e2afcf11 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Mar 15 23:54:00 2010 +0100 Show --print and --print-format options with -Rh, -Sh and -Uh only http://mailman.archlinux.org/pipermail/pacman-dev/2010-March/010519.html Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7965345d435870a47073fffafa2a429744aa2deb Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Nov 14 20:26:37 2009 +0100 More consistent printing of off_t and time_t time_t : %ld off_t : %jd and cast to intmax_t Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pactree | 31 ++++++++++++++++++++++++++----- lib/libalpm/be_files.c | 6 +++--- lib/libalpm/delta.c | 2 +- lib/libalpm/dload.c | 6 +++--- pactest/tests/sync405.py | 26 ++++++++++++++++++++++++++ pactest/tests/sync406.py | 31 +++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 22 ++++++++++++++++------ src/pacman/pacman.c | 13 ++++++++++--- 8 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 pactest/tests/sync405.py create mode 100644 pactest/tests/sync406.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: handle multiple install and changelog files
by Allan McRae 26 Apr '10

26 Apr '10

The presence of all install and changelog files (multiple files may be used with package splitting) is checked for in check_sanity(). All install and changelog files are copied to the source location when using --source. The check for install and changelog file presence is removed in create_srcpackage() as this is redundant to the checks performed in check_sanity(). Moved install and changelog handling in create_srcpackage() to after source array files, as this is more logical and readily allows for the following. A check is made when creating a source package that a symlink to an install file has not already been added. This can occur if the install file is used multiple times or if it is listed in the source array. Fixes FS#18831, FS#18394 and partially fixes FS#16004 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I could split these into a set of smaller changes but they overlap to such a great extent it seems redundant. Also, the patch remains fairly small. scripts/makepkg.sh.in | 71 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b306620..8ae41ea 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1095,24 +1095,6 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" - if [[ -n $install ]]; then - if [[ -f $install ]]; then - msg2 "$(gettext "Adding install script...")" - ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" - else - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - fi - fi - - if [[ -n $changelog ]]; then - if [[ -f $changelog ]]; then - msg2 "$(gettext "Adding package changelog...")" - ln -s "${startdir}/$changelog" "${srclinks}/${pkgbase}/" - else - error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" - fi - fi - local netfile for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") @@ -1125,6 +1107,32 @@ create_srcpackage() { fi done + local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) + if [[ -n $install_files ]]; then + local file + for file in ${install_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding install script (%s)...")" "$file" + ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" + fi + done + fi + + local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) + if [[ -n $changelog_files ]]; then + local file + for file in ${changelog_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding package changelog (%s)...")" "$file" + ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" + fi + done + fi + local TAR_OPT case "$SRCEXT" in *tar.gz) TAR_OPT="z" ;; @@ -1242,14 +1250,29 @@ check_sanity() { fi done - if [[ $install && ! -f $install ]]; then - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - return 1 + local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) + if [[ -n $install_files ]]; then + local file + for file in ${install_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f $file ]]; then + error "$(gettext "Install scriptlet (%s) does not exist.")" "$file" + return 1 + fi + done fi - if [[ -n $changelog && ! -f $changelog ]]; then - error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" - return 1 + local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) + if [[ -n $changelog_files ]]; then + for file in ${changelog_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f $file ]]; then + error "$(gettext "Changelog file (%s) does not exist.")" "$file" + return 1 + fi + done fi local valid_options=1 -- 1.7.0.6

1 0

[pacman-dev] [PATCH 1/2] check for valid optarg before using strdup
by Serge Ziryukin 26 Apr '10

26 Apr '10

Signed-off-by: Serge Ziryukin <ftrvxmtrx(a)gmail.com> --- src/pacman/pacman.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d32d4d1..206cdcf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -489,6 +489,7 @@ static int parseargs(int argc, char *argv[]) setarch(optarg); break; case OP_PRINTFORMAT: + check_optarg(); config->print_format = strdup(optarg); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; -- 1.7.0.6

2 3

[pacman-dev] [PATCH] New pactests for the phonon/qt issue
by Nagy Gabor 24 Apr '10

24 Apr '10

Original work by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync405.py | 26 ++++++++++++++++++++++++++ pactest/tests/sync406.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync405.py create mode 100644 pactest/tests/sync406.py diff --git a/pactest/tests/sync405.py b/pactest/tests/sync405.py new file mode 100644 index 0000000..d170cec --- /dev/null +++ b/pactest/tests/sync405.py @@ -0,0 +1,26 @@ +self.description = "phonon/qt issue" + +sp1 = pmpkg("kdelibs") +sp1.depends = ["phonon"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("qt", "4.6.1-1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("phonon") +self.addpkg2db("sync", sp3) + +lp = pmpkg("qt", "4.5.3-1") +lp.provides = ["phonon"] +lp.conflicts = ["phonon"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=kdelibs") +self.addrule("PKG_EXIST=qt") +self.addrule("PKG_EXIST=phonon") +self.addrule("PKG_VERSION=qt|4.6.1-1") + +self.expectfailure = True diff --git a/pactest/tests/sync406.py b/pactest/tests/sync406.py new file mode 100644 index 0000000..c15862f --- /dev/null +++ b/pactest/tests/sync406.py @@ -0,0 +1,31 @@ +self.description = "phonon/qt issue (2)" + +sp1 = pmpkg("kdelibs") +sp1.depends = ["phonon"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("qt", "4.6.1-1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("phonon") +self.addpkg2db("sync", sp3) + +sp4 = pmpkg("kdeapp") +sp4.depends = ["qt>=4.6"] +self.addpkg2db("sync", sp4) + +lp = pmpkg("qt", "4.5.3-1") +lp.provides = ["phonon"] +lp.conflicts = ["phonon"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % " ".join([p.name for p in sp1, sp4]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=kdelibs") +self.addrule("PKG_EXIST=qt") +self.addrule("PKG_EXIST=phonon") +self.addrule("PKG_EXIST=kdeapp") +self.addrule("PKG_VERSION=qt|4.6.1-1") + +self.expectfailure = True -- 1.7.0.5

1 0

[pacman-dev] [PATCH] makepkg: deprecate repackaging without a package function
by Allan McRae 23 Apr '10

23 Apr '10

File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avioded when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This extents the earier patch sent to the list and now deprecates the rebuilding of packages without package() functions. scripts/makepkg.sh.in | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b2b449c..b306620 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1847,9 +1847,14 @@ fi if (( INFAKEROOT )); then if (( ! SPLITPKG )); then if (( ! PKGFUNC )); then - if (( BUILDFUNC && ! REPKG )); then - run_build - tidy_install + if (( ! REPKG )); then + if (( BUILDFUNC )); then + run_build + tidy_install + fi + else + warning "$(gettext "Repackaging without the use of a package() function is deprecated")" + plain "$(gettext "as it may not preserve file permissions.")" fi else run_package @@ -1975,8 +1980,13 @@ else if (( PKGFUNC )); then run_package tidy_install - elif (( ! REPKG )); then - tidy_install + else + if (( ! REPKG )); then + tidy_install + else + warning "$(gettext "Repackaging without the use of a package() function is deprecated")" + plain "$(gettext "as it may not preserve file permissions.")" + fi fi create_package else -- 1.7.0.5

1 0

[pacman-dev] [PATCH] contrib/pactree: generate reverse dependency trees
by Allan McRae 20 Apr '10

20 Apr '10

From: Christophe Chapuis <chris.chapuis(a)gmail.com> Add an option to show the tree of packages which depend on a given package Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Just a git diff from Christophe's original patch. I adjusted the patch slightly so that the original was the first path in the if/else statements. Also bumped pkgver a larger version. contrib/pactree | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/contrib/pactree b/contrib/pactree index df53671..73bece3 100755 --- a/contrib/pactree +++ b/contrib/pactree @@ -41,7 +41,7 @@ arrow1_color="chocolate4" #color of the normal arrow arrow2_color="grey" #color of the "provided by" headless arrow readonly prog_name="pactree" -readonly prog_ver="0.2" +readonly prog_ver="0.3" _usage(){ echo "This program generates the dependency tree of an installed package" @@ -52,13 +52,14 @@ _usage(){ echo " -d, --depth INT Limit the shown dependencies depth" echo " -g, --graph Use graphviz to make an image of the tree" echo " -l, --linear Enable linear output" + echo " -r, --reversed Show reversed dependancies" echo " -s, --silent Shh, let me hear those errors!" echo " -u, --unique Print the dependency list with no duplicates" echo echo " -h, --help Print this help message" echo " -v, --version Print the program name and version" echo - echo "Example: $prog_name -c -d 2 readline" + echo "Example: $prog_name -c -d2 readline" } _version(){ @@ -140,7 +141,16 @@ _tree(){ if [[ ! " ${dep_list[@]} " =~ " $pkg_name " ]] && [ $spaces -ne $max_depth ]; then dep_list=( "${dep_list[@]}" "$pkg_name" ) - for dep_pkg in $(_grabfield "$pkg_dir/depends" %DEPENDS%); do + if [ $reversed_dep -eq 0 ]; then + deps_pkg="$(_grabfield "$pkg_dir/depends" %DEPENDS%)" + else + reqs_pkg_dir="$(_finddep "$pkg_name" %DEPENDS% depends)" + unset deps_pkg + for req_pkg_dir in $reqs_pkg_dir; do + deps_pkg=$(echo "$deps_pkg" "$(_grabfield "$req_pkg_dir/desc" %NAME%)") + done + fi + for dep_pkg in $deps_pkg; do spaces=$2 #Bash scoping ;_; if [ $graphviz -eq 1 ]; then echo "\"$1\" -> \"${dep_pkg%%[<>=]*}\" [color=$arrow1_color];" @@ -208,6 +218,12 @@ for (( n=0 ; n < $len_options ; n++ )); do continue fi + if [ "${options[$n]}" = "-r" -o "${options[$n]}" = "--reversed" ]; then + unset options[$n] + reversed_dep=1 + continue + fi + if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then max_depth="${options[$n]#-d}" @@ -229,6 +245,7 @@ linear=${linear:-0} silent=${silent:-0} nodup=${nodup:-0} graphviz=${graphviz:-0} +reversed_dep=${reversed_dep:-0} if [ $colored -ne 1 ]; then unset branch1_color @@ -292,8 +309,12 @@ if [ $graphviz -eq 1 ]; then root_pkgs="${options[@]}" # Uncomment for the "generated by pactree" node in graphviz #advert="xyz [height=0.07, fontsize=8.0, label=\"GENERATED WITH PACTREE\",shape=box,color="black",style=filled,fontcolor="white"];\n" - - echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.deps.$gformat" + if [ $reversed_dep -eq 0 ]; then + file_extension="deps.$gformat" + else + file_extension="reqs.$gformat" + fi + echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.$file_extension" else _main fi -- 1.7.0.5

1 0

[pacman-dev] VCS-PKGBUILDs
by David Campbell 18 Apr '10

18 Apr '10

Does anyone find it odd that the non-VCS PKGBUILDs explicitly check to make sure the sources have not changed and that the PKGBUILD someone uses is actually going to build the package the maintainer wrote it for, yet, VCS PKGBUILDs don't? VCS sources may change frequently, but this does not make them more secure and requiring of less scrutiny than non-VCS packages. If anything, they probably should be more scrutinized, since it would be more likely for someone to make a troublesome commit than a troublesome official release. There is also the issue that by automatically grabbing new sources without completely updating the PKGBUILD, many PKGBUILD fields may be incorrect, not just the pkgver. If the license a package is released under changes, the PKGBUILD won't care, etc.. Rather than making an often failed attempt to automatically update the pkgver and ignoring the rest of the PKGBUILD fields, why not have VCS PKGBUILDs behave more like all the other PKGBUILDs. When PKGBUILD sources change, a maintainer should have to update the PKGBUILD and PKGBUILDs which try to build using sources that don't match the PKGBUILD should fail. Figuring out the best way to check sources for all VCSs may require some creativity, but at least git would be really simple: check the hash for the last commit. Also, instead of using the date for the pkgver field of a VCS PKGBUILD, have the pkgver reflect the most recent release that the given development package is based off of. Then, use a commit field to show how many commits ahead of that release a package is. These fields would make it more clear what exactly the PKGBUILD is a PKGBUILD for. If there is no release to use commits since, the field could be left blank. This avoids ambiguity caused by different sources of a development project being released on the same day as well as issues with the sometimes significant difference between when a commit is authored and actually committed. -- David Campbell

4 5

[pacman-dev] pactree reverse dependancies
by Christophe Chapuis 15 Apr '10

15 Apr '10

Hello all, I just added an option to pactree, in order to look for reversed dependancies of a package instead of the normal dependancies. I already sent a mail to carlocci, who was the initial developper of this script, but as he doesn't answer I wonder if I should contact someone else. So, what should I do with this little patch? Attach it here in the mailing list? Tofe

2 5

[pacman-dev] .so provides/depends patches review
by Allan McRae 14 Apr '10

14 Apr '10

Hi, Sorry this has taken me a while... so long in fact that I do not have the original email stored anymore to reply to. But here goes my comments on the patches for soname provides/depends: http://mailman.archlinux.org/pipermail/pacman-dev/2010-February/010431.html My comments are currently only on functionality. I'll get to code after that is fully sorted. Firstly, it works well and does as advertised. So no issues there... However: 1) If I put a bad soname provides in the array (e.g. provides="readline.so") it just silently ignores it. No error and nothing put in the .PKGINFO. There needs to be an error (or at minimum a warning). The same goes for depends (although these are mostly caught by the initial dependency checking in makepkg). 2) Building readline on i686 with provides="libreadline.so", in the .PKGINFO I get: provides = libreadline.so=6-elf32_i386 My concern about that is that the library is not i386 but is i686. I may be prepared to accept that though as I guess x86 is x86 really... But what additional information is the elf32 providing? I could perhaps understand the operating system from the host triplet. If anything, my preferences are: libreadline.so=6-i686_linux (best) libreadline.so=6-i686 / libreadline.so=6-i386_linux libreadline.so=6-i386 (worst) Allan

4 5

[pacman-dev] [PATCH] makepkg: warn about repackaging without a package function
by Allan McRae 14 Apr '10

14 Apr '10

File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avioded when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Two areas to comment on: 1) "makepkg -R --asroot" does not give this warning. This is because it is assumed that the initial packaging stage was also done as root and so file permissions will be correct. Is that a fair assumption? 2) Should we depricate repackaging without a package function in pacman-3.5? Using a package function was supported in 3.3 and using only a package function (no build function) will be supported in 3.4. If that is reasonable, I will alter the warning and add it to the --asroot case too. scripts/makepkg.sh.in | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b2b449c..09a99e1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1847,9 +1847,14 @@ fi if (( INFAKEROOT )); then if (( ! SPLITPKG )); then if (( ! PKGFUNC )); then - if (( BUILDFUNC && ! REPKG )); then - run_build - tidy_install + if (( ! REPKG )); then + if (( BUILDFUNC )); then + run_build + tidy_install + fi + else + warning "$(gettext "Repackaging without the use of a package() function may not")" + plain "$(gettext "preserve file permissions.")" fi else run_package -- 1.7.0.5

2 1

[pacman-dev] implement .so dependencies?
by Florian Pritz 13 Apr '10

13 Apr '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Regarding the current mass rebuilds because of libpng I'd like to suggest implementing so dependencies again. There will be no more cases where packages break because of library updates and as a nice side effect AUR users see what they have to rebuild. Pacman will treat those dependencies like others so if a user is sure he wants to update he can use -Sd. I've also tested if packages with sodeps would slow down pacman operation, but that's not really the case. The current patch adds "sodep-$arch-$soFileName" for every .so file that's owned by a package in the depends array. Files from optdepends are silently ignored and if no dependency owns the file there will be a warning. I've just rebased the old patch onto HEAD, fixed a little bit and tested it with libjpeg, so it should be fine. - -- Florian Pritz -- {flo,bluewind}(a)server-speed.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJLWgg0AAoJEG0WVcFM4cE+xlYP/08Ec1K9gFz0g8Q/+ag4S8+S U9mInCwJTe9xnu+H1J9JRsMwZ8DzP8WUlc99pqgz9n9Nxk8cpE1eUU9IIluHzjvR bJglYvAKIIknEtc1OkLVicFW2OfvgNzSwx73W6J3fELlzABpxtEMwmmXAJMaVZKq aIVgZ/zFP5b6XJT14FfQJbR7Mj4V5mCAhY0W+5SJL58RIHxPRz1PJKbzuZUcqLBo ouBcBPH9YuiSKufJhbsowyE6Hfyg4btFVHktr7EBvHtB/nb8Kk09LduloaQ9ZtEl hdSlbQL36AI2xJdN4XyuP4+UKmSh4hJKxfVBBCcDeWZd4ZbcC4WIersBY4Ia3hle 96Z8IZG8ydfC6+Ii5wdhdgzwzgaI2ZitgzO/XTLvBB1xpL+gQpupcSFSuypiU0K0 Yz3gybnj1XKb/8UEpNgjuKu6G1UChnmbenSS6lYFotXNWilQM9kAkYTDMV/KoQa0 CeyflEuUJuggMsKPz71NJnRCxcXSEdhVebeB9jKX8l2TIOgHwIYmmbO3yMaowzF+ 39zEAgxYxaLlTXQ2mnL/OkPrFjNQ1exyWwD1nW1N8n7Sr0zT21P4XK8kOrCQlTp7 XswSeZBV+pfR2Uby5hU6tUW9UvWZOHq2YZB7SAWfI7IEzcQxyVcbwwjuxplVgUr+ whZlxxDSfR0k6Uc9jeGm =/iDR -----END PGP SIGNATURE-----

9 28

[pacman-dev] [PATCH] Fix a mistake in the cross-compilation fix
by Matthias Lanzinger 09 Apr '10

09 Apr '10

I noticed a serious mistake in my previous patch. -lssl and -lcrypto were beeing added to $LIBS and by that they were added as linker flags during compilation. This overruled the --as-needed flag and causes ssl to be directly linked to pacman. Signed-off-by: Matthias Lanzinger <mlaenz(a)gmail.com> --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d0fed48..9bb0cd1 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_SUBST([LIBS], ["-lfetch -lssl -lcrypto -ldl $LIBS"])], - AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lssl -lcrypto -ldl] ) + AC_CHECK_LIB([fetch], [fetchParseURL], [AC_SUBST([LIBS], ["-lfetch -ldl $LIBS"])], + AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lcrypto -ldl] ) # Check if libfetch supports conditional GET # (version >=2.21, struct url has member last_modified) AC_CHECK_MEMBER(struct url.last_modified, , -- 1.7.0.3

3 2

[pacman-dev] pacman output wrapping on hurd
by Allan McRae 09 Apr '10

09 Apr '10

Hi, On Arch Hurd, I am seeing weird output from pacman. See http://allanmcrae.com/images/pacman-hurd.png (sorry, qemu image so cut/paste is hard). Basically, it is wrapping the output any time there is a whitespace. Any ideas on what is causing that? Arch Hurd is still in its infancy (barely a toolchain and makepkg deps, but it boots!), so it may be something basic in the system is still missing. Allan

2 2

Re: [pacman-dev] [arch-dev-public] [arch-general] WARNING: [testing] broken due to openssl and heimdal rebuilds
by Xavier Chantry 07 Apr '10

07 Apr '10

On Wed, Apr 7, 2010 at 6:23 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Wed, Apr 7, 2010 at 10:16 AM, Allan McRae <allan(a)archlinux.org> wrote: >> On 08/04/10 00:54, Florian Pritz wrote: >>> >>> On 07.04.2010 16:10, Allan McRae wrote: >>>> >>>> This would really not help here. Pacman does not directly link openssl, >>>> but does through libarchive and libfetch. Adding versioned libarchive >>>> and libfetch to pacman's deps and using sodeps on openssl in those >>>> packages would prevent pacman's SyncFirst from working. >>>> >>> >>> Don't add depends=(libfetch.sp libarchive.so) to the pacman PKGBUILD and >>> it won't be a problem. (Also see #2 below) >> >> Adding those or not is the same as adding versioned deps or not. Both cause >> bad issues. >> >>>> no versioned deps in pacman for lib{archive,fetch} = bad as between the >>>> openssl and lib{archive,fetch} updates vercmp is broken and so is >>>> install files. >>> >>> sodeps would ensure that pacman updates libfetch and libarchive directly >>> after openssl. >> >> Not directly after, but in the same transaction. That is the same as the >> current issue we have. Using sodeps is no improvement over versioned deps >> here. > > Allan and I talked a bit on IRC and we both came to some idea that a > vercmp without any deps would probably be a good solution. We can hack > this up for now, file attached to do so. > > If this goes into the pacman package dir in SVN and we just add a "gcc > -O2 -o vercmp vercmp.c" in there and put it in the right place, we can > avoid a lot of hassle with everything here. > That sounds fine, but what is the long term solution exactly ?

2 1

[pacman-dev] [PATCH] Add vim modeline to PKGBUILD-split.proto
by David Campbell 04 Apr '10

04 Apr '10

Add the vim modeline that is in PKGBUILD.proto to PKGBUILD-split.proto so they are consistent with each other. --- PKGBUILD-split.proto | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 68a8cc4..53a3e8f 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -61,3 +61,5 @@ package_pkg2() { cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg2 } + +# vim:set ts=2 sw=2 et: -- 1.7.0.3

2 1

[pacman-dev] Why alpm_list.h?
by Moritz Wilhelmy 02 Apr '10

02 Apr '10

Hello, since I started to dig into pacman's code, I've also started to wonder why exactly libalpm reinvents the wheel by using it's own list implementation rather than sys/queue.h (see QUEUE(3) for details). Is it for backwards compatibility or what are the exact reasons to handle it this way? Kind Regards, Moritz

2 1

Re: [pacman-dev] [arch-dev-public] openssl 1.0 rebuild
by Xavier Chantry 02 Apr '10

02 Apr '10

On Fri, Apr 2, 2010 at 2:46 AM, Allan McRae <allan(a)archlinux.org> wrote: > > I'd just remove it. > > Basically the arguement against widespread usage of versioned deps is if you > put a versioned openssl>=1.0 there and someone does "pacman -Sy mutt", it > will pull in the new openssl and break many packages on their system. If > you do not put it there, it will only break mutt. > Wasn't it in http://honestknave.com/2009/07/18/the-arch-package-management-debacle/ (unfortunately dead) that the guy did the following : 1) pacman -Sy mutt oh damn mutt is broken because of openssl, let's upgrade openssl 2) pacman -S openssl boom, we are back in the versioned dep case. IIRC this was the post that led to this FR : http://bugs.archlinux.org/task/15581

1 0

[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