- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] Find real library names with libdepends/libprovides
by Mohammad Alsaleh 09 May '13

09 May '13

makepkg only handles libprovides/libdepends correctly if the naming scheme is: lib${name}.so --> lib$name.so.$ver But it is not uncommon for libname.so to link to a '.so' file that does not follow this naming scheme. For example, these 2 schemes are sometimes used: lib$name.so --> libname$major.$major.$minor lib$name.so --> libname-$major.$major.$minor There exists other schemes. With those cases, and before these patches, makepkg would add lib$name.so to provides unversioned and display a warning. And if another package adds lib$name.so as a dependency, the build will succeed and only a warning will be displayed. Not only makepkg fails to find version/arch for libraries in those scenarios. But the success of builds in both provide/depend sides might give the illusion that versioned sodepends are actually honored. If the idea behind these 2 patches is rejected. I would like to propose promoting the warning in find_libprovides() to an error. [PATCH 1/2] makepkg: Search/Add real library names libprovide link to [PATCH 2/2] makepkg: Search/Add real library names libdepend link to

4 4

[pacman-dev] [PATCH 2/2] makepkg: Search/Add real library names libdepend link to
by Mohammad Alsaleh 09 May '13

09 May '13

Search library paths for libdepend. If found and its realpath is not of the name scheme "libdepend.ver". Add the real library name to depends. Coupled with code in the libprovides side, this is necessary as the real library name is the one binaries depend on. And it is the one we can obtain version/arch info from. Signed-off-by: Mohammad Alsaleh <msal(a)tormail.org> --- Note: parsing library paths from `ldconfig -v` output is relatively slow. scripts/makepkg.sh.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7f4ee25..c4d0020 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1680,6 +1680,25 @@ tidy_install() { fi } +extra_libdepends() { + local d dfile extra_d extra_dfile + + # Search library paths for libdepend. + # If libdepend's file realpath has a different library name, add that name to depends + for d in "${depends[@]}"; do + if [[ $d = *.so ]]; then + while read dfile; do + extra_dfile="$(basename "$(realpath "$dfile")")" + if [[ "$extra_dfile" =~ \.so && "${extra_dfile%.so*}.so" != "$d" ]]; then + extra_d="${extra_dfile%.so*}.so" + depends+=("$extra_d") + warning "$(gettext "Library %s added to %s")" "$extra_d" "'depends'" + fi + done < <(find $(ldconfig -v 2>/dev/null| grep '^/' | sed 's|:||') -type l -maxdepth 1 -name "$d" 2>/dev/null) + fi + done +} + find_libdepends() { local d sodepends; @@ -1846,6 +1865,7 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" + extra_libdepends extra_libprovides mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) -- 1.8.2.2

2 1

[pacman-dev] [PATCH 1/2] makepkg: Search/Add real library names libprovide link to
by Mohammad Alsaleh 08 May '13

08 May '13

If libprovide file's realpath is not of the scheme "$libprovide.ver", add the real library name used to provides. The real name is needed to find version/arch info. And it is the one actually used by binaries as a dependency. Signed-off-by: Mohammad Alsaleh <msal(a)tormail.org> --- scripts/makepkg.sh.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..7f4ee25 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,6 +1744,23 @@ find_libdepends() { printf '%s\n' "${libdepends[@]}" } +extra_libprovides() { + local p pfile extra_p extra_pfile + + # If libprovide's realpath has a different library name, add that name to provides + for p in "${provides[@]}"; do + if [[ $p = *.so ]]; then + while read pfile; do + extra_pfile="$(basename "$(realpath "$pfile")")" + if [[ "$extra_pfile" =~ \.so && "${extra_pfile%.so*}.so" != "$p" ]]; then + extra_p="${extra_pfile%.so*}.so" + provides+=("$extra_p") + warning "$(gettext "Library %s added to %s")" "$extra_p" "'provides'" + fi + done < <(find "$pkgdir" -type l -name "$p" 2>/dev/null) + fi + done +} find_libprovides() { local p libprovides missing @@ -1829,6 +1846,7 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" + extra_libprovides mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) -- 1.8.2.2

1 0

[pacman-dev] [PATCH] Fix spelling errors using 'codespell' tool
by Anatol Pomozov 07 May '13

07 May '13

--- NEWS | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/be_package.c | 4 ++-- lib/libalpm/deps.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 6 +++--- m4/pkg.m4 | 2 +- scripts/library/README | 2 +- src/pacman/conf.c | 4 ++-- src/pacman/pacman.c | 4 ++-- src/pacman/util.c | 8 ++++---- test/scripts/parseopts_test.sh | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index 3a0361d..ce52e6f 100644 --- a/NEWS +++ b/NEWS @@ -912,7 +912,7 @@ VERSION DESCRIPTION - HTTP/1.1 support - an improved progress bar with transfer rates and ETA - cleaned up warning output a bit -2.7.2 - Supressed "No such file" messages during stripping +2.7.2 - Suppressed "No such file" messages during stripping - Removed extra newlines in /var/log/pacman.log - Added a --noextract option to makepkg to skip source extraction 2.7.1 - Fixed a couple obscure segfaults diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1d9db60..3ef81e3 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -314,7 +314,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, hash_local = alpm_compute_md5sum(filename); hash_pkg = alpm_compute_md5sum(checkfile); - /* update the md5 hash in newpkg's backup (it will be the new orginal) */ + /* update the md5 hash in newpkg's backup (it will be the new original) */ alpm_list_t *i; for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { alpm_backup_t *backup = i->data; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3b43ed8..cfe5fb3 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -390,7 +390,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, /* If full is false, only read through the archive until we find our needed * metadata. If it is true, read through the entire archive, which serves - * as a verfication of integrity and allows us to create the filelist. */ + * as a verification of integrity and allows us to create the filelist. */ while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { const char *entry_name = archive_entry_pathname(entry); @@ -460,7 +460,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, } } - if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */ + if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occurred */ _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"), pkgfile, archive_error_string(archive)); handle->pm_errno = ALPM_ERR_LIBARCHIVE; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index aebfd0b..96c49a9 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -488,7 +488,7 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep) /* These parameters are messy. We check if this package, given a list of * targets and a db is safe to remove. We do NOT remove it if it is in the - * target list, or if if the package was explictly installed and + * target list, or if if the package was explicitly installed and * include_explicit == 0 */ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, alpm_list_t *targets, int include_explicit) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index c653e45..3208458 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -105,7 +105,7 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum) sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); /* A policy was not met. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); - /* A system error occured. */ + /* A system error occurred. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); /* Fallback case */ if(!sigsum) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index dc1d043..f84fb66 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -527,7 +527,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) goto cleanup; } - /* fork- parent and child each have seperate code blocks below */ + /* fork- parent and child each have separate code blocks below */ pid = fork(); if(pid == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not fork a new process (%s)\n"), strerror(errno)); @@ -677,7 +677,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) return NULL; } -/** Check the alpm cachedirs for existance and find a writable one. +/** Check the alpm cachedirs for existence and find a writable one. * If no valid cache directory can be found, use /tmp. * @param handle the context handle * @return pointer to a writable cache directory. @@ -1251,7 +1251,7 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a /** Checks whether a string matches a shell wildcard pattern. * Wrapper around fnmatch. - * @param pattern pattern to match aganist + * @param pattern pattern to match against * @param string string to check against pattern * @return 0 if string matches pattern, non-zero if they don't match and on * error diff --git a/m4/pkg.m4 b/m4/pkg.m4 index 5152a4b..5c20244 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -53,7 +53,7 @@ fi[]dnl # to PKG_CHECK_MODULES(), but does not set variables or print errors. # # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place +# only at the first occurrence in configure.ac, so if the first place # it's called might be skipped (such as if it is within an "if", you # have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- diff --git a/scripts/library/README b/scripts/library/README index c28ebc6..9e2b6a1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -17,7 +17,7 @@ the short opts, any number of valid long opts may be be passed. The end of the options delimiter must then be added, followed by the user arguments to the calling program. -Reccommended Usage: +Recommended Usage: OPT_SHORT='fb:z' OPT_LONG=('foo' 'bar:' 'baz') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2ea49cc..5adc96c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -519,7 +519,7 @@ static int _parse_options(const char *key, char *value, char *endptr; const char *oldlocale; - /* set the locale to 'C' for consistant decimal parsing (0.7 and never + /* set the locale to 'C' for consistent decimal parsing (0.7 and never * 0,7) from config files, then restore old setting when we are done */ oldlocale = setlocale(LC_NUMERIC, NULL); setlocale(LC_NUMERIC, "C"); @@ -636,7 +636,7 @@ static int _add_mirror(alpm_db_t *db, char *value) } /** Sets up libalpm global stuff in one go. Called after the command line - * and inital config file parsing. Once this is complete, we can see if any + * and initial config file parsing. Once this is complete, we can see if any * paths were defined. If a rootdir was defined and nothing else, we want all * of our paths to live under the rootdir that was specified. Safe to call * multiple times (will only do anything the first time). diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 916873d..c220b27 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -288,7 +288,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count) } /** Catches thrown signals. Performs necessary cleanup to ensure database is - * in a consistant state. + * in a consistent state. * @param signum the thrown signal */ static void handler(int signum) @@ -313,7 +313,7 @@ static void handler(int signum) return; } } - /* SIGINT: no commiting transaction, release it now and then exit pacman + /* SIGINT: no committing transaction, release it now and then exit pacman * SIGHUP, SIGTERM: release no matter what */ alpm_trans_release(config->handle); /* output a newline to be sure we clear any line we may be on */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..bcaead0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -314,7 +314,7 @@ size_t strtrim(char *str) return end - pch; } -/* Replace all occurances of 'needle' with 'replace' in 'str', returning +/* Replace all occurrences of 'needle' with 'replace' in 'str', returning * a new string (must be free'd) */ char *strreplace(const char *str, const char *needle, const char *replace) { @@ -336,11 +336,11 @@ char *strreplace(const char *str, const char *needle, const char *replace) q = strstr(p, needle); } - /* no occurences of needle found */ + /* no occurrences of needle found */ if(!list) { return strdup(str); } - /* size of new string = size of old string + "number of occurences of needle" + /* size of new string = size of old string + "number of occurrences of needle" * x "size difference between replace and needle" */ newsz = strlen(str) + 1 + alpm_list_count(list) * (replacesz - needlesz); @@ -354,7 +354,7 @@ char *strreplace(const char *str, const char *needle, const char *replace) for(i = list; i; i = alpm_list_next(i)) { q = i->data; if(q > p) { - /* add chars between this occurence and last occurence, if any */ + /* add chars between this occurrence and last occurrence, if any */ memcpy(newp, p, (size_t)(q - p)); newp += q - p; } diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 1693b9f..2862cae 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -83,7 +83,7 @@ parse '-p PKGBUILD --' 3 -pPKGBUILD # valid shortopts as a long opt parse '--' 1 --sir -# long opt wiht no optarg +# long opt with no optarg parse '--log --' 2 --log # long opt with missing optarg -- 1.8.2.1

2 2

[pacman-dev] pkgrel in VCS packages
by Christian Hesse 07 May '13

07 May '13

Hello everybody, I love the new pkgver() function that allows to update pkgver string. However this also sets "pkgrel=1". Most of the time this is ok, but it is problematic for repositories that change very seldom, so a rebuild would get exactly the same version string again and again. Is there any way to workaround this? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

3 5

[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