- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-259-g5be7b6a
by allan＠archlinux.org 28 Jan '14

28 Jan '14

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 5be7b6a1b2e197a6d185fc6223ff1e7acc4c3e27 (commit) via d4def1c1936a917afaa337cbd77ddedb018bd3f9 (commit) via 19b3ee6d39d645368ed50d9a1d40a8aba241c102 (commit) via deaed047fd641f5c09148ea759f57ad91f210c55 (commit) via 6fa7e8aff5ec7e1909ec52bb60c032ec4199bc91 (commit) via cd2370754ae6893e6df4e835eeb819f827eaee4a (commit) via 83e14aeebde5edcf98b52b37cc4aa156a4f09608 (commit) via e6464f0cb6c36bf047a1dbdbf5cd313ff4fd2dbf (commit) via 4e9d88aa05184e29368f1602b9fcb6a05d293095 (commit) via e65a752475797eb3e917858190a2679e9cd680b9 (commit) via ffe7f6d16187e3a4b0bd273c212d92aac73d70f0 (commit) via 8a434aeb4616cec416419a216a620038d98024d3 (commit) via 62c76cf82518ce5d8c69ece862108ee6256d863b (commit) via b01c2aefd9212403832743727143143693c8ad63 (commit) via bce495e56f3d5d909bbc2a116cf5776c3621cd89 (commit) via 1d3b17e25124c6c38f994b5bdf1beceaec1f0049 (commit) via 5097b162fc0dee03ce23b22fd58bf7d2bfd2ea5b (commit) via 00b6694068bcf86775089e0c110073fa592794d5 (commit) via 3f34e0936abba7100b245726928f381ec06daeb1 (commit) from 480a9ff82fe6d560c7d6e7b6e5e5ecad30699f12 (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 5be7b6a1b2e197a6d185fc6223ff1e7acc4c3e27 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 15:19:33 2014 -0500 pmtest: use valgrind --child-silent-after-fork Silences false warnings after alpm forks to run install scripts. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d4def1c1936a917afaa337cbd77ddedb018bd3f9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 15:19:32 2014 -0500 pmtest: use --gen-suppression=all with valgrind Let valgrind do the work of writing any suppression rules needed by the test suite. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19b3ee6d39d645368ed50d9a1d40a8aba241c102 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 15:19:31 2014 -0500 pmtest: send valgrind output to var/log/valgrind This will allow us to detect whether valgrind found any errors while still preserving pacman's return code for tests. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit deaed047fd641f5c09148ea759f57ad91f210c55 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 15:19:30 2014 -0500 valgrind.supp: add fakeroot/fakechroot errors Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6fa7e8aff5ec7e1909ec52bb60c032ec4199bc91 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 28 20:30:51 2014 +1000 HACKING: mention tab size and line width Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd2370754ae6893e6df4e835eeb819f827eaee4a Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Jan 23 00:06:11 2014 +0100 Remove ts and sw from vim modeline when noet is set Forcing vim users to view files with a tabstop of 2 seems really unnecessary when noet is set. I find it much easier to read code with ts=4 and I dislike having to override the modeline by hand. Command run: find . -type f -exec sed -i '/vim.* noet/s# ts=2 sw=2##' {} + Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83e14aeebde5edcf98b52b37cc4aa156a4f09608 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Jan 16 17:18:23 2014 -0500 Add missing optdepends to the main list of variables in the split PKGBUILD prototype Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e6464f0cb6c36bf047a1dbdbf5cd313ff4fd2dbf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 13 23:01:42 2014 -0500 pacman.c: free string commandline options Plugs a memory leak when values were passed twice. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4e9d88aa05184e29368f1602b9fcb6a05d293095 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:13 2014 +0100 Rename ALPM_EVENT_OPTDEP_REQUIRED to _OPTDEP_REMOVAL Because this event is triggered when an optdepend for another package is being removed. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e65a752475797eb3e917858190a2679e9cd680b9 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:12 2014 +0100 pacman: Fix delayed warnings/errors sent to stdout not stderr Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ffe7f6d16187e3a4b0bd273c212d92aac73d70f0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 13 23:01:41 2014 -0500 pacman.c: remove unnecessary optarg checks getopt takes care of making sure that options that require a value have one. These checks were only added to silence clang, which no longer complains about optarg being unchecked, and newer options already use optarg unchecked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a434aeb4616cec416419a216a620038d98024d3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 13 23:01:44 2014 -0500 sync_prepare: treat from_sync as a boolean We only care that packages are being installed from a repo, not how many. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62c76cf82518ce5d8c69ece862108ee6256d863b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 13 23:01:45 2014 -0500 base64.c: comment out unused variable Commit e47eb9a7 commented out base64_encode, which left base64_enc_map unused, causing warnings under clang. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b01c2aefd9212403832743727143143693c8ad63 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 13 23:01:46 2014 -0500 package.h: convert scriptlet field to int It's a boolean, so signedness doesn't matter, and the public API already exposes it as an int through alpm_pkg_has_scriptlet(). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bce495e56f3d5d909bbc2a116cf5776c3621cd89 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 10 14:32:38 2014 +1000 Consistently use #ifdef Fix the occurances of #if to be #ifdef for consistency. commit 1d3b17e25124c6c38f994b5bdf1beceaec1f0049 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 21 19:20:44 2013 +1000 Fix build with --disable-gpgme The alpm_decode_signature function was made available for frontends to display signature information, but this required libalpm to be build with gpgme support. As that function did not require anything from gpgme, have it build unconditionally. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5097b162fc0dee03ce23b22fd58bf7d2bfd2ea5b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:07 2014 -0600 Fix compile warnings on systems without getmntent Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 00b6694068bcf86775089e0c110073fa592794d5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jan 9 09:44:18 2014 -0500 Makefile.am: move test-suite.log into test/ Pushing down the testing .gitignore entries in commit e25afaf6 exposed test-suite.log in the root. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f34e0936abba7100b245726928f381ec06daeb1 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:58:25 2014 -0500 create_verbose_row: free malloc'd strings Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 8 +++-- Makefile.am | 3 +- configure.ac | 2 +- contrib/Makefile.am | 2 +- contrib/bacman.sh.in | 2 +- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 2 +- contrib/pacdiff.sh.in | 2 +- contrib/paclist.sh.in | 2 +- contrib/paclog-pkglist.sh.in | 2 +- contrib/pacsysclean.sh.in | 2 +- contrib/rankmirrors.sh.in | 2 +- contrib/updpkgsums.sh.in | 2 +- doc/Makefile.am | 2 +- etc/Makefile.am | 2 +- lib/libalpm/Makefile.am | 8 ++--- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 4 +-- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/base64.c | 2 ++ lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 5 ++- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 4 +-- lib/libalpm/pkghash.c | 2 +- lib/libalpm/rawstr.c | 2 +- lib/libalpm/remove.c | 4 +-- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 68 ++++++++++++++++++++--------------------- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 11 ++++--- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- proto/PKGBUILD-split.proto | 1 + scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/common/Makefile.am | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/Makefile.am | 2 +- src/pacman/callback.c | 9 +++--- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/ini.c | 2 +- src/pacman/ini.h | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 18 ++++------- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 12 ++++---- src/pacman/util.h | 2 +- src/util/Makefile.am | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/Makefile.am | 2 +- test/pacman/pmtest.py | 5 ++- test/pacman/tests/Makefile.am | 2 +- test/scripts/Makefile.am | 2 +- test/util/Makefile.am | 2 +- valgrind.supp | 40 ++++++++++++++++++++++++ 110 files changed, 218 insertions(+), 172 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove ts and sw from vim modeline when noet is set
by Florian Pritz 28 Jan '14

28 Jan '14

Forcing vim users to view files with a tabstop of 2 seems really unnecessary when noet is set. I find it much easier to read code with ts=4 and I dislike having to override the modeline by hand. Command run: find . -type f -exec sed -i '/vim.* noet/s# ts=2 sw=2##' {} + Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- HACKING | 4 ++-- Makefile.am | 2 +- configure.ac | 2 +- contrib/Makefile.am | 2 +- contrib/bacman.sh.in | 2 +- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 2 +- contrib/pacdiff.sh.in | 2 +- contrib/paclist.sh.in | 2 +- contrib/paclog-pkglist.sh.in | 2 +- contrib/pacsysclean.sh.in | 2 +- contrib/rankmirrors.sh.in | 2 +- contrib/updpkgsums.sh.in | 2 +- doc/Makefile.am | 2 +- etc/Makefile.am | 2 +- lib/libalpm/Makefile.am | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/rawstr.c | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/common/Makefile.am | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/Makefile.am | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/ini.c | 2 +- src/pacman/ini.h | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 2 +- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/Makefile.am | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/Makefile.am | 2 +- test/pacman/tests/Makefile.am | 2 +- test/scripts/Makefile.am | 2 +- test/util/Makefile.am | 2 +- 106 files changed, 107 insertions(+), 107 deletions(-) diff --git a/HACKING b/HACKING index 1344644..cc4983f 100644 --- a/HACKING +++ b/HACKING @@ -14,7 +14,7 @@ Coding Style + [source,C] ------------------------------------------- -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ ------------------------------------------- 2. When opening new blocks such as 'while', 'if', or 'for', leave the opening @@ -202,5 +202,5 @@ For example, to run valgrind: valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/Makefile.am b/Makefile.am index 4d5adae..430abfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,4 +59,4 @@ update-po: .PHONY: update-po -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/configure.ac b/configure.ac index cfcc8d1..9f29069 100644 --- a/configure.ac +++ b/configure.ac @@ -556,4 +556,4 @@ ${PACKAGE_NAME}: use git version : ${wantgitver} " -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 99baf95..f6ca3f1 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -107,4 +107,4 @@ rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in zsh_completion: $(srcdir)/zsh_completion.in -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 222b0f8..3284cf4 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -355,4 +355,4 @@ msg "Done." exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..06e1b12 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -48,4 +48,4 @@ pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 7c844bb..039ac8a 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -317,4 +317,4 @@ fi summarize "$pkgcount" "${candidates[@]}" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index cd5160c..42d3515 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -191,4 +191,4 @@ done 3< <(cmd) exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 319dcba..1c10b32 100644 --- a/contrib/paclist.sh.in +++ b/contrib/paclist.sh.in @@ -65,4 +65,4 @@ pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2,$3 }' # exit with pacman's return value, not awk's exit ${PIPESTATUS[0]} -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index aaa7586..5d6f4be 100644 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -96,4 +96,4 @@ END { } }' | sort -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in index 3631921..8f2eea3 100644 --- a/contrib/pacsysclean.sh.in +++ b/contrib/pacsysclean.sh.in @@ -63,4 +63,4 @@ function format_size(size) { printf("%s\t%s\n", format_size($2), $1); }' -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 453ebfb..7b50eb2 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -231,4 +231,4 @@ for line in "${linearray[@]}"; do done finaloutput -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 0f52db4..7e680b8 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -94,4 +94,4 @@ fi ' > "$buildfile" } < "$buildfile" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/doc/Makefile.am b/doc/Makefile.am index cb01255..a7908df 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -175,4 +175,4 @@ install-data-hook: uninstall-hook: $(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8 -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/etc/Makefile.am b/etc/Makefile.am index 7a1b91b..5363f42 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -26,4 +26,4 @@ SED_PROCESS = \ %.conf: %.conf.in Makefile $(SED_PROCESS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 171bc46..62c5d62 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -84,4 +84,4 @@ libalpm_la_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBSSL_LIBS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 214e78e..5f1a953 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -731,4 +731,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index 2e1104f..1ad893e 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -28,4 +28,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle); #endif /* _ALPM_ADD_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 878c38b..86c4ec7 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -155,4 +155,4 @@ enum alpm_caps SYMEXPORT alpm_capabilities(void) | 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e9b0feb..b56bd7e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1359,4 +1359,4 @@ enum alpm_caps alpm_capabilities(void); #endif #endif /* _ALPM_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index a3c73aa..d297a03 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -790,4 +790,4 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, /** @} */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 3f3566b..312e8fc 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -91,4 +91,4 @@ void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size); #endif #endif /* _ALPM_LIST_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 04168c5..ca85d1a 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -93,4 +93,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup) return newbackup; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 765195f..b35880f 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -30,4 +30,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup); #endif /* _ALPM_BACKUP_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2c18a45..b547b00 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1103,4 +1103,4 @@ alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle) return db; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index aaf60fe..149f281 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -612,4 +612,4 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..6a7f92f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -713,4 +713,4 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, return db; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 54ed25e..0cb5b28 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -636,4 +636,4 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, return conflicts; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 983ed39..7c3ea03 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -35,4 +35,4 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict); #endif /* _ALPM_CONFLICT_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 2069a7b..c3815b6 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -707,4 +707,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target) return NULL; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 4bb6ee9..d0ee729 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -108,4 +108,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target); #endif /* _ALPM_DB_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 2da1496..2197d6b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -352,4 +352,4 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta) return newdelta; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 90a170c..b1d0a50 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -32,4 +32,4 @@ off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas, #endif /* _ALPM_DELTA_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e5a0404..de269b7 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -926,4 +926,4 @@ char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep) return str; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index d5ca236..a60175f 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -42,4 +42,4 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); #endif /* _ALPM_DEPS_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index dcab3b0..4c1fb5d 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -491,4 +491,4 @@ finish: return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 4d876d7..f460dc5 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -62,4 +62,4 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, #endif /* _ALPM_DISKSPACE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c74d2ad..a3ddd98 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -749,4 +749,4 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) memset(payload, '\0', sizeof(*payload)); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 6c9f7a7..02b41d4 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -53,4 +53,4 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, #endif /* _ALPM_DLOAD_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 8622180..e1b811f 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -163,4 +163,4 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index e6da681..744970a 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -145,4 +145,4 @@ alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist, sizeof(alpm_file_t), _alpm_files_cmp); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 66501f3..804de47 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -31,4 +31,4 @@ int _alpm_files_cmp(const void *f1, const void *f2); #endif /* _ALPM_FILELIST_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 81ee6fd..9042b57 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -36,4 +36,4 @@ void _alpm_graph_free(void *data) free(graph); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index bf06047..0cf261b 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -37,4 +37,4 @@ void _alpm_graph_free(void *data); #endif /* _ALPM_GRAPH_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 614dbaf..03ac2ce 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -50,4 +50,4 @@ void _alpm_group_free(alpm_group_t *grp) FREE(grp); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index b8cd3e1..3516fd2 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -27,4 +27,4 @@ void _alpm_group_free(alpm_group_t *grp); #endif /* _ALPM_GROUP_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1d661a2..e3a4b6b 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -674,4 +674,4 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 4126e1a..d03ed27 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -116,4 +116,4 @@ alpm_errno_t _alpm_set_directory_option(const char *value, #endif /* _ALPM_HANDLE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h index 1e2e1e8..757f4a4 100644 --- a/lib/libalpm/libarchive-compat.h +++ b/lib/libalpm/libarchive-compat.h @@ -70,4 +70,4 @@ static inline int _alpm_archive_read_support_filter_all(struct archive *archive) #endif /* _LIBARCHIVE_COMPAT_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 271bd00..a13ee72 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -85,4 +85,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ... va_end(args); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index dd60c85..8796a8e 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -29,4 +29,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, #endif /* _ALPM_LOG_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 1294f8e..b2f9b1c 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -773,4 +773,4 @@ int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 07b043c..3a8ebf8 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -151,4 +151,4 @@ int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index acb1a1c..dec449e 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -348,4 +348,4 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name) return NULL; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/rawstr.c b/lib/libalpm/rawstr.c index 86f4280..f3f81f5 100644 --- a/lib/libalpm/rawstr.c +++ b/lib/libalpm/rawstr.c @@ -134,4 +134,4 @@ int _alpm_raw_ncmp(const char *first, const char *second, size_t max) return (raw_toupper(*first) - raw_toupper(*second)); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9417a61..9041bfb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -765,4 +765,4 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index cd53285..f79b383 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -33,4 +33,4 @@ int _alpm_remove_single_package(alpm_handle_t *handle, #endif /* _ALPM_REMOVE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index b594a9b..b436aad 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1070,4 +1070,4 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 42b60b1..9404d74 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -36,4 +36,4 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr); #endif /* _ALPM_SIGNING_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e358585..5aca5df 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1317,4 +1317,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 82ed4be..54459e4 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -29,4 +29,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data); #endif /* _ALPM_SYNC_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index a795a1f..5e90a1c 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -389,4 +389,4 @@ alpm_list_t SYMEXPORT *alpm_trans_get_remove(alpm_handle_t *handle) return handle->trans->remove; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index f8ef045..95dc6b9 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -52,4 +52,4 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, #endif /* _ALPM_TRANS_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 40a5ebd..1bbc768 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1292,4 +1292,4 @@ void _alpm_alloc_fail(size_t size) fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index c12b39b..b566868 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -154,4 +154,4 @@ char *strsep(char **, const char *); #endif /* _ALPM_UTIL_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 59a7a4e..b3bb1a3 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -272,4 +272,4 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8130704..5d69993 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -161,4 +161,4 @@ uninstall-hook: cd $(DESTDIR)$(bindir) && \ $(RM) repo-remove repo-elephant -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 81354df..6404205 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3063,4 +3063,4 @@ install_package exit 0 #E_OK -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 2b39538..a9855d0 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -127,4 +127,4 @@ fi # remove the lock file rm -f "$lockfile" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 30fba10..94b3dda 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -627,4 +627,4 @@ fi exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index d13ce0e..df95501 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -186,4 +186,4 @@ echo exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index cc1f9ac..be49326 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -223,4 +223,4 @@ fi create_xdelta "$@" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index a9a4499..f77dd02 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -739,4 +739,4 @@ else fi exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4950333..ba402b2 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,4 @@ EXTRA_DIST = \ util-common.h util-common.c -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/common/util-common.c b/src/common/util-common.c index e4a9de9..86a57d7 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -107,4 +107,4 @@ char *strndup(const char *s, size_t n) } #endif -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/common/util-common.h b/src/common/util-common.h index 04d4e9d..3ace915 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -29,4 +29,4 @@ char *strndup(const char *s, size_t n); #endif /* _PM_UTIL_COMMON_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index f7272c6..5f10308 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -44,4 +44,4 @@ pacman_SOURCES = \ LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a181fa5..e529ac2 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -783,4 +783,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) } } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index a291fc7..60bfeb9 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -46,4 +46,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); #endif /* _PM_CALLBACK_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/check.c b/src/pacman/check.c index f9166b0..b960938 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -363,4 +363,4 @@ int check_pkg_full(alpm_pkg_t *pkg) return (errors != 0 ? 1 : 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/check.h b/src/pacman/check.h index 9f86a2a..c6b9534 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -27,4 +27,4 @@ int check_pkg_full(alpm_pkg_t *pkg); #endif /* _PM_CHECK_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cf8a417..7111eea 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -953,4 +953,4 @@ int parseconfig(const char *file) return parse_ini(file, _parse_directive, &section); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index c2ed1ca..6adb687 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -209,4 +209,4 @@ int config_set_arch(const char *arch); int parseconfig(const char *file); #endif /* _PM_CONF_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/database.c b/src/pacman/database.c index 44bf3af..471b1a0 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -85,4 +85,4 @@ int pacman_database(alpm_list_t *targets) return retval; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index f3a9035..27a5402 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -54,4 +54,4 @@ int pacman_deptest(alpm_list_t *targets) return 127; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/ini.c b/src/pacman/ini.c index cd7741d..ac4c6e4 100644 --- a/src/pacman/ini.c +++ b/src/pacman/ini.c @@ -214,4 +214,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) return _parse_ini(file, cb, data, &section_name, line, 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/ini.h b/src/pacman/ini.h index 4d403c1..dac4e22 100644 --- a/src/pacman/ini.h +++ b/src/pacman/ini.h @@ -27,4 +27,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data); #endif /* _PM_CONF_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/package.c b/src/pacman/package.c index 52219ff..0689783 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -448,4 +448,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index 65eea87..bc31892 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -33,4 +33,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status); #endif /* _PM_PACKAGE_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index df73bcf..97aeff9 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1223,4 +1223,4 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 7c9c365..094334b 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -40,4 +40,4 @@ int pacman_upgrade(alpm_list_t *targets); #endif /* _PM_PACMAN_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/query.c b/src/pacman/query.c index e62272a..cc9ea41 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -506,4 +506,4 @@ int pacman_query(alpm_list_t *targets) return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 8cf3ebc..b155c19 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -182,4 +182,4 @@ cleanup: return retval; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e9b98fa..357cf26 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -957,4 +957,4 @@ int pacman_sync(alpm_list_t *targets) return sync_trans(targets); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5495ea9..5aacb48 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -119,4 +119,4 @@ int pacman_upgrade(alpm_list_t *targets) return sync_prepare_execute(); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 05135d7..8c2d0c0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1665,4 +1665,4 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..b586994 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -82,4 +82,4 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li #endif /* _PM_UTIL_H */ -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index d539fa2..a007588 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -35,4 +35,4 @@ testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la vercmp_SOURCES = vercmp.c vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm_la-version.lo -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index b13d770..0058f8c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -134,4 +134,4 @@ int main(int argc, char *argv[]) cleanup(0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 687e558..a7426b1 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -458,4 +458,4 @@ int main(int argc, char *argv[]) return 0; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/pactree.c b/src/util/pactree.c index 7813267..0557c77 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -559,4 +559,4 @@ finish: return ret; } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/src/util/testdb.c b/src/util/testdb.c index 3d341b3..e4cf518 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -293,4 +293,4 @@ int main(int argc, char *argv[]) cleanup(errors > 0); } -/* vim: set ts=2 sw=2 noet: */ +/* vim: set noet: */ diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index 55e3c7a..f71333c 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -20,4 +20,4 @@ EXTRA_DIST = \ ldconfig.stub \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 9ab0c77..dba84e3 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -22,4 +22,4 @@ $(CONFTESTS): Makefile $(AM_V_at)chmod a-w $@.tmp $(AM_V_at)mv $@.tmp $@ -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index d525d89..5dca9a4 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/test/util/Makefile.am b/test/util/Makefile.am index 5839f37..0a9f7ea 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ $(check_SCRIPTS) -# vim:set ts=2 sw=2 noet: +# vim:set noet: -- 1.8.5.3

3 2

Re: [pacman-dev] Building pacman
by Andrew DeMaria 28 Jan '14

28 Jan '14

Yes, git pull and git status indicates I am clean and synced with remote. The file looks very strange to me as all it contains is: > [andrew@WhosYourDaddy pacman]$ cat lib/libalpm/util-common.h > ../../src/common/util-common.h[andrew@WhosYourDaddy pacman]$ This is the correct repo right? > [andrew@WhosYourDaddy pacman]$ git remote -vv > origin git://projects.archlinux.org/pacman.git (fetch) > origin git://projects.archlinux.org/pacman.git (push) -- Andrew DeMaria (720) 234-0077

2 4

[pacman-dev] Building pacman
by Andrew DeMaria 28 Jan '14

28 Jan '14

Hi all, In the process of building pacman (./autogen.sh, ./configure, make) I ran into the following error: > In file included from util.h:31:0, > from add.c:42: > util-common.h:1:1: error: expected identifier or '(' before '.' token > ../../src/common/util-common.h > ^ Have I missed something in the build process? Let me know if you need more of the compilation output or any other info. Cheers! Andrew

2 1

[pacman-dev] Fwd: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto
by Allan McRae 24 Jan '14

24 Jan '14

I am proposing we include this PKGBUILD-vcs.proto into pacman (after removing the pointer to the Arch wiki). Comments? Allan -------- Original Message -------- Subject: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto Date: Tue, 8 Oct 2013 16:13:25 +0200 From: Maxime Gauduin <alucryd(a)gmail.com> Reply-To: Arch Linux projects development discussion <arch-projects(a)archlinux.org> To: arch-projects(a)archlinux.org Having separate prototypes for each VCS type is no longer relevant since Pacman 4.1. Having a generic prototype for regular, bzr, git hg and svn packages makes more sense. Left cvs, and darcs protos untouched as they are not yet supported in Pacman. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 64 ---------------------------- prototypes/PKGBUILD-git.proto | 64 ---------------------------- prototypes/PKGBUILD-hg.proto | 65 ---------------------------- prototypes/PKGBUILD-svn.proto | 63 ---------------------------- prototypes/PKGBUILD-vcs.proto | 98 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto create mode 100644 prototypes/PKGBUILD-vcs.proto <snip> diff --git a/prototypes/PKGBUILD-vcs.proto b/prototypes/PKGBUILD-vcs.proto new file mode 100644 index 0000000..805f4ff --- /dev/null +++ b/prototypes/PKGBUILD-vcs.proto @@ -0,0 +1,98 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. +# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines for more +# information on packaging from VCS sources. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +replaces=() +backup=() +options=() +install= +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +noextract=() +md5sums=('SKIP') + +################################################################################ + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +################################################################################ + +pkgver() { + cd "$srcdir/${pkgname%-VCS}" + +# Bazaar + printf "%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/-/./g')" + +# Git, no tags available + printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "%s" "$(svnversion | tr -d 'A-z')" + +# Fallback + printf "%s" "$(date +%Y%m%d)" +} + +prepare() { + cd "$srcdir/${pkgname%-VCS}" + patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" +} + +build() { + cd "$srcdir/${pkgname%-VCS}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/${pkgname%-VCS}" + make -k check +} + +package() { + cd "$srcdir/${pkgname%-VCS}" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- 1.8.4

4 6

[pacman-dev] Orphaning files in the filesystem after unsuccessful pacman -R
by smiszym 22 Jan '14

22 Jan '14

Hello, It seems I found a bug in pacman. Some information first: version: pacman 4.1.2-5 prebuilt from official repo system: Linux 3.12.7-2-ARCH i686 So it happened when I tried to remove alex package. $ sudo pacman -R alex [sudo] password for michael: checking dependencies... Packages (1): alex-3.1.3-1 Total Removed Size: 1.18 MiB :: Do you want to remove these packages? [Y/n] y error: cannot remove file '/usr/': Read-only file system ldconfig: Can't create temporary cache file /etc/ld.so.cache~: Read-only file system error: command failed to execute correctly Uhm... I forgot I have root filesystem mounted read-only. No problem. $ sudo mount / -o remount,rw $ sudo pacman -R alex error: target not found: alex What? How could pacman remove the package from a read-only filesystem? Or maybe... $ sudo pacman -S alex resolving dependencies... looking for inter-conflicts... Packages (1): alex-3.1.3-1 Total Installed Size: 1.18 MiB :: Proceed with installation? [Y/n] y (1/1) checking keys in keyring [###] 100% (1/1) checking package integrity [###] 100% (1/1) loading package files [###] 100% (1/1) checking for file conflicts [###] 100% error: failed to commit transaction (conflicting files) alex: /usr/bin/alex exists in filesystem alex: /usr/share/alex/AlexTemplate exists in filesystem alex: /usr/share/alex/AlexTemplate-debug exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc-debug exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc-nopred exists in filesystem alex: /usr/share/alex/AlexWrapper-basic exists in filesystem alex: /usr/share/alex/AlexWrapper-basic-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-gscan exists in filesystem alex: /usr/share/alex/AlexWrapper-monad exists in filesystem alex: /usr/share/alex/AlexWrapper-monad-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-monadUserState exists in filesystem alex: /usr/share/alex/AlexWrapper-monadUserState-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-posn exists in filesystem alex: /usr/share/alex/AlexWrapper-posn-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-strict-bytestring exists in filesystem alex: /usr/share/licenses/alex/BSD3 exists in filesystem Errors occurred, no packages were upgraded. ...it didn't remove anything of course, but broke the database. Here is the point of the bug report. I repaired things like this: $ sudo pacman -S --force alex resolving dependencies... looking for inter-conflicts... Packages (1): alex-3.1.3-1 Total Installed Size: 1.18 MiB :: Proceed with installation? [Y/n] y (1/1) checking keys in keyring [###] 100% (1/1) checking package integrity [###] 100% (1/1) loading package files [###] 100% (1/1) checking for file conflicts [###] 100% (1/1) checking available disk space[###] 100% (1/1) installing alex [###] 100% $ sudo pacman -R alex checking dependencies... Packages (1): alex-3.1.3-1 Total Removed Size: 1.18 MiB :: Do you want to remove these packages? [Y/n] y (1/1) removing alex [###] 100% but this is all but elegant. The same problem occurred for several other packages, in identical way. I'm very surpised to find bug like that in pacman and still not sure that it isn't just my mistake somewhere. Anyway, please test it. I hope this report will help you. What do you think? Best regards Michał Szymański

3 3

[pacman-dev] [PATCH 2/3] pacsearch with repo-agnostic coloring
by Pierre Neidhardt 18 Jan '14

18 Jan '14

The 6 basic shell colors are stored in an array. An arbitrary hash of the repo name sets which color is used for the output. Added CLI option -n, --nocolor. Currently, "ver", "group" and "installed" are not bold. A single variable can print them bold. Now to_color() takes an array instead of a string. This removes the need for another row of regex substitutions, while making the code shorter and faster. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 113 ++++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 2418e19..d860471 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -1,7 +1,7 @@ #!/usr/bin/perl -# pacsearch - Adds color and install information to a 'pacman -Ss' search +# pacsearch - Perform a pacman search using both the local and the sync databases # -# Copyright (C) 2008-2011 Dan McGee <dan(a)archlinux.org> +# Copyright (C) 2008-2014 Dan McGee <dan(a)archlinux.org> # # Based off original shell script version: # Copyright (C) 2006-2007 Dan McGee <dan(a)archlinux.org> @@ -19,9 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -#TODO: colors flag on commandline -#TODO: for now the whole line is bold and some parts have the same formatting (e.g. extra and version), maybe it would be better to use regular formatting - use strict; use warnings; @@ -31,13 +28,15 @@ my $myver = '@PACKAGE_VERSION@'; sub usage { print "$myname (pacman) v$myver\n\n"; print "Perform a pacman search using both the local and the sync databases.\n\n"; - print "Usage: $myname <pattern>\n\n"; + print "Usage: $myname [-n] <pattern>\n\n"; + print "Options:\n"; + print " -n, --nocolor: turn off coloring\n\n"; print "Example: $myname ^gnome\n"; } sub version { printf "%s %s\n", $myname, $myver; - print "Copyright (C) 2008-2011 Dan McGee <dan\(a)archlinux.org>\n\n"; + print "Copyright (C) 2008-2014 Dan McGee <dan\(a)archlinux.org>\n\n"; print "Based off original shell script version:\n"; print "Copyright (C) 2006-2007 Dan McGee <dan\(a)archlinux.org>\n"; } @@ -56,37 +55,47 @@ if ($ARGV[0] eq "--version" || $ARGV[0] eq "-V") { } # define formatting variables -my $FMT_BLUE = "\e[1;94m"; -my $FMT_CYAN = "\e[1;96m"; -my $FMT_GREEN = "\e[1;92m"; -my $FMT_MAGENTA = "\e[1;95m"; -my $FMT_RED = "\e[1;91m"; -my $FMT_YELLOW = "\e[1;93m"; -my $FMT_BOLD = "\e[1m"; -my $FMT_RESET = "\e[0m"; +my $BLUE = "\e[94m"; +my $CYAN = "\e[96m"; +my $GREEN = "\e[92m"; +my $MAGENTA = "\e[95m"; +my $RED = "\e[91m"; +my $YELLOW = "\e[93m"; +my $BOLD = "\e[1m"; +my $REGULAR = ""; +my $RESET = "\e[0m"; +if ($ARGV[0] eq "--nocolor" || $ARGV[0] eq "-n") { + shift; + $BLUE = ""; + $CYAN = ""; + $GREEN = ""; + $MAGENTA = ""; + $RED = ""; + $YELLOW = ""; + $BOLD = ""; + $REGULAR = ""; + $RESET = ""; +} + +my @COLORS=($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); + +# We can choose if we output repo/pkgname bold or not. Same thing for 'ver group +# installed'. Not sure if it's worth a CLI option. +my $FMT_REPO = $BOLD; +my $FMT_OTHER = $REGULAR; # Color a "repo/pkgname pkgver (goups) [installed]" line. # We try to stick to pacman colors. sub to_color { - my $line = shift; - # get the installed text colored first (between square brackets) - $line =~ s/(\[.*\]$)/$FMT_CYAN$1$FMT_RESET/; - # group (between parentheses) - $line =~ s/($.*$)/$FMT_BLUE$1$FMT_RESET/; - # version (second field) - $line =~ s/^([^ ]+) ([^ ]+) /$1 $FMT_GREEN$2$FMT_RESET /; - # name (word after slash) - $line =~ s/\/([\w-]*)/\/$FMT_BOLD$1$FMT_RESET/; - # repo (word before slash inclusive) - $line =~ s/(^core\/)/$FMT_BLUE$1$FMT_RESET/; - $line =~ s/(^extra\/)/$FMT_GREEN$1$FMT_RESET/; - $line =~ s/(^community\/)/$FMT_MAGENTA$1$FMT_RESET/; - $line =~ s/(^testing\/)/$FMT_CYAN$1$FMT_RESET/; - $line =~ s/(^community-testing\/)/$FMT_RED$1$FMT_RESET/; - $line =~ s/(^multilib\/)/$FMT_YELLOW$1$FMT_RESET/; - $line =~ s/(^local\/)/$FMT_CYAN$1$FMT_RESET/; - # any other unknown repository - $line =~ s/(^[\w-]*\/)/$FMT_YELLOW$1$FMT_RESET/; + my @v = @_; + # Each repo name is hashed to give a unique, persistant color index. The + # hash function (x*2+1) is completely arbitrary. + my $repohash = $v[0]; + $repohash =~ s/(.)/ord($1)*2+1/ge; + my $repo_color=$COLORS[$repohash % 6]; + my $line = "$RESET$FMT_REPO$repo_color$v[0]/$RESET$FMT_REPO$v[1]$RESET $GREEN$FMT_OTHER$v[2]$RESET"; + $line .= " $BLUE$FMT_OTHER$v[3]$RESET" if $v[3] ne ""; + $line .= " $CYAN$FMT_OTHER$v[4]$RESET" if $v[4] ne ""; return $line; } @@ -103,16 +112,17 @@ if ($#syncpkgs >= 0) { # counter var for packages, used here and in the query loop too my $cnt = 0; foreach $_ (@syncpkgs) { - # we grab 4 fields here: repo, name/ver, installed, and desc - my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # we grab the following fields: repo, name, ver, group, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; if(not @pkgfields) { # skip any non-matching line and just print it for the user print $_, "\n"; next; } - # since installed is optional, we should fill it in if necessary - $pkgfields[2] = "" if not defined $pkgfields[2]; - # add a fifth field that indicates original order + # since 'group' and 'installed' are optional, we should fill it in if necessary + $pkgfields[3] = "" if not defined $pkgfields[3]; + $pkgfields[4] = "" if not defined $pkgfields[4]; + # add a last field that indicates original order push (@pkgfields, $cnt++); # add each sync pkg by name/ver to a hash table for quick lookup $allpkgs{$pkgfields[1]} = [ @pkgfields ]; @@ -127,30 +137,31 @@ if ($#querypkgs >= 0) { } foreach $_ (@querypkgs) { - # we grab 4 fields here: repo, name/ver, installed, and desc - my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # we grab the following fields: repo, name, ver, group, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; + # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; - # since installed is optional, we should fill it in if necessary - $pkgfields[2] = "" if not defined $pkgfields[2]; # check if the package was listed in the sync out if (not exists $allpkgs{$pkgfields[1]}) { - $pkgfields[2] = "[installed]"; - # add a fifth field that indicates original order (after sync) + # since 'group' is optional, we should fill it in if necessary + $pkgfields[3] = "" if not defined $pkgfields[3]; + # TODO: localize the "installed" word + $pkgfields[4] = "[installed]"; + # add a last field that indicates original order (after sync) push (@pkgfields, $cnt++); # add our local-only package to the hash $allpkgs{$pkgfields[1]} = [ @pkgfields ]; } } -# sort by original order (the fifth field) and print -foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) { +# sort by original order (the last field) and print +foreach $_ ( sort{ @{$allpkgs{$a}}[6] <=> @{$allpkgs{$b}}[6] } keys %allpkgs) { my @v = @{$allpkgs{$_}}; - my $line = "$v[0]/$v[1] $v[2]"; - $line = to_color($line); - # print colorized "repo/pkgname pkgver" string with possible installed text + my $line = to_color(@v); + # print colorized "repo/pkgname pkgver ..." string with possible installed text print "$line\n"; - print "$v[3]\n"; + print "$v[5]\n"; } #vim: set noet: -- 1.8.5.2

5 10

[pacman-dev] [RFC] Introduce pkgsuffix to PKGBUILD spec
by Dave Reisner 17 Jan '14

17 Jan '14

Hi, I've been parsing a large number of PKGBUILDs recently, and in doing so, learned a lot about how people misuse PKGBUILDs. One case in particular that intrigues me is the core/linux PKGBUILD in Arch[1] which uses code generation to create the package_* functions. This is mainly done for the purposes of making users' lives easier, as they have fewer changes they need to maintain. On the other hand, this makes the PKGBUILD far harder to parse, and perhaps arguably harder to read. I thought about how else this could be solved and came up with the idea of introducing a 'pkgsuffix' variable in the PKGBUILD spec. The name should make it obvious as to what it does -- for any package defined in the PKGBUILD, append $pkgsuffix to the name. I've already written an initial patch for makepkg which ends up being quite simple. Implementation details: The suffix should be as transparent as possible. The only time the full with-suffix names appear is in the final package output (tarball name and .PKGINFO). That means packages (when referenced via the --pkg flag) will still be the non-suffixed name. Source packages are a little trickier. I can imagine cases for including or excluding the suffix in the tarball name, but I went with the exclusion route. Note that the pkgname portion of the source tarball name is somewhat insignificant, as you could have pkgbase=voltron, pkgname=daibazaal, and the source tarball name would be voltron. Appending the suffix is, IMO, equally insigificant since the suffix applies to the output package names, not the pkgbase. Something that surfaced early in testing is a question about dependencies. My patch currently implicitly adds provides and conflicts for the pkgname sans-suffix. I think that there's a lot more cases where this is the right, rather than wrong, thing to do. At the moment, these added dependencies are unversioned. Thoughts? d [1] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=…

3 4

[pacman-dev] [PATCH] checkupdates: Add package download mode with "-d"
by Chris Down 17 Jan '14

17 Jan '14

This new mode, which must be run as root, allows for the precaching of packages which can then subsequently be updated by calling "pacman -Syu" as normal. This can then be integrated with a cron script (for example, checkupdates-cron[0]) for automated, safe downloading of packages alongside getting the list of packages to update, or run manually on the command line to download new packages, but avoid updating the main package database. As a side effect of adding the -d option, argument handling (which was previously not present) is now done using "getopts". This seems like a reasonable way to do it instead of just hacking in a check for "-d" as $1 now, but I'm not particularly averse to either. "getopts" would just allow for better future flexibility in this area. It is possible to do this as another script, say, downloadupdates, but we would encounter pretty heavy code duplication with "checkupdates", so it seems more sensible to do it here. Due to the use of --noconfirm, this has some limitations when we encounter more complex upgrade scenarios, for example when a new package conflict occurs, an upgrade path cannot be correctly/automatically determined, a package was replaced, etc. This is not a major problem -- in the worst case, we just don't get the packages that we wanted downloaded and an error message is displayed to the user. The choice to hide both STDOUT and STDERR of "pacman -Syuw" is potentially up for debate. It makes it more difficult to determine where the problem was if the command fails -- we still display a message saying that that was the case, and set the exit code accordingly, but the actual cause needs to be determined by the user elsewhere. For this reason, "-p" exists to force the package download to output as normal. It seems desirable that "-p" also affects the silence of the database update, but this is also up for discussion if people feel it should not be within the remit of the (( silent )) checks. [0]: https://github.com/cdown/checkupdates-cron --- contrib/checkupdates.sh.in | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..4a74632 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,16 +21,46 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' -if (( $# > 0 )); then +download=0 +silent=1 + +usage() { echo "${myname} (pacman) v${myver}" echo echo "Safely print a list of pending updates" echo echo "Usage: ${myname}" echo + echo "Options:" + echo " -d Download upgradeable packages to pacman package cache." + echo " -p Print pacman output from the database upgrade and package download." + echo echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 -fi +} + +run_silent() { + { + (( silent )) && exec &>/dev/null + "$@" + } +} + + +while getopts ':dp' opt; do + case $opt in + d) + if (( UID )); then + echo "Download mode can only be run as root." >&2 + exit 2 + fi + + download=1 + ;; + p) silent=0 ;; + \?) usage ;; + esac +done if [[ -z $CHECKUPDATES_DB ]]; then CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" @@ -43,9 +73,17 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null -fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null +run_silent fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null +if (( download )); then + if ! run_silent pacman -Suw --noconfirm --dbpath "$CHECKUPDATES_DB"; then + ret=$? + (( silent )) && echo "Failed to download packages." >&2 + exit "$ret" + fi +fi + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.5.3

1 1

[pacman-dev] [PATCH] Change the default makepkg checksum from MD5 to SHA-1
by Jason St. John 17 Jan '14

17 Jan '14

MD5 has been significantly compromised for years; switching to a more secure hash function, such as SHA-1, is long overdue. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I was tempted to switch straight to SHA-256 because SHA-1 has had some theoretical vulnerabilities for years; however, because there are effectively no practical/feasible, real-world attacks on SHA-1, plus the much larger hash size that users like to complain about, I figure that SHA-1 is good enough for now. etc/makepkg.conf.in | 2 +- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 43a6cf2..796aea7 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -81,7 +81,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 -INTEGRITY_CHECK=(md5) +INTEGRITY_CHECK=(sha1) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="@STRIP_BINARIES@" #-- Options to be used when stripping shared libraries. See `man strip' for details. diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f1dd420..e8a3bf1 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("${pkgbase}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.patch") noextract=() -md5sums=() # generate with 'updpkgsums' +sha1sums=() # generate with 'updpkgsums' prepare() { cd "${pkgname}-${pkgver}" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 0eb1c20..de966cf 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.patch") noextract=() -md5sums=() # generate with 'updpkgsums' +sha1sums=() # generate with 'updpkgsums' prepare() { cd "${pkgname}-${pkgver}" -- 1.8.5.3

2 3