September 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] buildsys: remove existing symlinks before installing
by Dave Reisner 14 Sep '11

14 Sep '11

This fixes build errors when performing a manual install straight to a filesystem where the files already exist. Reported-by: Sergej Pupykin <ml(a)sergej.pp.ru> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- We probably could also just add in the -f flag to the ln/cp calls, but I feel safer doing it this way. $(RM) will unconditionally expand to 'rm -f'. doc/Makefile.am | 1 + scripts/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a9aa78f..aa27b50 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -153,6 +153,7 @@ repo-remove.8: repo-add.8 install-data-hook: cd $(DESTDIR)$(mandir)/man8 && \ + $(RM) repo-remove.8 && \ ( $(LN_S) repo-add.8 repo-remove.8 || \ ln repo-add.8 repo-remove.8 || \ cp repo-add.8 repo-remove.8 ) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 52a784a..d89fd30 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -106,10 +106,12 @@ repo-elephant: $(srcdir)/repo-add.sh.in install-data-hook: cd $(DESTDIR)$(bindir) && \ + $(RM) repo-elephant && \ ( $(LN_S) repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) cd $(DESTDIR)$(bindir) && \ + $(RM) repo-remove && \ ( $(LN_S) repo-add repo-remove || \ ln repo-add repo-remove || \ cp repo-add repo-remove ) -- 1.7.6.1

2 2

[pacman-dev] make install fails to replace repo-add
by Sergej Pupykin 13 Sep '11

13 Sep '11

Hi, I have got following from "make install DESTDIR=..." cd /home/sergej/extent/pacman.git/PKG/usr/bin && \ ( ln -s repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) ln: failed to create symbolic link `repo-elephant': File exists ln: failed to create hard link `repo-elephant': File exists cp: `repo-add' and `repo-elephant' are the same file make[4]: *** [install-data-hook] Error 1 make[4]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[3]: *** [install-data-am] Error 2 make[3]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[2]: *** [install-am] Error 2 make[2]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make: *** [install-recursive] Error 1 Problem probably here: scripts/Makefile.am install-data-hook: cd $(DESTDIR)$(bindir) && \ ( $(LN_S) repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) cd $(DESTDIR)$(bindir) && \ ( $(LN_S) repo-add repo-remove || \ ln repo-add repo-remove || \ cp repo-add repo-remove )

4 5

[pacman-dev] Repositories management in enterprise
by Thomas Baquet 12 Sep '11

12 Sep '11

Hi there, While I was thinking how to deploy an ArchLinux like distribution in enterprise, I pointed that the biggest problem is the management of the updates. I though it could be interesting if there is way system like: Master ArchLinux repos → Enterprise repositories → Users, employees When is there an update to the master repos, the update will be done in a testing repos in the enterprise repositories; Then, administrators can verify if there is no problem for compatibility with the deployed machines, and if is okay, update the main repository of the enterprise. So my question is: is there a mechanism to do it automatically? -- Thomas Baquet Jabber ID: me lordblackfox net Website: http://lordblackfox.net/

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-182-g3905ada
by dan＠archlinux.org 12 Sep '11

12 Sep '11

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 3905ada993bacba31a1a9005fe4a0023890296d9 (commit) via d8eacae7bc1465b725e6b1c3b7ad8c27c52437f4 (commit) via befddfc3e6a1f61b0bb2b6c377f3a394a7620b81 (commit) via c736a12e86b826f3079f3cccde86d497528f85f3 (commit) via 7f1235ccbc3a81a4f8a50de96cea512353d6773e (commit) via 4737a87b84742e6d704e1a59792aed9427cbf620 (commit) via f7653e582bc499b0c2d16968220c63615ddb9a56 (commit) from db70c9da153c4767bfd96a15d40e086184bd5402 (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 3905ada993bacba31a1a9005fe4a0023890296d9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 17:01:00 2011 -0400 account for partial delta files in download size Similar to an earlier commit which accounts for .part files for full packages, calculate the download_size for deltas keeping mind the possibility of a partial transfer. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8eacae7bc1465b725e6b1c3b7ad8c27c52437f4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 16:01:43 2011 -0400 make compute_download_size consider .part files Check for the existance of a partial download of a package file before jumping to delta calculations. Currently, if there were 10MiB remaining in a 100MiB the values passed to the front end do not reflect this. Refactored from an old patch originally by Dan. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit befddfc3e6a1f61b0bb2b6c377f3a394a7620b81 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 11 15:11:24 2011 -0400 dload: provide optional netrc support if ~/.netrc exists and has credentials for the hostname requested in a download, they will be provided in an http auth request. This can still be overridden by explcitly declaring user:pass in the URL. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c736a12e86b826f3079f3cccde86d497528f85f3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 10 23:21:22 2011 -0400 makepkg: unset errexit when sourcing /etc/profile This is a fix for a bash3 specific bug, where a file sourced by /etc/profile would exit non-zero and make its way back up to makepkg, forcing it to exit after package installation. Along with unsetting the ERR handler, temporarily unset errexit to avoid this. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7f1235ccbc3a81a4f8a50de96cea512353d6773e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Sep 10 22:47:42 2011 -0400 paccache: escape . in trimming of diskspace string Before: ==> finished dry run: 2 candidates (diskspace saved: 7. MiB) After: ==> finished dry run: 2 candidates (diskspace saved: 7.8 MiB) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4737a87b84742e6d704e1a59792aed9427cbf620 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Sep 10 09:31:15 2011 -0500 download callback: show decimal places in rate if we have room Display now looks like this, whereas before we would have just showed '2M/s' for the extra repository download. The cutoff is placed at 100.0 to ensure we only use 4 character slots of width (e.g. '99.9', '100'). :: Synchronizing package databases... testing 39.9 KiB 470K/s 00:00 [######################] 100% core 51.4 KiB 469K/s 00:00 [######################] 100% extra 768.8 KiB 2.1M/s 00:00 [######################] 100% community-testing 1941.0 B 54.4M/s 00:00 [######################] 100% multilib 26.6 KiB 458K/s 00:00 [######################] 100% community 449.8 KiB 1649K/s 00:00 [######################] 100% Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f7653e582bc499b0c2d16968220c63615ddb9a56 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Sep 10 09:31:14 2011 -0500 Move download callback static vars into function Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 2 +- lib/libalpm/delta.c | 26 +++++++++++++++++++++----- lib/libalpm/dload.c | 1 + lib/libalpm/sync.c | 27 ++++++++++++++++++++++++--- scripts/makepkg.sh.in | 4 +++- src/pacman/callback.c | 16 +++++++++++----- 6 files changed, 61 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 00/15] Full optdep support with all the bells and whistles
by Benedikt Morbach 11 Sep '11

11 Sep '11

Hi there! This should implement everything that's listed on this page: https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends I know that this is probably 4.1 material and will most likely need quite a bit of polish, but I'd like to gather some comments now before the bit-rot creeps in. If you like, you can also get the code at https://github.com/moben/pacman on the optdep branch. Please take a look and comment. --- Benedikt Benedikt Morbach (15): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Show optdep install status in package info optdepends are not orphans unless --optdeps is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn Add config option for showing all optdeps again Warn on optdep removal Add flag to recurse through optdepends Show status on optdepends that are part of transaction Add option to install all optdepends by default Add option to ask which optdeps to install Make both HandleOptdeps settings work together doc/pacman.8.txt | 11 +++ doc/pacman.conf.5.txt | 14 ++++ etc/pacman.conf.in | 3 + lib/libalpm/add.c | 4 +- lib/libalpm/alpm.h | 25 ++++++- lib/libalpm/be_local.c | 12 +++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 8 ++- lib/libalpm/deps.c | 127 ++++++++++++++++++++++++++++++---- lib/libalpm/deps.h | 5 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 40 ++++++++--- lib/libalpm/remove.c | 22 +++++-- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 10 ++- src/pacman/conf.c | 28 ++++++++ src/pacman/conf.h | 10 +++ src/pacman/package.c | 24 +++++-- src/pacman/pacman.c | 7 ++ src/pacman/query.c | 27 ++++++- src/pacman/remove.c | 35 ++++++++-- src/pacman/sync.c | 125 ++++++++++++++++++++++++++++++++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 172 +++++++++++++++++++++++++++++++++++++++------ src/pacman/util.h | 5 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- 27 files changed, 635 insertions(+), 94 deletions(-) -- 1.7.6.1

1 15

[pacman-dev] pacman -Qs first-run performance
by Philipp 11 Sep '11

11 Sep '11

Hi there, pacman works very well for me, with one exception: searching for installed packages. For me a -Ss takes about 5 seconds, a -Qs 25 seconds. I also noticed that this seems to be true for the first search run only, the following ones are less than a second, no matter whether it's a repo or local search. But if you want to just quickly find out a thing, 25 seconds or so is a long time. Anyway, I had a very brief look at the code and am far from understanding it, but I think libalpm/db.c handles the search, the package names, descriptions, etc. are stored in a linked list of structs, the whole thing is cached in memory only and regex wizardry is used for the search. If that's true, the bottleneck I experience is the caching. 5 seconds for -Ss is acceptable for me, but I wonder whether there's a reasonably easy way to improve the 25 seconds of -Qs. My knowledge of pacman internals is non-existant and my C skills are minimal, so I don't think I can be a lot of help with this one, but maybe there's something else I can be of help with instead. Best regards, Philipp

5 13

[pacman-dev] [PATCH] makepkg: unset errexit when sourcing /etc/profile
by Dave Reisner 11 Sep '11

11 Sep '11

This is a fix for a bash3 specific bug, where a file sourced by /etc/profile would exit non-zero and make its way back up to makepkg, forcing it to exit after package installation. Along with unsetting the ERR handler, temporarily unset errexit to avoid this. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5981603..a130557 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,11 +474,13 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap + # avoid triggering the ERR trap and exiting + set +x local restoretrap=$(trap -p ERR) trap - ERR source /etc/profile &>/dev/null eval $restoretrap + set -x return $R_DEPS_SATISFIED } -- 1.7.6.1

1 1

[pacman-dev] [PATCH] paccache: escape . in trimming of diskspace string
by Dave Reisner 11 Sep '11

11 Sep '11

Before: ==> finished dry run: 2 candidates (diskspace saved: 7. MiB) After: ==> finished dry run: 2 candidates (diskspace saved: 7.8 MiB) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- contrib/paccache.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index b191ed9..8a8cad4 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -121,7 +121,7 @@ size_to_human() { } sizestr = sprintf("%.2f", size) - sub(/.?0+$/, "", sizestr) + sub(/\.?0+$/, "", sizestr) printf("%s %s", sizestr, suffix[count]) }' } -- 1.7.6.1

1 0

[pacman-dev] [PATCH 1/2] Move download callback static vars into function
by Dan McGee 10 Sep '11

10 Sep '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 0d9b57b..793facd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -37,11 +37,8 @@ #include "conf.h" /* download progress bar */ -static double rate_last; -static off_t xfered_last; static off_t list_xfered = 0.0; static off_t list_total = 0.0; -static struct timeval initial_time; /* delayed output during progress bar */ static int on_progress = 0; @@ -510,6 +507,9 @@ void cb_dl_total(off_t total) /* callback to handle display of download progress */ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { + static double rate_last; + static off_t xfered_last; + static struct timeval initial_time; int infolen; int filenamelen; char *fname, *p; -- 1.7.6.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-175-gdb70c9d
by dan＠archlinux.org 09 Sep '11

09 Sep '11

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 db70c9da153c4767bfd96a15d40e086184bd5402 (commit) via a03313f3f66e9ac03392cb255bc6c4e1958e14c2 (commit) via 905ae640cfb0787e9bdfbcacf21c62e64cc27512 (commit) via 4ed12aec30be0a36fff2937039c904526aeb3b79 (commit) via 17c3de3e4f6b03953e22d203d5891b37ffdf941c (commit) via 3d9f961d1367bf1669332047e667f98b9d35531e (commit) via 8ffa2b24a5e3d63d6f34a1257ed67904ec051e3d (commit) via b961ebe16ffb75bb947a193daa9e9fe639b6403d (commit) via 6317db84295430c2d2d164f81ff723b379b33035 (commit) via 3e08614fda144393ab1ca23dcf08f2cd2f604cf9 (commit) from 0e79802c0ac8453376d8c0f99629f5a3b499f571 (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 db70c9da153c4767bfd96a15d40e086184bd5402 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 22:22:25 2011 -0400 diskspace: fix memory leak on root mount not found Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a03313f3f66e9ac03392cb255bc6c4e1958e14c2 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 8 14:14:51 2011 -0500 Print 'loading packages' message on -U operations This will be the first thing printed when doing an upgrade. Currently there is no output at all until we start resolving dependencies, which can be a while in if specifying very large targets on the command line, in which case it is nice to let the user know we are doing something. Addresses FS#25822 in the most KISS way possible. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 905ae640cfb0787e9bdfbcacf21c62e64cc27512 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 6 14:40:29 2011 -0400 makepkg: use more awk'ish syntax in sanity checks This simplifies the flow a bit, making the pipeline a little easier to grok. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4ed12aec30be0a36fff2937039c904526aeb3b79 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 6 14:17:15 2011 -0400 makepkg: avoid for loop in deleting manpage hardlinks find can do this all on its own and remain portable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 17c3de3e4f6b03953e22d203d5891b37ffdf941c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 6 14:11:15 2011 -0400 makepkg: act on function return value, not output Correcting a typo, as this function will never output anything. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3d9f961d1367bf1669332047e667f98b9d35531e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 4 12:34:57 2011 -0400 makepkg: refactor check_pgpsigs output - display associated warnings on same line as pass/fail msg, to be more consistent with checksum verification output - properly error on a revoked key (matching pacman's behavior) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8ffa2b24a5e3d63d6f34a1257ed67904ec051e3d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 20:43:49 2011 -0500 Use more correct integer types in diskspace checks This adjusts type usage to match POSIX provided types from <sys/types.h> rather than assuming everything will fit in a long or unsigned long. Use fsblkcnt_t (unsigned) and blkcnt_t (signed) as appropriate. These are affected the same way off_t is on 32 bit platforms, where the types are extende to 64 bits if large file support is enabled. Because most numbers here are block counts, this isn't near as pressing as using a 32-bit variable for file sizes where anything over 2GiB can burn you; we likely can support files at least 512 but mainly 4096 times larger. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b961ebe16ffb75bb947a193daa9e9fe639b6403d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 20:41:09 2011 -0500 query check: use provided filelist count instead of keeping track We don't need to keep track of how many files are in a package now that said value is provided to us. It also makes more sense to use size_t here for types rather than the (hopefully never too short) int. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6317db84295430c2d2d164f81ff723b379b33035 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 20:33:23 2011 -0500 Remove unnecessary cast Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e08614fda144393ab1ca23dcf08f2cd2f604cf9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 15:02:52 2011 -0500 Ensure PackageRequired works as expected Changes in commit dc3336c277 caused this to stop working as expected for sync packages, due to the way the logic is structured. Ensure we always enter the signature code if the bitflag is flipped on to check signatures for packages. Rename 'use_sig' to 'has_sig' for clarity. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 13 ++++++----- lib/libalpm/diskspace.c | 33 +++++++++++++++------------ lib/libalpm/diskspace.h | 7 ++++- scripts/makepkg.sh.in | 54 +++++++++++++++++++++++----------------------- src/pacman/package.c | 2 +- src/pacman/query.c | 12 +++++----- src/pacman/upgrade.c | 1 + 7 files changed, 65 insertions(+), 57 deletions(-) hooks/post-receive -- The official pacman repository

1 0