December 2006 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] fix in_array (usage) and code cleanup
by Jürgen Hötzel 21 Dec '06

21 Dec '06

Hi, the use of in_array in line 444 is invalid: bash-3.2$ makepkg-cvs /home/juergen/archlinux/pacman-lib/scripts/makepkg: line 444: [: too many arguments Helper function like in_array should not use global variables. I also did some code cleanup (the temp. file "filelist" was not even used). Less Code. Better Code. patch enclosed. Jürgen

2 1

[pacman-dev] My makepkg changes/updates
by Dan McGee 21 Dec '06

21 Dec '06

Last email of the day, hopefully. Here is my current diff on makepkg, not really meant to be applied in its current state but at least letting you know what I am working on and hopefully I can get some feedback out of it. I'll make a cleaner diff in a few days and hopefully this script will start to look a little better. 1. Adds --repackage option and $REPKG variable, should be noted by a comment in the code. The diff does some weird things where I had to indent a whole big block of code, so I'd recommend just trying to look at it as a whole at that part (basically the whole 'build' section). 2. Adds and removes blank lines to be more consistent, or maybe just more for my own readability. Also adds a description of makepkg. 3. Removes keepdocs and nostrip options (on the command line). 4. Removes hardcoded references to /var/cache/pacman/src. 5. Fixes a syntax warning in the architecture detection. 6. Adds a missing / in the cp statement for source file copying. 7. Lets you see my scattered/random TODOs throughout the code. -Dan --- pacman-lib.orig/scripts/makepkg 2006-12-20 21:30:06.000000000 -0500 +++ pacman-lib/scripts/makepkg 2006-12-20 22:19:46.000000000 -0500 @@ -1,6 +1,6 @@ #!/bin/bash # -# makepkg +# makepkg - make packages compatable for use with pacman # # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> @@ -44,19 +44,21 @@ FORCE=0 GENINTEG=0 INSTALL=0 -DOWNLOAD="" NOBUILD=0 NODEPS=0 NOEXTRACT=0 RMDEPS=0 +REPKG=0 LOGGING=0 PACMAN_OPTS= -INFAKEROOT= +# determine if we are running with fakeroot if [ "$1" = "-F" ]; then INFAKEROOT=1 shift +else + INFAKEROOT=0 fi ### SUBROUTINES ### @@ -68,6 +70,7 @@ echo " $1" >&2 fi } + msg() { if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 @@ -91,6 +94,7 @@ echo "==> WARNING: $1" >&2 fi } + error() { if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 @@ -239,6 +243,7 @@ fi missingdeps=1 fi + # rerun any additional sh scripts found in /etc/profile.d/ for i in /etc/profile.d/*.sh do @@ -246,8 +251,6 @@ . $i &>/dev/null fi done - # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG return $missingdeps } @@ -269,18 +272,15 @@ echo " -h, --help This help" echo " -i, --install Install package after successful build" echo " -j <jobs> Set MAKEFLAGS to \"-j<jobs>\" before building" - echo " -k, --keepdocs Keep doc and info directories" echo " -L, --log Log package build process" echo " -m, --nocolor Disable colorized output messages" - echo " -n, --nostrip Do not strip symbols from binaries/libraries" echo " -o, --nobuild Download and extract files only" echo " -p <buildscript> Use an alternate build script (instead of '$BUILDSCRIPT')" echo " -r, --rmdeps Remove installed dependencies after a successful build" + # fix flyspray feature request #2978 + echo " -R, --repackage Repackage contents of $startdir/pkg without building" echo " -s, --syncdeps Install missing dependencies with pacman" echo " -S, --sudosync Install missing dependencies with pacman and sudo" - # fix flyspray feature request #5223 - Dan McGee <dpmcgee(a)gmail.com> - echo " -t <sourcedir> Cache source files in <sourcedir>" - echo " -w <destdir> Write package to <destdir> instead of the working dir" echo echo "These options can be passed to pacman:" echo @@ -294,15 +294,12 @@ ARGLIST=$@ if [ -f /etc/makepkg.conf ]; then - source /etc/makepkg.conf + source /etc/makepkg3.conf else - error "/etc/makepkg.conf not found. cannot continue" + error "/etc/makepkg3.conf not found. Cannot continue." exit 1 fi -#Let's be courteous and support frugalware's extensions -[ -e /usr/lib/frugalware/fwmakepkg ] && . /usr/lib/frugalware/fwmakepkg - while [ "$#" -ne "0" ]; do case $1 in # pacman @@ -319,12 +316,11 @@ --noextract) NOEXTRACT=1 ;; --install) INSTALL=1 ;; --force) FORCE=1 ;; - --keepdocs) KEEPDOCS=1 ;; - --nostrip) NOSTRIP=1 ;; --nobuild) NOBUILD=1 ;; --nocolor) USE_COLOR="n" ;; --geninteg) GENINTEG=1 ;; --rmdeps) RMDEPS=1 ;; + --repackage) REPKG=1 ;; --log) LOGGING=1 ;; --help) usage @@ -335,7 +331,7 @@ exit 1 ;; -*) - while getopts "bBcCdefghij:kLmnop:rsSt:w:-" opt; do + while getopts "bBcCdefghij:Lmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; B) USE_CCACHE=0 ;; @@ -346,30 +342,27 @@ f) FORCE=1 ;; g) GENINTEG=1 ;; h) - usage - exit 0 - ;; + usage + exit 0 + ;; i) INSTALL=1 ;; j) export MAKEFLAGS="-j$OPTARG" ;; - k) KEEPDOCS=1 ;; L) LOGGING=1 ;; m) USE_COLOR="n" ;; - n) NOSTRIP=1 ;; o) NOBUILD=1 ;; p) BUILDSCRIPT=$OPTARG ;; r) RMDEPS=1 ;; + R) REPKG=1 ;; s) DEP_BIN=1 ;; S) DEP_SUDO=1 ;; - t) SRCDEST=$OPTARG ;; - w) PKGDEST=$OPTARG ;; -) - OPTIND=0 - break - ;; + OPTIND=0 + break + ;; *) - usage - exit 1 - ;; + usage + exit 1 + ;; esac done ;; @@ -386,6 +379,7 @@ exit 1 fi +#TODO: is this necessary? # convert a (possibly) relative path to absolute cd $PKGDEST 2>/dev/null if [ $? -ne 0 ]; then @@ -396,20 +390,18 @@ cd $OLDPWD if [ "$CLEANCACHE" = "1" ]; then + # fix flyspray feature request #5223 if [ -n "$SRCDEST" ]; then msg "Cleaning up source files from the cache." - rm -rf /var/cache/pacman/src/* - rm -rf "${SRCDEST}"/* - exit 0 - else - if [ "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then - msg "Cleaning up source files from the cache." - rm -rf /var/cache/pacman/src/* - exit 0 - else - error "You must be root to clean the cache." + rm -rf "$SRCDEST"/* + if [ $? -ne 0 ]; then + error "Problem removing files; you may not have correct permissions in $SRCDEST" exit 1 + else + exit 0 fi + else + error "Source destination must be defined in makepkg.conf." fi fi @@ -452,7 +444,7 @@ error "pkgrel is not allowed to contain hyphens." exit 1 fi -if ! in_array $CARCH ${arch[@]}; then +if [ ! "in_array $CARCH ${arch[@]}" ]; then error "$pkgname is not available for the '$CARCH' architecture." plain "Note that many packages may need a line added to their $BUILDSCRIPT" plain "such as arch=('$CARCH')." @@ -504,7 +496,7 @@ msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" unset deplist makedeplist -# fix flyspray bug #5973 - Dan McGee <dpmcgee(a)gmail.com> +# fix flyspray bug #5973 if [ $(type -p pacman) -a "$NODEPS" = "0" -a "$GENINTEG" = "0" -a "$NOBUILD" = "0" ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]}) @@ -524,7 +516,9 @@ if [ $? -gt 0 ]; then exit 1 fi -elif [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" ]; then +elif [ "$GENINTEG" = "1" -o "$NOBUILD" = "1" ]; then + msg "skipping dependency checks." +elif [ "$NODEPS" = "1" ]; then warning "skipping dependency checks." else warning "pacman was not found in PATH. skipping dependency checks." @@ -537,16 +531,13 @@ mkdir -p src cd $startdir/src for netfile in ${source[@]}; do - file=$(strip_url $netfile) + file=$(strip_url "$netfile") if [ -f "../$file" ]; then - msg " Found $file in build dir" + msg2 "Found $file in build dir" cp "../$file" . elif [ -f "$SRCDEST/$file" ]; then - msg " Using cached copy of $file" - cp "$SRCDEST$file" . - elif [ -f "/var/cache/pacman/src/$file" ]; then - msg " Using cached copy of $file" - cp "/var/cache/pacman/src/$file" . + msg2 "Using cached copy of $file" + cp "$SRCDEST/$file" . else # check for a download utility if [ -z "$FTPAGENT" ]; then @@ -566,33 +557,28 @@ msg "Aborting..." exit 1 fi - msg " Downloading $file" + msg2 "Downloading $file" $FTPAGENT "$netfile" 2>&1 # fix flyspray bug #3289 ftpret=$? if [ $ftpret -gt 0 ]; then error "Failure while downloading $file" msg "Aborting..." - rm "$file" - exit 1 + #rm "$file" exit 1 fi - if [ "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then - mkdir -p /var/cache/pacman/src && cp $file /var/cache/pacman/src - if [ -n "$SRCDEST" ]; then - mkdir -p $SRCDEST && cp "$file" $SRCDEST - elif [ "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then - mkdir -p /var/cache/pacman/src && cp "$file" /var/cache/pacman/src - else + if [ -n "$SRCDEST" ]; then + mkdir -p $SRCDEST && cp "$file" $SRCDEST + if [ $? -ne 0 ]; then + warning "You do not have correct permissions to cache source in $SRCDEST" cp "$file" .. - fi + else + cp "$file" .. fi fi done - - -if [ "$NOEXTRACT" = "1" ]; then +if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "Skipping source integrity checks -- using existing src/ tree" else for integ in ${INTEGRITY_CHECK[@]}; do @@ -635,7 +621,7 @@ fi done plain "" - #Validate integrity checks + #Validate integrity checks else integrity_sums=($(eval echo \${${integrity_name}s[@]})) @@ -645,6 +631,7 @@ idx=0 for netfile in "${source[@]}"; do file=$(strip_url "$netfile") + #TODO is there a reason this is echo and not msg/msg2? echo -n " $file ... " >&2 echo "${integrity_sums[$idx]} $file" | $integrity_name -c - >/dev/null 2>&1 if [ $? -ne 0 ]; then @@ -671,8 +658,8 @@ fi #Extract sources -if [ "$NOEXTRACT" = "1" ]; then - warning "Skipping source extraction -- using existing src/ tree" +if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then + warning "Skipping source extraction -- using existing src/ tree" else msg "Extracting Sources..." for netfile in "${source[@]}"; do @@ -699,7 +686,7 @@ cmd="bunzip2 -f $file" ;; esac if [ "$cmd" != "" ]; then - msg " $cmd" + msg2 "$cmd" $cmd if [ $? -ne 0 ]; then # unzip will return a 1 as a warning, it is not an error @@ -713,71 +700,73 @@ done fi -if [ "$EUID" = "0" ]; then - # chown all source files to root.root - chown -R root.root $startdir/src -fi - -# check for existing pkg directory -if [ -d $startdir/pkg ]; then - msg "Removing existing pkg/ directory..." - rm -rf $startdir/pkg -fi -mkdir -p $startdir/pkg - -if [ "$NOBUILD" = "1" ]; then - msg "Sources are ready." - exit 0 -fi - -# use distcc if requested -if [ "$USE_DISTCC" = "y" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH -fi - -# use ccache if it's available -if [ "$USE_CCACHE" = "1" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH -fi - -# build -msg "Starting build()..." +if [ "$REPKG" = "0" ]; then + if [ "$EUID" = "0" ]; then + # chown all source files to root.root + chown -R root.root $startdir/src + fi -#check for "exit on syntax error" shell option -echo $SHELLOPTS | grep errexit 2>&1 >/dev/null -set_e=$? + # check for existing pkg directory + if [ -d $startdir/pkg ]; then + msg "Removing existing pkg/ directory..." + rm -rf $startdir/pkg + fi + mkdir -p $startdir/pkg -if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" - if [ -f "$BUILDLOG" ]; then - i=1 - while true; do - if [ -f "$BUILDLOG.$i" ]; then - i=$(($i +1)) - else - break - fi - done - mv "$BUILDLOG" "$BUILDLOG.$i" + if [ "$NOBUILD" = "1" ]; then + msg "Sources are ready." + exit 0 fi - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" - [ $set_e -eq 1 ] && set +e + # use distcc if requested + if [ "$USE_DISTCC" = "y" ]; then + [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + fi + + # use ccache if it's available + if [ "x$USE_CCACHE" = "1" ]; then + [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH + fi + + # build + msg "Starting build()..." + + #check for "exit on syntax error" shell option + echo $SHELLOPTS | grep errexit 2>&1 >/dev/null + set_e=$? + + if [ "x$LOGGING" = "1" ]; then + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + if [ -f "$BUILDLOG" ]; then + i=1 + while true; do + if [ -f "$BUILDLOG.$i" ]; then + i=$( ($i +1)) + else + break + fi + done + mv "$BUILDLOG" "$BUILDLOG.$i" + fi - if [ ${PIPESTATUS[0]} -gt 0 ]; then - error "Build Failed. Aborting..." - exit 2 - fi -else - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 - [ $set_e -eq 1 ] && set +e - if [ $? -gt 0 ]; then - error "Build Failed. Aborting..." - exit 2 + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 | tee "$BUILDLOG" + [ $set_e -eq 1 ] && set +e + + if [ ${PIPESTATUS[0]} -gt 0 ]; then + error "Build Failed. Aborting..." + exit 2 + fi + else + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 + [ $set_e -eq 1 ] && set +e + if [ $? -gt 0 ]; then + error "Build Failed. Aborting..." + exit 2 + fi fi fi @@ -788,6 +777,8 @@ rm -rf pkg/usr/info pkg/usr/share/info rm -rf pkg/usr/doc pkg/usr/share/doc rm -rf pkg/{usr,opt/gnome}/share/gtk-doc + # fix flyspray bug #5021 + #rm -rf ${DOC_DIRS[@]} fi # move /usr/share/man files to /usr/man

4 11

[pacman-dev] NoUpgrade issues
by Aaron Griffin 21 Dec '06

21 Dec '06

First off, thanks to Thomas and Travis for helping me out with this one. There is an issue with pacman and the NoUpgrade removal. Let me try to breeze over it. Files marked in the backup=() array have saved MD5 sums in pacman's db. Theses are used for comparison when upgrading. It compares the 'local' md5 sum (on the file system), the 'new' md5 sum, from the package, and the 'original' md5 sum from the database. Here is the problem: in BOTH pacman 2 and 3, when a package is marked NoUpgrade, pacman stores the 'local' md5 sum in the database instead of the 'original' md5 sums. I can see this _possibly_ being intentional, but here's where the problem occurs. When you remove NoUpgrade, the 'original' and 'local' md5 sums are the same. The comparission says "oh this file hasn't been touched since it was installed, we can overwrite it" and kills your configs. So, the proposed solution, which is the easiest: Fix pacman3 to store the correct md5 sum even if it is a NoUpgrade file. Then, we leave the NoUpgrade lines in pacman.conf and wait one release (or more) to remove them. Removing them will happen after each NoUpgrade package has been upgraded (or artificially version bumped). Those packages: initscripts module-init-tools pacman grub lilo filesystem ...and one or two others I forget... Does anyone have an issue with this solution?

3 3

[pacman-dev] [PATCH] fix automake conditional for java bindings
by Jürgen Hötzel 21 Dec '06

21 Dec '06

Hi, I work on Lua bindings and found this problem. Patch enclosed: Don't build java bindings when swig is NOT installed. Jürgen

2 1

[pacman-dev] My thoughts for development
by Dan McGee 21 Dec '06

21 Dec '06

Since I've been spending quite a bit of time looking at the code lately, I've been making a TODO list of things worth looking into. I thought I'd put it up on the list for input. makepkg issues: 1. We went through and added some of the undocumented options to the makepkg.conf file, but I haven't done a whole lot of testing on this to see if it works correctly. I also don't know if all the checking is correct, and I see Aaron put some x's in front of these checks. Has anyone else? They also aren't documented in the man page if anyone wants to step up to the plate... 2. Remove use of multiple `` or $() calls to the same function. I have a local update of calling $(id -u) once and storing it to a variable for later use, I can publish a patch sometime. 3. I posted a patch for #5223 (source cache) and it has been patched. However, it is now a triple conditional with three different possible locations for package source (current dir, $SRCDEST, and /var/cache/pacman/src). Is the last one necessary since it is highly recommended to not build as root? Should we deprecate this path? Looking even further ahead, should we make fakeroot a requirement for running makepkg? 4. Aaron, you brought up that `` is the older standard and $() should be used. It is a pretty simple find that will allow you to change these for consistency, I've done it on my working copy. 5. Already mentioned, but a modeline in makepkg. 6. Overabundance of options in makepkg- I was trying to find a new letter for a '--repackage' option and we are pretty much out of lowercase letters. At the moment we have two basic types of options: things that can be done in the pkgbuild options line, and things that directly affect the way makepkg works (geninteg, skip integs, location of PKGBUILD). Are the first type truly necessary? It would make makepkg a bit more streamlined if the only options were those that can't be done somewhere else. So i propose the '--nostrip', '--keepdocs', and any other option like this be removed. 7. Integrity checking- currently generating integrity checks will only generate those from the first one in the INTEGRITY_CHECK array. This seems to make sense as long as the array in makepkg.conf is ordered the way we want it to be. When checking, we do get warning messages for other types that may be in the array but are not in the PKGBUILD. I just wanted to confirm this is the behavior you are looking for. Other issues: 1. Move the PKGBUILD man page to section 5 2. How are you guys doing side-by-side builds with the old pacman? At least for me, the current build system seems horribly complicated with shell scripts, configure, automaking and such. Is there a good reason for this? 3. Everyone talks about pacman slowness (even though it isn't really that bad), and looking though the mailing list archives I believe Aaron implemented a form of lazy caching (not loading the descriptions when unnecessary). Anything else on this front? I thought of something and I may be way off track, but what if when generating a repository we make (in addition to the flat file format) a single file with lines consisting of pkgname-pkgver:description? This file could be loaded and searched a lot quicker than flat files, and I think the operation people complain about being slow the most is a search. Wow, long list, but maybe it will provoke other great ideas. Feel free to respond to any or all of it. -Dan

4 10

[pacman-dev] makepkg program flow and linearity
by Dan McGee 21 Dec '06

21 Dec '06

I feel like I haven't wrote enough emails to the list today, so here is another. :) I wrote out this little chart for my own good today and noticed that the flow is relatively linear, but some of the checks for options play some crazy tricks on how it flows. In some sense, the operations I list below can all be split up without overlap (read: be made into functions). I'm wondering if we should think a little more about program flow now that all these options such as 'don't check dependencies' and 'use existing source' are present? There are some very long sections of code all indented inside an if-block, and it makes changing things a lot harder (ex. the generate integrity/check integrity/extract sources block). What if before each definable section, we do the 'if' statement instead, even if it means two sections in a row might have the same if clause? I don't know if that explanation made sense, so let me know. makepkg program flow and steps: determine fakeroot status (using -F) source makepkg.conf set correct options from $ARGLIST check for sudo convert relative $PKGDEST to absolute if $CLEANCACHE clean cache unset all variables we use check if buildscript exists source buildscript check for no-nos in build script enter fakeroot if necessary (calling makepkg again) check runtime dependencies check buildtime dependencies retrieve sources loop through $INTEGRITY_CHECK if $GENINTEG generate integrity checks else check integrity checks extract sources check file ownership, remove pkg/, use distcc, use ccache if $LOGGING log build build remove info/doc files move man pages if necessary remove possibly empty /usr/share directory compress man pages strip binaries remove libtool files remove empty directories get package meta info and make .PKGINFO check for an install script build a filelist tar up the package if $CLEANUP then cleanup if $RMDEPS then remove installed dependencies if $INSTALL then install with sudo or as root, etc. -Dan

1 0

[pacman-dev] Patch for makepkg bug #5021
by Dan McGee 20 Dec '06

20 Dec '06

This is a _preliminary_ patch for bug 5021. It should do everything the original code does plus some. A few comments: 1. I have very little familiarity with info or doc files, and the find operation could be tightened up by adding an extension if they are always packaged this way (e.g. .info). 2. Is there ever a time where a folder would exist with the doc or info name and it shouldn't be deleted? Obviously these find operations will do that, so I would want to make sure this is the case. Good naming of directories would lead me to believe it shouldn't happen, but who knows... If anyone knows a good package to test this behavior on, let me know. I haven't yet ran it on a lot of packages. I tried running it on the gnubiff package listed in the bug report but got a linking error (with both the version in the PKGBUILD and the updated 2.2.4 version). -Dan ============= --- /home/dmcgee/projects/pacman-lib.orig/scripts/makepkg 2006-12-19 11:40:51.000000000 -0500 +++ makepkg 2006-12-20 01:13:56.000000000 -0500 @@ -774,13 +774,17 @@ fi fi -if [ ! "`check_option KEEPDOCS`" -a "$KEEPDOCS" = "0" ]; then +if [ ! "$(check_option KEEPDOCS)" -a "$KEEPDOCS" = "0" ]; then # remove info/doc files msg "Removing info/doc files..." cd $startdir - rm -rf pkg/usr/info pkg/usr/share/info - rm -rf pkg/usr/doc pkg/usr/share/doc - rm -rf pkg/{usr,opt/gnome}/share/gtk-doc + # fix flyspray bug #5021 + find pkg -type f -wholename "pkg/*/info/*" -exec rm -f {} \; + find pkg -type d -wholename "pkg/*/info" -exec rmdir {} \; + find pkg -type f -wholename "pkg/*/doc/*" -exec rm -f {} \; + find pkg -type d -wholename "pkg/*/doc" -exec rmdir {} \; + find pkg -type f -wholename "pkg/*/gtk-doc/*" -exec rm -f {} \; + find pkg -type d -wholename "pkg/*/gtk-doc" -exec rmdir {} \; fi # move /usr/share/man files to /usr/man

4 12

[pacman-dev] script spaces/tabs, modelines, etc.
by Dan McGee 18 Dec '06

18 Dec '06

Since I've been working on the makepkg script a decent amount, I noticed it had no vim modeline. I also noticed that many of the other scripts do not have a modeline, others are inconsistant, and the abs script actually has 2: $ grep vim * abs:# vim: set ft=sh ts=2 sw=2 abs:# vim: set ts=2 noet: gensync:# vim: set ts=2 sw=2 noet: rankmirrors:# vim: set ts=4 sw=4 sta et sts ai: The rankmirrors one is going to be a bit different because it is a python script, but should we standardize some sort of thing for the bash/sh scripts? Right now the makepkg script is starting to turn into an interesting mix of tabs and spaces, especially if someone uses a ts size different than 4. Here is my take on the situation: 1. Update the modeline for abs- ft should be detected anyway, and no need for two modelines. 2. Standardize the inclusion of the modeline used by the gensync script across all bash scripts included with pacman. It makes sense to have one standard and this seems to be the one most readily available for scripting. Always place this modeline as the last line of the file. If spacing/tabs is a no-no here, I apologize. :) -Dan

3 9

[pacman-dev] patch for makepkg bug #3289
by Dan McGee 18 Dec '06

18 Dec '06

http://bugs.archlinux.org/task/3289 is the ftp status bug, I took the idea from the patch that was sitting there and updated it a bit and made it work for this version of makepkg. No promises that the patch applies smoothly, I have a lot of local changes to my makepkg... -Dan P.S. Aaron, when you apply these, you can take my comments out with my name, I don't really need or want the credit for each little change. I'm fine with just being an additional author in the authors list. I just figured I would at least put a comment in referencing the bug it fixed for clarity now and this can be cleaned up later. =================================================================== RCS file: /home/cvs-pacman/pacman-lib/scripts/makepkg,v retrieving revision 1.19 diff -u -r1.19 makepkg --- makepkg 14 Dec 2006 05:23:08 -0000 1.19 +++ makepkg 18 Dec 2006 06:40:11 -0000 @@ -568,7 +576,10 @@ fi msg " Downloading $file" $FTPAGENT "$netfile" 2>&1 - if [ ! -f "$file" ]; then - error "Failed to download $file" + # fix flyspray bug #3289 - Dan McGee <dpmcgee(a)gmail.com> + ftpret=$? + if [ $ftpret -gt 0 ]; then + error "Failure while downloading $file" msg "Aborting..." + rm "$file" exit 1

2 2

[pacman-dev] makepkg script changes
by Dan McGee 12 Dec '06

12 Dec '06

This is a relatively big patch with a few different things in it. As always, take it or leave it. * Addresses FS bugs 5223 and 5973, comments are in the patch noting the start of these changes. * Allows makepkg script to be usable again. I did notice that integrity checks are not working at the moment, but I assume that is known. * Removed some duplicate lines of code (e.g. things that were moved earlier in the script or outside of loops) * Adds quotes around filename references to ensure we do not break the script with weird filenames. * Changes use of `` and $() to be a bit more consistent- `` are used wherever possible. * Removes /usr/share from man page compression search- they are explicitly moved from this location ten lines before in the script so there better not be anything there. Dan ____________________ --- pacman-lib.orig/scripts/makepkg 2006-12-05 17:30:23.000000000 -0500 +++ pacman-lib/scripts/makepkg 2006-12-11 20:02:59.000000000 -0500 @@ -25,11 +25,12 @@ # USA. # -myver='2.9.8' +myver='3.0.0' startdir=`pwd` PKGDEST=$startdir # Options +BUILDSCRIPT="./PKGBUILD" CLEANUP=0 CLEANCACHE=0 DEP_BIN=0 @@ -187,18 +188,18 @@ if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 - fi + fi elif [ "$DEP_SRC" = "1" ]; then # install missing deps by building them from source. # we look for each package name in $SRCROOT and build it. if [ "$SRCROOT" = "" ]; then - error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" + error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" exit 1 fi # TODO: handle version comparators (eg, glibc>=2.2.5) msg "Building missing dependencies..." for dep in $deplist; do - candidates=$(find $SRCROOT -type d -name "$dep") + candidates=`find $SRCROOT -type d -name "$dep"` if [ "$candidates" = "" ]; then error "Could not find \"$dep\" under $SRCROOT" exit 1 @@ -266,12 +267,14 @@ echo " -k, --keepdocs Keep doc and info directories" echo " -L, --log Log package build process" echo " -m, --nocolor Disable colorized output messages" - echo " -n, --nostrip Do not strip binaries/libraries" + echo " -n, --nostrip Do not strip symbols from binaries/libraries" echo " -o, --nobuild Download and extract files only" echo " -p <buildscript> Use an alternate build script (instead of '$BUILDSCRIPT')" echo " -r, --rmdeps Remove installed dependencies after a successful build" echo " -s, --syncdeps Install missing dependencies with pacman" echo " -S, --sudosync Install missing dependencies with pacman and sudo" + # fix flyspray feature request #5223 + echo " -t <sourcedir> Cache source files in <sourcedir>" echo " -w <destdir> Write package to <destdir> instead of the working dir" echo echo "These options can be passed to pacman:" @@ -279,22 +282,19 @@ echo " --noconfirm Do not ask for confirmation when resolving dependencies" echo " --noprogressbar Do not show a progress bar when downloading files" echo - echo "If -p is not specified, makepkg will look for './$BUILDSCRIPT'" + echo "If -p is not specified, makepkg will look for '$BUILDSCRIPT'" echo } ARGLIST=$@ -if [ -f /etc//makepkg.conf ]; then +if [ -f /etc/makepkg.conf ]; then source /etc/makepkg.conf else error "/etc/makepkg.conf not found. cannot continue" exit 1 fi -#Let's be courteous and support frugalware's extensions -[ -e /usr/lib/frugalware/fwmakepkg ] && . /usr/lib/frugalware/fwmakepkg - while [ "$#" -ne "0" ]; do case $1 in # pacman @@ -327,7 +327,7 @@ exit 1 ;; -*) - while getopts "bBcCdefghij:Lmnop:rsSw:-" opt; do + while getopts "bBcCdefghij:kLmnop:rsSt:w:-" opt; do case $opt in b) DEP_SRC=1 ;; B) USE_CCACHE=0 ;; @@ -352,6 +352,7 @@ r) RMDEPS=1 ;; s) DEP_BIN=1 ;; S) DEP_SUDO=1 ;; + t) SRCDEST=$OPTARG ;; w) PKGDEST=$OPTARG ;; -) OPTIND=0 @@ -387,13 +388,19 @@ cd $OLDPWD if [ "$CLEANCACHE" = "1" ]; then - if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then + if [ -n "$SRCDEST" ]; then msg "Cleaning up source files from the cache." - rm -rf /var/cache/pacman/src/* + rm -rf $SRCDEST/* exit 0 else - error "You must be root to clean the cache." - exit 1 + if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then + msg "Cleaning up source files from the cache." + rm -rf /var/cache/pacman/src/* + exit 0 + else + error "You must be root to clean the cache." + exit 1 + fi fi fi @@ -401,7 +408,6 @@ unset replaces depends conflicts backup source install build makedepends unset options - # some applications (eg, blackbox) will not build with some languages unset LC_ALL LANG umask 0022 @@ -409,11 +415,6 @@ if [ ! -f $BUILDSCRIPT ]; then error "$BUILDSCRIPT does not exist." exit 1 -else - #this is fun.... we'll unset - for var in $(grep "=" $BUILDSCRIPT | sed "s|.*$\<.*\>$=.*|\1|g"); do - unset $var - done fi source $BUILDSCRIPT @@ -427,16 +428,18 @@ error "pkgrel is not allowed to be empty." exit 1 fi -if [ $(echo $pkgver | grep '-') ]; then +if [ `echo $pkgver | grep '-'` ]; then error "pkgver is not allowed to contain hyphens." exit 1 fi -if [ $(echo $pkgrel | grep '-') ]; then +if [ `echo $pkgrel | grep '-'` ]; then error "pkgrel is not allowed to contain hyphens." exit 1 fi if ! in_array $CARCH ${arch[@]}; then error "$pkgname is not available for the '$CARCH' architecture." + plain "Note that many packages may need a line added to their $BUILDSCRIPT" + plain "such as arch=('$CARCH')." exit 1 fi @@ -457,8 +460,6 @@ fi fi -# some applications (eg, blackbox) will not build with some languages -unset LC_ALL LANG # Enter the fakeroot environment if necessary. This will call the makepkg script again # as the fake root user. We detect this by passing a sentinel option (-F) to makepkg @@ -488,7 +489,8 @@ msg "Making package: $pkgname $pkgver-$pkgrel (`date`)" unset deplist makedeplist -if [ `type -p pacman` -a "$NODEPS" = "0" ]; then +# fix flyspray bug #5973 +if [ `type -p pacman` -a "$NODEPS" = "0" -a "$GENINTEG" = "0" -a "$NOBUILD" = "0" ]; then msg "Checking Runtime Dependencies..." deplist=`checkdeps ${depends[@]}` handledeps $deplist @@ -507,7 +509,7 @@ if [ $? -gt 0 ]; then exit 1 fi -elif [ "$NODEPS" = "1" ]; then +elif [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" ]; then warning "skipping dependency checks." else warning "pacman was not found in PATH. skipping dependency checks." @@ -520,13 +522,16 @@ mkdir -p src cd $startdir/src for netfile in ${source[@]}; do - file=`strip_url $netfile` - if [ -f ../$file ]; then + file=`strip_url "$netfile"` + if [ -f "../$file" ]; then msg " Found $file in build dir" - cp ../$file . - elif [ -f /var/cache/pacman/src/$file ]; then - msg " Using local copy of $file" - cp /var/cache/pacman/src/$file . + cp "../$file" . + elif [ -f "$SRCDEST/$file" ]; then + msg " Using cached copy of $file" + cp "$SRCDEST/$file" . + elif [ -f "/var/cache/pacman/src/$file" ]; then + msg " Using cached copy of $file" + cp "/var/cache/pacman/src/$file" . else # check for a download utility if [ -z "$FTPAGENT" ]; then @@ -540,35 +545,35 @@ msg "Aborting..." exit 1 fi - proto=`echo $netfile | sed 's|://.*||'` + proto=`echo "$netfile" | sed 's|://.*||'` if [ "$proto" != "ftp" -a "$proto" != "http" -a "$proto" != "https" ]; then error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." exit 1 fi msg " Downloading $file" - $FTPAGENT $netfile 2>&1 - if [ ! -f $file ]; then + $FTPAGENT "$netfile" 2>&1 + if [ ! -f "$file" ]; then error "Failed to download $file" msg "Aborting..." exit 1 fi - if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then - mkdir -p /var/cache/pacman/src && cp $file /var/cache/pacman/src + if [ -n "$SRCDEST" ]; then + mkdir -p $SRCDEST && cp "$file" $SRCDEST + elif [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then + mkdir -p /var/cache/pacman/src && cp "$file" /var/cache/pacman/src else - cp $file .. + cp "$file" .. fi fi done - - if [ "$NOEXTRACT" = "1" ]; then warning "Skipping source extraction -- using existing src/ tree" warning "Skipping source integrity checks -- using existing src/ tree" else for integ in ${INTEGRITY_CHECK[@]}; do - integ="$(echo $integ | tr A-Z a-z)" + integ=`echo $integ | tr A-Z a-z` case "$integ" in md5) integrity_name="md5sum" ;; sha1) integrity_name="sha1sum" ;; @@ -577,12 +582,13 @@ sha512) integrity_name="sha512sum" ;; *) error "Invalid integrity algorithm '$integ' specified"; exit 1;; esac - if [ ! $(type -p $integrity_name) ]; then + if [ ! `type -p $integrity_name` ]; then error "Cannot find the $integrity_name program." exit 1 fi - if [ "$GENINTEG" = "1" ]; then + # Generate integrity checks + if [ "$GENINTEG" = "1" ]; then msg "Generating ${integrity_name}s for source files" plain "" ct=0 @@ -590,7 +596,7 @@ numsrc=${#source[@]} for netfile in "${source[@]}"; do file=`strip_url "$netfile"` - sum=$(eval "$integrity_name '$file' | cut -d' ' -f 1") + sum=`eval "$integrity_name '$file' | cut -d' ' -f 1"` if [ $ct -eq 0 ]; then echo -n "${integrity_name}s=(" else @@ -607,7 +613,8 @@ done plain "" exit 0 - else #validation + # Validate integrity checks + else integrity_sums=($(eval echo \${${integrity_name}s[@]})) if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then @@ -615,7 +622,7 @@ errors=0 idx=0 for netfile in "${source[@]}"; do - file=$(strip_url "$netfile") + file=`strip_url "$netfile"` echo -n " $file ... " >&2 echo "${integrity_sums[$idx]} $file" | $integrity_name -c - >/dev/null 2>&1 if [ $? -ne 0 ]; then @@ -723,9 +730,6 @@ mv "$BUILDLOG" "$BUILDLOG.$i" fi - echo $SHELLOPTS | grep errexit 2>&1 >/dev/null - set_e=$? - #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e build 2>&1 | tee "$BUILDLOG" @@ -771,12 +775,12 @@ # compress man pages msg "Compressing man pages..." -find $startdir/pkg/{usr{,/local,/share},opt/*}/man -type f 2>/dev/null | while read i ; do +find $startdir/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do ext="${i##*.}" fn="${i##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find $startdir/pkg/{usr{,/local,/share},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do + find $startdir/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do rm -f "$ln" ln -sf "${fn}.gz" "${ln}.gz" done --- pacman-lib.orig/etc/makepkg.conf.in 2006-11-16 20:40:22.000000000 -0500 +++ pacman-lib/etc/makepkg.conf.in 2006-12-11 20:09:54.000000000 -0500 @@ -61,8 +61,10 @@ # PACKAGE OUTPUT ######################################################################### # -#-- Destination: specify a fixed directory where all packages will be placed +#-- Destination: specify a fixed directory where made packages will be placed #PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/source #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>"

2 2