May 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Allow makepkg to use busybox find
by jhuntwork＠lightcubesolutions.com 03 May '12

03 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Allow makepkg to work correctly when used with find from busybox. The switches -empty, -samefile and -lname are not available. It is easy to work around -empty with rmdir, and -lname with readlink. However, -samefile functionality requires tracking and storing inodes to ensure hard links are re-created correctly. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 53 ++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..9bcb41f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,37 +1057,32 @@ tidy_install() { 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 | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local manpages inode files link + # the '|| true' part keeps the script from bailing on the EOF returned + # by read at the end of the find output + IFS=$'\n' read -rd '' -a files < \ + <(find ${MAN_DIRS[@]} \! -name "*.bz2" -type f \ + -o \! -name "*.gz" -type f 2>/dev/null || true) || true + for file in ${files[@]} ; do + # Track inodes so hard links can be identified and removed + inode=`stat -c %i ${file}` + if [ -z ${manpages[$inode]} ] ; then + manpages[$inode]="$file" + gzip -9 "$file" + else + rm -f "$file" + ln "${manpages[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" + fi + # update any symlinks to this manpage + file="${file##*/}" + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [ "${file}" = "`readlink ${link}`" ] ; then rm -f "$link" "${link}.gz" ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - IFS=$'\n' read -rd '' -a hardlinks < \ - <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \ - 2>/dev/null || true) || true - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done fi - fi + done done fi @@ -1116,7 +1111,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -depth -mindepth 1 -type d -exec rmdir --ignore-fail-on-non-empty '{}' + fi if check_option "upx" "y"; then -- 1.7.2.2

1 0

[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