- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] diskspace: dedupe code for loading FS usage
by Dave Reisner 02 May '12

02 May '12

add mount_point_load_fsinfo() for platforms using getmntent(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is just code movement for the following patches. lib/libalpm/diskspace.c | 52 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index daee244..f3f9092 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -69,6 +69,23 @@ static void mount_point_list_free(alpm_list_t *mount_points) FREELIST(mount_points); } +static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint) +{ +#ifdef HAVE_GETMNTENT + /* grab the filesystem usage */ + if(statvfs(mountpoint->mount_dir, &(mountpoint->fsp)) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information for %s: %s\n"), + mountpoint->mount_dir, strerror(errno)); + return -1; + } + + mountpoint->read_only = mountpoint->fsp.f_flag & ST_RDONLY; +#endif + + return 0; +} + static alpm_list_t *mount_point_list(alpm_handle_t *handle) { alpm_list_t *mount_points = NULL, *ptr; @@ -86,24 +103,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((mnt = getmntent(fp))) { - struct statvfs fsp; - if(!mnt) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information\n")); - continue; - } - if(statvfs(mnt->mnt_dir, &fsp) != 0) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information for %s: %s\n"), - mnt->mnt_dir, strerror(errno)); - continue; - } - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); mp->mount_dir_len = strlen(mp->mount_dir); - memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); - mp->read_only = fsp.f_flag & ST_RDONLY; + if(mount_point_load_fsinfo(handle, mp) < 0) { + free(mp->mount_dir); + free(mp); + continue; + } mount_points = alpm_list_add(mount_points, mp); } @@ -122,19 +129,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((ret = getmntent(fp, &mnt)) == 0) { - struct statvfs fsp; - if(statvfs(mnt->mnt_mountp, &fsp) != 0) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information for %s: %s\n"), - mnt->mnt_mountp, strerror(errno)); - continue; - } - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_mountp); mp->mount_dir_len = strlen(mp->mount_dir); - memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); - mp->read_only = fsp.f_flag & ST_RDONLY; + if(mount_point_load_fsinfo(handle, mp) < 0) { + free(mp->mount_dir); + free(mp); + continue; + } mount_points = alpm_list_add(mount_points, mp); } -- 1.7.10.1

1 2

[pacman-dev] [PATCH] Fix pactest when scriptlet shell is specified
by Allan McRae 02 May '12

02 May '12

If --with-scriptlet-shell is specified, sylimk the shell to /bin/sh in order for the "make check" to pass. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This at least works with --with-scriptlet-shell=/bin/bash... test/pacman/Makefile.am | 9 +++++++++ test/pacman/{pmtest.py => pmtest.py.in} | 3 +++ 2 files changed, 12 insertions(+) rename test/pacman/{pmtest.py => pmtest.py.in} (98%) diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index d198ba2..b821458 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -19,4 +19,13 @@ EXTRA_DIST = \ ldconfig.stub \ $(check_SCRIPTS) +CLEANFILES = pmtest.py + +edit = sed \ + -e 's|@SCRIPTLET_SHELL[@]|$(SCRIPTLET_SHELL)|g' + +pmtest.py: pmtest.py.in Makefile + $(AM_V_at)$(RM) $@ + $(AM_V_GEN)test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@ + # vim:set ts=2 sw=2 noet: diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py.in similarity index 98% rename from test/pacman/pmtest.py rename to test/pacman/pmtest.py.in index 1a02686..ace532d 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py.in @@ -127,6 +127,9 @@ def generate(self): os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot shutil.copy("/bin/sh", bindir) + shell = "@SCRIPTLET_SHELL@" + if not shell == "/bin/sh": + os.symlink("/bin/sh", os.path.join(self.root, shell[1:])) shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), os.path.join(sbindir, "ldconfig")) ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") -- 1.7.10

2 3

[pacman-dev] [PATCH] Add functions for reading mtree file from local db
by Allan McRae 01 May '12

01 May '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I have not tested this actually reads the mtree file correctly yet... but I would like some feedback if people think that this is the right approach to take before I spend more time on it. lib/libalpm/be_local.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/package.c | 21 +++++++++++++++++ lib/libalpm/package.h | 8 +++++++ 3 files changed, 89 insertions(+) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index aab6718..dbd8138 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -28,6 +28,10 @@ #include <dirent.h> #include <limits.h> /* PATH_MAX */ +/* libarchive */ +#include <archive.h> +#include <archive_entry.h> + /* libalpm */ #include "db.h" #include "alpm_list.h" @@ -210,6 +214,58 @@ static int _cache_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) return fclose((FILE *)fp); } +static void *_cache_mtree_open(alpm_pkg_t *pkg) +{ + int r; + struct archive *mtree; + + pkg->handle->pm_errno = 0; + + alpm_db_t *db = alpm_pkg_get_db(pkg); + char *mtfile = _alpm_local_db_pkgpath(db, pkg, "mtree"); + + if(access(mtfile, F_OK) != 0) { + /* there is no mtree file for this package */ + return NULL; + } + + if((mtree = archive_read_new()) == NULL) { + pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE; + return NULL; + } + + archive_read_support_filter_gzip(mtree); + archive_read_support_format_mtree(mtree); + + if((r = archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { + _alpm_log(pkg->handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), + mtfile, archive_error_string(mtree)); + pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE; + archive_read_finish(mtree); + return NULL; + } + + return mtree; +} + +static int _cache_mtree_read(void *entry, const alpm_pkg_t UNUSED *pkg, + void *archive) +{ + int ret; + struct archive *mtree = archive; + struct archive_entry *details = entry; + + ret = archive_read_next_header(mtree, &details); + + return ret; +} + +static void _cache_mtree_close(const alpm_pkg_t UNUSED *pkg, void *archive) +{ + struct archive *mtree = archive; + archive_read_free(mtree); +} + static int _cache_force_load(alpm_pkg_t *pkg) { return local_db_read(pkg, INFRQ_ALL); @@ -245,6 +301,10 @@ static struct pkg_operations local_pkg_ops = { .changelog_read = _cache_changelog_read, .changelog_close = _cache_changelog_close, + .mtree_open = _cache_mtree_open, + .mtree_read = _cache_mtree_read, + .mtree_close = _cache_mtree_close, + .force_load = _cache_force_load, }; diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 46d1473..0f446d3 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -121,6 +121,23 @@ static int _pkg_changelog_close(const alpm_pkg_t UNUSED *pkg, return EOF; } +static void *_pkg_mtree_open(alpm_pkg_t UNUSED *pkg) +{ + return NULL; +} + +static int _pkg_mtree_read(void UNUSED *entry, const alpm_pkg_t UNUSED *pkg, + void UNUSED *archive) +{ + return 0; +} + +static void _pkg_mtree_close(const alpm_pkg_t UNUSED *pkg, + void UNUSED *archive) +{ + return; +} + static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } /** The standard package operations struct. Get fields directly from the @@ -152,6 +169,10 @@ struct pkg_operations default_pkg_ops = { .changelog_read = _pkg_changelog_read, .changelog_close = _pkg_changelog_close, + .mtree_open = _pkg_mtree_open, + .mtree_read = _pkg_mtree_read, + .mtree_close = _pkg_mtree_close, + .force_load = _pkg_force_load, }; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c473549..aff9075 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -26,6 +26,10 @@ #include <sys/types.h> /* off_t */ +/* libarchive */ +#include <archive.h> +#include <archive_entry.h> + #include "alpm.h" #include "backup.h" #include "db.h" @@ -64,6 +68,10 @@ struct pkg_operations { size_t (*changelog_read) (void *, size_t, const alpm_pkg_t *, void *); int (*changelog_close) (const alpm_pkg_t *, void *); + void *(*mtree_open) (alpm_pkg_t *); + int (*mtree_read) (void *, const alpm_pkg_t *, void *); + void (*mtree_close) (const alpm_pkg_t *, void *); + int (*force_load) (alpm_pkg_t *); }; -- 1.7.10

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-257-g9d9c12e
by dan＠archlinux.org 01 May '12

01 May '12

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 9d9c12e4e2dc92dfb6582ea7f79087e382348e71 (commit) via 92e20b508d302a1d91f9b2a6836ac1cd4453c87c (commit) via 7fd0d037951f47329b869f8bf06368026a0c3ac0 (commit) via d214c2347adc601554aaf524b224ce9bc182faed (commit) via 5a9f5c60dae8d173e9e2f6da78499c046600e6ca (commit) via 4d3170978711a91f1afe8ffef9dad9c2bc60585d (commit) via 678bdfb0d079dba08bf1f4d34a93e5d36521c43d (commit) from 2e6cb69bf6d6b2738d7a9c23c55d1734378402c7 (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 9d9c12e4e2dc92dfb6582ea7f79087e382348e71 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 1 10:59:03 2012 +1000 makepkg: fix package arch detection get_pkg_arch checked for the arch variable being overridden in the package_$1() function when used with a package as a parameter. However, when there was no override, it did not fall back to the global value. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 92e20b508d302a1d91f9b2a6836ac1cd4453c87c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 29 23:03:27 2012 -0400 contrib: remove executable bit from input files There's no reason to make these executable, and this also mimics what we do in the scripts/ subdir. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fd0d037951f47329b869f8bf06368026a0c3ac0 Author: Daniel Wallace <daniel.wallace(a)gatech.edu> Date: Sun Apr 29 22:40:42 2012 -0400 zsh completion for makepkg This adds zsh completion for makepkg to the _pacman file in /usr/share/zsh/site-functions/. it completes makepkg and allows for stacking of flags like -si, -sci, et cetera. Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> commit d214c2347adc601554aaf524b224ce9bc182faed Author: Daniel Wallace <daniel.wallace(a)gatech.edu> Date: Tue Apr 24 22:36:07 2012 -0400 add zsh completion to pacman-key This patch adds zsh completion to pacman-key. It completes files/directories for --config or --gpgdir and just completes the command for --keyserver then it can complete keyids or files for all the other flags. Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> commit 5a9f5c60dae8d173e9e2f6da78499c046600e6ca Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 23:40:06 2012 -0500 Convert ALLOC_FAIL macro into a function This path is rarely (read: never) taken in any normal run of the code, so injecting the fprintf() call everywhere with the macro is a bit overkill. Instead, add a lightweight _alpm_alloc_fail() function that gets called instead. This does have a reasonable effect on the size of the generated code; most places using the macros provided by util.c have their code size reduced. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d3170978711a91f1afe8ffef9dad9c2bc60585d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 23:23:54 2012 -0500 be_local: use the right length value for filename in all cases Increment the strlen() provided value by 1 for the NULL byte so we use the right value in all three places we later reference it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 678bdfb0d079dba08bf1f4d34a93e5d36521c43d Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Apr 7 14:18:28 2012 +0200 pkgdelta/repo-add: quoting fixes Finish the job on master; most of these were applied to maint already. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 207 ++++++++++++++++++++++++++++++++++++++++++++- lib/libalpm/be_local.c | 9 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/util.c | 5 ++ lib/libalpm/util.h | 10 +-- scripts/makepkg.sh.in | 1 + scripts/repo-add.sh.in | 2 +- 7 files changed, 221 insertions(+), 15 deletions(-) mode change 100755 => 100644 contrib/bacman.sh.in mode change 100755 => 100644 contrib/paccache.sh.in mode change 100755 => 100644 contrib/pacdiff.sh.in mode change 100755 => 100644 contrib/paclist.sh.in mode change 100755 => 100644 contrib/paclog-pkglist.sh.in mode change 100755 => 100644 contrib/pacscripts.sh.in mode change 100755 => 100644 contrib/pacsearch.in mode change 100755 => 100644 contrib/pacsysclean.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix package arch detection
by Allan McRae 01 May '12

01 May '12

get_pkg_arch checked for the arch variable being overridden in the package_$1() function when used with a package as a parameter. However, when there was no override, it did not fall back to the global value. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fa8ba66..1f0b4e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -274,6 +274,7 @@ get_pkg_arch() { else local arch_override eval $(declare -f package_$1 | sed -n 's/$^[[:space:]]*arch=$/arch_override=/p') + (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") if [[ $arch_override = "any" ]]; then printf "%s\n" "any" else -- 1.7.10

1 0

[pacman-dev] [PATCH] makepkg: add mtree file into package
by Allan McRae 30 Apr '12

30 Apr '12

Add an mtree file to the package with all file information. This can be added to the local pacman database on install allowing full package verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Two things I want to query here... 1) bsdtar -czf .MTREE .... When creating the package, we use gzip instead of bsdtar's -z option due to it including time stamps. From memory this was important due to package deltas. So I guess that does not apply here? 2) The timestamps are interesting.... - etc/bash_completion.d/burp time=1335764490.307580112 - etc/bash_completion.d/burp time=1335764490.0 The first is from creating the .MTREE file before compressing the package. The second is creating the mtree file from files on the filesystem after the package is installed. Does anyone know what is going on here? I guess we can just round the times in the mtree file to the nearest second when checking. scripts/makepkg.sh.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d1251b8..fa8ba66 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1350,8 +1350,6 @@ create_package() { done # tar it up - msg2 "$(gettext "Compressing package...")" - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 @@ -1362,6 +1360,14 @@ create_package() { # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob + + msg2 "$(gettext "Generating .MTREE file...")" + bsdtar -czf .MTREE --format=mtree \ + --options='!all,use-set,type,uid,gid,mode,size,time,md5' \ + "${comp_files[@]}" * + comp_files+=(".MTREE") + + msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail # bsdtar's gzip compression always saves the time stamp, making one -- 1.7.10

3 2

[pacman-dev] [PATCH] Extract .MTREE file into local package database
by Allan McRae 30 Apr '12

30 Apr '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b007766..b98346e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -164,6 +164,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, snprintf(filename, PATH_MAX, "%s%s-%s/changelog", _alpm_db_path(handle->db_local), newpkg->name, newpkg->version); archive_entry_set_perm(entry, 0644); + } else if(strcmp(entryname, ".MTREE") == 0) { + /* the mtree file goes inside the db */ + snprintf(filename, PATH_MAX, "%s%s-%s/mtree", + _alpm_db_path(handle->db_local), newpkg->name, newpkg->version); + archive_entry_set_perm(entry, 0644); } else if(*entryname == '.') { /* for now, ignore all files starting with '.' that haven't * already been handled (for future possibilities) */ -- 1.7.10

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-250-g2e6cb69
by dan＠archlinux.org 30 Apr '12

30 Apr '12

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 2e6cb69bf6d6b2738d7a9c23c55d1734378402c7 (commit) via 8c7202ca19361c35357140b0e3083cfa5bc12d21 (commit) via 9dd42dc0daab510a4e68118d89b5543936d2074f (commit) via 8a9c666a8c0f46739724e2032cedb451121c4594 (commit) via 6d2fb6fd815c7f427028b20faa16e531d5cc2aa4 (commit) via 52a9a5240ac8dc9eef1fc68c1bf4290b76fe09ae (commit) via 82b7122542e16354b560bae9c7f6f3608873a8e1 (commit) via e0afd81d18fdc646bbf6d37a1627c0267176e167 (commit) via dbc58d9386170a193d951c926c87075450de3bb1 (commit) via 20ff0cd40fd228f56251634a7429439244c24eac (commit) via 1583a2079c8e84c9cd960a596dae2e36c9077bbb (commit) via 953415c86a17c1db8bebbbaca89e6fd5783386b6 (commit) via 242411a1b4197910ac75b50033eb530004cc0e5c (commit) via 22050f18f4049b20f56e98766b68c0c32d070f1a (commit) via d38a1c02dbbf90b890bcd79d0354d04a4886c026 (commit) via 6d10de881e0ca38d8f20384e20139784589ea2c7 (commit) via ea4aa6f184909db38bacbbf60f22f1674f2853a6 (commit) via 03acea832ad39fa371781f045c39677a02d1156a (commit) via 1b494ab77198a6cbb9c06a13435159641e2dc0c5 (commit) via 71fcb69028d6e02bc7f24459918e504d261f86cd (commit) from b2a2a982979ecd9b9bcdbf5f1c60d005ed238b60 (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 2e6cb69bf6d6b2738d7a9c23c55d1734378402c7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 13:23:23 2012 +1000 Output "Packages" instead of "Targets" Prefix the list of packages being installed/removed with "Packages" instead of "Targets" as they are package names by this stage. Fixes FS#23123. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8c7202ca19361c35357140b0e3083cfa5bc12d21 Merge: 9dd42dc 82b7122 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 20:27:32 2012 -0500 Merge remote-tracking branch 'dave/buildsys' commit 9dd42dc0daab510a4e68118d89b5543936d2074f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 24 23:36:08 2012 -0400 makepkg: remove subshelling from check_option and friends Instead of creating a subshell for each of these checks (of which there are many), pass in an expected value and make the check_* function do the comparison for us, returning 0 (match), 1, (mismatch), or 127 (not found). For a measureable benefit, I tested this on a fairly simple package, perl-term-readkey, and counted the number of clone(2) syscalls to try and isolate those generated by makepkg itself, rather than the user defined functions. Results as shown below: 336 before 180 after So, roughly a 50% reduction, which makes sense given that a single check_option() call could be up to 3 subprocesses in total. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8a9c666a8c0f46739724e2032cedb451121c4594 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 24 23:09:31 2012 -0400 makepkg: null terminate filenames to strip Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6d2fb6fd815c7f427028b20faa16e531d5cc2aa4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 22 23:35:20 2012 -0400 pacman/package.c: show checksums with -Sii These were removed entirely by f34864cc9e, but some people (myself included) still find them useful. Revive these details, but "demote" them, so that they're only displayed when extra sync data is requested. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52a9a5240ac8dc9eef1fc68c1bf4290b76fe09ae Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 20:14:10 2012 -0500 Move short-lived realpath buffers to the stack There is little reason here to grab 4K from the heap only to return it a few lines later. Instead, just use the stack to hold the returned value saving ourselves the malloc/free cycle. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82b7122542e16354b560bae9c7f6f3608873a8e1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Mar 19 23:56:59 2012 -0400 libalpm: add pkg-config file No one seems to do this "correctly", but for the sake of having an easy method of detecting the presence and version of libalpm on a given system, we provide a straightforward .pc file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e0afd81d18fdc646bbf6d37a1627c0267176e167 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 21:05:51 2012 -0500 Pointer coding style cleanups 'foo_type_t *variable' rather than 'foo_type_t* variable'. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbc58d9386170a193d951c926c87075450de3bb1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 21:01:55 2012 -0500 be_local: write all single-valued attributes first There isn't a whole lot of reason other than code clarity for this, but it makes it a bit more obvious where multivalued attributes start. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20ff0cd40fd228f56251634a7429439244c24eac Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 20:59:24 2012 -0500 util/testdb: don't return crazy error values With some contrived examples, you could easily make testdb return a very high error count, which could easily overflow the 8-bit unsigned integer limit. Instead, simply return 1 or 0 based on whether errors were found. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1583a2079c8e84c9cd960a596dae2e36c9077bbb Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 20:44:29 2012 -0500 Split check steps in Makefile into multiple targets This allows a `make -j4 check` invocation to actually run in parallel, even though 95% of our test suite time is currently dominated by pactest. It also allows running something like `make test-vercmp`. Also, add some targets to the .PHONY list that belong in it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 953415c86a17c1db8bebbbaca89e6fd5783386b6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 22 17:38:48 2012 -0400 rankmirrors: move to contrib/ This script is of questionable value, as it ranks mirrors by an uninteresting attribute: ping. While the script itself is interesting, people should be encouraged to rank mirrors by more useful measures, such as actual speed, locality, or up to date-ness. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 242411a1b4197910ac75b50033eb530004cc0e5c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 13 14:34:02 2012 +1000 makepkg: Be more consistent with missing program message Also prevent "sudo" and "su" from being translated. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 22050f18f4049b20f56e98766b68c0c32d070f1a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 9 16:27:00 2012 +1000 makepkg: treat list of packages to be installed as an array Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d38a1c02dbbf90b890bcd79d0354d04a4886c026 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 9 21:09:35 2012 +1000 makepkg: deal with overriden package arch properly This fixes a lot of checks done by makepkg (e.g. to see if a package is already built and choosing which package to install). Previously, if a package had both "i686" and "any" versions, the "i686" one always took precidence regardless of the value of "arch" in the PKGBUILD for that package. Fixes FS#27204. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6d10de881e0ca38d8f20384e20139784589ea2c7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 13:33:57 2012 -0400 paccache: adopt parseopts for options parsing Add longopts and update usage. This removes the TODO item and incorporates --help/--version into the standard option set. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ea4aa6f184909db38bacbbf60f22f1674f2853a6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 11 09:29:07 2012 -0400 configure: require bash >= 4.1 at compile time We've unofficially agreed to raise our minimum supported bash version to 4.1, and since added features that require it. Additionally, an earlier commit adds a syntax check to the builds of scripts/ and contrib/ which could conceivably fail with an earlier shell. Therefore, make this a hard requirement of the build process. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 03acea832ad39fa371781f045c39677a02d1156a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 21:34:30 2012 -0400 validate bash scripts with 'bash -n' during build. Use the no-exec mode of $(BASH_SHELL) to check for syntax errors in shell scripts. Since we use the extglob feature in various places, this requires that we pass -O extglob to the shell as well, to ensure that the parser is armed to handle this syntax. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1b494ab77198a6cbb9c06a13435159641e2dc0c5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 12:55:20 2012 -0400 contrib: rename bash scripts: .in -> .sh.in For consistency with the scripts/ directory, ensure that all bash scripts use the same pre-build suffix. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 71fcb69028d6e02bc7f24459918e504d261f86cd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 12:46:48 2012 -0400 contrib: use a separate build rule for bash scripts Treat bash scripts separately from the others to allow for a different build rule, which is reused from the scripts/ subdir. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 16 +- configure.ac | 19 +- contrib/.gitignore | 1 + contrib/Makefile.am | 51 +++-- contrib/{bacman.in => bacman.sh.in} | 1 - contrib/{paccache.in => paccache.sh.in} | 119 +++++++----- contrib/{pacdiff.in => pacdiff.sh.in} | 0 contrib/{paclist.in => paclist.sh.in} | 0 .../{paclog-pkglist.in => paclog-pkglist.sh.in} | 0 contrib/{pacscripts.in => pacscripts.sh.in} | 0 contrib/{pacsysclean.in => pacsysclean.sh.in} | 0 {scripts => contrib}/rankmirrors.sh.in | 0 doc/Makefile.am | 2 + lib/libalpm/.gitignore | 1 + lib/libalpm/Makefile.am | 3 + lib/libalpm/be_local.c | 38 ++-- lib/libalpm/conflict.c | 3 +- lib/libalpm/group.c | 2 +- lib/libalpm/handle.c | 5 +- lib/libalpm/libalpm.pc.in | 12 ++ lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- scripts/.gitignore | 1 - scripts/Makefile.am | 5 +- scripts/makepkg.sh.in | 194 ++++++++++++-------- src/pacman/package.c | 9 +- src/pacman/util.c | 2 +- src/util/testdb.c | 8 +- 28 files changed, 309 insertions(+), 187 deletions(-) rename contrib/{bacman.in => bacman.sh.in} (99%) rename contrib/{paccache.in => paccache.sh.in} (76%) rename contrib/{pacdiff.in => pacdiff.sh.in} (100%) rename contrib/{paclist.in => paclist.sh.in} (100%) rename contrib/{paclog-pkglist.in => paclog-pkglist.sh.in} (100%) rename contrib/{pacscripts.in => pacscripts.sh.in} (100%) rename contrib/{pacsysclean.in => pacsysclean.sh.in} (100%) rename {scripts => contrib}/rankmirrors.sh.in (100%) create mode 100644 lib/libalpm/libalpm.pc.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Manual rankmirrors.
by Kevin Chadwick 27 Apr '12

27 Apr '12

I use rankmirrors and I notice on timeouts pacman automatically switches. Today, though most packages downloaded quickly from the mirror just selected by rankmirrors, one or two went very very slow. I guess differing routes by different package requests. Would it be easy to add a ^S (Ctrl-S) to tell pacman to stop and retry at the next mirror. If I ever find the time, not too likely for a while, I might look into it. Just figured if anyone had worked on it and thought yeah I could just change that then it wold be worth flinging the idea at the devs. On a side note should pacman be using /proc/mounts for Checkspace rather than /etc/mtab.

6 10

[pacman-dev] [PATCH] makepkg: remove subshelling from check_option and friends
by Dave Reisner 25 Apr '12

25 Apr '12

Instead of creating a subshell for each of these checks (of which there are many), pass in an expected value and make the check_* function do the comparison for us, returning 0 (match), 1, (mismatch), or 127 (not found). For a measureable benefit: I tested this on a fairly simple package (perl-term-readkey) and counted the number of clone syscalls to try and isolate those generated by makepkg itself, rather than the user defined functions. Results as shown below: 336 before 180 after So, roughly a 50% reduction, which makes sense given that a single check_option() call could be up to 3 subprocesses in total. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I've looked over this enough times that I'm starting to go blind looking at the patch. It's passed my testing as well, but this is the sort of thing that's ripe for regressions, so another set of eyes/testing would be appreciated. scripts/makepkg.sh.in | 137 ++++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 58 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0f3c466..cfe00d3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -264,47 +264,67 @@ get_full_version() { # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # -# usage : check_option( $option ) -# return : y - enabled -# n - disabled -# ? - not found +# usage : check_option( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found ## check_option() { - local ret=$(in_opt_array "$1" ${options[@]}) - if [[ $ret != '?' ]]; then - printf "%s\n" "$ret" - return - fi + in_opt_array "$1" ${options[@]} + case $? in + 0) # assert enabled + [[ $2 = y ]] + return ;; + 1) # assert disabled + [[ $2 = n ]] + return + esac # fall back to makepkg.conf options - ret=$(in_opt_array "$1" ${OPTIONS[@]}) - if [[ $ret != '?' ]]; then - printf "%s\n" "$ret" - return - fi + in_opt_array "$1" ${OPTIONS[@]} + case $? in + 0) # assert enabled + [[ $2 = y ]] + return ;; + 1) # assert disabled + [[ $2 = n ]] + return + esac - echo '?' # Not Found + # not found + return 127 } ## # Check if option is present in BUILDENV # -# usage : check_buildenv( $option ) -# return : y - enabled -# n - disabled -# ? - not found +# usage : check_buildenv( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found ## check_buildenv() { in_opt_array "$1" ${BUILDENV[@]} + case $? in + 0) # assert enabled + [[ $2 = "y" ]] + return ;; + 1) # assert disabled + [[ $2 = "n" ]] + return ;; + esac + + # not found + return 127 } ## # usage : in_opt_array( $needle, $haystack ) -# return : y - enabled -# n - disabled -# ? - not found +# return : 0 - enabled +# 1 - disabled +# 127 - not found ## in_opt_array() { local needle=$1; shift @@ -312,15 +332,16 @@ in_opt_array() { local opt for opt in "$@"; do if [[ $opt = "$needle" ]]; then - echo 'y' # Enabled - return + # enabled + return 0 elif [[ $opt = "!$needle" ]]; then - echo 'n' # Disabled - return + # disabled + return 1 fi done - echo '?' # Not Found + # not found + return 127 } @@ -910,12 +931,12 @@ run_function() { local pkgfunc="$1" # clear user-specified buildflags if requested - if [[ $(check_option buildflags) = "n" ]]; then + if check_option "buildflags" "n"; then unset CFLAGS CXXFLAGS LDFLAGS fi # clear user-specified makeflags if requested - if [[ $(check_option makeflags) = "n" ]]; then + if check_option "makeflags" "n"; then unset MAKEFLAGS fi @@ -962,13 +983,13 @@ run_function() { run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if check_buildenv "distcc" "y" && ! check_option "distc" "n"; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS fi # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi @@ -994,12 +1015,12 @@ tidy_install() { cd_safe "$pkgdir" msg "$(gettext "Tidying install...")" - if [[ $(check_option docs) = "n" && -n ${DOC_DIRS[*]} ]]; then + if check_option "docs" "n" && [[ -n ${DOC_DIRS[*]} ]]; then msg2 "$(gettext "Removing doc files...")" rm -rf -- ${DOC_DIRS[@]} fi - if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[*]} ]]; then + if check_option "purge" "y" && [[ -n ${PURGE_TARGETS[*]} ]]; then msg2 "$(gettext "Purging unwanted files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do @@ -1011,7 +1032,7 @@ tidy_install() { done fi - if [[ $(check_option zipman) = "y" && -n ${MAN_DIRS[*]} ]]; then + if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" local manpage ext file link hardlinks hl find ${MAN_DIRS[@]} -type f 2>/dev/null | @@ -1047,7 +1068,7 @@ tidy_install() { done fi - if [[ $(check_option strip) = "y" ]]; then + if check_option "strip" "y"; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" @@ -1065,17 +1086,17 @@ tidy_install() { done fi - if [[ $(check_option libtool) = "n" ]]; then + if check_option "libtool" "n"; then msg2 "$(gettext "Removing "%s" files...")" "libtool" find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi - if [[ $(check_option emptydirs) = "n" ]]; then + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi - if [[ $(check_option upx) = "y" ]]; then + if check_option "upx" "y"; then msg2 "$(gettext "Compressing binaries with %s...")" "UPX" local binary find . -type f -perm -u+w 2>/dev/null | while read binary ; do @@ -1234,14 +1255,15 @@ write_pkginfo() { done for it in "${packaging_options[@]}"; do - local ret="$(check_option $it)" - if [[ $ret != "?" ]]; then - if [[ $ret = "y" ]]; then + check_option "$it" "y" + case $? in + 0) printf "makepkgopt = %s\n" "$it" - else + ;; + 1) printf "makepkgopt = %s\n" "!$it" - fi - fi + ;; + esac done check_license @@ -1658,7 +1680,7 @@ check_software() { fi # fakeroot - building as non-root user - if [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then + if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary required for building as non-root user.")" "fakeroot" ret=1 @@ -1666,7 +1688,7 @@ check_software() { fi # gpg - package signing - if [[ $SIGNPKG == 'y' || (-z "$SIGNPKG" && $(check_buildenv sign) == 'y') ]]; then + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" ret=1 @@ -1690,7 +1712,7 @@ check_software() { fi # upx - binary compression - if [[ $(check_option upx) == 'y' ]]; then + if check_option "upx" "y"; then if ! type -p upx >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing binaries.")" "upx" ret=1 @@ -1698,7 +1720,7 @@ check_software() { fi # distcc - compilation with distcc - if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if check_buildenv "distcc" "y" && ! check_option "distcc" "n" ]]; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" ret=1 @@ -1706,7 +1728,7 @@ check_software() { fi # ccache - compilation with ccache - if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" ret=1 @@ -1714,7 +1736,7 @@ check_software() { fi # strip - strip symbols from binaries/libraries - if [[ $(check_option strip) = "y" ]]; then + if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" ret=1 @@ -1722,7 +1744,7 @@ check_software() { fi # gzip - compressig man and info pages - if [[ $(check_option zipman) = "y" ]]; then + if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" ret=1 @@ -2062,7 +2084,7 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then +if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then ALL_OFF="$(tput sgr0)" @@ -2146,7 +2168,7 @@ use the %s option.")" "makepkg" "--asroot" error "$(gettext "The %s option is meant for the root user only. Please\n\ rerun %s without the %s flag.")" "--asroot" "makepkg" "--asroot" exit 1 # $E_USER_ABORT - elif (( EUID > 0 )) && [[ $(check_buildenv fakeroot) != "y" ]]; then + elif (( EUID > 0 )) && ! check_buildenv "fakeroot" "y"; then warning "$(gettext "Running %s as an unprivileged user will result in non-root\n\ ownership of the packaged files. Try using the %s environment by\n\ placing %s in the %s array in %s.")" "makepkg" "fakeroot" "'fakeroot'" "BUILDENV" "$MAKEPKG_CONF" @@ -2230,7 +2252,7 @@ if declare -f build >/dev/null; then fi if declare -f check >/dev/null; then # "Hide" check() function if not going to be run - if [[ $RUN_CHECK = 'y' || (! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n") ]]; then + if [[ $RUN_CHECK = 'y' ]] || { ! check_buildenv "check" "n" && [[ $RUN_CHECK != "n" ]]; }; then CHECKFUNC=1 fi fi @@ -2246,8 +2268,7 @@ if [[ -n "${PKGLIST[@]}" ]]; then fi # check if gpg signature is to be created and if signing key is valid -[[ -z $SIGNPKG ]] && SIGNPKG=$(check_buildenv sign) -if [[ $SIGNPKG == 'y' ]]; then +if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then if ! gpg --list-key ${GPGKEY} &>/dev/null; then if [[ ! -z $GPGKEY ]]; then error "$(gettext "The key %s does not exist in your keyring.")" "${GPGKEY}" @@ -2361,7 +2382,7 @@ if (( SOURCEONLY )); then cd_safe "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then + if ! check_buildenv "fakeroot" "y" || (( EUID == 0 )); then create_srcpackage else enter_fakeroot @@ -2453,7 +2474,7 @@ else cd_safe "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then + if ! check_buildenv "fakeroot" "y" || (( EUID == 0 )); then if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build -- 1.7.10

1 0