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

Re: [pacman-dev] [PATCH 1/5] pacman-key: keyring management tool
by Martti Kühne 20 Sep '10

20 Sep '10

Hello list I believe, line 19 on the patch, copy-pasted from allan's suggestion misses a third person's 's' as it is usual in English... -The script *pacman-key* manage *pacman*'s keyring, which is the +The script *pacman-key* manages *pacman*'s keyring, which is the Just to add my oppinion in this. I'm very pleased to see this feature coming, since it was an issue in the archlinux.se mirror discussion where ppl were making fun of arch because of that. IMHO this is coming at the right time... :-) cheers! mar77i

1 0

[pacman-dev] stripping binaries in makepkg
by Florian Pritz 18 Sep '10

18 Sep '10

Hi, Why do we only strip binaries in $STRIP_DIRS and not every binary in the package? The current behavior fails with multilib unless you add usr/lib32 to the list, but I fail to see a good reason why we use a variable here. Scanning will probably be a bit slower, but that only holds true for big packages and normally those have huge compile times anyway. Can someone enlighten me please? -- Florian Pritz -- {flo,bluewind}(a)server-speed.net

1 0

[pacman-dev] [PATCH] PKGBUILD-example.txt: Remove superfluous "|| return 1".
by Lukas Fleischer 16 Sep '10

16 Sep '10

--- doc/PKGBUILD-example.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 7245228..99fd8c2 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -15,6 +15,6 @@ md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make make prefix=$pkgdir/usr install } -- 1.7.2.3

4 4

[pacman-dev] {Spam?} [PATCH] bacman: unify package creation with makepkg
by Allan McRae 15 Sep '10

15 Sep '10

Currently bacman always compresses with gzip now matter what PKGEXT is set to. Rework the entire package creation process to be similar to that in makepkg. This also make the explicit assumption that PKGEXT is defined in makepkg.conf. Thanks to Nelson Chan <khcha.n.el(a)gmail.com> for the original patch to fix the incorrect package compression. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index dfd53e8..6dd7839 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -87,7 +87,6 @@ fi pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" -pkg_ext=${PKGEXT:-'.pkg.tar.gz'} pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" @@ -164,13 +163,6 @@ fi pkg_size=$(du -sk | awk '{print $1 * 1024}') -if [ -f "$pkg_dir/install" ] ; then - cp "$pkg_dir/install" "$work_dir/.INSTALL" -fi -if [ -f $pkg_dir/changelog ] ; then - cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" -fi - # # .PKGINFO stuff # @@ -254,6 +246,17 @@ while read i; do esac done +comp_files=".PKGINFO" + +if [ -f "$pkg_dir/install" ] ; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" + comp_files+=" .INSTALL" +fi +if [ -f $pkg_dir/changelog ] ; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" + comp_files+=" .CHANGELOG" +fi + # # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL # @@ -265,8 +268,31 @@ chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null # echo "Generating the package..." +case "$PKGEXT" in + *tar.gz) EXT=${PKGEXT%.gz} ;; + *tar.bz2) EXT=${PKGEXT%.bz2} ;; + *tar.xz) EXT=${PKGEXT%.xz} ;; + *tar) EXT=${PKGEXT} ;; + *) echo "WARNING: '%s' is not a valid archive extension." \ + "$PKGEXT" ; EXT=$PKGEXT ;; +esac + +pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$? + +# when fileglobbing, we want * in an empty directory to expand to +# the null string rather than itself +shopt -s nullglob +# TODO: Maybe this can be set globally for robustness +shopt -s -o pipefail +bsdtar -cf - $comp_files * | +case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; +esac > ${pkg_file} || ret=$? + if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" -- 1.7.2.3

2 3

[pacman-dev] Fwd: [arch-general] Makepkg $(srcdir) detection and false-positives
by Allan McRae 15 Sep '10

15 Sep '10

Forwarding to pacman-dev. The idea seems reasonable to me as this check was mainly to catch bad paths in configuration files. Allan -------- Original Message -------- Subject: [arch-general] Makepkg $(srcdir) detection and false-positives Date: Fri, 27 Aug 2010 08:58:28 +0100 From: Nathan Wayde <kumyco(a)konnichi.com> Reply-To: General Discussion about Arch Linux <arch-general(a)archlinux.org> Organization: Konnichi Computing To: General Discusson about Arch Linux <arch-general(a)archlinux.org> I'm not sure if this is the correct ML or not but whatever I'll post here anyway. I was just reading the ML where the quest? to finding why makepkg warns about $srcdir was brought up and a simple grep -R... seemed to be the method of detection. Anyway it reminded me of another message on the topic last week i think where someone said that it would warn on files with debugging symbols... TL;DR makepkg does a grep -q to decide if a package contains files that reference $(srcdir), this is inadequate as it causes a false-positive on files that contain debugging symbols. This can be eliminated by specifying the option `-I` a.k.a `--binary-files=without-match` to grep which makes prevents grep from matching binary files. Rationale: the only paths that binary files should contain based on buildtime setting are path such as '/usr/share/xyz'. If the pkgbuild *accidentally* uses a variable that resolves with $srcdir in it then I'd argue that the pkgbuild is broken and will most likely break the application in other ways and will be caught before sharing the pkgbuild. I can't be the only one that tests their packages before uploading to the AUR right? On another note, shouldn't there also be a check for $pkgdir. The only cases of this that I've ran into myself have been a reference to $pkgdir causing all sorts of nonsense such as broken symlinks and incorrect resource paths.

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-5-gc299319
by dan＠archlinux.org 15 Sep '10

15 Sep '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, maint has been updated via c2993197ea383aaeb4b0585bfe46235e8c14939d (commit) via 79541193f736c3b5a5d1f9a4b902608c8faaad37 (commit) via e29dde9157cadd0ce8bafb22e5157d853faf005a (commit) from 6d41da4086d658a3d416e7b23b7566e84fe0462f (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD-example.txt | 2 +- lib/libalpm/po/kk.po | 18 ++-- po/kk.po | 171 ++++++++++++++-------------- po/pt.po | 278 +++++++++++++++++++++++++--------------------- 4 files changed, 246 insertions(+), 223 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-63-gd201d1f
by dan＠archlinux.org 15 Sep '10

15 Sep '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 d201d1f312308b91eff78cb20a148146c3f1188c (commit) via c2993197ea383aaeb4b0585bfe46235e8c14939d (commit) via 79541193f736c3b5a5d1f9a4b902608c8faaad37 (commit) via e29dde9157cadd0ce8bafb22e5157d853faf005a (commit) via 31aed1243ec70632d4e319e67c09446f1a474a6e (commit) via e344fab3b12803b3a43aebe0b1a57c49631cc0ff (commit) via 6d41da4086d658a3d416e7b23b7566e84fe0462f (commit) via df15a8c4322d10393cf6fda5a5f29f4a1a299709 (commit) from fe788ee4a68d2a8ba3bc3f938172294589c36fc4 (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 d201d1f312308b91eff78cb20a148146c3f1188c Merge: 31aed12 c299319 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 15 07:31:37 2010 -0500 Merge branch 'maint' commit 31aed1243ec70632d4e319e67c09446f1a474a6e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 7 08:27:25 2010 -0500 Remove quotes in remaining bash regexes After a8dcfeccfc, Allan noted that one more regular exprssion inside makepkg also contained quotes; these should not be there for the same reason as that commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e344fab3b12803b3a43aebe0b1a57c49631cc0ff Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 7 08:24:36 2010 -0500 Restore trimming of db and pkg extensions These keep having to change because we are getting really good at changing the downloaded filename. Shorten the match sequences to just .db and .pkg and trim everything after and including these strings. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 +- doc/PKGBUILD-example.txt | 2 +- lib/libalpm/po/kk.po | 18 ++-- lib/libalpm/po/pt.po | 8 +- po/en_GB.po | 1 - po/fr.po | 1 - po/hu.po | 1 - po/it.po | 1 - po/kk.po | 171 ++++++++++++------------ po/pt.po | 335 +++++++++++++++++++++++----------------------- po/ru.po | 2 +- po/sk.po | 1 - scripts/makepkg.sh.in | 2 +- src/pacman/callback.c | 2 +- 14 files changed, 274 insertions(+), 277 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Updated Kazakh translation on Transifex.net
by Baurzhan Muftakhidinov 15 Sep '10

15 Sep '10

Hi all! I've updated Kazakh translation of pacman and libalpm. http://www.transifex.net/projects/p/archlinux-pacman/ So, please commit it;) Thanks,

2 1

[pacman-dev] [PATCH 1/3] libalpm md5: use larger and dynamic buffer
by Dan McGee 12 Sep '10

12 Sep '10

This gave at least a 10% improvement on a few tested platforms due to the reduced number of read calls from files when computing the md5sum. It really is just a precursor to another patch to come which is to use MD5 functions that do the job a lot better than anything we can do. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/md5.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/md5.c b/lib/libalpm/md5.c index 7d2716f..9063504 100644 --- a/lib/libalpm/md5.c +++ b/lib/libalpm/md5.c @@ -36,6 +36,8 @@ * int md5_file( char *path, unsigned char *output ) * to * int md5_file( const char *path, unsigned char *output ) + * * use a dynamically-allocated buffer in md5_file, and increase the size + * for performance reasons * * various static/inline changes * * NOTE: XySSL has been renamed to PolarSSL, which is available at @@ -44,6 +46,7 @@ #include <string.h> #include <stdio.h> +#include <stdlib.h> #include "md5.h" @@ -309,11 +312,16 @@ int md5_file( const char *path, unsigned char output[16] ) FILE *f; size_t n; md5_context ctx; - unsigned char buf[1024]; + unsigned char *buf; - if( ( f = fopen( path, "rb" ) ) == NULL ) + if( ( buf = calloc(8192, sizeof(unsigned char)) ) == NULL ) return( 1 ); + if( ( f = fopen( path, "rb" ) ) == NULL ) { + free( buf ); + return( 1 ); + } + md5_starts( &ctx ); while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) @@ -322,6 +330,7 @@ int md5_file( const char *path, unsigned char output[16] ) md5_finish( &ctx, output ); memset( &ctx, 0, sizeof( md5_context ) ); + free( buf ); if( ferror( f ) != 0 ) { -- 1.7.2.2

7 18

[pacman-dev] [PATCH] Restore trimming of db and pkg extensions
by Dan McGee 07 Sep '10

07 Sep '10

These keep having to change because we are getting really good at changing the downloaded filename. Shorten the match sequences to just .db and .pkg and trim everything after and including these strings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 3696d3c..32dafb5 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -575,7 +575,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) fname = strdup(filename); /* strip package or DB extension for cleaner look */ - if((p = strstr(fname, ".pkg.tar.")) || (p = strstr(fname, ".db.tar."))) { + if((p = strstr(fname, ".pkg")) || (p = strstr(fname, ".db"))) { *p = '\0'; } /* In order to deal with characters from all locales, we have to worry -- 1.7.2.3

3 2