From f743f58682d47fba5366c910d6179851e1f9483e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 25 Oct 2014 11:03:43 -0400 Subject: find-libdeps: cleanup some quoting/array concerns --- find-libdeps.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/find-libdeps.in b/find-libdeps.in index c9b451e..b40f794 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -32,11 +32,11 @@ else setup_workdir case ${script_mode} in - deps) bsdtar -C $WORKDIR -xf "$1";; - provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";; + deps) bsdtar -C "$WORKDIR" -xf "$1";; + provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";; esac - pushd $WORKDIR >/dev/null + pushd "$WORKDIR" >/dev/null fi process_sofile() { @@ -50,16 +50,16 @@ process_sofile() { if ! in_array "${soname}=${soversion}-${soarch}" ${soobjects[@]}; then # libfoo.so=1-64 echo "${soname}=${soversion}-${soarch}" - soobjects=(${soobjects[@]} "${soname}=${soversion}-${soarch}") + soobjects+=("${soname}=${soversion}-${soarch}") fi } case $script_mode in - deps) find_args="-perm -u+x";; - provides) find_args="-name *.so*";; + deps) find_args=(-perm -u+x);; + provides) find_args=(-name '*.so*');; esac -find . -type f $find_args | while read filename; do +find . -type f "${find_args[@]}" | while read filename; do if [[ $script_mode = "provides" ]]; then # ignore if we don't have a shared object if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then -- cgit v1.2.3-54-g00ecf From b58fb33482bdce19163eb23ea79bb1a2f74b1719 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 25 Oct 2014 11:20:48 -0400 Subject: checkpkg: mask errors from lib-provides bsdtar doesn't consider it an error when your --include doesn't match anything in the archive, so we're forced to dump stderr to /dev/null here. Fixes: https://bugs.archlinux.org/task/42551 --- checkpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index 6ba04ed..467ac74 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -63,8 +63,8 @@ for _pkgname in "${pkgname[@]}"; do sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" - find-libprovides "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/libraries-$_pkgname-old" - find-libprovides "$pkgfile" | sort > "$TEMPDIR/libraries-$_pkgname" + find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old" + find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname" if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then msg "Sonames differ in $_pkgname!" echo "$diff_output" -- cgit v1.2.3-54-g00ecf From 443aedca9a1acb928c2d2f0ef75bc5c2a68c209b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 23 Dec 2014 17:52:45 -0500 Subject: makepkg-*.conf: add VCSCLIENTS definition Needed for makepkg 4.2 --- makepkg-i686.conf | 7 +++++++ makepkg-x86_64.conf | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index da249f6..64ddd67 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget +#-- The the package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 33dbe99..cf14784 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget +#-- The the package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### -- cgit v1.2.3-54-g00ecf From db135e90137c5ebb9248ae7bd5ced4e8ee6b27da Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 24 Dec 2014 10:56:41 -0500 Subject: prepare 20141224 release It's an xmas miracle! --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 244a791..b5ff302 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20141024 +V=20141224 PREFIX = /usr/local -- cgit v1.2.3-54-g00ecf