- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] scripts/makepkg.sh.in: Strip bins/libs in all {bin, sbin, lib} directories.
by Andrew Fyfe 19 Oct '07

19 Oct '07

In one of the original clean up patches[1] I changed the search path for stripping binaries and libraries. This resulted in only usr/{bin,sbin,lib} being searched. This patch reverts that change. [1] 721ceee1e2c9b18425d84cf39f6541b2f04072b3 Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- 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 4399076..df6c92e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -736,7 +736,7 @@ tidy_install() { if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" - for file in $(find {,*/}{bin,lib,sbin} -type f 2>/dev/null || true); do + for file in $(find {,usr/{,local/},opt/}{bin,lib,sbin} -type f 2>/dev/null || true); do case "$(file -biz "$file")" in *application/x-sharedlib*) # Libraries /usr/bin/strip --strip-debug "$file";; -- 1.5.3.4-dirty

2 1

[pacman-dev] [PATCH] libalpm/package.c : fix requiredby with multiple providers.
by Chantry Xavier 18 Oct '07

18 Oct '07

The code didn't match the following comment : "A depends on B through n depends <=> A listed in B's requiredby n times" Because of the usage of break instead of continue, it stopped at n=1. I was surprised to see this case happens in real, that's how I noticed the bug: wine depends on both freeglut and glut, while freeglut provides glut. So when installing wine, the update_depends function listed wine twice in freeglut's requiredby. But the compute_requiredby function (used when installing freeglut, and used by testdb) listed wine only once in freeglut's requiredby. That made testdb unhappy. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 38e6e4c..cd33ca2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -543,7 +543,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n", cachepkgname, pkg->name); reqs = alpm_list_add(reqs, strdup(cachepkgname)); - break; + continue; } } } -- 1.5.3.4

4 3

[pacman-dev] Add delta information to libalpm.
by Nathan Jones 18 Oct '07

18 Oct '07

This patchset adds delta information to repository databases and libalpm, allowing libalpm to download multiple delta files when upgrading a package. I still have some work to do, but I thought I would post this now to get any suggestions and criticisms that anyone has. Some things I still need to do: Add error checking/md5sum to the download function. Remove some hardcoded stuff (like ".pkg.tar.gz"). Run through valgrind to make sure everything is freed. Delete delta files and intermediate packages after they are not needed. Test... The patches in action: $ ls -lh wbox*.pkg.tar.gz wbox*.delta -rw-r--r-- 1 nathanj users 55K 2007-10-15 17:11 wbox-3-1-i686.pkg.tar.gz -rw-r--r-- 1 nathanj users 7.9K 2007-10-15 17:11 wbox-3-1_to_4-1-i686.delta -rw-r--r-- 1 nathanj users 56K 2007-10-15 17:11 wbox-4-1-i686.pkg.tar.gz -rw-r--r-- 1 nathanj users 398 2007-10-15 17:11 wbox-4-1_to_4-2-i686.delta -rw-r--r-- 1 nathanj users 56K 2007-10-15 17:11 wbox-4-2-i686.pkg.tar.gz $ repo-add test.db.tar.gz wbox-4-2-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'wbox-4-2-i686.pkg.tar.gz' -> Removing existing package 'wbox-3-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'wbox-3-1_to_4-1-i686.delta' -> Added delta 'wbox-4-1_to_4-2-i686.delta' ==> Creating updated database file /home/nathanj/pkgs/pkgs/test.db.tar.gz $ pacman -Q wbox wbox 3-1 $ sudo pacman -Sy wbox :: Synchronizing package databases... test 3.4K 8.2M/s 00:00:00 [#####################] 100% resolving dependencies... done. looking for inter-conflicts... done. Targets: wbox-4-2 Total Package Size: 0.05 MB Total Download Size 0.01 MB Total Installed Size: 0.08 MB Proceed with installation? [Y/n] :: Retrieving packages from test... wbox-3-1_to_4-1-i686... 7.9K 23.3M/s 00:00:00 [#####################] 100% wbox-4-1_to_4-2-i686... 0.4K 5.3M/s 00:00:00 [#####################] 100% Generating wbox-4-1-i686.pkg.tar.gz with wbox-3-1_to_4-1-i686.delta... done. Generating wbox-4-2-i686.pkg.tar.gz with wbox-4-1_to_4-2-i686.delta... done. checking package integrity... done. (1/1) checking for file conflicts [#####################] 100% (1/1) upgrading wbox [#####################] 100%

7 22

[pacman-dev] RootDir using symlinks -> problem
by Xavier 16 Oct '07

16 Oct '07

I use the following options for using an alternate rootdir and testing stuff: RootDir = /home/xav/pacman/pacman/foo DBPath = /home/xav/pacman/pacman/foo/var/lib/pacman CacheDir = /home/xav/pacman/pacman/foo/var/cache/pacman/pkg with the following symlink : /home/xav/pacman -> /data/share/devel/pacman/ Running pacman -v with this config gives the following : Root : /data/share/devel/pacman/pacman/foo/ DB Path : /home/xav/pacman/pacman/foo/var/lib/pacman/ This makes the scriptlets handling in libalpm/trans.c break : 570 strncpy(scriptfn, installfn, PATH_MAX); 571 /* chop off the root so we can find the tmpdir in the chroot */ 572 scriptpath = scriptfn + strlen(root) - 1; Because for example: scriptfn = /home/xav/pacman/pacman/foo/var/lib/pacman/local/slocate-3.1-3/install root = /data/share/devel/pacman/pacman/foo/ so scriptpath result in /pacman/local/slocate-3.1-3/install, instead of /var/lib/pacman/local/slocate-3.1-3/install

4 19

[pacman-dev] pacman and maintainers
by Mateusz Jedrasik 16 Oct '07

16 Oct '07

Hi, I think it should be/would be nice if pacman could show who is the current maintainer of a particular package. It would make it a lot easier to contact them in case something is broken, not updated, or so. Currently one has to go to the lenghts of seeing cvsweb, downloading PKGBUILD, and searching for the maintainer in there, often (sometimes at least) ones who are no longer active. Cheers -- Mateusz Jędrasik <m.jedrasik(a)gmail.com> tel. +48(79)022-9393, +48(51)69-444-90 http://imachine.szklo.eu.org

5 10

[pacman-dev] pacman doesn't remove lockfile after -Sy failure
by Nagy Gabor 16 Oct '07

16 Oct '07

Hi! I said everything in the subject. You can test with /etc/rc.d/network stop pacman -Sy pacman -Sy Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 3

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-464-g128b288
by Dan McGee 15 Oct '07

15 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 128b288ca7f396d3cbb6c9620807075274bdbe8e (commit) via 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 (commit) via 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb (commit) via 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 (commit) via abce73de4cc124da946a4da2d413b784332d91db (commit) via 0adedc536fe372b4def5954f3b24ca63ff86aecf (commit) via 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 (commit) via 3c4e98f7b56c17590965be9dbae25fe1915b75cb (commit) from 7f3adc3936ca66d86ff18e06e77da66bcef843ff (commit) - Log ----------------------------------------------------------------- commit 128b288ca7f396d3cbb6c9620807075274bdbe8e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 18:52:17 2007 -0500 Fix scriptlet pactest cases so they 'succeed' again Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 14 10:17:48 2007 +0200 libalpm/trans.c : fix a recently introduced breakage in scriptlets handling. Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 18:09:49 2007 +0200 libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet. This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 17:10:51 2007 +0200 pacman/pacman.c : put back root check even if -r is specified. Root is needed for most install / remove operation, because it's needed for chrooting, for running scriptlets. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit abce73de4cc124da946a4da2d413b784332d91db Author: Nathan Jones <nathanj(a)insightbb.com> Date: Sun Oct 14 11:59:38 2007 -0400 Manually check xdelta exit codes. This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0adedc536fe372b4def5954f3b24ca63ff86aecf Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 17:29:32 2007 -0500 Updates to fix Doxygen documentation generation We had way too much going on with the Doxygen manpage generation. Clean it up quite a bit by removing directory manpages, using relative paths, not having a manpage for every single alpm function, and ensuring internal functions are not documented publicly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 10 06:57:42 2007 -0500 util/testdb: fix up function naming We shouldn't use the _alpm prefix (copy-paste issue, no big deal). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c4e98f7b56c17590965be9dbae25fe1915b75cb Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Oct 9 13:27:08 2007 -0500 Add two new pactests to check symlink behavior Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/Doxyfile | 6 ++-- doc/Makefile.am | 2 +- lib/libalpm/alpm.h | 4 +- lib/libalpm/alpm_list.h | 6 +--- lib/libalpm/md5.h | 6 ++-- lib/libalpm/trans.c | 52 ++++++++++++++++++++++++---------------- pactest/tests/conflict005.py | 20 +++++++++++++++ pactest/tests/conflict006.py | 17 +++++++++++++ pactest/tests/scriptlet001.py | 5 ++++ pactest/tests/scriptlet002.py | 5 ++++ scripts/makepkg.sh.in | 29 +++++++++++++++------- src/pacman/pacman.c | 4 +-- src/util/testdb.c | 8 +++--- 13 files changed, 114 insertions(+), 50 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 7f3adc3936ca66d86ff18e06e77da66bcef843ff \ 128b288ca7f396d3cbb6c9620807075274bdbe8e

1 0

[pacman-dev] [PATCH] Manually check xdelta exit codes.
by Nathan Jones 14 Oct '07

14 Oct '07

This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- scripts/makepkg.sh.in | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4a68c84..193afe4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -900,17 +900,33 @@ create_xdelta() { msg "$(gettext "Making delta from version %s...")" "$latest_version" local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + # 'xdelta delta' returns 1 even on success, so manually check exit codes + # bash's exit on error option must first be unset + set +e + # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if # TMP_DIR is unset) then perform the delta on the resulting tars xdelta delta "$base_file" "$pkg_file" "$delta_file" - # Generate the final gz using xdelta for compression. xdelta will be our - # common denominator compression utility between the packager and the users - # makepkg and pacman must use the same compression algorithm or the delta - # generated package may not match, producing md5 checksum errors. - msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" - msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" - xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? = 0 -o $? = 1 ]; then + # Generate the final gz using xdelta for compression. xdelta will be our + # common denominator compression utility between the packager and the + # users. makepkg and pacman must use the same compression algorithm or + # the delta generated package may not match, producing md5 checksum + # errors. + msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" + msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" + xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? != 0 ]; then + error "$(gettext "Could not generate the package from the delta.")" + exit 1 + fi + else + warning "$(gettext "Delta was not able to be created.")" + fi + + # turn exit on error back on + set -e else warning "$(gettext "No previous version found, skipping xdelta.")" fi -- 1.5.3.4

2 3

[pacman-dev] [PATCH 3/3] libalpm/trans.c : fix a recently introduced breakage in scriptlets handling.
by Chantry Xavier 14 Oct '07

14 Oct '07

Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)

1 0

[pacman-dev] [PATCH 2/3] libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet.
by Chantry Xavier 14 Oct '07

14 Oct '07

This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)

1 0