- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: refactor absolute filename detection
by Cedric Staniewski 27 May '10

27 May '10

Move the absolute filename detection to a new function to reduce code duplication. This patch also fixes the --allsource option that did not include remote source files if they reside in $startdir instead of $SRCDEST. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- Finally finished this quiet old patch[1]. However, I am not completely happy with it: 1) error_source_file_not_found is an ugly name; need to find a better/shorter one. It's not possible to correctly exit makepkg from within a subshell anymore which why these file=... || error_source_file_not_found checks are necessary. 2) The part in download_sources is rather ugly too. Do we really need to distinguish between source files from build dir and from cache? I think I've tested every changed function, but please do further testing. This patch is rebased on master and Dieter's patch[2]. [1] http://mailman.archlinux.org/pipermail/pacman-dev/2009-October/009755.html [2] http://mailman.archlinux.org/pipermail/pacman-dev/2010-May/010779.html scripts/makepkg.sh.in | 106 +++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 51 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9741879..96c5d12 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -179,6 +179,32 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR # 1) "filename::http://path/to/file" # 2) "http://path/to/file" +# return the absolute filename of an source entry +# +# this function accepts a source entry or the already extracted filename of a +# source entry as input +get_absolute_filename() { + local file="$(get_filename "$1")" + + if [[ -f "$startdir/$file" ]] ; then + file="$startdir/$file" + else + if [[ -f "$SRCDEST/$file" ]] ; then + file="$SRCDEST/$file" + else + return 1 + fi + fi + + echo "$file" +} + +error_source_file_not_found() { + error "$(gettext "Unable to find source file %s.")" "$file" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_FILE +} + # extract the filename from a source entry get_filename() { # if a filename is specified, use it @@ -458,20 +484,24 @@ download_sources() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - local url=$(get_url "$netfile") - if [[ -f $startdir/$file ]]; then - msg2 "$(gettext "Found %s in build dir")" "$file" - rm -f "$srcdir/$file" - ln -s "$startdir/$file" "$srcdir/" - continue - elif [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Using cached copy of %s")" "$file" - rm -f "$srcdir/$file" - ln -s "$SRCDEST/$file" "$srcdir/" + local file + if file=$(get_absolute_filename "$netfile"); then + if [[ ${file%/*} = $startdir ]]; then + msg2 "$(gettext "Found %s in build dir")" "${file##*/}" + elif [[ ${file%/*} = $SRCDEST ]]; then + msg2 "$(gettext "Using cached copy of %s")" "${file##*/}" + else + # should never be reached + error 'Source file found but it neither exists in $startdir nor $SRCDEST.' + exit 1 + fi + ln -sf "$file" "$srcdir/" continue fi + file=$(get_filename "$netfile") + local url=$(get_url "$netfile") + # if we get here, check to make sure it was a URL, else fail if [[ $file = $url ]]; then error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file" @@ -553,18 +583,7 @@ generate_checksums() { local netfile for netfile in "${source[@]}"; do - local file="$(get_filename "$netfile")" - - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s to generate checksum.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi - + local file="$(get_absolute_filename "$netfile")" || error_source_file_not_found local sum="$(openssl dgst -${integ} "$file")" sum=${sum##* } (( ct )) && echo -n "$indent" @@ -600,14 +619,10 @@ check_checksums() { file="$(get_filename "$file")" echo -n " $file ... " >&2 - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - echo "$(gettext "NOT FOUND")" >&2 - errors=1 - found=0 - else - file="$SRCDEST/$file" - fi + if ! file="$(get_absolute_filename "$file")"; then + echo "$(gettext "NOT FOUND")" >&2 + errors=1 + found=0 fi if (( $found )) ; then @@ -645,25 +660,17 @@ extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile for netfile in "${source[@]}"; do - file=$(get_filename "$netfile") + absfile="$(get_absolute_filename "$netfile")" || error_source_file_not_found + file=${absfile##*/} if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s for extraction.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi # fix flyspray #6246 - local file_type=$(file -bizL "$file") + local file_type=$(file -bizL "$absfile") local ext=${file##*.} local cmd='' case "$file_type" in @@ -693,10 +700,10 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [[ $cmd = bsdtar ]]; then - $cmd -xf "$file" || ret=$? + $cmd -xf "$absfile" || ret=$? else rm -f "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=$? + $cmd -dcf "$absfile" > "${file%.*}" || ret=$? fi if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" @@ -1091,13 +1098,10 @@ create_srcpackage() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - if [[ -f $netfile ]]; then - msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif (( SOURCEONLY == 2 )) && [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + if [[ -f $netfile ]] || (( SOURCEONLY == 2 )); then + local file=$(get_absolute_filename "$netfile") || error_source_file_not_found + msg2 "$(gettext "Adding %s...")" "${file##*/}" + ln -s "$file" "${srclinks}/${pkgbase}" fi done -- 1.7.1

3 3

[pacman-dev] [PATCH] repo-add: symlink to db file to reponame.db
by Allan McRae 27 May '10

27 May '10

This is a small step towards allowing pacman to handle databases with variable compression types. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Although this does relatively little, it would be good to have it in before pacman-3.4 so that in a later release we could set DBEXT=.db or get rid of it altogether. scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0e46c37..7bde600 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -487,6 +487,7 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" + ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}" else msg "$(gettext "No packages modified, nothing to do.")" exit 1 -- 1.7.1

1 0

[pacman-dev] [PATCH] makepkg: Add a late check if package exists when using package functions
by Nezmer 26 May '10

26 May '10

pkgver and pkgrel can be overridden in package functions. makepkg can't use the overridden values when doing the early check if a package file already exists. That means makepkg will silently delete the existing package file and generate a new one. pkgbase=N pkgname=(N1 N2) pkgver=1 pkgrel=1 arch=(any) package_N1() { pkgver=v1 } package_N2() { pkgver=v2 } Signed-off-by: Nezmer <git(a)nezmer.info> --- This is just a quick fix I needed. There is probably better ways to do this. scripts/makepkg.sh.in | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8c0da8b..c2953b4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -979,6 +979,17 @@ check_package() { if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi + + # Check again if package already exists in case pkgver or pkgrel was overridden + if (( PKGFUNC || SPLITPKG )); then + for pkg in ${pkgname[@]}; do + if [[ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} \ + || -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT} ]]; then + error "$(gettext "A package already exists.")" + exit 1 + fi + done + fi } create_package() { -- 1.7.1

2 2

[pacman-dev] [PATCH] makepkg: bad code rep in bscript parsing
by Andres P 26 May '10

26 May '10

Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 75 +++++++++++++++++-------------------------------- 1 files changed, 26 insertions(+), 49 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..00b96a9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1070,6 +1070,30 @@ create_package() { fi } +parse_buildscript() { + local i + for i in 'changelog' 'install'; do + local $i=$(sed -n "s,^$[[:space:]]*$$i=,\1,p" "$BUILDSCRIPT") + local file + for file in ${!i}; do + # evaluate any bash variables used + eval file=${file} + + [[ $1 ]] || file=${srclinks}/${pkgbase}/$file + [[ -f $file ]] && return + + if [[ $1 ]]; then + error "$(gettext "${i^} file (%s) does not exist.")" "$file" + return 1 + else + msg2 "$(gettext "Adding $i file (%s)...")" "$file" + ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" + fi + done + done +} + + create_srcpackage() { cd "$startdir" @@ -1107,31 +1131,7 @@ create_srcpackage() { fi done - local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) - if [[ -n $install_files ]]; then - local file - for file in ${install_files[@]}; do - # evaluate any bash variables used - eval file=${file} - if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then - msg2 "$(gettext "Adding install script (%s)...")" "$file" - ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" - fi - done - fi - - local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) - if [[ -n $changelog_files ]]; then - local file - for file in ${changelog_files[@]}; do - # evaluate any bash variables used - eval file=${file} - if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then - msg2 "$(gettext "Adding package changelog (%s)...")" "$file" - ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" - fi - done - fi + parse_buildscript local TAR_OPT case "$SRCEXT" in @@ -1250,30 +1250,7 @@ check_sanity() { fi done - local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) - if [[ -n $install_files ]]; then - local file - for file in ${install_files[@]}; do - # evaluate any bash variables used - eval file=${file} - if [[ ! -f $file ]]; then - error "$(gettext "Install scriptlet (%s) does not exist.")" "$file" - return 1 - fi - done - fi - - local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) - if [[ -n $changelog_files ]]; then - for file in ${changelog_files[@]}; do - # evaluate any bash variables used - eval file=${file} - if [[ ! -f $file ]]; then - error "$(gettext "Changelog file (%s) does not exist.")" "$file" - return 1 - fi - done - fi + parse_buildscript check local valid_options=1 local opt known kopt -- 1.7.1

4 7

[pacman-dev] [PATCH] Update pacsearch to work with new Qs/Ss output
by Dan McGee 25 May '10

25 May '10

Now that we have the '[installed]' text, update pacsearch to look for it and highlight it instead of the former '***' prefix. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- contrib/pacsearch | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/contrib/pacsearch b/contrib/pacsearch index c9be759..a20df26 100755 --- a/contrib/pacsearch +++ b/contrib/pacsearch @@ -1,7 +1,7 @@ #!/usr/bin/perl # pacsearch - Adds color and install information to a 'pacman -Ss' search # -# Copyright (C) 2008 Dan McGee <dpmcgee(a)gmail.com> +# Copyright (C) 2008, 2010 Dan McGee <dpmcgee(a)gmail.com> # # Based off original shell script version: # Copyright (C) 2006-2007 Dan McGee <dpmcgee(a)gmail.com> @@ -39,7 +39,7 @@ if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") { print "$progname version $version\n"; - print "Copyright (C) 2006-2008 Dan McGee\n"; + print "Copyright (C) 2006-2010 Dan McGee\n"; exit 0; } @@ -53,17 +53,18 @@ my $CLR6 = "\e[0;33m"; my $CLR7 = "\e[1;36m"; my $INST = "\e[1;31m"; my $BASE = "\e[0m"; -my $INSTMARK = $INST."***"; -# color a "repo/pkgname pkgver" line based on the respository name +# color a "repo/pkgname pkgver" line based on the repository name sub to_color { my $line = shift; + # get the installed text colored first + $line =~ s/(\[.*\]$)/$INST$1$BASE/; + # and now the repo and dealings $line =~ s/(^core\/.*)/$CLR1$1$BASE/; $line =~ s/(^extra\/.*)/$CLR2$1$BASE/; $line =~ s/(^community\/.*)/$CLR3$1$BASE/; $line =~ s/(^testing\/.*)/$CLR4$1$BASE/; - $line =~ s/(^unstable\/.*)/$CLR5$1$BASE/; - $line =~ s/(^custom\/.*)/$CLR6$1$BASE/; + $line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/; $line =~ s/(^local\/.*)/$CLR7$1$BASE/; # any other unknown repository $line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/; @@ -83,10 +84,10 @@ if ($#syncpkgs >= 0) { # counter var for packages, used here and in the query loop too my $cnt = 0; foreach $_ (@syncpkgs) { - # we grab 3 fields here: repo, name/ver, and desc - my @pkgfields = /^(.*?)\/(.*?)\n(.*)$/s; - # add a fourth field that will indicate install status - push (@pkgfields, ""); + # we grab 4 fields here: repo, name/ver, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # since installed is optional, we should fill it in if necessary + $pkgfields[2] = "" if not defined $pkgfields[2]; # add a fifth field that indicates original order push (@pkgfields, $cnt++); # add each sync pkg by name/ver to a hash table for quick lookup @@ -102,16 +103,13 @@ if ($#querypkgs >= 0) { } foreach $_ (@querypkgs) { - # we grab 3 fields here: repo, name/ver, and desc - my @pkgfields = /^(.*?)\/(.*?)\n(.*)$/s; + # we grab 4 fields here: repo, name/ver, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # since installed is optional, we should fill it in if necessary + $pkgfields[2] = "" if not defined $pkgfields[2]; # check if the package was listed in the sync out - # if it is we want to mark it with a *** marker - if (exists $allpkgs{$pkgfields[1]}) { - # mark it in our fourth field as installed - @{ $allpkgs{$pkgfields[1]} }[3] = $INSTMARK; - } else { - # add a fourth field that will indicate install status - push (@pkgfields, $INSTMARK); + if (not exists $allpkgs{$pkgfields[1]}) { + $pkgfields[2] = "[installed]"; # add a fifth field that indicates original order (after sync) push (@pkgfields, $cnt++); # add our local-only package to the hash @@ -122,11 +120,11 @@ foreach $_ (@querypkgs) { # sort by original order (the fifth field) and print foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) { my @v = @{$allpkgs{$_}}; - my $line = "$v[0]/$v[1]"; + my $line = "$v[0]/$v[1] $v[2]"; $line = to_color($line); - # print install marker + colorized "repo/pkgname pkgver" string - print "$v[3]$line\n"; - print "$v[2]\n"; + # print colorized "repo/pkgname pkgver" string with possible installed text + print "$line\n"; + print "$v[3]\n"; } #vim: set noet: -- 1.7.1

1 0

[pacman-dev] [PATCH] makepkg: don't decompress when stripping binaries
by Andres P 25 May '10

25 May '10

f569c4a042 wrongly relied on file's output. The fix is to not decompress files in the first place. Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..49dc714 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -869,9 +869,7 @@ tidy_install() { msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" local binary find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -biz "$binary")" in - *compressed-encoding*) # Skip compressed binaries - ;; + case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip $STRIP_SHARED "$binary";; *application/x-archive*) # Libraries (.a) -- 1.7.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-196-g80f7c17
by dan＠archlinux.org 25 May '10

25 May '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 80f7c1707c2b25cbb88120f5d12e7e038beba36c (commit) via ae73d756607edc8733ddb5facc7066316c34d11f (commit) via 3cd237dec34801963b8cd522038e1a86948d2c91 (commit) via 52c3f871db3142c5157b898b46ca4f1eef05ff73 (commit) via f948cb25bb3bc4ebfdd9d759451586e1baeb7b86 (commit) from 9ab6bfad223ce65d3c37785d0aae8676bfc2702f (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 80f7c1707c2b25cbb88120f5d12e7e038beba36c Author: Andres P <stderr(a)mail.com> Date: Tue May 18 17:56:47 2010 -0430 bash_completion : full rewrite with many improvements * Undeclared local vars with common enough names to warrant breakage * Performance issues with _pacman trying to replicate /usr/bin/pacman with find and other slow tools. * Performance issues with expanding an array (with sometimes hundreds of items) over three times. * Expanding said array to remove already completed entries had the side effect of braking filenames with spaces and or \n. * add -D --database options and --print * fix dirs showing up when they shouldn't in completions * completions regarding database entries shouldn't trigger filename completion. This is now down to 106 lines. The original one (master) is 365 lines long, yet this one retains all functionality. The work is documented in FS#16630. Signed-off-by: Andres P <stderr(a)mail.com> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae73d756607edc8733ddb5facc7066316c34d11f Author: Andres P <aepd87(a)gmail.com> Date: Sat May 22 00:36:52 2010 -0430 makepkg: replace unnecessary uses of grep Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3cd237dec34801963b8cd522038e1a86948d2c91 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 22 22:27:14 2010 +1000 makepkg: fix permissions on install and changelog files The .INSTALL and .CHANGELOG files in a package retained the permissions that they had in $startdir. Do a chmod after copying to ensure that the permissions are sane. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52c3f871db3142c5157b898b46ca4f1eef05ff73 Author: Andres P <aepd87(a)gmail.com> Date: Mon May 24 17:02:55 2010 -0430 makepkg: don't decompress when stripping binaries f569c4a042 wrongly relied on file's output. The fix is to not decompress files in the first place. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f948cb25bb3bc4ebfdd9d759451586e1baeb7b86 Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 19 20:33:35 2010 +1000 Change directory in package function in PKGBUILD.proto makepkg goes back to the $startdir between the build() and package() functions so we need to change directory at the start of the package function. TODO: fix makepkg to make this unnecessary Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 2 + contrib/bash_completion | 434 ++++++++++------------------------------------- scripts/makepkg.sh.in | 20 +- 3 files changed, 98 insertions(+), 358 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix permissions on install and changelog files
by Allan McRae 22 May '10

22 May '10

The .INSTALL and .CHANGELOG files in a package retained the permissions that they had in $startdir. Do a chmod after copying to ensure that the permissions are sane. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..4a6040d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1015,6 +1015,7 @@ create_package() { if [[ -n $install ]]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL + chmod 644 .INSTALL comp_files="$comp_files .INSTALL" fi @@ -1022,6 +1023,7 @@ create_package() { if [[ -n $changelog ]]; then msg2 "$(gettext "Adding package changelog...")" cp "$startdir/$changelog" .CHANGELOG + chmod 644 .CHANGELOG comp_files="$comp_files .CHANGELOG" fi -- 1.7.1

1 0

[pacman-dev] [PATCH] [makepkg] split debug support
by Arerep Serdna 22 May '10

22 May '10

~ Less code repetition ~ Drop -t flag; OPTIONS=(splitdbg) only ~ secure_dir isn't really secure but I couldn't think of a better name Signed-off-by: Arerep Serdna <aepd87(a)gmail.com> --- Original by Jan M. (funkyou): http://bugs.archlinux.org/task/10975 etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 134 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 89 insertions(+), 46 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..f744ac3 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -62,6 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- splitdbg: Same as above, while keeping the symbols in usr/lib/debug #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..93548ef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -43,8 +43,9 @@ BUILDSCRIPT='@BUILDSCRIPT@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" +dbgdir="$startdir/dbg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'splitdbg' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -808,6 +809,28 @@ run_package() { run_function "$pkgfunc" } +secure_dir() { + [[ -d $1 ]] || mkdir -p "$1"; chmod a-s "$1" +} + +# strip_flags must be declared local in the inclosing function +pre_strip() { + local binary + while read binary; do + case "$(file -biz "$binary")" in + *application/x-sharedlib*) # Libraries (.so) + strip_flags="$STRIP_SHARED";; + *application/x-archive*) # Libraries (.a) + strip_flags="$STRIP_STATIC";; + *application/x-executable*) # Binaries + strip_flags="$STRIP_BINARIES";; + *) + continue;; + esac + echo "$binary" + done < <(find "${STRIP_DIRS[@]}" -type f -perm -u+w 2>/dev/null) +} + tidy_install() { cd "$pkgdir" msg "$(gettext "Tidying install...")" @@ -865,21 +888,32 @@ tidy_install() { done fi - if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then - msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" - local binary - find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -biz "$binary")" in - *compressed-encoding*) # Skip compressed binaries - ;; - *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; - *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done + if [[ -n ${STRIP_DIRS[*]} ]]; then + local strip_flags + if [[ $(check_option splitdbg) = "y" ]]; then + msg2 "$(gettext "Moving debugging symbols from binaries and libraries into separate files...")" + pre_strip | while read binary; do + basename="${binary%%*/}" + dirname="${dirname%/*}" + dbg_file="$basename.debug" + dbg_dest="$dbgdir/usr/lib/debug/$binary.debug" + dbg_destdir="${dbg_dest%/*}" + pushd "$dirname" &>/dev/null + /usr/bin/objcopy --only-keep-debug "$basename" "$dbg_file" + /usr/bin/strip $strip_flags "$basename" + /usr/bin/objcopy --add-gnu-debuglink="$dbg_file" "$basename" + if [[ ! -d $dbg_destdir ]]; then + mkdir -p "$dbg_destdir" + fi + mv "$dbg_file" "$dbg_dest" + popd &>/dev/null + done + elif [[ $(check_option strip) = "y" ]]; then + msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" + pre_strip | while read binary; do + /usr/bin/strip $strip_flags "$binary" + done + fi fi if [[ $(check_option libtool) = "n" ]]; then @@ -1070,12 +1104,23 @@ create_package() { fi } +create_dbgpackage() { + [[ -n $(find "$dbgdir" -type f -name \*.debug -print -quit) && + $(check_option splitdbg) = "y" ]] || return 0 + local pkg="${1:-$pkgname}" + pkgdesc+=" (Debug symbols)" + pkgdir="$dbgdir" + depends=("$pkg") + unset backup build changelog conflicts install optdepends \ + provides replaces source + create_package "$pkg-debug" +} + create_srcpackage() { cd "$startdir" # Get back to our src directory so we can begin with sources. - mkdir -p "$srcdir" - chmod a-s "$srcdir" + secure_dir "$srcdir" cd "$srcdir" if (( ! SKIPINTEG || SOURCEONLY == 2 )); then download_sources @@ -1417,6 +1462,24 @@ restore_package_variables() { done } +process_splitpkg() { + for pkg in ${pkgname[@]}; do + for dir in {pkg,dbg}dir; do + read $dir <<<"${!dir}/$pkg" + secure_dir "${!dir}" + done + backup_package_variables + run_package $pkg + tidy_install + create_package $pkg + create_dbgpackage $pkg + restore_package_variables + for dir in {pkg,dbg}dir; do + read $dir <<<"${!dir%/*}" + done + done +} + # getopt like parser parse_options() { local short_options=$1; shift; @@ -1782,8 +1845,7 @@ else fi if (( GENINTEG )); then - mkdir -p "$srcdir" - chmod a-s "$srcdir" + secure_dir "$srcdir" cd "$srcdir" download_sources generate_checksums @@ -1884,18 +1946,9 @@ if (( INFAKEROOT )); then tidy_install fi create_package + create_dbgpackage else - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" - backup_package_variables - run_package $pkg - tidy_install - create_package $pkg - restore_package_variables - pkgdir="${pkgdir%/*}" - done + process_splitpkg fi msg "$(gettext "Leaving fakeroot environment.")" @@ -1949,8 +2002,7 @@ fi umask 0022 # get back to our src directory so we can begin with sources -mkdir -p "$srcdir" -chmod a-s "$srcdir" +secure_dir "$srcdir" cd "$srcdir" if (( NOEXTRACT )); then @@ -1989,8 +2041,7 @@ else msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" + secure_dir "$pkgdir" cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -2012,18 +2063,9 @@ else fi fi create_package + create_dbgpackage else - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" - backup_package_variables - run_package $pkg - tidy_install - create_package $pkg - restore_package_variables - pkgdir="${pkgdir%/*}" - done + process_splitpkg fi else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then -- 1.7.1

3 4

[pacman-dev] [PATCH 2/2] ensure package download sizes are invalidated when an error occurs
by Jonathan Conder 22 May '10

22 May '10

Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/sync.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index d9f4c28..9e140dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -855,9 +855,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(files) { EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); - errors = _alpm_download_files(files, current->servers, cachedir); - - if (errors) { + if(_alpm_download_files(files, current->servers, cachedir)) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); if(pm_errno == 0) { @@ -869,12 +867,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } } - for(j = trans->add; j; j = j->next) { - pmpkg_t *pkg = j->data; - pkg->infolevel &= ~INFRQ_DSIZE; - pkg->download_size = 0; - } - /* clear out value to let callback know we are done */ if(handle->totaldlcb) { handle->totaldlcb(0); @@ -1003,6 +995,12 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) ret = 0; error: + for(j = trans->add; j; j = j->next) { + pmpkg_t *pkg = j->data; + pkg->infolevel &= ~INFRQ_DSIZE; + pkg->download_size = 0; + } + FREELIST(files); alpm_list_free(deltas); return(ret); -- 1.7.1

4 8