- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] PKGBUILD.vim: fix epoch syntax highlighting
by lolilolicon 09 Oct '11

09 Oct '11

--- contrib/PKGBUILD.vim | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 1814c22..4d69e4d 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -220,6 +220,9 @@ hi def link pb_k_pkgrel pbKeywords hi def link pbIllegalPkgdesc Error hi def link pb_k_desc pbKeywords +hi def link pbIllegalEpoch Error +hi def link pb_k_epoch pbKeywords + hi def link pbIllegalUrl Error hi def link pb_k_url pbKeywords -- 1.7.6.4

1 0

[pacman-dev] Tested pacman 4.0.0rc2-1 - the results
by Daniel Nilsson 08 Oct '11

08 Oct '11

Hi. I've tested pacman 4.0.0rc2-1 on a fresh arch netinstall in virtualbox to test the new signature checking. I followed the instructions on this page (the rc2 announcement): http://mailman.archlinux.org/pipermail/arch-dev-public/2011-September/02163… First I did a full system upgrade with: # pacman -Syyu then I installed pacman rc2 with: # pacman -U pacman-4.0.0rc2-1-i686.pkg.tar.gz install finished without errors. Then I did: # pacman-key --init which yielded the following: "gpg: /etc/pacman.d/gnupg/trustdb.gpg: trustdb createdgpg: no ultimately trusted keys foundgpg: Generating pacman keychain master key... Not enough random bytes available. Please do some other work to givethe OS a chance to collect more entropy! (Need 284 more bytes)" I waited for a while but the command never finished. I tried to reboot, ran "pacman-key --init" once again and got the same message as above but with "(Need 282 more bytes)" instead.Waited for a while to see if it would finish but there was no progress. I hope this feedback will help pacman development. Please let me know if I should provide more info. (I've not tested the x86-64 version yet).

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-65-g9168977
by dan＠archlinux.org 06 Oct '11

06 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 9168977b3b33e1aa3f9d130bbd82be4536684171 (commit) via 22abe27bfa4f4e6c3ce3dfc345bb45a1f0666ab8 (commit) via 4928f9edc371a4e4f90f329c9908f00cdbfe5bfb (commit) via 273cc66a8a3173e41b68fd07a0944887a1eb80b9 (commit) via 7e5bbf0387203a078bf901d730f063f10c7c1f2c (commit) via 3f937c8404b54efa34c4774da6d33c352c51aad9 (commit) via 524847145d3977b8eed6203ae280906aaceca28b (commit) from a8ca9b93f8efbbca2311cb0b99d9bd31c1636527 (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 9168977b3b33e1aa3f9d130bbd82be4536684171 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 6 00:39:18 2011 -0500 Update NEWS for 4.0.0 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 22abe27bfa4f4e6c3ce3dfc345bb45a1f0666ab8 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 6 14:14:46 2011 +0800 bacman: use globbing to get local package db path The original code- pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" is problematic in several ways: - $pac_db and $pkg_name should be quoted, obviously. - It assumes pkgver always starts with an integer, while in fact it just can't contain ':' and '-'. Counterexample: the code breaks on lshw B.02.15-1. - It assumes there are no more than one directory matching the pattern. While this should be the case if everything works perfectly, it certainly relies on external conditions. Counterexample: if the local db contains two packages named foo and foo-3g, even if everything else is perfect, the code will match two directories. Don't make assumptions, use what is known. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 4928f9edc371a4e4f90f329c9908f00cdbfe5bfb Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 6 14:14:45 2011 +0800 bacman: add tar.Z package creation support bacman should support whatever makepkg does as PKGEXT. Also remove obsolete $EXT variable. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 273cc66a8a3173e41b68fd07a0944887a1eb80b9 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 6 14:14:44 2011 +0800 bacman: small code cleanup This includes: - Quoting fixes. - Drop deprecated mktemp option -p. - Set extglob nullglob shell options at the top. - Use extended globbing instead of regex to match %HEADER% in pacman db. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 7e5bbf0387203a078bf901d730f063f10c7c1f2c Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 6 14:14:43 2011 +0800 bacman: bashify using [[ ]] and (( )) Another style change. The [[ expression ]] form is particularly cleaner, safer and more powerful than the [ expression ] form. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 3f937c8404b54efa34c4774da6d33c352c51aad9 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 6 14:14:42 2011 +0800 bacman: indent code using TAB As every piece of code in the whole project uses TAB as indentation character, bacman shouldn't be an exception. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 524847145d3977b8eed6203ae280906aaceca28b Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 23:43:21 2011 -0500 Enable CheckSpace by default in default config file This will have to be picked up downstream of course, but addresses FS#25684 now that this is a lot faster in 4.0 than it was in the original 3.5 implementation. Also make curl the first XferCommand listed, as we are moving away from any other download program at this point. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 71 +++++++++++ contrib/bacman.in | 333 ++++++++++++++++++++++++++-------------------------- etc/pacman.conf.in | 6 +- 3 files changed, 241 insertions(+), 169 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] bacman: get local package db path the correct way
by lolilolicon 06 Oct '11

06 Oct '11

Use globbing and store the expansion results in an array. The [epoch:]pkgver part can start without an integer, e.g. lshw is currently at version B.02.15. extglob is just good enough to match pkgname-[epoch:]pkgver-pkgrel. Set nullglob globally. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/bacman.in | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index fe13e5b..b51a4a3 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -23,6 +23,9 @@ readonly progname="bacman" readonly progver="0.2.1" +shopt -s extglob +shopt -s nullglob + # # User Friendliness # @@ -90,8 +93,7 @@ pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" -pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" -pkg_namver="${pkg_dir##*/}" +pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([0-9])) # # Checks everything is in place @@ -101,7 +103,11 @@ if [ ! -d "$pac_db" ] ; then exit 1 fi -if [ ! -d "$pkg_dir" ] ; then +if [ ${#pkg_dir[@]} -gt 1 ]; then + echo "ERROR: ${#pkg_dir[@]} entries for package ${pkg_name} found in pacman database" + printf "%s\n" "${pkg_dir[@]}" + exit 1 +elif [ ${#pkg_dir[@]} -eq 0 -o ! -d "$pkg_dir" ]; then echo "ERROR: package ${pkg_name} not found in pacman database" exit 1 fi @@ -109,6 +115,7 @@ fi # # Begin # +pkg_namver="${pkg_dir##*/}" echo Package: ${pkg_namver} work_dir=$(mktemp -d -p /tmp) cd "$work_dir" || exit 1 @@ -275,9 +282,6 @@ esac pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" ret=0 -# when fileglobbing, we want * in an empty directory to expand to -# the null string rather than itself -shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail bsdtar -cf - $comp_files * | -- 1.7.6.4

3 31

[pacman-dev] [PATCH] Update NEWS for 4.0.0 release
by Dan McGee 06 Oct '11

06 Oct '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- NEWS | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 8d18236..6215951 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,73 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +4.0.0 - well-integrated and powerful signed packages and databases + support in pacman, the library, and scripts (FS#5331) + - over 800 commits to pacman.git since 3.5.4 release + - many code cleanup commits across library/binaries/scripts + - many performance improvement commits across library/binaries + - add new -S --recursive operation to upgrade a full dep chain + - report upgrade size on sync operations (FS#12566) + - early terminal input is flushed before question prompts + - remove duplicate code shared in sync and upgrade operations + - remove ShowSize; replaced with VerbosePkgLists (FS#15772) + - print callback (warning, error) messages to stderr (FS#25099) + - download progress callback has more room for filenames + - fix selection entry for long values (FS#25253) + - make config parsing two-pass process, enhance error messages + - print helpful tips on -Qi <filename> or -S <filename> + - replace libfetch with libcurl for backend download library + - timeout when mirror is not responding (FS#15369) + - full HTTPS protocol support (FS#22435) + - support of non-traditional/redirected URLs (FS#22645) + - ensure downloads are only resumed if appropriate (FS#23803) + - only remove empty directories if no remaining owner (FS#25141) + - better cache directory choosing and honor $TMPDIR (FS#25435) + - replaces are parsed as dependency-style strings (FS#23410) + - split package verification and load stages + - sync database reading refactor for performance + - filelists now have a dedicated type with metadata + - diskspace check no longer requires iterating package archives + - update and add checksum routines from PolarSSL + - validate sync database sha256sum if available + - correctly parse sizes in database > 2GiB + - API: several type renames from pm* to alpm_* prefix + - API: several enum constant renames from PM to ALPM_* prefix + - API: several types are now public exposed structs + - API: handle is no longer a single global variable + - API: more changes than can be mentioned here, see README + - much improved API documentation for use by Doxygen + - pactest: several performance/checking improvements + - scripts: + - refactor some common components into shared bash library + - split translations into pacman-scripts catalog (FS#15148) + - makepkg: + - allow signing packages after creation + - allow verifying source file signatures (FS#20448) + - support UPX compression of executables (FS#17213) + - allow usage of an alternate build directory (FS#22308) + - cleancache option has been removed; use shell instead + - improved variable sanity checking (FS#16004) + - better handling of package extensions (.tar.Z or invalid) + - allow PKGEXT/SRCEXT environment overrides (FS#19860) + - only check for writable PKGDEST if necessary (FS#24735) + - check_software function exits early if missing req'd binaries + - do source packaging in fakeroot (FS#24330) + - be more POSIX-compatible in use of `ln` (FS#24893) + - handle spaces with filenames in noextract (FS#25100) + - repo-add: + - handle and include package signatures in databases + - verify database signature before modification + - sign database after creation/modification + - general script cleanup and bash-ification + - add sha256sums to database (FS#23103) + - pkgdelta: add a manpage + - pacman-key: new keyring management tool for signed data + - pactree: support sync databases with -s option + - pacsort: new utility, sort version numbers as pacman does + - contrib/paclog-pkglist: new, recover from missing local DB + - contrib/paccache: new, pacman cache cleanup script + - documentation: extensive updates to all manpages + - translations: extensive updates, new languages: lt, zh_TW 3.5.4 - fix display of lists on non-TTYs and other output fixes - fix group selection entry for large inputs (FS#24253) - fix divide by zero when downloading zero length files -- 1.7.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-58-ga8ca9b9
by dan＠archlinux.org 06 Oct '11

06 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a8ca9b93f8efbbca2311cb0b99d9bd31c1636527 (commit) via 2df519f80789a67668a6d8718f746d3876b86eeb (commit) via dc7d691b20b1d105fc44ac860efc3afa6e134553 (commit) via 484d5ec624f12220df809b63bba719105eafdb8f (commit) via ab7d2890a47f051a892b05b4d551de0e5c5c8282 (commit) via cf0edb92ba349afad02e6bc1ca79da0cb6a72ea3 (commit) from 94bc64ae1bd6a51d71829a58a2e1972f629d47fb (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 a8ca9b93f8efbbca2311cb0b99d9bd31c1636527 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:39:05 2011 -0500 Update translation message catalogs in prep for 4.0 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2df519f80789a67668a6d8718f746d3876b86eeb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:36:34 2011 -0500 Add a top-level 'update-po' make target This makes the maintainer's life (read: my life) a lot easier when updating translation files to push to Transifex. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dc7d691b20b1d105fc44ac860efc3afa6e134553 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 5 22:30:14 2011 -0500 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 484d5ec624f12220df809b63bba719105eafdb8f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:18:19 2011 -0500 pacman-key: treat foo-trusted as an ownertrust export file This allows it to serve double-duty. In order to allow users to base verification decisions off of both a valid signature and a trusted signature, we need to assign some level of owner trust to the keys we designate as trusted on import. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab7d2890a47f051a892b05b4d551de0e5c5c8282 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 12:41:27 2011 -0500 pacman-key: refine and clarify import/import-trustdb behavior * --import now only imports keys from pubkey.gpg and does not import owner trust; if you want to have both simply run the operations in sequence. * --import-trustdb has been simplified; it will overwrite existing values in the trust database as before, but there is no need to export it first as those values are safe if left untouched. * Fix the manpage referring to a non-existent option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cf0edb92ba349afad02e6bc1ca79da0cb6a72ea3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 4 15:31:17 2011 -0500 Parse '0' as a valid package installed size This was a bad oversight on my part, pointed out by Jakob. Whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 5 + doc/pacman-key.8.txt | 15 +- lib/libalpm/po/ca.po | 18 +- lib/libalpm/po/cs.po | 17 +- lib/libalpm/po/da.po | 14 +- lib/libalpm/po/de.po | 19 +- lib/libalpm/po/el.po | 19 +- lib/libalpm/po/en_GB.po | 18 +- lib/libalpm/po/es.po | 20 +-- lib/libalpm/po/fi.po | 20 +- lib/libalpm/po/fr.po | 24 ++-- lib/libalpm/po/hu.po | 18 +- lib/libalpm/po/it.po | 19 +-- lib/libalpm/po/kk.po | 18 +- lib/libalpm/po/libalpm.pot | 8 +- lib/libalpm/po/lt.po | 19 +- lib/libalpm/po/nb.po | 43 +++--- lib/libalpm/po/pl.po | 16 +- lib/libalpm/po/pt.po | 17 +- lib/libalpm/po/pt_BR.po | 25 ++-- lib/libalpm/po/ro.po | 19 +- lib/libalpm/po/ru.po | 18 +- lib/libalpm/po/sk.po | 17 +- lib/libalpm/po/sr.po | 17 +- lib/libalpm/po/sr(a)latin.po | 17 +- lib/libalpm/po/sv.po | 14 +- lib/libalpm/po/tr.po | 44 +++--- lib/libalpm/po/uk.po | 19 +- lib/libalpm/po/zh_CN.po | 18 +- lib/libalpm/po/zh_TW.po | 20 +- lib/libalpm/util.c | 2 +- scripts/pacman-key.sh.in | 37 +++-- scripts/po/ca.po | 14 +- scripts/po/cs.po | 14 +- scripts/po/da.po | 14 +- scripts/po/de.po | 79 ++------- scripts/po/el.po | 95 ++++------- scripts/po/en_GB.po | 94 ++++------- scripts/po/es.po | 79 ++------- scripts/po/fi.po | 14 +- scripts/po/fr.po | 105 ++++-------- scripts/po/hu.po | 13 +- scripts/po/it.po | 75 ++------- scripts/po/kk.po | 14 +- scripts/po/lt.po | 99 ++++------- scripts/po/nb.po | 314 +++++++++++++++++++--------------- scripts/po/pacman-scripts.pot | 20 ++- scripts/po/pl.po | 14 +- scripts/po/pt.po | 14 +- scripts/po/pt_BR.po | 250 ++++++++++++---------------- scripts/po/ro.po | 76 ++------- scripts/po/ru.po | 13 +- scripts/po/sk.po | 14 +- scripts/po/sr.po | 14 +- scripts/po/sr(a)latin.po | 14 +- scripts/po/sv.po | 14 +- scripts/po/tr.po | 26 +-- scripts/po/uk.po | 376 +++++++++++++++++++++++++---------------- scripts/po/zh_CN.po | 14 +- scripts/po/zh_TW.po | 4 +- src/pacman/po/ca.po | 65 +++----- src/pacman/po/cs.po | 69 +++----- src/pacman/po/da.po | 43 ++--- src/pacman/po/de.po | 78 +++------ src/pacman/po/el.po | 91 +++++------ src/pacman/po/en_GB.po | 102 +++++------- src/pacman/po/es.po | 78 +++------ src/pacman/po/fi.po | 79 ++++----- src/pacman/po/fr.po | 93 +++++------ src/pacman/po/hu.po | 64 +++---- src/pacman/po/it.po | 76 +++------ src/pacman/po/kk.po | 63 +++---- src/pacman/po/lt.po | 95 +++++------ src/pacman/po/nb.po | 153 ++++++++--------- src/pacman/po/pacman.pot | 14 +- src/pacman/po/pl.po | 70 +++----- src/pacman/po/pt.po | 67 +++----- src/pacman/po/pt_BR.po | 230 +++++++++++++------------- src/pacman/po/ro.po | 80 +++------ src/pacman/po/ru.po | 70 ++++----- src/pacman/po/sk.po | 80 ++++------ src/pacman/po/sr.po | 71 ++++----- src/pacman/po/sr(a)latin.po | 71 ++++----- src/pacman/po/sv.po | 47 +++--- src/pacman/po/tr.po | 152 ++++++++--------- src/pacman/po/uk.po | 93 +++++------ src/pacman/po/zh_CN.po | 63 +++---- src/pacman/po/zh_TW.po | 77 ++++----- 88 files changed, 2105 insertions(+), 2729 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Parse '0' as a valid package installed size
by Dan McGee 05 Oct '11

05 Oct '11

This was a bad oversight on my part, pointed out by Jakob. Whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 18d1c36..beefa93 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1089,7 +1089,7 @@ off_t _alpm_strtoofft(const char *line) errno = 0; /* we are trying to parse bare numbers only, no leading anything */ - if(line[0] < '1' || line[0] > '9') { + if(line[0] < '0' || line[0] > '9') { return (off_t)-1; } result = strtoull(line, &end, 10); -- 1.7.7

1 0

[pacman-dev] Examples in the manpages
by Nico Schottelius 04 Oct '11

04 Oct '11

Dear pacman-devs, after a funny replace pacman-with-pacman-git evening, I digged around a bit into makepkg and pacman and noticed there are no examples in the manpages. Is that intented or would you like to/accept patches which add the EXAMPLES section? Cheers, Nico -- New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0 Please resign, if you signed 9885188C or 8D0E27A4. Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...

13 47

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-52-g94bc64a
by dan＠archlinux.org 04 Oct '11

04 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 94bc64ae1bd6a51d71829a58a2e1972f629d47fb (commit) via c4d6688694975c877e6bff3d6147ae23207a0cbe (commit) via b0543440caad87f1f660eefd6ec5f1a07c7763a0 (commit) via 39b0ac43fcbe35897f616a8e202ae9f3bcb1ee5c (commit) via 73139ccb3c47ed1ebb1a62a27deb080b66d92bf4 (commit) from 6bb594802588240405efee0813f7aa1daa9648b3 (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 94bc64ae1bd6a51d71829a58a2e1972f629d47fb Author: lolilolicon <lolilolicon(a)gmail.com> Date: Sat Oct 1 15:31:00 2011 +0800 makepkg: create tar file for bogus PKGEXT If PKGEXT is not one of the recognized tar*'s, create_package() would create an empty package file and fail, since bsdtar on the left side of the pipe returns 141 on SIGPIPE (broken pipe). This patch changes the behavior for an invalid PKGEXT. A warning is printed on stderr, and a tar file is created. Also retire the obsolete $EXT variable. Add the obligatory comment why we don't use bsdtar's compression. Finally, fix mixed-tab-space indentation. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c4d6688694975c877e6bff3d6147ae23207a0cbe Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 30 11:08:49 2011 -0500 Use _alpm_local_db_pkgpath in _cache_changelog_open Another place where we were doing the dirty work by hand. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b0543440caad87f1f660eefd6ec5f1a07c7763a0 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Fri Sep 30 15:32:49 2011 +0800 makepkg: support .tar.Z source packages creation SRCEXT should allow whatever PKGEXT does. Also address an uninitialized use of $ret. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 39b0ac43fcbe35897f616a8e202ae9f3bcb1ee5c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:43:23 2011 -0500 Revamp scriptlet path formation for scriptlets in local database Expose the current static get_pkgpath() function internally to the rest of the library as _alpm_local_db_pkgpath(). This allows use of this convenience function in add.c and remove.c when forming the path to the scriptlet location. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73139ccb3c47ed1ebb1a62a27deb080b66d92bf4 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 03:45:46 2011 -0500 Refactor _alpm_runscriptlet() Add an is_archive parameter to reduce the amount of black magic going on. Rework to use fewer PATH_MAX sized local variables, and simplify some of the logic where appropriate in both this function and in the callers where duplicate calls can be replaced by some conditional parameter code. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 46 +++++++++++++++-------------------------- lib/libalpm/be_local.c | 27 ++++++++++++----------- lib/libalpm/db.h | 1 + lib/libalpm/remove.c | 14 +++++++----- lib/libalpm/trans.c | 53 +++++++++++++++++++++++++++++++---------------- lib/libalpm/trans.h | 4 +- scripts/makepkg.sh.in | 30 +++++++++++--------------- 7 files changed, 90 insertions(+), 85 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: create tar file for bogus PKGEXT
by lolilolicon 02 Oct '11

02 Oct '11

If PKGEXT is not one of the recognized tar*'s, create_package() would create an empty package file and fail, since bsdtar on the left side of the pipe returns 141 on SIGPIPE (broken pipe). This patch changes the behavior for an invalid PKGEXT. A warning is printed on stderr, and a tar file is created. Also retire the obsolete $EXT variable. Also add the obligatory comment why we don't use bsdtar's compression. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc06baa..213ac32 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1256,17 +1256,6 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local EXT - case "$PKGEXT" in - *tar.gz) EXT=${PKGEXT%.gz} ;; - *tar.bz2) EXT=${PKGEXT%.bz2} ;; - *tar.xz) EXT=${PKGEXT%.xz} ;; - *tar.Z) EXT=${PKGEXT%.Z} ;; - *tar) EXT=${PKGEXT} ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$PKGEXT" ; EXT=$PKGEXT ;; - esac - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}" local ret=0 @@ -1279,13 +1268,18 @@ create_package() { shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail + # bsdtar's gzip compression always saves the time stamp, making one + # archive created using the same command line distinct from another. + # 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) cat ;; + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; + *tar) cat ;; + *) warning "$(gettext "'%s' is not a valid archive extension." <&-)" \ + "$PKGEXT" <&- >&2; cat ;; esac > "${pkg_file}" || ret=$? shopt -u nullglob -- 1.7.6.4

3 6