- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-316-gf892775
by dan＠archlinux.org 03 Feb '11

03 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via f89277536612ff8e204cefcb6ff7cca7079d6bd5 (commit) via 35a8cf134bedf723dc6df5c6c2d6744ed942f31f (commit) via d8c4b12c66f1b4851eac5b61c7455a05d891ac70 (commit) via 332dd86912515dda5703127d13fd21f96e8273b9 (commit) via 3444146b48685deb4ebd68c3a5b4be5d2197b935 (commit) from 87240dae6d4631a812ee81ed53c1622dd164bfcf (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 f89277536612ff8e204cefcb6ff7cca7079d6bd5 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Feb 3 11:01:01 2011 +1000 makepkg: initialize local arrays to empty Fixes bash-3.2 compatibility. Thanks-to: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35a8cf134bedf723dc6df5c6c2d6744ed942f31f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Feb 3 10:15:36 2011 +1000 makepkg: error on invalid optdepends Missed in commit a88cb03a. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8c4b12c66f1b4851eac5b61c7455a05d891ac70 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Feb 1 15:59:35 2011 +0100 makepkg: make SRCPKGDEST default to $startdir The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 332dd86912515dda5703127d13fd21f96e8273b9 Author: Nezmer <git(a)nezmer.info> Date: Tue Feb 1 12:02:50 2011 -0500 makepkg: Fix the check for references to srcdir/pkgdir At least in FreeBSD, find always returns 0 if it finds stuff (imagine that). It doesn't care about the exit status of whatever is passed to -exec. This patch makes the checks compatible with this behaviour. Using xargs and not using grep directly because packages with too many files would cause grep to complain about argument list being too long. This should also fix the false positive in packages with no files. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3444146b48685deb4ebd68c3a5b4be5d2197b935 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Feb 1 15:59:34 2011 +0100 makepkg: fix indention to follow style guide Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: initialize local arrays to empty
by Allan McRae 03 Feb '11

03 Feb '11

Fixes bash-3.2 compatibility. Thanks-to: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e8f57e1..13415fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1257,7 +1257,7 @@ check_sanity() { fi fi - local provides_list + local provides_list=() eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then @@ -1266,7 +1266,7 @@ check_sanity() { fi done - local backup_list + local backup_list=() eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then @@ -1275,7 +1275,7 @@ check_sanity() { fi done - local optdepends_list + local optdepends_list=() eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} -- 1.7.4

1 0

[pacman-dev] makepkg bash-3.2 issue
by Allan McRae 03 Feb '11

03 Feb '11

Hi, Can anyone give me a fix for this: local optdepends_list eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") In bash-3.2, this gives optdepends_list with "" as the first item in the array. It appears that declaring a local variable in bash-3.2 causes it to be given a blank value: bash-4.1 > declare optdepends_list > echo ${#optdepends_list[@]} 0 bash-3.2 > declare optdepends_list > echo ${#optdepends_list[@]} 1 Anyone know how to work around this? Allan

3 3

[pacman-dev] [PATCH] makepkg: make SRCPKGDEST default to $startdir
by Cedric Staniewski 03 Feb '11

03 Feb '11

The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. --- doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 020804c..6130249 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -183,8 +183,8 @@ Options **SRCPKGDEST=**"/path/to/folder":: If this value is not set, source package files will be stored in - PKGDEST. Many people like to keep all source package files in - a central location for easy cleanup, so this path can be set here. + in the current directory. Many people like to keep all source package files + in a central location for easy cleanup, so this path can be set here. **PACKAGER=**"John Doe <john(a)example.com>":: This value is used when querying a package to see who was the builder. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0a90b89..493c962 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then fi SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} -SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined +SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then -- 1.7.4

3 3

[pacman-dev] [PATCH] makepkg: error on invalid optdepends
by Allan McRae 03 Feb '11

03 Feb '11

Missed in commit a88cb03a. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebafa0b..e8f57e1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1281,6 +1281,7 @@ check_sanity() { local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" + ret=1 fi done -- 1.7.4

1 0

[pacman-dev] [PATCH] makepkg: Fix the check for references to srcdir/pkgdir in BSDs
by Nezmer 02 Feb '11

02 Feb '11

At least in FreeBSD, find always returns 0 If It finds stuff (imagine that). It doesn't care about the exit status of whatever is passed to -exec. This patch makes the checks compatible with this behaviour. Using xargs and not using grep directly because packages with too many files would cause grep to complain about argument list being too long. This should also fix the false positive in packages with no files. Signed-off-by: Nezmer <git(a)nezmer.info> --- 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 b1b1b75..72b8035 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,10 +1000,10 @@ check_package() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -exec grep -q -I "${srcdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi - if find "${pkgdir}" -type f -exec grep -q -I "${pkgdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$pkgdir" fi -- 1.7.3.5

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-311-g87240da
by dan＠archlinux.org 01 Feb '11

01 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 87240dae6d4631a812ee81ed53c1622dd164bfcf (commit) from 111e07d0be44b76b910c6a004421ede4f6f6fb49 (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 87240dae6d4631a812ee81ed53c1622dd164bfcf Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 1 09:59:12 2011 -0600 Fix locale.h/setlocale inclusion with --disable-nls Noted in FS#22697. When I factored out _alpm_parsedate() into a common function, I didn't move the <locale.h> include properly, causing a build failure when NLS is disabled and this header isn't automatically included everywhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 2 -- lib/libalpm/be_package.c | 1 - lib/libalpm/be_sync.c | 1 - lib/libalpm/util.c | 5 +++-- 4 files changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove existing pkg/ dir only if it's not empty.
by Esa Määttä 01 Feb '11

01 Feb '11

This allows symbolic linking of the pkg directory. Without this patch the symbolic link to an another directory would be removed as existing pkg/ directory. Signed-off-by: Esa Määttä <esa.maatta(a)iki.fi> --- 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 b1b1b75..bd2739b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2056,8 +2056,8 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # check for existing pkg directory; don't remove if we are repackaging - if [[ -d $pkgdir ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then + # check for existing non empty pkg directory; don't remove if we are repackaging + if [[ -n $(ls -A "$pkgdir" 2>/dev/null) ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi -- 1.7.4

2 1

[pacman-dev] [PATCH] makepkg: fix indention to follow style guide
by Cedric Staniewski 01 Feb '11

01 Feb '11

--- Just spaces -> tabs scripts/makepkg.sh.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b1b1b75..0a90b89 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1171,14 +1171,14 @@ create_srcpackage() { exit 1 # TODO: error code fi - if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" - ret=$? - fi - - if (( ret )); then - warning "$(gettext "Failed to create symlink to source package file.")" - fi + if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi cd "${startdir}" rm -rf "${srclinks}" -- 1.7.4

1 0

[pacman-dev] sodeps: makepkg patches
by Florian Pritz 01 Feb '11

01 Feb '11

The -d/-dd patches are in master now so I'll start a new thread for the makepkg patches only. I've tested them with readline and they work fine. The final PKGINFO contains entries like these: depend = libc.so=6-64 provides = libreadline.so=6-64 Git repo is here http://git.server-speed.net/users/flo/pacman/?h=sodeps

4 7