- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: Feature Request
by Dan McGee 11 Oct '09

11 Oct '09

Something really old that I found today while cleaning email...not sure if you can pull anything useful out of this, Allan. The from address bounces which is why I'm forwarding this here rather than asking him to write directly. -Dan ---------- Forwarded message ---------- From: Archaic <archaic(a)kconline.com> Date: Sat, Feb 7, 2009 at 8:49 PM Subject: Re: Feature Request To: dan(a)archlinux.org Okay, I think I've managed to integrate this feature request with the minimal fuss and full backwards compatability. To give a run down, the new features will allow for a build(), check(), and inst() section in the PKGBUILD, however, if either check() or inst() are missing, they will be skipped over. Also, check() will never even be attempted unless the 'check' option appears in the PKGBUILD or makepkg.conf. There are 2 other changes that *can* be made to any give PKGBUILD merely as a result of making the above changes: 1) You no longer need to cd "$srcdir/pkgname-pkgver" in the PKGBUILD. The non-standard paths are still viable like ${srcdir}/tcl${pkgver}/unix if so needed. 2) You don't need excess || return 1 statements as in: ./configure make || return 1 make install Provided you use a separate build(), check(), and inst() function, the makepkg code itself will handle the errors. Let me know what you think of these changes. -- Archaic My other computer is an abacus.

1 0

[pacman-dev] [PATCH] FS#8798 - Allow -Qo to perform a functional 'which'
by Jatheendra 11 Oct '09

11 Oct '09

Hi all, This is a simple patch to add a "which" like functionality to pacman -Qo[Bug FS#8798]. This is my first patch ,so any constructive criticism is most welcome. Thanks, Shankar --- src/pacman/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..fb3bb92 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -55,6 +55,43 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip trailing '/' */ + while (path[len-1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname,bufptr) == 0) { + strncpy(filename,fullname,PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -66,21 +103,35 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename,alpm_list_getdata(t),PATH_MAX+1); + char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename,'/') == NULL) { + if((search_path(filename,&buf)) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } + if(S_ISDIR(buf.st_mode)) { pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine ownership of a directory\n")); @@ -140,6 +191,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.0.2

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-63-g72bc947
by dan＠archlinux.org 11 Oct '09

11 Oct '09

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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 (commit) via 3dc87851cc5990d358cf985d8e79dffeb2d91a21 (commit) via 14ab02e289668e30d33c473e00fc43e5dc457644 (commit) via 471b1fa54395f7f16939e213f50aaf76f390553b (commit) via caea098c2191a2d94a28e90bfef958c34473a5a4 (commit) via 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d (commit) via 302310c5aad5ae25a1e712ca6f9de6bef73e17de (commit) via 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f (commit) via 6e312220ec6668d6fc9ef37dbf581ca155511697 (commit) via 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 (commit) via 145103aacc57d35579315bfbf7c5607c590af194 (commit) via 35dc9b03149dc2f42022fe5fea80a3aed3207489 (commit) from cf0d619670a4d0c67ad67e22bacbb69c203714f5 (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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Sep 12 20:50:03 2009 +0200 Fix "-Sd conflict_pkg" bug If the -d switch was invoked with -S (or -U), the removes list was simply lost, because trans->remove was computed in an "if(!(trans->flags & PM_TRANS_FLAG_NODEPS))" block. I've added a new pactest file, sync045.py (derived from sync043.py) to test this. Additionally, I did some other minor cleanups in sync_prepare: * preferred list is not needed anymore * I removed a needless alpm_list_remove_dupes line (the target list should not contain dupes at all) * I moved alpm_list_free(remove); to cleanup part to eliminate a possible memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3dc87851cc5990d358cf985d8e79dffeb2d91a21 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Oct 11 02:38:33 2009 +0200 alpm_list : add new alpm_list_diff_sorted function This is more efficient than alpm_list_diff since it assumes the two lists are sorted. And also we get the two sides of the diff. Even sorting should more efficient than the current list_diff. Sorting the two lists should be O(n*log(n)+m*log(m)) while the current list_diff is O(n*m). So I also reimplemented list_diff using list_diff_sorted. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14ab02e289668e30d33c473e00fc43e5dc457644 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 22:49:24 2009 +0200 Rework the alpm_unpack functions Add support to extract a list of entries Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 471b1fa54395f7f16939e213f50aaf76f390553b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 23:56:15 2009 +0200 update sync200 pactest update download -> fetch This just meant that we used XferCommand even if internal download was available, no big deal. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit caea098c2191a2d94a28e90bfef958c34473a5a4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Sep 26 00:58:42 2009 +0200 cygwin fix : use unsigned char for ctype function See http://www.nabble.com/-PATCH-RFA--Distinguish-between-EOF-and-character-wit… cygwin 1.7 actually displays a warning when using signed char with the ctype function, so that compilation fails when using -Wall -Werror. So we just cast all arguments to unsigned char. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 9 20:27:40 2009 +0200 replace rankmirrors by bash clone This removes python optdepends in pacman package This bash clone is a courtesy of Matthew Bruenig <matthewbruenig(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 302310c5aad5ae25a1e712ca6f9de6bef73e17de Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:19:55 2009 -0500 Minor scope/typing cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:15:27 2009 -0500 libalpm: clean up lock function We were doing a lot of manual work; leverage the standard library a bit to do more for us. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e312220ec6668d6fc9ef37dbf581ca155511697 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:09:39 2009 -0500 Reduce calls to list_count() in removing package We don't need to count the number of packages left once per file when removing; we only need to do it once per package. Also move a variable into the correct scope. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:04:28 2009 -0500 Add missing get_usedelta() method Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 145103aacc57d35579315bfbf7c5607c590af194 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:02:20 2009 -0500 typing: a few more fixes for special int types Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35dc9b03149dc2f42022fe5fea80a3aed3207489 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 13:51:47 2009 -0500 int typing: s/unsigned short/int/ in libalpm After our recent screwup with size_t and ssize_t in the download code, I found the `-Wsign-conversion` flag to GCC to see if we were doing anything else boneheaded. I didn't find anything quite as bad, but we did have some goofups- most of our public unsigned methods would return -1 on error, which is a bit odd in an unsigned context. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 15 ++- lib/libalpm/alpm_list.c | 85 ++++++++++--- lib/libalpm/alpm_list.h | 2 + lib/libalpm/backup.c | 8 +- lib/libalpm/be_files.c | 6 +- lib/libalpm/be_package.c | 7 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 6 +- lib/libalpm/dload.c | 8 +- lib/libalpm/handle.c | 15 ++- lib/libalpm/handle.h | 4 +- lib/libalpm/package.c | 4 +- lib/libalpm/package.h | 4 +- lib/libalpm/remove.c | 8 +- lib/libalpm/sync.c | 27 ++--- lib/libalpm/trans.c | 6 +- lib/libalpm/util.c | 75 ++++++++---- lib/libalpm/util.h | 7 +- pactest/tests/{sync043.py => sync045.py} | 4 +- pactest/tests/sync200.py.in | 2 +- scripts/Makefile.am | 4 +- scripts/rankmirrors.py.in | 191 ---------------------------- scripts/rankmirrors.sh.in | 202 ++++++++++++++++++++++++++++++ src/pacman/pacman.c | 4 +- src/pacman/util.c | 10 +- 26 files changed, 404 insertions(+), 304 deletions(-) copy pactest/tests/{sync043.py => sync045.py} (87%) delete mode 100644 scripts/rankmirrors.py.in create mode 100644 scripts/rankmirrors.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.1-12-g9282a4a
by dan＠archlinux.org 11 Oct '09

11 Oct '09

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 9282a4a9094ddeae8d0bef0f575e45c574591c4b (commit) via f77d73af4bc8be7086ac0dbda260b28c03f2773c (commit) via ba14bd77282a598b687fe6c4bfd5b375341d911b (commit) via 8db120c2605bb2f1591d501c5e351a16ab9f45ad (commit) via a0acf8b509f5c2611516a25d383a0706dd8d76ee (commit) via a131c468f7704b8674044e70433d0a413f5e5e67 (commit) via d7a20d9c41da4315282c3ebf8d43a8759c2dfb23 (commit) via 42042723a884930caf80ed578fc9fee2e0822bfb (commit) via 44a57c890b2ecba85dbd8364594883439634f630 (commit) from 20392c0a025d01128eb78c6656db7c15b3fbcd89 (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 9282a4a9094ddeae8d0bef0f575e45c574591c4b Author: Christian Larsson <congacx(a)gmail.com> Date: Tue Oct 6 20:52:53 2009 +0200 Update Swedish translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f77d73af4bc8be7086ac0dbda260b28c03f2773c Author: 甘露(Lu.Gan) <rhythm.gan(a)gmail.com> Date: Tue Oct 6 19:17:07 2009 +0200 Update chinese translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ba14bd77282a598b687fe6c4bfd5b375341d911b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Oct 5 23:58:14 2009 +0200 New Greek translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8db120c2605bb2f1591d501c5e351a16ab9f45ad Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Oct 4 17:33:49 2009 +0200 Update translations Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a0acf8b509f5c2611516a25d383a0706dd8d76ee Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Oct 4 17:02:00 2009 +0200 Update all pot and po files for 3.3.2 release Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a131c468f7704b8674044e70433d0a413f5e5e67 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 4 16:59:48 2009 -0500 3.2.2 release changes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7a20d9c41da4315282c3ebf8d43a8759c2dfb23 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 4 16:56:25 2009 -0500 doc: Add HACKING to html target Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 42042723a884930caf80ed578fc9fee2e0822bfb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 4 09:48:56 2009 -0500 doc: ensure SyncFirst behavior with flags is clear When a SyncFirst transaction kicks in, no flags like '--force' are honored. This is for good reason, as honoring something like '--asdeps' could be quite unintentional. Document this fact and a possible workaround. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 44a57c890b2ecba85dbd8364594883439634f630 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Sep 26 02:42:27 2009 +0200 callback.c : fallback to normal download with bogus size When using totaldownload, we might get into some weird situations where xfered>total because of bogus CSIZE database entries. This code adds a sanity check and fallbacks to normal download progress if needed. Here is an example using totaldownload on a database with wrong CSIZE, for a total download of ~26 MB. Before : gnome-desktop-2.28.... 1144,3K 678,3K/s 00:00:02 [#################] 4% gnome-panel-2.28.0-... 4,2M 887,7K/s 00:00:05 [#################] 16% gnome-applets-2.28.... 13,6M 1083,0K/s 00:00:13 [#################] 52% gnome-backgrounds-2... 22,9M 964,0K/s 00:00:24 [#################] 87% gnome-settings-daem... 23,6M 938,5K/s 00:00:26 [#################] 90% gnome-control-cente... 26,1M 946,1K/s 00:00:28 [#################] 100% gnome-icon-theme-2.... 27,7M 1465,0K/s 1193046:28:15 [#######----------] gnome-icon-theme-2.... 28,0M 1502,2K/s 1193046:28:15 [########---------] gnome-icon-theme-2.... 28,4M 1582,2K/s 1193046:28:15 [##########-------] gnome-icon-theme-2.... 28,7M 1603,4K/s 1193046:28:15 [############-----] gnome-icon-theme-2.... 29,0M 1604,5K/s 1193046:28:15 [##############---] gnome-icon-theme-2.... 29,3M 1621,0K/s 1193046:28:14 [################-] gnome-icon-theme-2.... 29,6M 1434,8K/s 1193046:28:14 [#################] gnome-icon-theme-2.... 29,6M 974,2K/s 00:00:31 [#################] 113% After : gnome-desktop-2.28.... 1144,3K 1038,7K/s 00:00:01 [#################] 4% gnome-panel-2.28.0-... 4,2M 988,4K/s 00:00:04 [#################] 16% gnome-applets-2.28.... 13,6M 1190,4K/s 00:00:12 [#################] 52% gnome-backgrounds-2... 22,9M 1242,9K/s 00:00:19 [#################] 87% gnome-settings-daem... 23,6M 1193,9K/s 00:00:20 [#################] 90% gnome-control-cente... 2,5M 1347,4K/s 00:00:02 [#################] 100% gnome-icon-theme-2.... 3,5M 1205,4K/s 00:00:03 [#################] 100% Note that gnome-control-center resetted to normal progress mode (2,5M is the package size, not the total size) Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 + TRANSLATORS | 4 +- configure.ac | 4 +- doc/Makefile.am | 7 +- doc/index.txt | 1 + doc/pacman.conf.5.txt | 7 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/cs.po | 8 +- lib/libalpm/po/de.po | 8 +- lib/libalpm/po/el.po | 556 ++++++++++++++ lib/libalpm/po/en_GB.po | 8 +- lib/libalpm/po/es.po | 8 +- lib/libalpm/po/fr.po | 8 +- lib/libalpm/po/hu.po | 8 +- lib/libalpm/po/it.po | 8 +- lib/libalpm/po/kk.po | 8 +- lib/libalpm/po/libalpm.pot | 10 +- lib/libalpm/po/nb_NO.po | 8 +- lib/libalpm/po/pl.po | 8 +- lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ro.po | 8 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/sv_SE.po | 26 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 8 +- lib/libalpm/po/zh_CN.po | 26 +- po/LINGUAS | 1 + po/cs.po | 11 +- po/de.po | 11 +- po/el.po | 1735 ++++++++++++++++++++++++++++++++++++++++++++ po/en_GB.po | 93 +--- po/es.po | 14 +- po/fr.po | 10 +- po/hu.po | 11 +- po/it.po | 15 +- po/kk.po | 10 +- po/nb_NO.po | 11 +- po/pacman.pot | 8 +- po/pl.po | 11 +- po/pt_BR.po | 11 +- po/ro.po | 11 +- po/ru.po | 11 +- po/sv_SE.po | 45 +- po/tr.po | 11 +- po/uk.po | 11 +- po/zh_CN.po | 37 +- src/pacman/callback.c | 18 +- 47 files changed, 2605 insertions(+), 259 deletions(-) create mode 100644 lib/libalpm/po/el.po create mode 100644 po/el.po hooks/post-receive -- The official pacman repository

3 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-3-g5e03941
by dan＠archlinux.org 11 Oct '09

11 Oct '09

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 5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (commit) via f15c8d46166a4774028b32407cd1477990130911 (commit) via aea22ac2fd57725f841fe5dddf8dee440a036381 (commit) from 9282a4a9094ddeae8d0bef0f575e45c574591c4b (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/alpm_list.c | 1 + lib/libalpm/po/zh_CN.po | 6 +++--- po/el.po | 4 ++-- po/zh_CN.po | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-51-gcf0d619
by dan＠archlinux.org 11 Oct '09

11 Oct '09

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 cf0d619670a4d0c67ad67e22bacbb69c203714f5 (commit) via 5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (commit) via f15c8d46166a4774028b32407cd1477990130911 (commit) via aea22ac2fd57725f841fe5dddf8dee440a036381 (commit) via 9282a4a9094ddeae8d0bef0f575e45c574591c4b (commit) via f77d73af4bc8be7086ac0dbda260b28c03f2773c (commit) via ba14bd77282a598b687fe6c4bfd5b375341d911b (commit) via 8db120c2605bb2f1591d501c5e351a16ab9f45ad (commit) via a0acf8b509f5c2611516a25d383a0706dd8d76ee (commit) via a131c468f7704b8674044e70433d0a413f5e5e67 (commit) via d7a20d9c41da4315282c3ebf8d43a8759c2dfb23 (commit) via 42042723a884930caf80ed578fc9fee2e0822bfb (commit) via 44a57c890b2ecba85dbd8364594883439634f630 (commit) from 8e7652f1afd7ba5198f3aa10a94c50bb67f7a407 (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 cf0d619670a4d0c67ad67e22bacbb69c203714f5 Merge: 8e7652f1afd7ba5198f3aa10a94c50bb67f7a407 5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 12:57:57 2009 -0500 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 6 + TRANSLATORS | 4 +- configure.ac | 4 +- doc/Makefile.am | 7 +- doc/index.txt | 1 + doc/pacman.conf.5.txt | 7 +- lib/libalpm/alpm_list.c | 1 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/cs.po | 8 +- lib/libalpm/po/de.po | 8 +- lib/libalpm/po/el.po | 556 ++++++++++++++ lib/libalpm/po/en_GB.po | 8 +- lib/libalpm/po/es.po | 8 +- lib/libalpm/po/fr.po | 8 +- lib/libalpm/po/hu.po | 8 +- lib/libalpm/po/it.po | 8 +- lib/libalpm/po/kk.po | 8 +- lib/libalpm/po/libalpm.pot | 10 +- lib/libalpm/po/nb_NO.po | 8 +- lib/libalpm/po/pl.po | 8 +- lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ro.po | 8 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/sv_SE.po | 26 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 8 +- lib/libalpm/po/zh_CN.po | 26 +- po/LINGUAS | 1 + po/cs.po | 11 +- po/de.po | 11 +- po/el.po | 1735 ++++++++++++++++++++++++++++++++++++++++++++ po/en_GB.po | 93 +--- po/es.po | 14 +- po/fr.po | 10 +- po/hu.po | 11 +- po/it.po | 15 +- po/kk.po | 10 +- po/nb_NO.po | 11 +- po/pacman.pot | 8 +- po/pl.po | 11 +- po/pt_BR.po | 11 +- po/ro.po | 11 +- po/ru.po | 11 +- po/sv_SE.po | 45 +- po/tr.po | 11 +- po/uk.po | 11 +- po/zh_CN.po | 36 +- src/pacman/callback.c | 18 +- 48 files changed, 2605 insertions(+), 259 deletions(-) create mode 100644 lib/libalpm/po/el.po create mode 100644 po/el.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] Rework the alpm_unpack functions
by Xavier Chantry 11 Oct '09

11 Oct '09

Add support to extract a list of entries Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/be_files.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 55 ++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/util.h | 5 +++- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 51492d5..53bbda1 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -245,7 +245,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) /* uncompress the sync database */ checkdbdir(db); - ret = _alpm_unpack(dbfilepath, syncdbpath, NULL); + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); if(ret) { free(dbfilepath); RET_ERR(PM_ERR_SYSTEM, -1); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c99f596..6f5216e 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -368,7 +368,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, /* either extract or copy the scriptlet */ snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir); if(!strcmp(script, "pre_upgrade") || !strcmp(script, "pre_install")) { - if(_alpm_unpack(installfn, tmpdir, ".INSTALL")) { + if(_alpm_unpack_single(installfn, tmpdir, ".INSTALL")) { retval = 1; } } else { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 381b116..3777349 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,14 +241,38 @@ int _alpm_lckrm() /* Compression functions */ /** - * @brief Unpack a specific file or all files in an archive. + * @brief Unpack a specific file in an archive. * * @param archive the archive to unpack * @param prefix where to extract the files - * @param fn a file within the archive to unpack or NULL for all + * @param fn a file within the archive to unpack * @return 0 on success, 1 on failure */ -int _alpm_unpack(const char *archive, const char *prefix, const char *fn) +int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn) +{ + alpm_list_t *list = NULL; + int ret = 0; + if(fn == NULL) { + return(1); + } + list = alpm_list_add(list, (void *)fn); + ret = _alpm_unpack(archive, prefix, list, 1); + alpm_list_free(list); + return(ret); +} + +/** + * @brief Unpack a list of files in an archive. + * + * @param archive the archive to unpack + * @param prefix where to extract the files + * @param list a list of files within the archive to unpack or + * NULL for all + * @param breakfirst break after the first entry found + * + * @return 0 on success, 1 on failure + */ +int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst) { int ret = 0; mode_t oldmask; @@ -301,14 +325,23 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) archive_entry_set_perm(entry, 0755); } - /* If a specific file was requested skip entries that don't match. */ - if (fn && strcmp(fn, entryname)) { - _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); - if (archive_read_data_skip(_archive) != ARCHIVE_OK) { - ret = 1; - goto cleanup; + /* If specific files were requested, skip entries that don't match. */ + if(list) { + char *prefix = strdup(entryname); + char *p = strstr(prefix,"/"); + if(p) { + *(p+1) = '\0'; + } + char *found = alpm_list_find_str(list, prefix); + free(prefix); + if(!found) { + _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); + if (archive_read_data_skip(_archive) != ARCHIVE_OK) { + ret = 1; + goto cleanup; + } + continue; } - continue; } /* Extract the archive entry. */ @@ -324,7 +357,7 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) goto cleanup; } - if(fn) { + if(breakfirst) { break; } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index ccf169d..baba858 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -26,6 +26,8 @@ #include "config.h" +#include "alpm_list.h" + #include <stdio.h> #include <string.h> #include <stdarg.h> @@ -62,7 +64,8 @@ int _alpm_copyfile(const char *src, const char *dest); char *_alpm_strtrim(char *str); int _alpm_lckmk(); int _alpm_lckrm(); -int _alpm_unpack(const char *archive, const char *prefix, const char *fn); +int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); +int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list args); int _alpm_run_chroot(const char *root, const char *cmd); -- 1.6.4.4

2 3

[pacman-dev] [PATCH] makepkg: allow overriding arch in split packages
by Allan McRae 11 Oct '09

11 Oct '09

This allows building a mixture of binary and arch=any packages. Fixes FS#15955. The value of CARCH is no longer overridden to "any" in when arch=any is used and the assigning of the "any" arch is delayed to during the packaging stage. Adjustments were required to fix installing and checking for pre-built packages of varing arches. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 1 + doc/PKGBUILD.5.txt | 2 +- scripts/makepkg.sh.in | 49 +++++++++++++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 2d772d5..68a8cc4 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -37,6 +37,7 @@ package_pkg1() { pkgver= pkgrel= pkgdesc="" + arch=() license=() groups=() depends=() diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 611a314..17288d7 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -276,7 +276,7 @@ name of the split package. All options and directives for the split packages default to the global values given within the PKGBUILD. However, some of these can be overridden within each split package's packaging function. The following variables can be overridden: `pkgver`, -`pkgrel`, `pkgdesc`, `license`, `groups`, `depends`, `optdepends`, +`pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2500638..3472f7c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,7 +46,7 @@ pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') -splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'license' 'groups' \ +splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides @@ -895,9 +895,7 @@ write_pkginfo() { echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO - if [ -n "$CARCH" ]; then - echo "arch = $CARCH" >>.PKGINFO - fi + echo "arch = $PKGARCH" >>.PKGINFO if [ "$(check_option force)" = "y" ]; then echo "force = true" >> .PKGINFO fi @@ -976,6 +974,12 @@ create_package() { nameofpkg="$1" fi + if [ "$arch" = "any" ]; then + PKGARCH="any" + else + PKGARCH=$CARCH + fi + write_pkginfo $nameofpkg local comp_files=".PKGINFO" @@ -1004,7 +1008,7 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}${EXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" local ret=0 @@ -1116,7 +1120,11 @@ install_package() { local pkglist for pkg in ${pkgname[@]}; do - pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + else + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" + fi done local ret=0 @@ -1159,15 +1167,14 @@ check_sanity() { return 1 fi - if [ "$arch" = 'any' ]; then - CARCH='any' - fi - if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" -eq 0 ]; then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as arch=('%s').")" "$CARCH" - return 1 + if [ "$arch" != 'any' ]; then + if ! in_array $CARCH ${arch[@]}; then + if [ "$IGNOREARCH" -eq 0 ]; then + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as arch=('%s').")" "$CARCH" + return 1 + fi fi fi @@ -1713,8 +1720,9 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then - if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then + if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ + -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package @@ -1728,7 +1736,8 @@ else allpkgbuilt=1 somepkgbuilt=0 for pkg in ${pkgname[@]}; do - if [ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" ]; then + if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then somepkgbuilt=1 else allpkgbuilt=0 @@ -1783,7 +1792,7 @@ if [ "$INFAKEROOT" -eq 1 ]; then exit 0 # $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" # if we are creating a source-only package, go no further if [ "$SOURCEONLY" -ne 0 ]; then @@ -1911,7 +1920,7 @@ else fi fi -msg "$(gettext "Finished making: %s")" "$pkgbase $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" install_package -- 1.6.4.4

1 0

[pacman-dev] [PATCH] makepkg: allow overriding pkgver and pkgrel in split packages
by Allan McRae 11 Oct '09

11 Oct '09

Fixing a single package within a split package requires the overriding or pkgrel. In very rare (but existing) cases, it is useful to override pkgver. Partial fix for FS#15955. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 2 ++ doc/PKGBUILD.5.txt | 6 +++--- scripts/makepkg.sh.in | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 11ceff2..2d772d5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -34,6 +34,8 @@ build() { package_pkg1() { # options and directives that can be overridden + pkgver= + pkgrel= pkgdesc="" license=() groups=() diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 435a148..611a314 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -275,9 +275,9 @@ name of the split package. All options and directives for the split packages default to the global values given within the PKGBUILD. However, some of these can be overridden within each split -package's packaging function. The following variables can be overridden: `pkgdesc`, -`license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, -`backup`, `options`, `install` and `changelog`. +package's packaging function. The following variables can be overridden: `pkgver`, +`pkgrel`, `pkgdesc`, `license`, `groups`, `depends`, `optdepends`, +`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d80e115..2500638 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,8 +46,9 @@ pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') -splitpkg_overrides=('pkgdesc' 'license' 'groups' 'depends' 'optdepends' 'provides' \ - 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') +splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'license' 'groups' \ + 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ + 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options -- 1.6.4.4

2 2

[pacman-dev] [PATCH] makepkg: allow skipping intergrity checks whem making source package
by Allan McRae 11 Oct '09

11 Oct '09

Extends the use of the --skipinteg option to creating a source package. Fixes FS#15984. 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 88487da..149326a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1038,9 +1038,15 @@ create_srcpackage() { # Get back to our src directory so we can begin with sources. mkdir -p "$srcdir" cd "$srcdir" - download_sources - # We can only check checksums if we have all files. - check_checksums + if [ $SKIPINTEG -eq 0 -o "$SOURCEONLY" -eq 2 ]; then + download_sources + fi + if [ $SKIPINTEG -eq 0 ]; then + # We can only check checksums if we have all files. + check_checksums + else + warning "$(gettext "Skipping integrity checks.")" + fi cd "$startdir" msg "$(gettext "Creating source package...")" -- 1.6.4.4

1 0