- Pacman-dev - lists.archlinux.org

[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

[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 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 88487da..d85f858 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1038,9 +1038,13 @@ 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 ]; then + # We can only check checksums if we have all files. + download_sources + check_checksums + else + warning "$(gettext "Skipping integrity checks.")" + fi cd "$startdir" msg "$(gettext "Creating source package...")" -- 1.6.4.4

1 1

[pacman-dev] [PATCH 1/5] 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/trans.c | 2 +- lib/libalpm/util.c | 55 ++++++++++++++++++++++++++++++++++++++++---------- lib/libalpm/util.h | 5 +++- 3 files changed, 49 insertions(+), 13 deletions(-) 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..5785497 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,14 +241,36 @@ 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); + 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 pointer to a list of files within the archive to unpack or + * NULL for all + * @return 0 on success, 1 on failure + */ +int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t **list) { int ret = 0; mode_t oldmask; @@ -259,6 +281,10 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) ALPM_LOG_FUNC; + if(list && *list == NULL) { + return(0); + } + if((_archive = archive_read_new()) == NULL) RET_ERR(PM_ERR_LIBARCHIVE, 1); @@ -301,14 +327,18 @@ 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 && *list != NULL) { + char *data = NULL; + *list = alpm_list_remove_str(*list, entryname, &data); + if(data == NULL) { + _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,12 +354,15 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) goto cleanup; } - if(fn) { + if(list && *list == NULL) { break; } } cleanup: + if(list && *list != NULL) { + _alpm_log(PM_LOG_DEBUG, "not all entries were extracted\n"); + } umask(oldmask); archive_read_finish(_archive); if(restore_cwd) { diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index ccf169d..58a8607 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 _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 5

[pacman-dev] [PATCH] [RFC] Only extract new db entries
by Allan McRae 09 Oct '09

09 Oct '09

This is an incomplete patch that I need some help finishing. The idea is to only extract folders for new packages into the package database and then clean up the old directories. This is essentially implementing Xyne's "rebase" script within pacman. So far I have got: 1. Only remove all db entries if using "-Syy" 2. Generate list of directories in db 3. ??? 4. Clean up directories not found in new db. Step 3 needs to check if an directory in the sync db archive is in the current database. If it is not, then extract its files. If it is, then remove it from the list of directories that will be removed in step 4. This is where I am confused on how best to proceed. The archive will be open to read a list of files, so calling _aplm_unpack for a single file would seem a waste. I am not sure how to continue. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_files.c | 60 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 21533ef..5e5a5fa 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -181,6 +181,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) time_t newmtime = 0, lastupdate = 0; const char *dbpath; size_t len; + DIR *dbdir; + struct dirent *ent = NULL; + alpm_list_t *dbdirlist; int ret; @@ -229,36 +232,79 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) return(-1); } else { const char *syncdbpath = _alpm_db_path(db); - /* remove the old dir */ - if(_alpm_rmrf(syncdbpath) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); - RET_ERR(PM_ERR_DB_REMOVE, -1); + + /* remove the old dir if forcing update */ + if(force) { + if(_alpm_rmrf(syncdbpath) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } } - /* Cache needs to be rebuilt */ - _alpm_db_free_pkgcache(db); + /* create list of directories in db */ + dbdir = opendir(syncdbpath); + if (dbdir != NULL) { + while((ent = readdir(dbdir)) != NULL) { + const char *name = ent->d_name + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + /* stat the entry, make sure it's a directory */ + snprintf(path, PATH_MAX, "%s%s", dbpath, name); + if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { + continue; + } + + dbdirlist = _alpm_list_add(dbdirlist, name) + } + } + close(dbdir); /* form the path to the db location */ len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); - /* uncompress the sync database */ + /* TODO - extract new entries from the sync database */ + /* Remove old entries from dbdirlist as we go */ checkdbdir(db); + +/* old code to be replaced ret = _alpm_unpack(dbfilepath, syncdbpath, NULL); if(ret) { free(dbfilepath); RET_ERR(PM_ERR_SYSTEM, -1); } +*/ + unlink(dbfilepath); free(dbfilepath); + /* remove old directories from dbdir */ + for (i = dbdirlist; i; i = i->next) { + const char *name = i->data; + len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; + MALLOC(olddbdir, len, RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(olddbdir, PATH_MAX, "%s/%s", syncdbpath, name); + if(_alpm_rmrf(olddbdir) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), olddbdir); + free(olddbdir); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } + free(olddbdir); + } + FREELIST(dbdirlist); + /* if we have a new mtime, set the DB last update value */ if(newmtime) { _alpm_log(PM_LOG_DEBUG, "sync: new mtime for %s: %ju\n", db->treename, (uintmax_t)newmtime); setlastupdate(db, newmtime); } + + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); } return(0); -- 1.6.4.4

1 0

[pacman-dev] [PATCH] Show 'Required By' in -Si output
by Dan McGee 09 Oct '09

09 Oct '09

Just as we do in -Qi, we can compute required by information for sync database packages. The behavior seems sane; for a given package, the -Si required by will show all packages in *any* sync database that require it. Implements FS#16244. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/package.c | 46 ++++++++++++++++++++++++++++++++++++---------- src/pacman/package.c | 13 ++++--------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index de17166..b0b6480 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -556,6 +556,21 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg) return pkg->scriptlet; } +static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs) +{ + const alpm_list_t *i; + for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { + if(!i->data) { + continue; + } + pmpkg_t *cachepkg = i->data; + if(_alpm_dep_edge(cachepkg, pkg)) { + const char *cachepkgname = alpm_pkg_get_name(cachepkg); + *reqs = alpm_list_add(*reqs, strdup(cachepkgname)); + } + } +} + /** * @brief Compute the packages requiring a given package. * @param pkg a package @@ -565,18 +580,29 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) { const alpm_list_t *i; alpm_list_t *reqs = NULL; + pmdb_t *db; - pmdb_t *localdb = alpm_option_get_localdb(); - for(i = _alpm_db_get_pkgcache(localdb); i; i = i->next) { - if(!i->data) { - continue; - } - pmpkg_t *cachepkg = i->data; - if(_alpm_dep_edge(cachepkg, pkg)) { - const char *cachepkgname = alpm_pkg_get_name(cachepkg); - reqs = alpm_list_add(reqs, strdup(cachepkgname)); + if(pkg->origin == PKG_FROM_FILE) { + /* The sane option; search locally for things that require this. */ + db = alpm_option_get_localdb(); + fprintf(stderr, "db name: %s\n", db->treename); + find_requiredby(pkg, db, &reqs); + } else { + /* We have a DB package. if it is a local package, then we should + * only search the local DB; else search all known sync databases. */ + db = pkg->origin_data.db; + if(db->is_local) { + fprintf(stderr, "db name: %s\n", db->treename); + find_requiredby(pkg, db, &reqs); + } else { + for(i = handle->dbs_sync; i; i = i->next) { + db = i->data; + fprintf(stderr, "db name: %s\n", db->treename); + find_requiredby(pkg, db, &reqs); + } } } + return(reqs); } diff --git a/src/pacman/package.c b/src/pacman/package.c index 3b14516..e7e2552 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -83,10 +83,8 @@ void dump_pkg_full(pmpkg_t *pkg, int level) depstrings = alpm_list_add(depstrings, alpm_dep_compute_string(dep)); } - if(level>0) { - /* compute this here so we don't get a pause in the middle of output */ - requiredby = alpm_pkg_compute_requiredby(pkg); - } + /* compute this here so we don't get a pause in the middle of output */ + requiredby = alpm_pkg_compute_requiredby(pkg); /* actual output */ string_display(_("Name :"), alpm_pkg_get_name(pkg)); @@ -97,11 +95,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), depstrings); list_display_linebreak(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); - /* Only applicable if installed */ - if(level > 0) { - list_display(_("Required By :"), requiredby); - FREELIST(requiredby); - } + list_display(_("Required By :"), requiredby); list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); if(level < 0) { @@ -142,6 +136,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) printf("\n"); FREELIST(depstrings); + FREELIST(requiredby); } /* Display the content of a sync package -- 1.6.4.4

8 11

[pacman-dev] 3.3.2 release soon
by Xavier 08 Oct '09

08 Oct '09

Looks like we are going to need a new bugfix release sooner than expected. Just when 3.3.1 was released, two issues popped up : 1) the repo-add / CSIZE / any / symlink issue : http://code.toofishes.net/cgit/dan/pacman.git/commit/?h=maint&id=20aa17c276… 2) the infinite download issue : http://bugs.archlinux.org/task/16359 That's also an occasion for translators to do a quick update if needed (but there are no modified/new strings). Especially Swedish and Chinese since these two were not fully translated for 3.3.1

4 15