- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.1-9-g0f988be
by allan＠archlinux.org 07 May '13

07 May '13

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 0f988beff8794338485352dc1beafbfcdbb20db1 (commit) via a4a7336dff8155cfeb37341d1e9e56092439bae6 (commit) via 35289bc17ebdc08e3870fa70e4342c4af81be7af (commit) via 692633264a5cf1aa3e526522d7daf68d73943f12 (commit) via 34da9d25e4884c3f89092f6295f1ca6070604c7e (commit) via c5716d0e72e47c8cd2ca1a437598eeee54111754 (commit) via 0aa9628560e1ebbb4f4274305504f2f806b67266 (commit) via 9de33488bffffd4bb273f73f98a0ced40ba06f29 (commit) via 91b9ea922ae3db12cbff570718709d4c836c4cbf (commit) via c5a4b35528452855d125cea749fcc4a3a01fca9b (commit) via c1dfdd20109bdd154630df9f9d5465e947aa851e (commit) via 99b8d78bc6ad76a0986614a92db15ee9d76124a8 (commit) via b8c84479712f021735466d9882bf8ebbf1c558e4 (commit) via ee3b70c4a9f3564a6ec4bf9823189e217ab66dc9 (commit) via 769facca22db733f0a70ce6a38062d37fe8d2579 (commit) via 9f9cf95692d9399d1528635a70ce873cd0518449 (commit) via e19091b2bfe53cc1c37f2fc4999c359719637d7c (commit) via 597286eb258f841dfc00f65474138fc6192f0092 (commit) via 695f0e443e18ca5d7b722bdf2c4695cc63c1af54 (commit) via 7e0f528274478e7d3057d71717596fdaa5e5bb79 (commit) via 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 (commit) via b7c994db8b049b87df5ec5d6cada84a36c60c47d (commit) via 3de8f8f1ccf103ae9737299b52407b4ebe51d75a (commit) via 32c91e28952f3b746da7513849a8f3c996aab807 (commit) via 95c68d26ef1fe9ccf7eafc1be4205964255c7f3f (commit) via 0f486adfec6d44f7578e526379078231aa300601 (commit) via 87acfef1669a3d6a185fde8c83535cb57bd3bbc5 (commit) via fa601c41ed356a7d9e05995fa4337203cfaab6ed (commit) via f9280a0523d0c49039a0ad27718701c20d874ec3 (commit) via 0f05bfc340891ed6649168c888bb7c598d7f0d58 (commit) via 7b10519835eadec97487728516b1a712c4b896eb (commit) via b5a7734a7ecdd35f64f33eeed5252423ca005fd2 (commit) from 5caf143faaa64bd76c10c8e35dd0adbfd8619615 (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 0f988beff8794338485352dc1beafbfcdbb20db1 Merge: c5716d0 a4a7336 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 7 12:59:44 2013 +1000 Merge branch 'maint' commit c5716d0e72e47c8cd2ca1a437598eeee54111754 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat May 4 09:37:38 2013 -0400 conflict.c: compare package pointers directly p1 and p2 both come directly from the upgrade list without being copied so they can be compared directly instead of comparing their names. Also fix minor style violation. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9de33488bffffd4bb273f73f98a0ced40ba06f29 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Apr 28 22:42:22 2013 -0400 Add --noprepare option to makepkg This new option disables the prepare function. Useful in combination with -o to get an unpatched copy of the sources for testing purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8c84479712f021735466d9882bf8ebbf1c558e4 Author: Connor Behan <connor.behan(a)gmail.com> Date: Thu Apr 18 01:40:06 2013 -0700 Remove ALPM_QUESTION_LOCAL_NEWER Remove a question that hasn't been used since the 3.0 days. To prevent us from having an ugly enum of questions that is missing a bitmask, this changes the API of the hidden --ask option. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ee3b70c4a9f3564a6ec4bf9823189e217ab66dc9 Author: Connor Behan <connor.behan(a)gmail.com> Date: Wed Apr 17 02:04:04 2013 -0700 Unify front and backend responses for --print When libalpm asks the user a question, there are two possible defaults. One default for pacman (used when the user presses enter without typing and for --noconfirm) and the libalpm default. Currently the libalpm default gets used for the pacman "--print" option. This affects the printing of ignored packages since the defaults differ for "ALPM_QUESTION_INSTALL_IGNOREPKG". Adjust the response of this case when using --print so pacman acts consistently. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f9cf95692d9399d1528635a70ce873cd0518449 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 14 14:32:20 2013 -0400 util.py: replace file() with open() open() is the standard way to open a file in python. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e19091b2bfe53cc1c37f2fc4999c359719637d7c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 14 14:32:19 2013 -0400 pmpkg: default mode 0755 for dirs in sync packages TarInfo objects default to mode 0644 while mkfile in util.py uses 0755 for directories, causing pacman warnings about differing permissions on tests involving package updates. Set the mode on TarInfo directory objects to 0755 unless the test specifies a different mode. Bug referenced in FS#30723. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87acfef1669a3d6a185fde8c83535cb57bd3bbc5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Mar 24 15:09:18 2013 -0400 makepkg: avoid file|grep dependency for CRLF check Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa601c41ed356a7d9e05995fa4337203cfaab6ed Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Apr 2 19:53:43 2013 -0400 makepkg: remove extra ansi color codes All those extra '\e[1;'s were just setting bold redundantly or immediately being cancelled. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 13 +- configure.ac | 4 +- contrib/bash_completion.in | 2 +- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 4 +- contrib/zsh_completion.in | 15 +- doc/index.txt | 1 + doc/makepkg.8.txt | 6 + doc/makepkg.conf.5.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 7 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/conflict.c | 8 +- lib/libalpm/deps.c | 2 +- lib/libalpm/libalpm.pc.in | 2 +- lib/libalpm/po/ar.po | 39 +-- lib/libalpm/po/ca.po | 11 +- lib/libalpm/po/cs.po | 11 +- lib/libalpm/po/da.po | 35 +-- lib/libalpm/po/de.po | 11 +- lib/libalpm/po/el.po | 15 +- lib/libalpm/po/en_GB.po | 4 +- lib/libalpm/po/eo.po | 2 +- lib/libalpm/po/es.po | 13 +- lib/libalpm/po/fa.po | 2 +- lib/libalpm/po/fi.po | 16 +- lib/libalpm/po/fr.po | 109 ++++---- lib/libalpm/po/gl.po | 7 +- lib/libalpm/po/hr.po | 39 +-- lib/libalpm/po/hu.po | 8 +- lib/libalpm/po/id.po | 5 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/ja.po | 12 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/ko.po | 4 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 13 +- lib/libalpm/po/nb.po | 6 +- lib/libalpm/po/nl.po | 256 +++++++++--------- lib/libalpm/po/pl.po | 7 +- lib/libalpm/po/pt.po | 4 +- lib/libalpm/po/pt_BR.po | 43 +-- lib/libalpm/po/ro.po | 13 +- lib/libalpm/po/ru.po | 38 +-- lib/libalpm/po/sk.po | 12 +- lib/libalpm/po/sl.po | 5 +- lib/libalpm/po/sr.po | 32 +-- lib/libalpm/po/sr(a)latin.po | 32 +-- lib/libalpm/po/sv.po | 4 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 11 +- lib/libalpm/po/zh_TW.po | 6 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 6 +- m4/pkg.m4 | 2 +- proto/PKGBUILD-split.proto | 8 +- proto/PKGBUILD.proto | 8 +- scripts/library/README | 2 +- scripts/makepkg.sh.in | 69 +++-- scripts/po/ar.po | 52 ++-- scripts/po/ca.po | 17 +- scripts/po/cs.po | 19 +- scripts/po/da.po | 88 ++++--- scripts/po/de.po | 32 ++- scripts/po/el.po | 22 +- scripts/po/en_GB.po | 15 +- scripts/po/eo.po | 10 +- scripts/po/es.po | 39 ++- scripts/po/fa.po | 10 +- scripts/po/fi.po | 22 +- scripts/po/fr.po | 490 +++++++++++++++++++---------------- scripts/po/gl.po | 10 +- scripts/po/hr.po | 14 +- scripts/po/hu.po | 168 +++++++----- scripts/po/id.po | 13 +- scripts/po/it.po | 14 +- scripts/po/ja.po | 68 ++--- scripts/po/kk.po | 10 +- scripts/po/ko.po | 12 +- scripts/po/lt.po | 23 +- scripts/po/nb.po | 33 ++- scripts/po/nl.po | 10 +- scripts/po/pacman-scripts.pot | 10 +- scripts/po/pl.po | 21 +- scripts/po/pt.po | 16 +- scripts/po/pt_BR.po | 72 ++--- scripts/po/ro.po | 19 +- scripts/po/ru.po | 175 ++++++++----- scripts/po/sk.po | 19 +- scripts/po/sl.po | 15 +- scripts/po/sr.po | 27 +- scripts/po/sr(a)latin.po | 27 +- scripts/po/sv.po | 12 +- scripts/po/tr.po | 16 +- scripts/po/uk.po | 14 +- scripts/po/zh_CN.po | 23 +- scripts/po/zh_TW.po | 10 +- src/pacman/callback.c | 24 +- src/pacman/conf.c | 4 +- src/pacman/pacman.c | 7 +- src/pacman/po/ar.po | 29 ++- src/pacman/po/ca.po | 77 +++--- src/pacman/po/cs.po | 28 +- src/pacman/po/da.po | 64 +++-- src/pacman/po/de.po | 46 ++-- src/pacman/po/el.po | 175 +++++++------ src/pacman/po/en_GB.po | 25 +- src/pacman/po/eo.po | 16 +- src/pacman/po/es.po | 39 +-- src/pacman/po/fa.po | 20 +- src/pacman/po/fi.po | 44 ++-- src/pacman/po/fr.po | 284 ++++++++++---------- src/pacman/po/gl.po | 19 +- src/pacman/po/hr.po | 49 ++-- src/pacman/po/hu.po | 33 ++- src/pacman/po/id.po | 23 +- src/pacman/po/it.po | 24 +- src/pacman/po/ja.po | 75 +++--- src/pacman/po/kk.po | 18 +- src/pacman/po/ko.po | 16 +- src/pacman/po/lt.po | 34 ++- src/pacman/po/nb.po | 25 +- src/pacman/po/nl.po | 14 +- src/pacman/po/pacman.pot | 14 +- src/pacman/po/pl.po | 29 ++- src/pacman/po/pt.po | 37 +-- src/pacman/po/pt_BR.po | 96 +++---- src/pacman/po/ro.po | 31 ++- src/pacman/po/ru.po | 203 +++++++-------- src/pacman/po/sk.po | 31 ++- src/pacman/po/sl.po | 19 +- src/pacman/po/sr.po | 240 +++++++++-------- src/pacman/po/sr(a)latin.po | 259 +++++++++--------- src/pacman/po/sv.po | 20 +- src/pacman/po/tr.po | 30 ++- src/pacman/po/uk.po | 38 +-- src/pacman/po/zh_CN.po | 44 ++-- src/pacman/po/zh_TW.po | 216 +++++++-------- src/pacman/util.c | 21 +- test/pacman/pmpkg.py | 2 + test/pacman/tests/ignore005.py | 2 +- test/pacman/tests/sync140.py | 2 +- test/pacman/tests/sync141.py | 2 +- test/pacman/tests/unresolvable001.py | 2 +- test/pacman/tests/upgrade090.py | 2 +- test/pacman/util.py | 2 +- test/scripts/parseopts_test.sh | 4 +- 148 files changed, 2987 insertions(+), 2264 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.1.1, created. v4.1.1
by allan＠archlinux.org 07 May '13

07 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The annotated tag, v4.1.1 has been created at e6b256e2389bff2bbe59c45ee938c86f99a1c361 (tag) tagging a4a7336dff8155cfeb37341d1e9e56092439bae6 (commit) replaces v4.1.0 tagged by Allan McRae on Tue May 7 12:57:08 2013 +1000 - Log ----------------------------------------------------------------- That was not too broken... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRiG2EAAoJEPmf/g/q6Zm9F34H/RBfUohK59nhXC8XFupppaM7 cQiXqJJXjZ/bgCfPHmmsP3yg8obvRROpV3hazUHBs4Z+7dYw48ZcVZRbY/aJRdKX lGq+0QXwmb2CGZHOZOl+8PrM4Iq1yHzjTNa1Y5qJehGi1dQ7I6VgIJSlA6nsw/oo tzZh/TW6LTcqU6fOi/ERp+Dg7WTGHx/guFvFoP1/wCjcj4VPAUPmvTZMfN41u5F5 GSlbym+kDd1OPtU2ZTmsKMmRfgFNgaHnPv2QRXe9dpCf9aOYgL6tfB0IXxEKLRwl VR/PGNEscUOmndCQYd+lFe/eosvCZAzu7vy3t5R8/MCHluBTIYCju50S6xfSAWA= =LnuB -----END PGP SIGNATURE----- Allan McRae (8): contrib/checkupdates: do not log Rework callback message to add translation Do not use checkout directory for SVN config makepkg: fix svn repo extraction Use libalpm version in pkg-config file Pull translation updates from transifex More translation updates 4.1.1 release NEWS, version bumps, etc. Anatol Pomozov (1): Fix spelling errors using 'codespell' tool Andrew Gregory (4): use off_t for table_row_t.size pacman: add -Qkk to usage() help pacman/util.c: fix output flushing in questions pacman/util.c: add missing braces Daniel Wallace (1): zsh completion: make sure -Ss works Dave Reisner (2): paccache: avoid subshell in calling runcmd makepkg: avoid redirecting stdout Eric Bélanger (2): Add prepare function to PKGBUILD proto files Add -V/--version option to makepkg's usage function and man page Maxime Gauduin (1): Add support for all bzr URLs in the PKGBUILD source array Simon Gomizelj (1): ctypes.h shouldn't be included twice William Giokas (3): doc: fix debug spelling mistake contrib: Use sysconfdir instead of /etc makepkg: don't run remove_deps twice when unneeded ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.0-23-ga4a7336
by allan＠archlinux.org 07 May '13

07 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via a4a7336dff8155cfeb37341d1e9e56092439bae6 (commit) via 35289bc17ebdc08e3870fa70e4342c4af81be7af (commit) via 692633264a5cf1aa3e526522d7daf68d73943f12 (commit) via 34da9d25e4884c3f89092f6295f1ca6070604c7e (commit) from 0aa9628560e1ebbb4f4274305504f2f806b67266 (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 a4a7336dff8155cfeb37341d1e9e56092439bae6 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 7 11:55:44 2013 +1000 4.1.1 release NEWS, version bumps, etc. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 35289bc17ebdc08e3870fa70e4342c4af81be7af Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 7 11:39:01 2013 +1000 More translation updates Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 692633264a5cf1aa3e526522d7daf68d73943f12 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat May 4 09:36:02 2013 -0400 pacman/util.c: add missing braces Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 34da9d25e4884c3f89092f6295f1ca6070604c7e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat May 4 09:39:28 2013 -0400 pacman/util.c: fix output flushing in questions Flush stream before taking input in select_question() and only flush once during question(). Also fix some tabs inside related fprintf statements. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 11 ++ configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/po/ar.po | 2 + lib/libalpm/po/ca.po | 1 + lib/libalpm/po/cs.po | 1 + lib/libalpm/po/da.po | 31 +++--- lib/libalpm/po/de.po | 3 +- lib/libalpm/po/el.po | 1 + lib/libalpm/po/es.po | 1 + lib/libalpm/po/fi.po | 2 +- lib/libalpm/po/fr.po | 1 + lib/libalpm/po/gl.po | 1 + lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/id.po | 1 + lib/libalpm/po/ko.po | 4 +- lib/libalpm/po/lt.po | 1 + lib/libalpm/po/nl.po | 252 +++++++++++++++++++++++---------------------- lib/libalpm/po/pl.po | 1 + lib/libalpm/po/pt_BR.po | 33 +++--- lib/libalpm/po/ro.po | 1 + lib/libalpm/po/ru.po | 3 +- lib/libalpm/po/sk.po | 2 + lib/libalpm/po/sl.po | 1 + lib/libalpm/po/sr.po | 28 ++--- lib/libalpm/po/sr(a)latin.po | 28 ++--- lib/libalpm/po/zh_CN.po | 1 + scripts/po/ar.po | 29 +++--- scripts/po/ca.po | 12 +-- scripts/po/cs.po | 6 +- scripts/po/da.po | 79 +++++++------- scripts/po/de.po | 13 ++- scripts/po/el.po | 11 +- scripts/po/en_GB.po | 8 +- scripts/po/eo.po | 2 +- scripts/po/es.po | 9 +- scripts/po/fa.po | 2 +- scripts/po/fi.po | 9 +- scripts/po/fr.po | 12 ++- scripts/po/gl.po | 2 +- scripts/po/hr.po | 7 +- scripts/po/hu.po | 9 +- scripts/po/id.po | 8 +- scripts/po/it.po | 7 +- scripts/po/ja.po | 7 +- scripts/po/kk.po | 2 +- scripts/po/ko.po | 2 +- scripts/po/lt.po | 8 +- scripts/po/nb.po | 22 ++-- scripts/po/nl.po | 2 +- scripts/po/pl.po | 5 +- scripts/po/pt.po | 5 +- scripts/po/pt_BR.po | 63 ++++++------ scripts/po/ro.po | 8 +- scripts/po/ru.po | 9 +- scripts/po/sk.po | 12 +-- scripts/po/sl.po | 3 +- scripts/po/sr.po | 20 ++-- scripts/po/sr(a)latin.po | 20 ++-- scripts/po/sv.po | 2 +- scripts/po/tr.po | 9 +- scripts/po/uk.po | 7 +- scripts/po/zh_CN.po | 10 +- scripts/po/zh_TW.po | 2 +- src/pacman/po/ar.po | 13 +-- src/pacman/po/ca.po | 27 ++--- src/pacman/po/cs.po | 8 +- src/pacman/po/da.po | 54 +++++----- src/pacman/po/de.po | 24 +++-- src/pacman/po/el.po | 151 ++++++++++++++------------- src/pacman/po/en_GB.po | 17 ++- src/pacman/po/eo.po | 2 +- src/pacman/po/es.po | 19 ++-- src/pacman/po/fa.po | 2 +- src/pacman/po/fi.po | 18 ++-- src/pacman/po/fr.po | 17 +-- src/pacman/po/gl.po | 7 +- src/pacman/po/hr.po | 5 +- src/pacman/po/hu.po | 22 ++-- src/pacman/po/id.po | 17 +-- src/pacman/po/it.po | 16 +-- src/pacman/po/ja.po | 15 +-- src/pacman/po/kk.po | 6 +- src/pacman/po/ko.po | 4 +- src/pacman/po/lt.po | 18 ++-- src/pacman/po/nb.po | 17 +-- src/pacman/po/nl.po | 2 +- src/pacman/po/pl.po | 15 ++- src/pacman/po/pt.po | 19 ++-- src/pacman/po/pt_BR.po | 80 +++++++------- src/pacman/po/ro.po | 17 ++- src/pacman/po/ru.po | 19 ++-- src/pacman/po/sk.po | 19 ++-- src/pacman/po/sl.po | 7 +- src/pacman/po/sr.po | 228 +++++++++++++++++++++------------------- src/pacman/po/sr(a)latin.po | 247 +++++++++++++++++++++++--------------------- src/pacman/po/sv.po | 6 +- src/pacman/po/tr.po | 20 ++-- src/pacman/po/uk.po | 28 +++-- src/pacman/po/zh_CN.po | 18 ++-- src/pacman/po/zh_TW.po | 200 +++++++++++++++++------------------ src/pacman/util.c | 9 +- 102 files changed, 1195 insertions(+), 1079 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] conflict.c: compare package pointers directly
by Andrew Gregory 04 May '13

04 May '13

p1 and p2 both come directly from the upgrade list without being copied so they can be compared directly instead of comparing their names. Also fix minor style violation. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 18e29a8..465f8b8 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -556,11 +556,11 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* Look at all the targets to see if file has changed hands */ for(k = upgrade; k && !resolved_conflict; k = k->next) { - alpm_pkg_t *p2 = k->data; - if(!p2 || strcmp(p1->name, p2->name) == 0) { + alpm_pkg_t *localp2, *p2 = k->data; + if(!p2 || p1 == p2) { continue; } - alpm_pkg_t *localp2 = _alpm_db_get_pkgfromcache(handle->db_local, p2->name); + localp2 = _alpm_db_get_pkgfromcache(handle->db_local, p2->name); /* localp2->files will be removed (target conflicts are handled by CHECK 1) */ _alpm_filelist_resolve(handle, alpm_pkg_get_files(localp2)); -- 1.8.2.2

3 3

[pacman-dev] [PATCH] pacman/util.c: flush output once for questions
by Andrew Gregory 04 May '13

04 May '13

Convert a couple random tabs inside fprintf to spaces. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..7b7dace 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1384,15 +1384,15 @@ int multiselect_question(char *array, int count) *lastchar = 1; while(1) { memset(array, 1, count); fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); - fprintf(stream, ": "); + fprintf(stream, ": "); fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; } @@ -1448,15 +1448,16 @@ int select_question(int count) /* Use stderr so questions are always displayed when redirecting output */ stream = stderr; } while(1) { fprintf(stream, "\n"); fprintf(stream, _("Enter a number (default=%d)"), preset); - fprintf(stream, ": "); + fprintf(stream, ": "); + fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; } flush_term_input(fileno(stdin)); @@ -1509,15 +1510,14 @@ static int question(short preset, const char *format, va_list args) fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); return preset; } - fflush(stream); flush_term_input(fd_in); if(fgets(response, sizeof(response), stdin)) { size_t len = strtrim(response); if(len == 0) { return preset; } -- 1.8.2

2 3

[pacman-dev] [PATCH] pacman/util.c: add missing braces
by Andrew Gregory 04 May '13

04 May '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 8234120..66765b1 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -847,8 +847,9 @@ static void display_transaction_sizes(alpm_list_t *table) struct table_row_t *row = i->data; int len = string_length(row->label); - if(len > max_len) + if(len > max_len) { max_len = len; + } } max_len += 2; -- 1.8.2.2

1 0

[pacman-dev] [RFC] [PATCH] Add makepkg-template
by Florian Pritz 02 May '13

02 May '13

This allows for somewhat easy templating for PKGBUILDs. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Andrew reviewed most of the perl script already, I just got rid of a dependency on File::Slurp afterwards. doc/.gitignore | 1 + doc/Makefile.am | 4 ++ doc/makepkg-template.1.txt | 89 +++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Makefile.am | 7 ++ scripts/makepkg-template.pl.in | 160 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 262 insertions(+) create mode 100644 doc/makepkg-template.1.txt create mode 100755 scripts/makepkg-template.pl.in diff --git a/doc/.gitignore b/doc/.gitignore index a96ddb3..ad496ce 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,6 +1,7 @@ PKGBUILD.5 libalpm.3 makepkg.8 +makepkg-template.1 makepkg.conf.5 pacman.8 pacman-key.8 diff --git a/doc/Makefile.am b/doc/Makefile.am index bcb05b7..cb01255 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,6 +6,7 @@ ASCIIDOC_MANS = \ pacman.8 \ makepkg.8 \ + makepkg-template.1 \ repo-add.8 \ vercmp.8 \ pkgdelta.8 \ @@ -21,6 +22,7 @@ DOXYGEN_MANS = $(wildcard man3/*.3) HTML_MANPAGES = \ pacman.8.html \ makepkg.8.html \ + makepkg-template.1.html \ repo-add.8.html \ vercmp.8.html \ pkgdelta.8.html \ @@ -46,6 +48,7 @@ EXTRA_DIST = \ asciidoc-override.css \ pacman.8.txt \ makepkg.8.txt \ + makepkg-template.1.txt \ repo-add.8.txt \ vercmp.8.txt \ pkgdelta.8.txt \ @@ -147,6 +150,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am # Dependency rules pacman.8 pacman.8.html: pacman.8.txt makepkg.8 makepkg.8.html: makepkg.8.txt +makepkg-template.1 makepkg-template.1.html: makepkg-template.1.txt repo-add.8 repo-add.8.html: repo-add.8.txt vercmp.8 vercmp.8.html: vercmp.8.txt pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt new file mode 100644 index 0000000..cea470a --- /dev/null +++ b/doc/makepkg-template.1.txt @@ -0,0 +1,89 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +makepkg-template(1) +=================== + +Name +---- +makepkg-template - package build templating utility + + +Synopsis +-------- +'makepkg-template' [options] + + +Description +----------- +'makepkg-template' is a script to ease the work of maintaining multiple similar PKGBUILDs. +It allows you to move most of the code from the PKGBUILD into a template file and uses +markers to allow in-place updating of existing PKGBUILDs if the template has been changed. + +Markers are bash comments in the form of: + + # template (start|end); key=value; key2=value2 + +and + + # template end; + +Currently used keys are: name (mandatory), version + +For initial creation there is a shortcut: + + %% template input; key=value; + +If the version is not set, 'makepkg-template' will automatically use the most +recent version of the template, otherwise the specified version will be used +allowing for easier verification of untrused PKGBUILDs if the template is trusted. + +Template files may also contain markers leading to nested templates in the +resulting PKGBUILD. + +Template files should be stored in one directory and filenames should be +"$template_name.$version.template" with a symlink "$template_name.template" +pointing to the most recent template. + +Options +------- + +*-p, \--input* <buildscript>:: + Read the package script `buildscript` instead of the `PKGBUILD` default. + +*-o, \--output* <buildscript>:: + Write the updated file to `buildscript` instead of overwriting the input file. + +*-n, \--newest*:: + Always use the newest available template file. + +*\--template-dir* <dir>:: + Change the dir where we are looking for template files. + +Example PKGBUILD +---------------- + + pkgname=foo-bar + # template start; name=foo-module; version=1.2.3 + _srcdir="$pkgname-$pkgver" + + build() { + cd "$_srcdir" + ./configure + make + } + # template start; name=package-simple; version=1.0 + package() + cd "$_srcdir" + make DESTDIR="$pkgdir" install + } + # template end; + # template end; + + + +See Also +-------- +linkman:makepkg[8], linkman:PKGBUILD[5] + +include::footer.txt[] diff --git a/scripts/.gitignore b/scripts/.gitignore index 9e403bf..26e088b 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,4 +1,5 @@ makepkg +makepkg-template pacman-db-upgrade pacman-key pacman-optimize diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 784b180..bc5d588 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = po bin_SCRIPTS = \ $(OURSCRIPTS) \ + makepkg-template \ repo-remove \ repo-elephant @@ -18,6 +19,7 @@ OURSCRIPTS = \ EXTRA_DIST = \ makepkg.sh.in \ + makepkg-template.pl.in \ pacman-db-upgrade.sh.in \ pacman-key.sh.in \ pacman-optimize.sh.in \ @@ -76,6 +78,11 @@ makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/library/parseopts.sh +makepkg-template: \ + $(srcdir)/makepkg-template.pl.in + $(AM_V_at)$(RM) -f makepkg-template + $(AM_V_at)cp $< $@ + pacman-db-upgrade: \ $(srcdir)/pacman-db-upgrade.sh.in \ $(srcdir)/library/output_format.sh diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in new file mode 100755 index 0000000..d03fd33 --- /dev/null +++ b/scripts/makepkg-template.pl.in @@ -0,0 +1,160 @@ +#!/usr/bin/perl +use warnings; +use strict; +use v5.14; +use Cwd qw(abs_path); +use File::Spec; +use Getopt::Long; +use Pod::Usage; + +my %opts = ( + input => 'PKGBUILD', + template_dir => '/usr/share/makepkg-template', +); + +sub burp { + my ($file_name) = shift; + open (my $fh, ">", $file_name) || die "can't create $file_name $!" ; + print $fh @_; +} + +# read a template marker line and parse values into a hash +# format is "(#|%%) template (start|input|end); key=value; key2=value2; ..." +sub parse_template_line { + my ($line, $filename, $linenumber) = @_; + my %values; + + my @elements = split(/;\s?/, $line); + + foreach my $element (@elements) { + given($element) { + when (/^(?:#|%%) template (.*)$/) { + $values{template} = $1; + } + when (/^([a-z0-9_]+)=(.*);?$/) { + $values{$1} = $2; + } + } + } + + if (!$values{name}) { + die "invalid template line: can't find template name", + "$filename:$linenumber: $line"; + } + + return \%values; +} + +# load a template, process possibly existing markers (nested templates) +sub load_template { + my ($values) = @_; + + my $ret = ""; + + my $path; + if (!$opts{newest} and $values->{version}) { + $path = "$opts{template_dir}/$values->{name}.$values->{version}.template"; + } else { + $path = "$opts{template_dir}/$values->{name}.template"; + } + + # resolve symlink(s) and use the real file's basename for version detection + my $basename = (File::Spec->splitpath(abs_path($path)))[2]; + my ($version) = ($basename =~ /^[^\.]+\.([0-9\.]+)\.template$/); + + my $parsed = process_file($path); + + $ret .= "# template start; name=$values->{name}; version=$version;\n"; + $ret .= $parsed; + $ret .= "# template end;\n"; + return $ret; +} + +# process input file and load templates for all markers found +sub process_file { + my ($filename) = @_; + + my $ret = ""; + my $in_block = 0; + my $linenumber = 0; + + open FH, "<", $filename or die "failed to open '$filename': $!"; + my @lines = <FH>; + close FH; + + foreach my $line (@lines) { + my $add_line = 1; + $linenumber++; + + # special marker to insert a template for the first time + # start with %% in order to create an invalid bash script until replaced + if ($line =~ /^%% template input/) { + my $values = parse_template_line($line, $filename, $linenumber); + $ret .= load_template($values); + $add_line = 0; + } + + if ($line =~ /^# template ([^;]+);?/) { + given ($1) { + # marker followed by code from the template and an end + when ('start') { + my $values = parse_template_line($line, $filename, $linenumber); + + # only process the first template level here + # load_template calls us again if templates are nested + if ($in_block == 0) { + $ret .= load_template($values); + } + $in_block++; + } + + when ('end') { + $in_block--; + $add_line = 0; + } + + default { + die "Unknown template marker '$1'", + "$filename:$linenumber: $line"; + } + } + } + + if ($in_block > 0) { + $add_line = 0; + } + + $ret .= "$line" if $add_line; + } + return $ret; +} + +Getopt::Long::Configure ("bundling"); +GetOptions( + "help" => sub {pod2usage(-exitval => 0, -verbose => 1); }, + "h" => sub {pod2usage(-exitval => 0, -verbose => 0); }, + "input|p=s" => \$opts{input}, + "output|o=s" => \$opts{output}, + "newest|n" => \$opts{newest}, + "template-dir=s" => \$opts{template_dir}, +) or pod2usage(1); + +$opts{output} = $opts{input} unless $opts{output}; + +my $output = process_file($opts{input}); + +burp($opts{output}, $output); + +__END__ +=head1 SYNOPSIS + +makepkg-template [options] + + Options: + --input, -p <file> PKGBUILD to read (default: ./PKGBUILD) + --output, -o <file> file to output to (default: input file) + --newest, -n update templates to newest possible version + (default: use specified version in the template markers) + --template-dir <dir> dir to search for templates (default: /usr/share/makepkg-template) + +=cut -- 1.8.2.2

3 5

[pacman-dev] [PATCH] makepkg: fix --verifysource (FS#35057)
by William Giokas 02 May '13

02 May '13

This should fix both the `use -f to override` and the dependency checking. Signed-off-by: William Giokas <1007380(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index edfca3c..9159b2c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2836,7 +2836,7 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; fi fi -if (( ! PKGVERFUNC )); then +if (( ! PKGVERFUNC && ! VERIFYSOURCE )); then check_build_status fi @@ -2915,7 +2915,7 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( VERIFYSOURCE || NODEPS || (NOBUILD && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" -- 1.8.3.rc0.33.gde0977d

3 7

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.0-19-g0aa9628
by allan＠archlinux.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 0aa9628560e1ebbb4f4274305504f2f806b67266 (commit) via 91b9ea922ae3db12cbff570718709d4c836c4cbf (commit) via c5a4b35528452855d125cea749fcc4a3a01fca9b (commit) via c1dfdd20109bdd154630df9f9d5465e947aa851e (commit) via 99b8d78bc6ad76a0986614a92db15ee9d76124a8 (commit) via 769facca22db733f0a70ce6a38062d37fe8d2579 (commit) from 597286eb258f841dfc00f65474138fc6192f0092 (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 0aa9628560e1ebbb4f4274305504f2f806b67266 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Apr 30 21:18:42 2013 +1000 Pull translation updates from transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91b9ea922ae3db12cbff570718709d4c836c4cbf Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Apr 28 21:49:01 2013 -0400 Add -V/--version option to makepkg's usage function and man page Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c5a4b35528452855d125cea749fcc4a3a01fca9b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Apr 26 20:32:37 2013 -0400 makepkg: avoid redirecting stdout If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1dfdd20109bdd154630df9f9d5465e947aa851e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 26 12:42:36 2013 +1000 Use libalpm version in pkg-config file We currently use the pacman version number in the libalpm.pc file. It makes more sense to use the libalpm version. Fixes FS#34967. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 99b8d78bc6ad76a0986614a92db15ee9d76124a8 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Tue Apr 23 02:14:29 2013 -0400 Add prepare function to PKGBUILD proto files Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 769facca22db733f0a70ce6a38062d37fe8d2579 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Sun Apr 14 19:33:46 2013 -0700 Fix spelling errors using 'codespell' tool Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- doc/makepkg.8.txt | 3 + lib/libalpm/add.c | 2 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/deps.c | 2 +- lib/libalpm/libalpm.pc.in | 2 +- lib/libalpm/po/ar.po | 37 ++-- lib/libalpm/po/ca.po | 10 +- lib/libalpm/po/cs.po | 10 +- lib/libalpm/po/da.po | 6 +- lib/libalpm/po/de.po | 8 +- lib/libalpm/po/el.po | 14 +- lib/libalpm/po/en_GB.po | 4 +- lib/libalpm/po/eo.po | 2 +- lib/libalpm/po/es.po | 12 +- lib/libalpm/po/fa.po | 2 +- lib/libalpm/po/fi.po | 16 +- lib/libalpm/po/fr.po | 108 ++++----- lib/libalpm/po/gl.po | 6 +- lib/libalpm/po/hr.po | 39 ++-- lib/libalpm/po/hu.po | 8 +- lib/libalpm/po/id.po | 4 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/ja.po | 12 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/ko.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 12 +- lib/libalpm/po/nb.po | 6 +- lib/libalpm/po/nl.po | 4 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt.po | 4 +- lib/libalpm/po/pt_BR.po | 12 +- lib/libalpm/po/ro.po | 12 +- lib/libalpm/po/ru.po | 37 ++-- lib/libalpm/po/sk.po | 10 +- lib/libalpm/po/sl.po | 4 +- lib/libalpm/po/sr.po | 6 +- lib/libalpm/po/sr(a)latin.po | 6 +- lib/libalpm/po/sv.po | 4 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 10 +- lib/libalpm/po/zh_TW.po | 6 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 6 +- m4/pkg.m4 | 2 +- proto/PKGBUILD-split.proto | 8 +- proto/PKGBUILD.proto | 8 +- scripts/library/README | 2 +- scripts/makepkg.sh.in | 3 +- scripts/po/ar.po | 25 ++- scripts/po/ca.po | 13 +- scripts/po/cs.po | 17 +- scripts/po/da.po | 17 +- scripts/po/de.po | 25 ++- scripts/po/el.po | 17 +- scripts/po/en_GB.po | 13 +- scripts/po/eo.po | 8 +- scripts/po/es.po | 40 ++-- scripts/po/fa.po | 8 +- scripts/po/fi.po | 17 +- scripts/po/fr.po | 490 +++++++++++++++++++++++------------------ scripts/po/gl.po | 8 +- scripts/po/hr.po | 11 +- scripts/po/hu.po | 167 +++++++++----- scripts/po/id.po | 11 +- scripts/po/it.po | 13 +- scripts/po/ja.po | 69 +++--- scripts/po/kk.po | 8 +- scripts/po/ko.po | 10 +- scripts/po/lt.po | 23 +- scripts/po/nb.po | 19 +- scripts/po/nl.po | 8 +- scripts/po/pacman-scripts.pot | 10 +- scripts/po/pl.po | 16 +- scripts/po/pt.po | 15 +- scripts/po/pt_BR.po | 17 +- scripts/po/ro.po | 15 +- scripts/po/ru.po | 172 +++++++++------ scripts/po/sk.po | 15 +- scripts/po/sl.po | 12 +- scripts/po/sr.po | 11 +- scripts/po/sr(a)latin.po | 11 +- scripts/po/sv.po | 10 +- scripts/po/tr.po | 13 +- scripts/po/uk.po | 13 +- scripts/po/zh_CN.po | 25 ++- scripts/po/zh_TW.po | 8 +- src/pacman/conf.c | 4 +- src/pacman/pacman.c | 4 +- src/pacman/po/ar.po | 18 +- src/pacman/po/ca.po | 66 +++--- src/pacman/po/cs.po | 24 +- src/pacman/po/da.po | 24 +- src/pacman/po/de.po | 42 ++-- src/pacman/po/el.po | 38 ++-- src/pacman/po/en_GB.po | 20 +- src/pacman/po/eo.po | 14 +- src/pacman/po/es.po | 34 +-- src/pacman/po/fa.po | 18 +- src/pacman/po/fi.po | 42 ++-- src/pacman/po/fr.po | 281 ++++++++++++----------- src/pacman/po/gl.po | 16 +- src/pacman/po/hr.po | 46 ++-- src/pacman/po/hu.po | 33 +-- src/pacman/po/id.po | 18 +- src/pacman/po/it.po | 20 +- src/pacman/po/ja.po | 74 ++++--- src/pacman/po/kk.po | 16 +- src/pacman/po/ko.po | 14 +- src/pacman/po/lt.po | 30 +-- src/pacman/po/nb.po | 26 ++- src/pacman/po/nl.po | 12 +- src/pacman/po/pacman.pot | 14 +- src/pacman/po/pl.po | 18 +- src/pacman/po/pt.po | 30 +-- src/pacman/po/pt_BR.po | 30 +-- src/pacman/po/ro.po | 28 ++- src/pacman/po/ru.po | 204 +++++++++-------- src/pacman/po/sk.po | 26 ++- src/pacman/po/sl.po | 16 +- src/pacman/po/sr.po | 20 +- src/pacman/po/sr(a)latin.po | 20 +- src/pacman/po/sv.po | 18 +- src/pacman/po/tr.po | 24 +- src/pacman/po/uk.po | 24 +- src/pacman/po/zh_CN.po | 42 ++-- src/pacman/po/zh_TW.po | 22 +- src/pacman/util.c | 8 +- test/scripts/parseopts_test.sh | 2 +- 131 files changed, 1986 insertions(+), 1413 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] pacman-4.1.1
by Allan McRae 30 Apr '13

30 Apr '13

Hi translators, It is about time for a 4.1.1 release. As always, we tried to minimise the number of string changes for minor releases and we only have 5 new strings. I will be making the release mid next week, so it would be great to have this done by the weekend. Thanks, Allan

1 0