June 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] Warnings with -D_FORTIFY_SOURCE=2
by Allan McRae 14 Jun '10

14 Jun '10

Hi, Trying to build pacman with the gcc flag -D_FORTIFY_SOURCE=2 gives a bunch of warnings like: add.c:586:8: warning: ignoring return value of ‘chdir’, declared with attribute warn_unused_result be_files.c:660:9: warning: ignoring return value of ‘fgets’, declared with attribute warn_unused_result util.c:146:9: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result pacman.c:712:8: warning: ignoring return value of ‘getcwd’, declared with attribute warn_unused_result util.c:796:12: warning: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result There are 21 warnings in total. Would there be in interest in adding the return value check (some of which would be basically useless...) and adding -D_FORTIFY_SOURCE=2 to the CFLAGS when used with --enable-debug? Allan

3 2

[pacman-dev] [PATCH 2/2] add example + Files for makepkg
by Nico Schottelius 13 Jun '10

13 Jun '10

Signed-off-by: Nico Schottelius <nico(a)kr.ethz.ch> --- doc/makepkg.8.txt | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)

2 1

[pacman-dev] [translation] Portuguese Brazil (was: Current translation summary)
by Dan McGee 12 Jun '10

12 Jun '10

On Thu, Jun 10, 2010 at 1:08 PM, Leandro Inacio <carvalho.inacio(a)gmail.com> wrote: > Portuguese Brazil, 100% translated. > > I guess the output (such as -Qi and -Si) is wrong, cann't test right now. > Please see this and give me feedback about this. Thanks! Looks all good to me, I tested out -Qi and -Si here and didn't notice anything funny. -Dan

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-232-g6297248
by dan＠archlinux.org 12 Jun '10

12 Jun '10

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 6297248087e3f73df636b7950b3f94b9e0b6d98d (commit) from 5f5b6f16afdac3b5fb5b0e1c7caf45dac4ade9d3 (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 6297248087e3f73df636b7950b3f94b9e0b6d98d Author: Leandro Inácio <leandro(a)archlinux-br.org> Date: Fri Jun 11 19:01:46 2010 -0500 Update Portuguese (Brazil) translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/pt_BR.po | 52 ++++---- po/pt_BR.po | 375 +++++++++++++++++++++++------------------------ 2 files changed, 208 insertions(+), 219 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-231-g5f5b6f1
by dan＠archlinux.org 11 Jun '10

11 Jun '10

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 5f5b6f16afdac3b5fb5b0e1c7caf45dac4ade9d3 (commit) via f9c70d31402b11e21b25cba970f41e1853ce5ed6 (commit) via d978039cf0e0cf2accabc33c925d33edaabf0ebb (commit) from d73d055c6fc194ce7b383308ed283ef3100ab26f (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 5f5b6f16afdac3b5fb5b0e1c7caf45dac4ade9d3 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 11 09:57:12 2010 -0500 translations: rename Norwegian translation from nb_NO to nb This puts us more in line with other projects that don't attach the country code to the language code. $ du -sh /usr/share/locale/nb*/LC_MESSAGES 3.5M /usr/share/locale/nb/LC_MESSAGES 132K /usr/share/locale/nb_NO/LC_MESSAGES Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f9c70d31402b11e21b25cba970f41e1853ce5ed6 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 11 09:57:12 2010 -0500 translations: rename Swedish translation from sv_SE to sv This puts us more in line with other projects that don't attach the country code to the language code. $ du -sh /usr/share/locale/sv*/LC_MESSAGES 7.2M /usr/share/locale/sv/LC_MESSAGES 60K /usr/share/locale/sv_SE/LC_MESSAGES Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d978039cf0e0cf2accabc33c925d33edaabf0ebb Author: Christos Nouskas <nous(a)archlinux.us> Date: Wed Jun 9 15:16:59 2010 -0500 Revise Greek translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 4 +- lib/libalpm/po/LINGUAS | 4 +- lib/libalpm/po/el.po | 25 ++++++++++++----------- lib/libalpm/po/{nb_NO.po => nb.po} | 0 lib/libalpm/po/{sv_SE.po => sv.po} | 4 +- po/LINGUAS | 4 +- po/el.po | 39 +++++++++++++++++------------------ po/{nb_NO.po => nb.po} | 0 po/{sv_SE.po => sv.po} | 4 +- 9 files changed, 42 insertions(+), 42 deletions(-) rename lib/libalpm/po/{nb_NO.po => nb.po} (100%) rename lib/libalpm/po/{sv_SE.po => sv.po} (99%) rename po/{nb_NO.po => nb.po} (100%) rename po/{sv_SE.po => sv.po} (99%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix creation of source packages
by Allan McRae 09 Jun '10

09 Jun '10

Source packages were getting created with only links to local source files. Caused by commit 5cddcc90. Also, fix error when install and changelog files are in the source array. Caused by commit fe1e3471. Thanks to Christopher Rogers <slaxemulator(a)gmail.com> for pointing out areas that were failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d6d1f6..86984db 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1096,7 +1096,7 @@ create_srcpackage() { for file in "${source[@]}"; do if [[ -f $file ]]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$file" "$srclinks/$pkgbase" + ln -s "${startdir}/$file" "$srclinks/$pkgbase" elif (( SOURCEONLY == 2 )); then local absfile=$(get_filepath "$file") || missing_source_file "$file" msg2 "$(gettext "Adding %s...")" "${absfile##*/}" @@ -1110,9 +1110,9 @@ create_srcpackage() { local file for file in ${!i}; do # evaluate any bash variables used - eval file='${srclinks}/${pkgbase}/'${file} - if [[ ! -f $file ]]; then - msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file##*/}" + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file}" ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" fi done -- 1.7.1

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-228-gd73d055
by dan＠archlinux.org 09 Jun '10

09 Jun '10

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 d73d055c6fc194ce7b383308ed283ef3100ab26f (commit) via b8863622828287fc0ba204ce7270176753df6bd2 (commit) via ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 (commit) from 8163beb622733824d9e7baa884a574ac36ad3d8e (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 d73d055c6fc194ce7b383308ed283ef3100ab26f Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 16:48:50 2010 +1000 makepkg: use BUILDFILE rather than BUILDSCRIPT In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8863622828287fc0ba204ce7270176753df6bd2 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 15:31:30 2010 +1000 makepkg: fix errors with multiple install or changelog files Another issue caused by fe1e3471. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 13:45:22 2010 +1000 Fix creation of source packages Source packages were getting created with only links to local source files. Caused by commit 5cddcc90. Also, fix dangling symlinks to install and changelog files. Caused by commit fe1e3471. Thanks to Christopher Rogers <slaxemulator(a)gmail.com> for pointing out areas that were failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] [RFC] makepkg: add a test suite
by Allan McRae 09 Jun '10

09 Jun '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am getting annoyed at constantly missing bugs in makepkg patches! So, this is a really, really, really crappy attempt at getting a test suite up and going for makepkg. Essentially, stick a PKGBUILD in test/makepkg/tests and run test/makepkg/mptest. The test suite is controlled by an 'optional' mptest() function in the PKGBUILD. In that function you can define the following variables: files (array): A list of file necessary for the test to run. First entry is always the PKGBUILD. The syntax 'test001::PKGBUILD' can be used, tell the test suite to copy file 'test001' to 'PKGBUILD'. flags (string): Flags to pass to makepkg tests (array): Lists of tests to run files and tests have defaults (file to just copying the test file to 'PKGBUILD' and tests to running 'pkg_exists') The only tests available so far are: pkg_exists - checks all packages exist and have a .PKGINFO file pkg_has_file - checks a package has a file (not tested...) Needed tests: pkginfo - checks pkginfo file is correct Of course this needs a lot more structure and tests, but comments on the direction this is heading would be appreciated. All work on this is on my mptest branch. test/makepkg/mptest | 140 ++++++++++++++++++++++++++++++++++++++++++++ test/makepkg/tests/test001 | 7 ++ 2 files changed, 147 insertions(+), 0 deletions(-) create mode 100755 test/makepkg/mptest create mode 100644 test/makepkg/tests/test001 diff --git a/test/makepkg/mptest b/test/makepkg/mptest new file mode 100755 index 0000000..01e4b4a --- /dev/null +++ b/test/makepkg/mptest @@ -0,0 +1,140 @@ +#!/bin/bash + +splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ + 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ + 'backup' 'options' 'install' 'changelog') +readonly -a splitpkg_overrides + +backup_package_variables() { + for var in ${splitpkg_overrides[@]}; do + indirect="${var}_backup" + eval "${indirect}=(\"\${$var[@]}\")" + done +} + +restore_package_variables() { + for var in ${splitpkg_overrides[@]}; do + indirect="${var}_backup" + if [[ -n ${!indirect} ]]; then + eval "${var}=(\"\${$indirect[@]}\")" + else + unset ${var} + fi + done +} + +## +# Performs necessary PKGBUILD variable overrides for a given split-package +# +# Usage: pasre_splitpkg_overrides <pkgname> +## +parse_splitpkg_overrides() { + if grep -q "package_$1()" ${files[0]#*::}; then + backup_package_variables + pkgfunc=$(sed -n "/^package_$1/,/^}/p" ${files[0]#*::}) + for var in ${splitpkg_overrides[@]}; do + eval $(echo $pkgfunc | grep -Eo "$var=(\"[^)]*\"|$[^)]*$|[^ ]*)") + done + fi +} + +## +# Prepares for testing (including the running of makepkg) +## +prepare_test() { + # set default values + files=("$test::PKGBUILD") + flags="" + tests=('pkg_exists') + + # override defaults + if [[ $(type -t mptest) = "function" ]]; then + mptest + fi + + for file in ${files[@]}; do + cp ${file%%::*} ${testdir}/${file#*::} + done + + cd $testdir + ../../../../scripts/makepkg --config ../../../../etc/makepkg.conf $flags &> /dev/null + cd .. +} + +## +# Runs the requested tests +## +run_test() { + FAIL=0 + + cd $testdir + for i in ${tests[@]}; do + eval $i || FAIL=1 + done + cd .. + + return $FAIL +} + +## +# Checks if all package are created including PKGINFO presence +## +pkg_exists() { + for pkg in ${pkgname[@]}; do + parse_splitpkg_overrides $pkg + if [[ $arch != "any" ]]; then + arch=$CARCH + fi + if [[ ! -e $pkg-$pkgver-$pkgrel-$arch$PKGEXT ]] ;then + return 1 + fi + if ! bsdtar -tf $pkg-$pkgver-$pkgrel-$arch$PKGEXT -q .PKGINFO &> /dev/null; then + return 1 + fi + restore_package_variables + done + + return 0 +} + +## +# Checks for a file in a package +# +# Usage: pkg_has_file <pkgname> <file> +## +pkg_has_file() { + parse_splitpkg_overrides $1 + + if ! bsdtar -tf $pkg-$pkgver-$pkgrel-$arch$PKGEXT $2 &> /dev/null; then + return 1 + fi + restore_package_variables + + return 0 +} + + +## +# RUN THE TESTS! +## +cd tests + +for test in test*; do + source ../../../etc/makepkg.conf + source $test + + testdir=$(mktemp -d $test.XXXXXXXX) + if ! prepare_test; then + echo "FAIL: $test" + else + if ! run_test; then + echo "FAIL: $test" + else + echo "PASS: $test" + fi + fi + + # cleanup + unset mptest files flags tests + rm -rf $testdir +done \ No newline at end of file diff --git a/test/makepkg/tests/test001 b/test/makepkg/tests/test001 new file mode 100644 index 0000000..dfe6ec6 --- /dev/null +++ b/test/makepkg/tests/test001 @@ -0,0 +1,7 @@ +# test001: Minimal working PKGBUILD + +pkgname=NAME +pkgver=1 +pkgrel=1 +arch=('any') + -- 1.7.1

1 0

[pacman-dev] [PATCH] makepkg: use BUILDFILE rather than BUILDSCRIPT
by Allan McRae 09 Jun '10

09 Jun '10

In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- First error found by the future makepkg test suite! scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d6d1f6..b166f9d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1237,7 +1237,7 @@ check_sanity() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in ${!i}; do # evaluate any bash variables used @@ -1280,7 +1280,7 @@ check_sanity() { if [[ -n "${PKGLIST[@]}" ]]; then for pkg in ${PKGLIST[@]}; do if ! in_array $pkg ${pkgname[@]}; then - error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" + error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDFILE" return 1 fi done -- 1.7.1

1 1

[pacman-dev] [PATCH] makepkg: fix errors with multiple install or changelog files
by Allan McRae 09 Jun '10

09 Jun '10

Another issue caused by fe1e3471. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86984db..7785ff1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1106,9 +1106,9 @@ create_srcpackage() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") local file - for file in ${!i}; do + for file in $filelist; do # evaluate any bash variables used eval file=${file} if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then @@ -1237,9 +1237,9 @@ check_sanity() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") local file - for file in ${!i}; do + for file in $filelist; do # evaluate any bash variables used eval file=${file} if [[ ! -f $file ]]; then -- 1.7.1

1 0