October 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Correctly close the pipe used for scriptlet execution
by Dan McGee 19 Oct '08

19 Oct '08

We never had a call to pclose() in here before, leaving our file descriptor in some sort of limbo state. In addition, clean up some of the other logic such as directly calling exit(1) on a popen() failure rather than going to our cleanup block, and handling and respecting the exit status of the subprocess correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 73ae822..96ac1bc 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -551,8 +551,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, if(!pipe) { _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), strerror(errno)); - retval = 1; - goto cleanup; + exit(1); } while(!feof(pipe)) { char line[PATH_MAX]; @@ -561,7 +560,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn, alpm_logaction("%s", line); EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); } - exit(0); + retval = pclose(pipe); + exit(WEXITSTATUS(retval)); } else { /* this code runs for the parent only (wait on the child) */ pid_t retpid; -- 1.6.0.2

1 0

[pacman-dev] [PATCH] repo-add: Use openssl instead of md5sum
by Dan McGee 19 Oct '08

19 Oct '08

This is similar to the change we made in makepkg so it is cross-platform compatible and doesn't require coreutils. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 381e49f..6c852fa 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -121,7 +121,7 @@ db_write_delta() arch=${deltavars[3]} # get md5sum and size of delta - md5sum="$(md5sum "$deltafile" | cut -d ' ' -f 1)" + md5sum="$(openssl dgst -md5 "$deltafile" | awk '{print $NF}')" csize=$(@SIZECMD@ "$deltafile") # ensure variables were found @@ -201,7 +201,7 @@ db_write_entry() # compute checksums msg2 "$(gettext "Computing md5 checksums...")" - echo -e "%MD5SUM%\n$(md5sum "$pkgfile" | cut -d ' ' -f 1)\n" >>desc + echo -e "%MD5SUM%\n$(openssl dgst -md5 "$pkgfile" | awk '{print $NF}')\n" >>desc # add base64'd PGP signature if [ -f "$pkgfile.sig" ];then -- 1.6.0.2

1 0

[pacman-dev] "explicit dependencies", a compromise between explicit and deps
by Dieter Plaetinck 18 Oct '08

18 Oct '08

Hi, pacman has an option --asdeps so the user can install packages as if it were deps. In fact, such packages will be treated exactly the same as normal dependencies: - if no explicit package depends on them, they will be considered orphans and are subject to be cleaned up, along with 'real' orphans. This can be a good thing when the user installs the packages --asdeps assuming a package will state them as dep later on. if doesn't happen it can really be considered an orphan and can be deleted. This can be a bad thing when the user installs the packages --asdeps because no package states the dependencies on them, but they are needed/wanted for some reason. (Often this means the "dependent" package misses a dependency and this package should be fixed, but not always) - in a backup/restore or clone system scenario the usual approach is to do 'pacman -Qe' to get a package list. When restoring/installing the list on another box this means we install only the explicit packages and their dependencies. Some packages we installed ourself --asdeps will get lost. This is not always good. A current workaround would be to install these packages explicitly, but doesn't always feel right either because we don't want the package explictly, although we do want them because they provide features to a package even though it's not really needed. In fact, this is very similar to the 'recommends' directive in debian package. Many arch packages literally say 'install x to have feature foo, install y to have feature bar' (these are the 'recommended' packages). If the user then installs x or y they are not really explicit packages (because we only want them because we use another package that recommends them), but they are not dependencies either (otherwise they will get lost) What I propose is an intermediate state between 'explicit' and 'dependency', called 'explicit dependency'. This would be the new default way when the user wants to install something as a dep (usually because a package recommended it), whereas the 'old' '--asdeps' installs a package as a 'real' dependency (eg: do this only when you're sure you'll install a package that depends on them, otherwise the package will be an orphan and get cleaned up someday or not be restored when restoring/cloning a system) What are your ideas? Thanks, Dieter

7 10

[pacman-dev] [PATCH] Give pacman-optimize a refresher
by Dan McGee 17 Oct '08

17 Oct '08

This patch addresses quite a few lingering issues in the pacman-optimize script. FS#11767 provoked this look-over and the following issues were noticed and fixed: * If an alternate dbroot was specified, then the lockfile location was never updated to reflect it. The lockfile location is now set after all dbpath initialization. * The inclusion of a trailing slash on dbroot was problematic and led to the following command being executed: bsdtar -xpf /tmp/pacman-optimize.p12Q4vAUWY/pacman-db.tar.gz \ -C /var/lib/pacman/.new/ It is doubtful we meant to create a hidden directory like this below our database root, only to go and delete it a second later and then re-extract. Fix the whole thing by ensuring our dbpath has its trailing slash stripped and then appending it when necessary. * The DB extraction was performed twice for no real apparent reason. This opens the door for extraction problems the second time around, leaving you with no original database to fall back to. Change the behavior so we only extract once, and then perform a directory shuffle once we verify the checksums are correct. * Perform an explicit sync after we drop the new database on the disk. It should work better this way. * Tighten up our check for a pacman lockfile and the time we create one. There is still a possible race condition but the window is shorter. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Hey guys, I'd really appreciate if some of you can scrutinize this patch a bit and give it a few test runs. I've ran it on my real local DB, so I can at least offer the assurance that it worked for me. Any feedback or suggestions for changes are obviously welcome. I'm not sure if we should land this on maint or master- any opinions? -Dan scripts/pacman-optimize.sh.in | 55 +++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 21 deletions(-) diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 0cd108b..0ea22e4 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@' myver='@PACKAGE_VERSION@' dbroot='@localstatedir@/lib/pacman/' -lockfile="${dbroot}db.lck" msg() { local mesg=$1; shift @@ -98,11 +97,6 @@ if ! type diff >/dev/null 2>&1; then die "$(gettext "diff tool was not found, please install diffutils.")" fi -# make sure pacman isn't running -if [ -f "$lockfile" ]; then - die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" -fi - if [ ! -d "$dbroot" ]; then die "$(gettext "%s does not exist or is not a directory.")" "$dbroot" fi @@ -111,12 +105,21 @@ if [ ! -w "$dbroot" ]; then die "$(gettext "You must have correct permissions to optimize the database.")" fi -workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) || - die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2 +# strip any trailing slash from our dbroot +dbroot="${dbroot%/}" +# form the path to our lockfile location +lockfile="${dbroot}/db.lck" +# make sure pacman isn't running +if [ -f "$lockfile" ]; then + die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" +fi # do not let pacman run while we do this touch "$lockfile" +workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) || + die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2 + # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" @@ -124,46 +127,56 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" cd "$dbroot" -bsdtar -czf "$workdir/pacmanDB.tgz" ./ +bsdtar -czf "$workdir/pacman-db.tar.gz" ./ if [ $? -ne 0 ]; then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" fi -# step 3: make and sum the new db -msg "$(gettext "Making and MD5sum'ing the new db...")" +# step 3: make and sum the new db side-by-side with the old +msg "$(gettext "Making and MD5sum'ing the new database...")" mkdir "$dbroot.new" -bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot.new/" +bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" +# immediate sync following extraction should get it written continuously on HDD +msg "$(gettext "Syncing database to disk...")" +sync if [ $? -ne 0 ]; then rm -rf "$workdir" die_r "$(gettext "Untar'ing %s failed.")" "$dbroot" fi find "$dbroot.new" -type f | sort | \ - xargs md5sum | sed 's#.new/##' > "$workdir/pacsums.new" + xargs md5sum | sed 's#.new##' > "$workdir/pacsums.new" # step 4: compare the sums msg "$(gettext "Checking integrity...")" diff "$workdir/pacsums.old" "$workdir/pacsums.new" >/dev/null 2>&1 if [ $? -ne 0 ]; then # failed - # leave /tmp/pacsums.old and .new for checking to see what doesn't match up + # leave our pacman-optimize tmpdir for checking to see what doesn't match up rm -rf "$dbroot.new" die_r "$(gettext "Integrity check FAILED, reverting to old database.")" fi -# step 5: remove the new temporary database and the old one -# and use the .tgz to replace the old one -msg "$(gettext "Putting the new database in place...")" -rm -rf "$dbroot.new" "$dbroot"/* -bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot/" +# step 5: shuffle the newly extracted DB into the proper location +msg "$(gettext "Rotating database into place...")" + +fail=0 +mv "$dbroot" "$dbroot.old" || fail=1 +mv "$dbroot.new" "$dbroot" || fail=1 +chmod --reference="$dbroot.old" "$dbroot" || fail=1 +chown --reference="$dbroot.old" "$dbroot" || fail=1 +if [ $fail -ne 0 ]; then + # failure with our directory shuffle + die_r "$(gettext "New database substitution failed. Check for $dbroot,\n$dbroot.old, and $dbroot.new directories.")" +fi +rm -rf "$dbroot.old" -# remove the lock file, sum files, and .tgz of database +# remove the lock file and our working directory with sums and tarfile rm -f "$lockfile" rm -rf "$workdir" echo msg "$(gettext "Finished. Your pacman database has been optimized.")" -msg "$(gettext "For full benefits of pacman-optimize, run 'sync' now.")" echo exit 0 -- 1.6.0.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-9-g30851a2
by dan＠archlinux.org 13 Oct '08

13 Oct '08

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 30851a24ff68b00898565a1144926d83c623e6bf (commit) via f0e1846b51dfdeb095038b6b04d307ddfdec0029 (commit) via d7e502a467c054cf3bf7c50362ff7f8087b0c382 (commit) via 927ce2b7a52360507da3d81804520dbba4a9700d (commit) via ce3d70aa99ab86d49756d1858580750f2f13dd9e (commit) via f9be2334f7b01ba30235500cb12d4ed61fff564b (commit) via 18452a6c51827e91f37978397552c30cb92c26cd (commit) from 242e9e90f4190b9f770a0230e99d302f7ec53e70 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile.am | 3 +++ configure.ac | 23 ----------------------- doc/Makefile.am | 22 ++++++++++++---------- lib/libalpm/cache.c | 1 - lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/trans.c | 5 ++--- lib/libalpm/util.c | 3 ++- pactest/pmtest.py | 4 +--- pactest/tests/scriptlet001.py | 4 ++++ pactest/tests/scriptlet002.py | 4 ++++ src/pacman/pacman.c | 36 ++++++++++++++++++++++++++---------- src/pacman/util.c | 11 ++++++----- src/pacman/util.h | 6 +++--- 15 files changed, 63 insertions(+), 62 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-30-gfa02a71
by dan＠archlinux.org 13 Oct '08

13 Oct '08

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 fa02a71abd62fc8b45e92ce1652b5d98174a6dca (commit) via 91a013a8791b73daf4d17b2d52c8dfaf12887cc6 (commit) via f1f8f0e1c291a2201f122e0ec1d7e6179bf11cc8 (commit) via 30851a24ff68b00898565a1144926d83c623e6bf (commit) via f0e1846b51dfdeb095038b6b04d307ddfdec0029 (commit) via d7e502a467c054cf3bf7c50362ff7f8087b0c382 (commit) via 927ce2b7a52360507da3d81804520dbba4a9700d (commit) via ce3d70aa99ab86d49756d1858580750f2f13dd9e (commit) via f9be2334f7b01ba30235500cb12d4ed61fff564b (commit) via 18452a6c51827e91f37978397552c30cb92c26cd (commit) via 242e9e90f4190b9f770a0230e99d302f7ec53e70 (commit) via 95ea6fb3c19a8d72d5b2e71ab5e37f2da8c77d5d (commit) from da933c223eedb66c51b4a48b6ab0ce8fcb344b5c (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 fa02a71abd62fc8b45e92ce1652b5d98174a6dca Merge: 91a013a8791b73daf4d17b2d52c8dfaf12887cc6 30851a24ff68b00898565a1144926d83c623e6bf Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 12 21:36:45 2008 -0500 Merge branch 'maint' commit 91a013a8791b73daf4d17b2d52c8dfaf12887cc6 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 4 20:44:19 2008 -0500 makepkg: allow compression type to be autodetected Inspired by commit 7e8f1469c4168875b54956d63884b8583ce99e38, use our given PKGEXT or SRCEXT to determine what method of compression to use on the package we create. If the extension is invalid, this should fall back to creating a non-compressed tar file. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1f8f0e1c291a2201f122e0ec1d7e6179bf11cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 23 18:27:01 2008 -0500 Quiet up the make process a bit When we do our sed edits, we really don't need every command printed out to the terminal. Now with "make -s", the output is quite palatable. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 3 +++ configure.ac | 23 ----------------------- doc/Makefile.am | 22 ++++++++++++---------- etc/Makefile.am | 7 ++++--- lib/libalpm/cache.c | 1 - lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/trans.c | 5 ++--- lib/libalpm/util.c | 3 ++- pactest/pmtest.py | 4 +--- pactest/tests/Makefile.am | 11 ++++++----- pactest/tests/scriptlet001.py | 4 ++++ pactest/tests/scriptlet002.py | 4 ++++ scripts/Makefile.am | 15 ++++++++------- scripts/makepkg.sh.in | 20 ++++++++++++++++++-- src/pacman/callback.c | 24 ++++++++++++++++-------- src/pacman/package.c | 4 +++- src/pacman/pacman.c | 36 ++++++++++++++++++++++++++---------- src/pacman/util.c | 11 ++++++----- src/pacman/util.h | 6 +++--- 21 files changed, 118 insertions(+), 88 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] Russian translation updated
by serg 07 Oct '08

07 Oct '08

I've corrected some errors.

2 2

[pacman-dev] [PATCH] Print a newline between packages when printing sync info.
by Loui 03 Oct '08

03 Oct '08

Reading sync info of more than one package was a bit confusing so I added a newline so it's easier to read.

2 2

[pacman-dev] [PATCH] Mention libarchive and libdownload as dependencies in INSTALL.
by Loui 02 Oct '08

02 Oct '08

This is just to give people trying to build pacman more info right off the bat.

2 2