- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libalpm: add PID to db.lck
by Allan McRae 03 Nov '08

03 Nov '08

This is the first step in being able to automatically remove phantom lock files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index da3463b..811572a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -242,7 +242,9 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) int _alpm_lckmk() { int fd; - char *dir, *ptr; + pid_t pid; + size_t len; + char *dir, *ptr, *spid; const char *file = alpm_option_get_lockfile(); /* create the dir of the lockfile first */ @@ -256,7 +258,16 @@ int _alpm_lckmk() while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EINTR); - return(fd > 0 ? fd : -1); + if(fd > 0) { + pid = getpid(); + size_t len = snprintf(spid, 0, "%d", pid) + 1; + spid = malloc(len); + snprintf(spid, len, "%d", pid) + 1; + while(write(fd, (void *)spid, len) == -1 && errno == EINTR); + fsync(fd); + return(fd); + } + return(-1); } /* Remove a lock file */ -- 1.6.0.3

2 3

[pacman-dev] [PATCH] Turn libarchive warnings into libalpm warnings
by Dan McGee 01 Nov '08

01 Nov '08

Rather than hiding these warnings, show them to the user as they happen. This will prevent things such as hiding full filesystem errors (ENOSPC) from the user as seen in FS#11639. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Note: this patch is almost superseded by the next one, but its important to note we are suddenly going to put more force behind these libarchive warnings. lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5040589..f4caa5c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -444,7 +444,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), @@ -594,7 +594,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index da3463b..a9330d3 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -333,7 +333,7 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) int readret = archive_read_extract(_archive, entry, 0); if(readret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname, archive_error_string(_archive)); } else if(readret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), -- 1.6.0.3

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-45-g9394f22
by dan＠archlinux.org 01 Nov '08

01 Nov '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 9394f229a0328228e810b7d4588b24643b42df6a (commit) via 43f9eb1aa95d78a1560e30536a05525f2b18de0d (commit) via 8d4e1e67546bcc04b5412e0f94a752c7215fb53d (commit) via 314b4462d2ef1264b50b6745c57072f9c7b9d14e (commit) via c4b9991258fb360e0d140a84efe7803eb633df79 (commit) via 2890114600baefb6cb1dde513ca3107258b64c92 (commit) via 8d33dcb81c464f5e42d83078472bc509e087dd62 (commit) from cd51abf0c8d04c72cc85b28cd45b33b9020c661e (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 9394f229a0328228e810b7d4588b24643b42df6a Merge: 43f9eb1aa95d78a1560e30536a05525f2b18de0d 2890114600baefb6cb1dde513ca3107258b64c92 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:55:50 2008 -0500 Merge branch 'maint' commit 43f9eb1aa95d78a1560e30536a05525f2b18de0d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:40:55 2008 -0500 Set SIGPIPE handler to SIG_IGN when downloading We don't want a failed write to kill our whole program when we are downloading things, so set the SIGPIPE handler to ignore when downloading and restore any previous signal handler when we complete the download. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d4e1e67546bcc04b5412e0f94a752c7215fb53d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:11:38 2008 -0500 Make libfetch the 'native' download library Use libfetch naming in the code in place of libdownload names. This is in preparation for dropping support for libdownload at some point as libfetch can run on Linux. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 314b4462d2ef1264b50b6745c57072f9c7b9d14e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Oct 24 02:05:12 2008 +0200 -Qu rework From now on -Qu is an "outdated package" filter on local database. (This is a behaviour change.) This patch fixes some memleaks and makes the code cleaner, for details see my comment on FS#7884. FS#11868 is implemented. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4b9991258fb360e0d140a84efe7803eb633df79 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 29 14:21:28 2008 +1000 makepkg: actually fix passing PKGBUILD from pipe If PKGBUILD (BUILDSCRIPT) is not found, test for information from a pipe and use that. Fixes FS#9187. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d33dcb81c464f5e42d83078472bc509e087dd62 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 28 22:04:39 2008 +1000 makepkg: enable passing PKGBUILD from pipe Do not attemp to update pkgver/pkgrel when reading a SCM based PKGBUILD from a pipe. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 4 +-- lib/libalpm/dload.c | 47 +++++++++++++++++++++++++++----------------- lib/libalpm/error.c | 6 ++-- lib/libalpm/sync.c | 52 +++++++++++------------------------------------- lib/libalpm/sync.h | 3 +- lib/libalpm/trans.c | 13 +----------- lib/libalpm/trans.h | 1 - scripts/makepkg.sh.in | 25 +++++++++++++++++------ src/pacman/pacman.c | 2 +- src/pacman/query.c | 28 +++---------------------- 10 files changed, 70 insertions(+), 111 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Set SIGPIPE handler to SIG_IGN when downloading
by Dan McGee 01 Nov '08

01 Nov '08

We don't want a failed write to kill our whole program when we are downloading things, so set the SIGPIPE handler to ignore when downloading and restore any previous signal handler when we complete the download. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e4a8a0b..f197d06 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -24,6 +24,7 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <signal.h> #include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) @@ -115,6 +116,7 @@ static int download_internal(const char *url, const char *localpath, size_t dl_thisfile = 0; char *tempfile, *destfile, *filename; int ret = 0; + struct sigaction new_action, old_action; struct url *fileurl = url_for_string(url); if(!fileurl) { @@ -148,6 +150,13 @@ static int download_internal(const char *url, const char *localpath, /* 10s timeout - TODO make a config option */ fetchTimeout = 10000; + /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or + * something along those lines. Store the old signal handler first. */ + new_action.sa_handler = SIG_IGN; + sigemptyset(&new_action.sa_mask); + sigaction(SIGPIPE, NULL, &old_action); + sigaction(SIGPIPE, &new_action, NULL); + dlf = fetchXGet(fileurl, &ust, (handle->nopassiveftp ? "" : "p")); if(fetchLastErrCode != 0 || dlf == NULL) { @@ -238,6 +247,9 @@ static int download_internal(const char *url, const char *localpath, ret = 0; cleanup: + /* restore any existing SIGPIPE signal handler */ + sigaction(SIGPIPE, &old_action, NULL); + FREE(tempfile); FREE(destfile); if(localf != NULL) { -- 1.6.0.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-16-g2890114
by dan＠archlinux.org 01 Nov '08

01 Nov '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 2890114600baefb6cb1dde513ca3107258b64c92 (commit) from a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (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 2890114600baefb6cb1dde513ca3107258b64c92 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 18:59:19 2008 -0500 makepkg: fix bash substitution to work under older versions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman -Qu does not shows the correctly total download size
by Hugo Doria 30 Oct '08

30 Oct '08

pacman does not show the correctly total download size. Also, the result is different from pacman -Su. Example: # pacman -Qu Checking for package upgrades... warning: avant-window-navigator: local (0.2.6-2) is newer than community (0.2.6-1) warning: iptables: local (1.4.2-1) is newer than core (1.4.0-2) warning: xorg-server: local (1.4.99.906-2) is newer than extra (1.4.2-2) Remove (1): bluez-libs-3.32-1 Total Removed Size: 0.31 MB Targets (8): bluez-4.1-1 evolution-data-server-2.24.1-1 gnome-control-center-2.24.0.1-3 k3b-1.0.5-2 libgphoto2-2.4.3-1 samba-3.2.4-3 smbclient-3.2.4-3 tdb-3.2.4-1 Total Download Size: 0.00 MB Total Installed Size: 145.76 MB # pacman -Su :: Starting full system upgrade... :: Replace bluez-libs with testing/bluez? [Y/n] warning: avant-window-navigator: local (0.2.6-2) is newer than community (0.2.6-1) warning: iptables: local (1.4.2-1) is newer than core (1.4.0-2) warning: xorg-server: local (1.4.99.906-2) is newer than extra (1.4.2-2) resolving dependencies... looking for inter-conflicts... Remove (1): bluez-libs-3.32-1 Total Removed Size: 0.31 MB Targets (8): bluez-4.1-1 evolution-data-server-2.24.1-1 gnome-control-center-2.24.0.1-3 k3b-1.0.5-2 libgphoto2-2.4.3-1 tdb-3.2.4-1 smbclient-3.2.4-3 samba-3.2.4-3 Total Download Size: 49.51 MB Total Installed Size: 145.76 MB pacman -Qu gives me 0MB, while pacman -Su shows almost 50MB Both shows the same Total Installed Size, tought. Im using the lastest pacman: # pacman -Q pacman pacman 3.2.1-1 http://bugs.archlinux.org/task/11846 -- Hugo

4 3

[pacman-dev] [PATCH] makepkg: actually fix passing PKGBUILD from pipe
by Allan McRae 29 Oct '08

29 Oct '08

If PKGBUILD (BUILDSCRIPT) is not found, test for information from a pipe and use that. Fixes FS#9187. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f5caa12..627001a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1358,8 +1358,13 @@ unset replaces depends conflicts backup source install build makedepends unset optdepends options noextract if [ ! -f "$BUILDSCRIPT" ]; then - error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" - exit 1 + if [ -t 0 ]; then + error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" + exit 1 + else + # PKGBUILD passed through a pipe + BUILDSCRIPT=/dev/stdin + fi fi source "$BUILDSCRIPT" -- 1.6.0.3

2 1

[pacman-dev] [PATCH] makepkg: enable passing PKGBUILD from pipe
by Allan McRae 29 Oct '08

29 Oct '08

Do not attemp to update pkgver/pkgrel when reading a SCM based PKGBUILD from a pipe. Fixes FS#9187. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 52784b6..f5caa12 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1048,6 +1048,10 @@ devel_check() { if [ "$HOLDVER" = "1" ]; then return fi + # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe + if [ ! -f "./$BUILDSCRIPT" ]; then + return + fi if [ "$FORCE_VER" = "" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent @@ -1115,9 +1119,11 @@ devel_update() { # if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "$pkgver" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT - source $BUILDSCRIPT + if [ -f "./$BUILDSCRIPT" ]; then + sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT + source $BUILDSCRIPT + fi fi fi } -- 1.6.0.3

2 5

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

29 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 a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (commit) via 2f5d7927254a760a54282d70c827768c56c657b7 (commit) via 1e656c0a6a7f2dcf5dc40f1b1027161847b967b4 (commit) via 50e3dc02bf1a99ec040988fde1425adba67da4cb (commit) via d1fec15d8148dec186e437da912d6a03a8d26b11 (commit) via d24592cbcdff03d397a185946a15b170d0cd75c9 (commit) from 30851a24ff68b00898565a1144926d83c623e6bf (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: lib/libalpm/po/ru.po | 12 +- lib/libalpm/po/zh_CN.po | 153 +++++++++++----------- lib/libalpm/trans.c | 6 +- po/ru.po | 26 ++-- po/zh_CN.po | 299 ++++++++++++++++++++--------------------- scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 55 +++++--- scripts/repo-add.sh.in | 4 +- 8 files changed, 286 insertions(+), 273 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

29 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 cd51abf0c8d04c72cc85b28cd45b33b9020c661e (commit) via 2e431e1cc3c9bb445ea886521117f483e78aa84a (commit) via a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (commit) via 2f5d7927254a760a54282d70c827768c56c657b7 (commit) via 1e656c0a6a7f2dcf5dc40f1b1027161847b967b4 (commit) via 50e3dc02bf1a99ec040988fde1425adba67da4cb (commit) via d1fec15d8148dec186e437da912d6a03a8d26b11 (commit) via d24592cbcdff03d397a185946a15b170d0cd75c9 (commit) from fa02a71abd62fc8b45e92ce1652b5d98174a6dca (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 cd51abf0c8d04c72cc85b28cd45b33b9020c661e Merge: 2e431e1cc3c9bb445ea886521117f483e78aa84a a63aeed562c8bdd6604ec50e6a4b684f6edabda3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 28 22:20:09 2008 -0500 Merge branch 'maint' commit 2e431e1cc3c9bb445ea886521117f483e78aa84a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 21:06:53 2008 +0200 testdb : extend the tool to allow checking sync dbs too. Example usage and output : > src/util/testdb -h usage: testdb [-b <pacman db>] : check the local database testdb [-b <pacman db>] core extra ... : check the listed sync databases > src/util/testdb Checking the integrity of the local database in /var/lib/pacman/ > src/util/testdb core extra testing community Checking the integrity of the sync databases in /var/lib/pacman/ missing dependency for archboot : bcm43xx-fwcutter>=006-2 missing dependency for xvattr : xfree86 missing dependency for eclipse-ve : eclipse<3.3 missing dependency for flumotion : twisted-web missing dependency for gg2 : arts missing dependency for man-pages-cs : groff-utf8 missing dependency for qc-usb : kernel26<2.6.26 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ru.po | 12 +- lib/libalpm/po/zh_CN.po | 153 +++++++++++----------- lib/libalpm/trans.c | 6 +- po/ru.po | 26 ++-- po/zh_CN.po | 299 ++++++++++++++++++++--------------------- scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 55 +++++--- scripts/repo-add.sh.in | 4 +- src/util/testdb.c | 174 +++++++++++++++++------- 9 files changed, 412 insertions(+), 321 deletions(-) hooks/post-receive -- The official pacman repository

1 0