- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] fix upgrade first prompt for ignored SyncFirst packages
by Richard Pougnet 13 Feb '12

13 Feb '12

Fix bug 26445: Added a logical AND to line 969 checking to see if the package marked as SyncFirst is also selected to be ignored by the user. modified: src/pacman/sync.c Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- src/pacman/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 700bb78..c8902cc 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -966,7 +966,7 @@ int pacman_sync(alpm_list_t *targets) if(packages) { /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */ alpm_list_t *tmp = NULL; - if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { + if((config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) && !config->ignorepkg) { alpm_list_free(tmp); printf(_(":: The following packages should be upgraded first :\n")); list_display(" ", packages); -- 1.7.9

1 0

[pacman-dev] [PATCH] lib/sync: use full delta size as max download size
by Dave Reisner 12 Feb '12

12 Feb '12

The max filesize for a delta download must be the full size of the delta file, not just what's remaining. Fixes FS#28345 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9478829..468438f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -838,7 +838,7 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t alpm_delta_t *delta = dlts->data; if(delta->download_size != 0) { struct dload_payload *payload = build_payload( - handle, delta->delta, delta->download_size, repo->servers); + handle, delta->delta, delta->delta_size, repo->servers); ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } -- 1.7.9

1 0

[pacman-dev] [PATCH] Do not check for ALPM_ERR_PKG_INVALID_ARCH on remove operation
by Allan McRae 11 Feb '12

11 Feb '12

alpm_trans_prepare can not return ALPM_ERR_PKG_INVALID_ARCH on a remove operation so there is no point in checking for it Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/remove.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 96bb537..52d2c7a 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -115,12 +115,6 @@ int pacman_remove(alpm_list_t *targets) pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { - case ALPM_ERR_PKG_INVALID_ARCH: - for(i = data; i; i = alpm_list_next(i)) { - const char *pkg = i->data; - printf(_(":: package %s does not have a valid architecture\n"), pkg); - } - break; case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; -- 1.7.9

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.2, created. v4.0.2
by dan＠archlinux.org 11 Feb '12

11 Feb '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 annotated tag, v4.0.2 has been created at 22217c03bb12a562439f9b7d1a27bea4fe86d079 (tag) tagging e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (commit) replaces v4.0.1 tagged by Dan McGee on Sat Feb 11 15:28:37 2012 -0600 - Log ----------------------------------------------------------------- 4.0.2 maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEUEABECAAYFAk823Y0ACgkQXC5GoPU6du29ZgCSAofE43ZJbJbUrGM+lrHjGKRc wACePacvDP1HgEIS8Kv98KN5RxW1Pjw= =0yup -----END PGP SIGNATURE----- Allan McRae (14): Allow comments after repo section header in pacman.conf Prevent rebuild of man pages when using release tarballs makepkg: simplify source archive generation makepkg: fix missing source file detection makepkg: abort on missing download agent Fix missing [removal] output makepkg: fix error on unnecessary -r makepkg: restrict usage of flags passed to pacman makepkg: workaround for zipman issues Fix rare segfault on package removal makepkg: Fix non-writable SRCPKGDEST error message makepkg: deal with mercurial exit codes makepkg: disable extglob when sourcing BUILDSCRIPT pactree: allow comments after repo section header Andrew Gregory (3): makepkg.sh.in - fix remove_deps test for deps to be removed remove.c: make "target not found" error consistent with sync.c makepkg.sh.in - if both -r and -i are provided, only remove makedeps Dan McGee (31): Miscellaneous post-4.0.1 updates Add two new pactests for pacman upgrade behavior _alpm_ldconfig: return value from _alpm_run_chroot Enforce signature download size limit on -U <url> operations repo-add: enforce maximum .sig file size Use correct size in memset Fix bogus string cast in search debug message Search for PGP subkeys in a keyserver-acceptable way Remove useless logger message Update scripts translation catalog Update translations from Transifex Use fileno() in isatty() call doc/vercmp: add note about pkgrel handling Don't remove unknown files in cache cleaning code Remove unused strtoupper() function Use isdigit() rather than character range comparisons repo-add: clean up help messages Update copyright on changed files since beginning of year Add diskspace checking support for Solaris/Illumos contrib/bash_completion: don't print stderr messages Fix sys/mnttab.h header include Make a few more copyright date tweaks Update pot translation catalogs Update translations Add simple integer-only pow() implementation pactest: check return code in some upgrade tests Update translations from Transifex Translation updates from Transifex, mostly scripts Fix a handful of comment typos or misspellings Final pre-release Transifex updates 4.0.2 release updates Dave Reisner (8): makepkg: avoid using comm for diff'ing package lists makepkg.5: fix typo s/tar,bz2/tar.bz2/ contrib/paccache: silence possible output from cd add new pactest for syncfirst with recursive deps fetch_url: look for files in cache before downloading lib/dload: enforce usage of TCP keepalives lib/dload: give uniform naming to curl CB functions scripts: always use printf with embedded gettext Eric Bélanger (1): pacsysclean: Add new contrib script Lukas Fleischer (1): contrib/paclist: Add "--help" command line parameter Mantas Mikulėnas (1): makepkg: add forgotten newline in help output Olivier Brunel (2): Fix broken output when asking question and stdin is piped util.c, rmrf(): only create string when needed Thomas Dziedzic (1): Fix FS#27924: don't display negative zeroes Timothy Redaelli (1): pacman-key: Add missing quotes canyonknight (4): Fix bash completion for *.pkg.tar Fix zsh completion for *.pkg.tar Turn gpg commands into functions in pacman-key Improve exit statuses and error messages in pacman-key ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-67-ge7bc1e3
by dan＠archlinux.org 11 Feb '12

11 Feb '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, maint has been updated via e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (commit) via f8ae60bc28644fd46810fbab7d5acf143586dfd4 (commit) via 294f0fdf4df361e0d553eb650e1aacdb83f7bdf5 (commit) via 31432edcbe484a5fca01abff77359061ae813fcc (commit) via 9b1ab3d76713d99a11d8da2204557856d59bd3a5 (commit) via ea32924c626b828b3752c021362a6e0e7f79885c (commit) via 594524146906a2dfe1ea334a90f88aec24d8833a (commit) from b7c06d6d678ebe6a434b2387c3bda14647113f32 (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 e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 11 15:24:35 2012 -0600 4.0.2 release updates Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f8ae60bc28644fd46810fbab7d5acf143586dfd4 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 11 15:01:35 2012 -0600 Final pre-release Transifex updates Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 294f0fdf4df361e0d553eb650e1aacdb83f7bdf5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 17:30:23 2012 +1000 pactree: allow comments after repo section header Duplicate the fix in config file parsing from d95c0494. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31432edcbe484a5fca01abff77359061ae813fcc Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 14:15:38 2012 +1000 makepkg: disable extglob when sourcing BUILDSCRIPT PKGBUILDs are advertised as being pure bash so it would be expected that the default bash options are in effect when sourcing it. This inadvertantly "fixes" FS#27780 where enabling extglob causes the bash parser to error on non-valid bash function names like package_libxml++(). Note that these function names are unsupported in bash and could break again even with this "fix" in future bash releases. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9b1ab3d76713d99a11d8da2204557856d59bd3a5 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Feb 10 08:20:13 2012 +1000 makepkg: deal with mercurial exit codes From mercurial-2.1, "hg pull" returns 1 when there are no updates. Catch the return code and either pull the update or return an error as appropriate. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ea32924c626b828b3752c021362a6e0e7f79885c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 6 22:12:11 2012 -0600 Fix a handful of comment typos or misspellings Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 594524146906a2dfe1ea334a90f88aec24d8833a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 6 21:59:12 2012 -0600 Translation updates from Transifex, mostly scripts This is after some manual massaging to fix issues with newlines in some translations of the script catalogs. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 25 ++++ configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/alpm.h | 6 +- lib/libalpm/po/fr.po | 25 ++-- scripts/makepkg.sh.in | 13 ++- scripts/po/ca.po | 90 ++++++------- scripts/po/cs.po | 61 ++------ scripts/po/da.po | 35 ++--- scripts/po/de.po | 98 +++++++------- scripts/po/el.po | 89 +++++------- scripts/po/en_GB.po | 7 +- scripts/po/es.po | 71 +++------- scripts/po/fi.po | 217 +++++++++++++++--------------- scripts/po/fr.po | 179 ++++++++++++------------- scripts/po/hu.po | 93 ++++++------- scripts/po/it.po | 90 +++++------- scripts/po/kk.po | 50 ++----- scripts/po/lt.po | 306 ++++++++++++++++++++--------------------- scripts/po/nb.po | 110 +++++++--------- scripts/po/pacman-scripts.pot | 5 +- scripts/po/pl.po | 58 ++------ scripts/po/pt.po | 104 ++++++-------- scripts/po/pt_BR.po | 115 +++++++--------- scripts/po/ro.po | 91 +++++------- scripts/po/ru.po | 57 ++------ scripts/po/sk.po | 96 ++++++------- scripts/po/sr.po | 61 ++------ scripts/po/sr(a)latin.po | 61 ++------ scripts/po/sv.po | 36 ++---- scripts/po/tr.po | 90 +++++------- scripts/po/uk.po | 65 ++------- scripts/po/zh_CN.po | 92 +++++------- scripts/po/zh_TW.po | 7 +- src/pacman/pacman.c | 10 +- src/pacman/po/fi.po | 34 +++--- src/pacman/po/fr.po | 61 ++++---- src/pacman/po/hu.po | 6 +- src/pacman/po/it.po | 17 +-- src/pacman/util.c | 2 +- src/util/pactree.c | 12 +- 41 files changed, 1136 insertions(+), 1514 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: allow specifying compression options
by Allan McRae 11 Feb '12

11 Feb '12

From: Christian Hesse <mail(a)earthworm.de> Adds the ability to override the commands used to compressing compiled and source packages. This is useful for those wanting to use alternative implementations of the compression tools or non-default compression options. Allan: documented options in man page Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Adjust patch from FS#27430. Sending to list for final comments. doc/makepkg.conf.5.txt | 4 ++++ etc/makepkg.conf.in | 10 ++++++++++ scripts/makepkg.sh.in | 8 ++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index db1e6d5..5970946 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -213,6 +213,10 @@ Options This value is used when querying a package to see who was the builder. It is recommended you change this to your name and email address. +**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", **COMPRESSXZ=**"(xz -c -z -)", **COMPRESSZ=**"(compress -c -f)":: + Sets the command and options used when compressing compiled or source + packages in the named format. + **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index e9152c8..6c87ea4 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -107,6 +107,16 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #GPGKEY="" ######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSZ=(compress -c -f) + + +######################################################################### # EXTENSION DEFAULTS ######################################################################### # diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa98cfa..0fab2a1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1292,10 +1292,10 @@ create_package() { # Disable bsdtar compression and use gzip -n for now. bsdtar -cf - $comp_files * | case "$PKGEXT" in - *tar.gz) gzip -c -f -n ;; - *tar.bz2) bzip2 -c -f ;; - *tar.xz) xz -c -z - ;; - *tar.Z) compress -c -f ;; + *tar.gz) "${COMPRESSGZ[@]:-gzip -c -f -n}" ;; + *tar.bz2) "${COMPRESSBZ2[@]:-bzip2 -c -f}" ;; + *tar.xz) "${COMPRESSXZ[@]:-xz -c -z -}" ;; + *tar.Z) "${COMPRESSZ[@]:-compress -c -f}" ;; *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT"; cat ;; -- 1.7.9

2 3

[pacman-dev] [PATCH] Skip reading sync db detlas files if UseDelta is unset
by Allan McRae 11 Feb '12

11 Feb '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index f162199..a686def 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -511,7 +511,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0 - || strcmp(filename, "deltas") == 0) { + || (strcmp(filename, "deltas") == 0 && db->handle->deltaratio > 0.0) ) { int ret; while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { char *line = buf.line; @@ -585,6 +585,8 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, goto error; } *likely_pkg = pkg; + } else if(strcmp(filename, "deltas") == 0) { + /* skip reading delta files if UseDelta is unset */ } else if(strcmp(filename, "files") == 0) { /* currently do nothing with this file */ } else { -- 1.7.9

1 0

[pacman-dev] [PATCH] pactree: allow comments after repo section header
by Allan McRae 11 Feb '12

11 Feb '12

Duplicate the fix in config file parsing from d95c0494. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/util/pactree.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index a7dab9f..aa02c80 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -168,17 +168,17 @@ static int register_syncs(void) { size_t linelen; char *ptr; + /* ignore whole line and end of line comments */ + if((ptr = strchr(line, '#'))) { + *ptr = '\0'; + } + linelen = strtrim(line); - if(line[0] == '#' || !linelen) { + if(linelen == 0) { continue; } - if((ptr = strchr(line, '#'))) { - *ptr = '\0'; - linelen = strtrim(line); - } - if(line[0] == '[' && line[linelen - 1] == ']') { free(section); section = strndup(&line[1], linelen - 2); -- 1.7.9

1 0

[pacman-dev] [PATCH] Rmove unnecessary defines from src/util/Makefile.am
by Allan McRae 11 Feb '12

11 Feb '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/util/Makefile.am | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e386d95..8e98324 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -2,15 +2,12 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ gpgdir = ${sysconfdir}/pacman.d/gnupg/ -cachedir = ${localstatedir}/cache/pacman/pkg/ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree -DEFS = -DLOCALEDIR=\"@localedir@\" \ - -DCONFFILE=\"$(conffile)\" \ +DEFS = -DCONFFILE=\"$(conffile)\" \ -DDBPATH=\"$(dbpath)\" \ -DGPGDIR=\"$(gpgdir)\" \ - -DCACHEDIR=\"$(cachedir)\" \ @DEFS@ AM_CPPFLAGS = \ -- 1.7.9

1 0

[pacman-dev] [PATCH] testpkg: set gpgdir
by Allan McRae 11 Feb '12

11 Feb '12

Without setting gpgdir, testpkg outputs: warning: Public keyring not found; have you run 'pacman-key --init'? Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that this uses a compile time patch to the GPGDIR. testpkg does this for DBPATH too. It is probably not worth allowing these to be overridden via pacman.conf until we have a config parser function available. src/util/Makefile.am | 2 ++ src/util/testpkg.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 590bb3d..e386d95 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,6 +1,7 @@ # paths set at make time conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ +gpgdir = ${sysconfdir}/pacman.d/gnupg/ cachedir = ${localstatedir}/cache/pacman/pkg/ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree @@ -8,6 +9,7 @@ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ -DDBPATH=\"$(dbpath)\" \ + -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" \ @DEFS@ diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 6385e41..96400a7 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -59,6 +59,9 @@ int main(int argc, char *argv[]) /* let us get log messages from libalpm */ alpm_option_set_logcb(handle, output_cb); + /* set gpgdir to default */ + alpm_option_set_gpgdir(handle, GPGDIR); + if(alpm_pkg_load(handle, argv[1], 1, level, &pkg) == -1 || pkg == NULL) { err = alpm_errno(handle); -- 1.7.9

1 0