May 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] package PKGINFO format vs DB format
by Aaron Griffin 19 Sep '07

19 Sep '07

I may be missing some history here, but I am wondering why the package metadata is in a different format than the DB metadata. As far as parsing goes, it would be ideal to unify the two formats. Does anyone (judd, you're CC'd on this) know any reason to keep two different formats, or any tools that would be negatively impacted by such a change? Please note, a "negative impact" is not that same as "we have to change it for the new format" - more along the lines of "we can no longer do XYZ". -- Aaron

5 13

[pacman-dev] makepkg3 improvements (for pacman-3.1)
by Andrew Fyfe 19 Sep '07

19 Sep '07

Hi, I've been using pacman for over a year now on DIY-Linux (http://www.diy-linux.org), and to put it simply it's great easy to use and easy to setup. So I thought it was about time I contribute something back... an improved version of makepkg. For the impatient :p see the script attached. makepkg2's use of fakeroot was a bit hackish, it's now very hackish in makepkg3. It also kicks up a few strange bugs (flyspray #6208) because it's being used where it shouldn't be. So I've rewritten/reordered makepkg to reduce the amount of time spent in fakeroot. Specificly it's now only used for... fake_install() (if it exists. See below) build() (if there's no fake_install) tidy_install() - remove docs - move/compress man pages - strip binaries/libraries - remove libtool files - remove empty directories create_package() - create .PKGINFO & .FILELIST - tar it all up everything else is run outside of fakeroot. Over at DIY-Linux we have a patch that adds an extra function to PKGBUILD (fake_install). This way we can prepare, compile, and test the package as the user running makepkg. Then fake_install is run inside fakeroot to install the package. This further reduces the time spent in fakeroot and the possibility of any weird bugs popping up. If the build script doesn't contain a fake_install function the build function is run inside of fakeroot instead (maintaining backwards compatibility with how things work at the moment). Other changes... - reordered the code to reduce the number of if..then..else cases - renamed a lot of variables so they're a bit more descriptive - started to add error codes for the different reasons why makepkg exits - quoted all variables that contain paths so '/home/me/a folder with spaces' doesn't cause errors. (but build scripts are still a point of failure as the majority don't have $startdir in quotes.) - fixed flyspray bug #6468 -- Localized dates for build/install date - added some more error catching - added the ability to choose between usr/man and usr/share/man (var (_MAN_DIR) at the top of the script.) There are still a few things that need fixed, but some discussion is probably required. - Should build deps be removed after a successful build? At the moment deps are only removed if '-r' is used and it removes build deps and runtime deps. An extra option to remove build deps? - Should root be a loud to run makepkg? IMO running makepkg as root is a hanus crime, and anyone foolish enough to do so deserves to have their system burn to the ground as the result of a broken build script. One mistaken key stroke in a build script can result in a successful build or the destruction of a system :p I've added a warning that asks the user if they're sure the want to continue running makepkg as root. With sudo and fakeroot there's no need to run makepkg as root, but thats just my opinion. Andrew #!/bin/bash # # 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> # Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> # Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> # Copyright (c) 2006 by Alex Smith <alex(a)alex-smith.me.uk> # Copyright (c) 2006 by Andras Voroskoi <voroskoi(a)frugalware.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. # #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # NOTES # ~~~~~~~ # TODO: Rename option names? # --syncdeps > --installdeps # --nodeps > --skipdeps # # TODO: Should root be aloud to run makepkg? # # TODO: Create error codes. # # TODO: Should build deps be removed after build? #____________________________________________________________________ set -e trap 'echo -e "\033[1;31mBANG! \033[1;37mThat didnt sound good. \033[1;33m:(\033[1;0m" >&2' ERR #set -x # For debugging, pipe the output to a file, there's lots of it. _DEBUG_MODE='n' #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Initialize Variables #---------------------------------------------------------------------- _VERSION='3.1.0' _BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' _ARG_LIST="$@" # Actions # ~~~~~~~~~ _CLEAN_CACHE='n' _CHECK_DEPS='y' _BUILD_DEPS='n' _SYNC_DEPS='n' _GENERATE_CHKSUM='n' _VALIDATE_CHKSUM='y' _EXTRACT_SOURCE='y' _BUILD_PACKAGE='y' _CLEANUP='n' _REMOVE_DEPS='n' _INSTALL_PACKAGE='n' # Options # ~~~~~~~~~ _FORCE='n' _REPACKAGE='n' _USE_SUDO='n' _LOG_BUILD='n' _USE_COLOR='n' # Miscellaneous # ~~~~~~~~~~~~~~~ _IN_FAKEROOT='n' _PACKAGE_NAME='UNKNOWN' _BUILD_SCRIPT='PKGBUILD' _PKG_EXT='pkg.tar.gz' _MAN_DIR='usr' # For Arch Linux #_MAN_DIR='usr/share' # For DIY-Linux _PACMAN_OPTS='' startdir="$(pwd)" # Exit/Error Codes # ~~~~~~~~~~~~~~~~~~ # TODO: Create exit codes for each different error. E_OK=0 E_UNKNOWN=1 E_USER_ABORT=4 E_INVALID_BUILD_SCRIPT=8 E_MISSING_PROGRAM=16 E_CONFIG_ERROR=32 # For dep checks # ~~~~~~~~~~~~~~~~ . /etc/abs/abs.conf _SRC_ROOT="$ABSROOT" #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # General purpose functions. #---------------------------------------------------------------------- # TODO: Use terminal safe coloring/bolding. See TODO.dan # TODO: Move general functions to an external library file, for all # pacman scripts to use. plain () { if [ $_USE_COLOR = 'y' ]; then echo -e " \033[1;37m$1\033[1;0m" >&2 else echo " $1" >&2 fi } msg () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;32m==>\033[1;37m $1\033[1;0m" >&2 else echo "==> $1" >&2 fi } msg2 () { if [ $_USE_COLOR = 'y' ]; then echo -e " \033[1;34m->\033[1;37m $1\033[1;0m" >&2 else echo " -> $1" >&2 fi } warning () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;33m==> WARNING:\033[1;37m $1\033[1;0m" >&2 else echo "==> WARNING: $1" >&2 fi } error () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;31m==> ERROR:\033[1;37m $1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 fi } debug () { [ $_DEBUG_MODE = 'y' ] || return if [ $_USE_COLOR = 'y' ]; then echo -e "\033[;35m**> DEBUG:\033[1;37m $1\033[1;0m" >&2 else echo "**> DEBUG: $1" >&2 fi } yn_question () { if [ $_USE_COLOR = 'y' ]; then echo -en " \033[1;1m$1\033[1;0m " >&2 else echo -n " $1 " >&2 fi local answer read answer answer="$(echo $answer | tr [:upper:] [:lower:])" if [ "$answer" = 'y' -o "$answer" = 'yes' ]; then return 0 else return 1 fi } strip_url () { echo "$1" | sed 's|^.*://.*/||g'; } in_array() { local needle=$1 shift 1 [ -z "$1" ] && return 1 for i in $*; do [ "$i" = "$needle" ] && return 0 done return 1 } in_array2 () { local needle=$(echo $1 | tr [:upper:] [:lower:]) local i shift 1 [ -z "$1" ] && return 2 for i in $*; do i=$(echo $i | tr [:upper:] [:lower:]) if [ "$i" = "$needle" ]; then return 0 elif [ "$i" = "!$needle" ]; then return 1 fi done return 2 } check_option () { local ret in_array2 $1 ${options[@]}; ret=$? [ $ret -eq 2 ] && { in_array2 $1 ${OPTIONS[@]}; ret=$?; } [ $ret -eq 2 ] && ret=1 return $ret } check_buildenv () { local ret in_array2 $1 ${BUILDENV[@]}; ret=$? [ $ret -eq -1 ] && ret=1 return $ret } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Usage functions. #---------------------------------------------------------------------- display_usage () { cat << EOF makepkg version $_VERSION Usage: $0 [options] Actions: -C, --cleancache Clean up source files from the cache. -g, --geninteg Generate integrity checks for source files. -c, --clean Clean up work files after build. -e, --noextract Do not extract source files (use existing src/ dir). -i, --install Install package after successful build. -o, --nobuild Download and extract files only. -R, --repackage Repackage contents of pkg/ without building. -b, --builddeps Build missing dependencies from source -d, --nodeps Skip all dependency checks -r, --rmdeps Remove installed dependencies after a successful build -s, --syncdeps Install missing dependencies with pacman Options: -f, --force Overwrite existing package. -L, --log Log package build process. -m, --nocolor Disable colorized output messages. -p <buildscript> Use an alternate build script (instead of '${_BUILD_SCRIPT}'). If -p is not specified, makepkg will look for '${_BUILD_SCRIPT}'. -S, --usesudo When calling pacman, use sudo. -h, --help Display this help and exit -V, --version Output version information and exit Variables: SRCDEST ... PKGDEST ... Exit Codes: 0 Ok 1 Unknown 4 User abort 8 Invalid build script 16 Missing program 32 Config error These options can be passed to pacman: --noconfirm Do not ask for confirmation when resolving dependencies --noprogressbar Do not show a progress bar when downloading files Report bugs to <${_BUG_REPORT_EMAIL}> EOF } display_version () { echo "makepkg $_VERSION"; } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # makepkg functions. #---------------------------------------------------------------------- run_build () { if [ "$(type -t $1)" != "function" ]; then error "Unknown function '$1'." exit 1 fi # use distcc if it is requested (check buildenv and PKGBUILD opts) if check_buildenv distcc && [ $(check_option distcc) -ne 1 ]; then [ -d /usr/lib/distcc/bin ] && export PATH="/usr/lib/distcc/bin:$PATH" elif [ $(check_option distcc) -eq 1 ]; then # if it is not wanted, clear the makeflags too export MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) if check_buildenv ccache && [ $(check_option ccache) -ne 1 ]; then [ -d /usr/lib/ccache/bin ] && export PATH="/usr/lib/ccache/bin:$PATH" fi # clear user-specified makeflags if requested if [ $(check_option makeflags) -eq 1 ]; then export MAKEFLAGS="" fi msg "Running '$1'..." cd "${startdir}/src" # Some locales can break builds. local _LC_ALL="$LC_ALL" ; export LC_ALL='C' local _LANG="$LANG" ; export LANG='C' umask 0022 local ret=0 if [ $_LOG_BUILD = 'y' ]; then local build_log="${startdir}/${_PACKAGE_NAME}-${1}.log" if [ -f "$build_log" ]; then local i=1 while true; do if [ -f "${build_log}.$i" ]; then i=$(($i+1)) else break fi done mv "${build_log}" "${build_log}.$i" fi msg2 "$1 will be logged to $build_log" $1 2>&1 | tee "${build_log}" || ret=${PIPESTATUS[0]} else $1 2>&1 || ret=$? fi export LC_ALL="$_LC_ALL" export LANG="$_LANG" if [ $ret -gt 0 ]; then error "Build FAILED. Aborting" exit 2 # TODO: error code fi } tidy_install () { cd "${startdir}/pkg" msg "Tidying Install..." if ! check_option docs; then msg2 "Removing documentation files..." #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi local old_man_dir if [ "$_MAN_DIR" = 'usr' ]; then old_man_dir='usr/share' else old_man_dir='usr' fi if [ -d $old_man_dir ]; then msg2 "Moving ${old_man_dir}/man files to /${_MAN_DIR}/man..." mkdir -p ${_MAN_DIR}/man cp -a ${old_man_dir}/man/* ${_MAN_DIR}/man/ rm -rf ${old_man_dir}/man fi if [ -d usr/info ]; then msg2 "Moving /usr/info files to /usr/share/info..." mkdir -p usr/share/info cp -a usr/info/* usr/share/info/ rm -rf usr/info fi [ -e usr/share/info/dir ] && rm -f usr/share/info/dir msg2 "Compressing man pages..." find {${_MAN_DIR}/,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 {${_MAN_DIR},usr/local/,opt/*/}man -lname "$fn" 2> /dev/null | while read ln ; do rm -f "$ln" ln -sf "${fn}.gz" "${ln}.gz" done # compress the original gzip -9 "$i" fi done if check_option strip; then local file msg2 "Stripping debugging symbols from libraries..." for file in $(LC_ALL=C LANG=C \ find {,usr/,usr/local/,opt/*/}lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec file '{}' \; 2>/dev/null | \ grep 'LSB shared object,' | cut -d : -f 1 ); do strip --strip-debug "${file}" done msg2 "Stripping symbols from binaries..." for file in $(LC_ALL=C LANG=C \ find {,usr/,usr/local/,opt/*/}{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -exec file '{}' \; 2>/dev/null | \ grep 'LSB executable,' | cut -d : -f 1); do strip --strip-unneeded "${file}" done fi if ! check_option libtool; then msg2 "Removing libtool .la files..." find -type f -name "*.la" -exec rm -f -- '{}' \; fi if ! check_option emptydirs; then msg2 "Removing empty directories..." find -depth -type d -empty -delete; fi } create_package () { cd "${startdir}/pkg" msg "Creating package..." # get some package meta info # flyspray bug 6468 -- Localized dates for build/install date local builddate="$(LC_ALL=C ; LANG=C ; date -u +"%Y-%m-%dT%T%:z")" if [ "$PACKAGER" != "" ]; then local packager="$PACKAGER" else local packager="Arch Linux (http://www.archlinux.org)" fi local size=$(du -sb | awk '{print $1}') # build a filelist - do this first to keep meta files out of the list msg2 "Generating .FILELIST file..." tar -cvf /dev/null * | sort >.FILELIST # write the .PKGINFO file msg2 "Generating .PKGINFO file..." echo "# Generated by makepkg $_VERSION" >.PKGINFO echo "# $(LC_ALL=C; LANG=C; date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "url = $url" >>.PKGINFO echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO if [ "$CARCH" != "" ]; then echo "arch = $CARCH" >>.PKGINFO fi local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO done for it in "${replaces[@]}"; do echo "replaces = $it" >>.PKGINFO done for it in "${groups[@]}"; do echo "group = $it" >>.PKGINFO done for it in "${depends[@]}"; do echo "depend = $it" >>.PKGINFO done for it in "${conflicts[@]}"; do echo "conflict = $it" >>.PKGINFO done for it in "${provides[@]}"; do echo "provides = $it" >>.PKGINFO done for it in "${backup[@]}"; do echo "backup = $it" >>.PKGINFO done # TODO: maybe remove this at some point # warn if license array is not present or empty if [ "$license" = "" ]; then warning "Please add a license line to your ${_BUILD_SCRIPT}!" plain "example for GPL'ed software: license=('GPL')." fi local comp_files # check for an install script if [ "$install" != "" ]; then msg2 "Copying install script..." cp "$startdir/$install" .INSTALL comp_files="${comp_files} .INSTALL" fi # do we have a changelog? if [ -f "$startdir/ChangeLog" ]; then msg2 "Copying package change log" cp "$startdir/ChangeLog" .CHANGELOG comp_files="${comp_files} .CHANGELOG" fi # tar it up msg2 "Compressing package..." local pkg_file="$PKGDEST/${_PACKAGE_NAME}.${_PKG_EXT}" comp_files="${comp_files} .PKGINFO .FILELIST" if ! tar -czf $pkg_file $comp_files *; then error "Failed to create package file." exit 1 # TODO: error code fi } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Dependencie check functions #---------------------------------------------------------------------- checkdeps() { debug "checkdeps() $*" [ $# -eq 0 ] && return pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? if [ $ret -eq 127 ]; then #unresolved deps #strip out the pacman prefix from "requires: xyz" echo $pmout | sed 's|requires:||g' elif [ $ret -ne 0 ]; then error "pacman returned a fatal error ($ret): $pmout" exit 1 fi } handledeps() { debug "handledeps() $*" local R_DEPS_SATISFIED=0 local R_MISSING_DEPS=1 [ $# -eq 0 ] && return $R_DEPS_SATISFIED local deplist="$*" local striplist local dep for dep in $deplist; do depstrip="$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" striplist="$striplist $depstrip" done if [ $_BUILD_DEPS = 'n' -a $_SYNC_DEPS = 'n' ]; then return $R_MISSING_DEPS elif [ $_USE_SUDO = 'n' -a $EUID -gt 0 ]; then warning "Cannot auto-install missing dependencies as a normal user without sudo!" plain "Run makepkg as root or with -S to resolve dependencies automatically." return $R_MISSING_DEPS fi if [ $_SYNC_DEPS = 'y' ]; then msg "Installing missing dependencies..." local ret=0 if [ $_USE_SUDO = 'y' ]; then # install missing deps from binary packages (using pacman -S and sudo) sudo pacman $_PACMAN_OPTS -S $striplist || ret=$? else # install missing deps from binary packages (using pacman -S) pacman $_PACMAN_OPTS -S $striplist || ret=$? fi if [ $ret -eq 1 ]; then error "Pacman failed to install missing dependencies." exit 1 # TODO: error code fi elif [ $_BUILD_DEPS = 'y' ]; then msg "Building missing dependencies..." # install missing deps by building them from source. # we look for each package name in $SRCROOT and build it. if [ "$_SRC_ROOT" = "" ]; then error "Source root cannot be found - please make sure it is specified in /etc/abs/abs.conf" exit $E_CONFIG_ERROR fi # TODO: handle version comparators (eg, glibc>=2.2.5) for dep in $striplist; do local candidates="$(find $_SRC_ROOT -type d -name "$dep")" if [ -z "$candidates" ]; then error "Could not find \"$dep\" under $_SRC_ROOT" exit 1 # TODO: error code fi local makepkg_opts='-i -c -b' [ $_REMOVE_DEPS = 'y' ] && makepkg_opts="-r $makepkg_opts" local ret=0 local pkgdir for pkgdir in $candidates; do if [ -f "$pkgdir/$_BUILD_SCRIPT" ]; then cd "$pkgdir" ret=0 PKGBUILD="$PKGBUILD" makepkg $makepkg_opts || ret=$? if [ $ret -eq 0 ]; then continue 2 fi fi done error "Failed to build \"$dep\"" exit 1 # TODO: error code done fi # rerun any additional sh scripts found in /etc/profile.d/ local i for i in /etc/profile.d/*.sh do if [ -x $i ]; then . $i &>/dev/null fi done return $R_DEPS_SATISFIED } resolvedeps() { debug "resolvedeps() $*" local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 deplist="$(checkdeps $*)" [ -z "$deplist" ] && return $R_DEPS_SATISFIED if handledeps $deplist; then # check deps again to make sure they were resolved deplist="$(checkdeps $*)" [ -z "$deplist" ] && return $R_DEPS_SATISFIED elif [ $_SYNC_DEPS = 'y' -o $_BUILD_DEPS = 'y' ]; then error "Failed to install all missing dependencies." fi msg "Missing Dependencies:" local dep for dep in $deplist; do msg2 "$dep" done return $R_DEPS_MISSING } # fix flyspray bug #5923 removedeps() { [ $_REMOVE_DEPS = 'n' ] && return [ $_USE_SUDO = 'n' -a $EUID -gt 0 ] && return # runtimedeps and buildtimedeps are set when resolving deps local deplist="$runtimedeps $buildtimedeps" local striplist="" [ -z "$deplist" ] && return local dep for dep in $deplist; do striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" done msg "Removing installed dependencies..." if [ $_USE_SUDO = 'y' ]; then sudo pacman $_PACMAN_OPTS -Rs $striplist else pacman $_PACMAN_OPTS -Rs $striplist fi # TODO: is error checking (pacman) required/helpful here? } install_package () { [ $_INSTALL_PACKAGE = 'n' ] && return [ $_USE_SUDO = 'n' -a $EUID -gt 0 ] && return local ret=0 msg "Installing package with 'pacman -U'..." if [ $_USE_SUDO = 'y' ]; then sudo pacman $_PACMAN_OPTS -U "${PKGDEST}/${_PACKAGE_NAME}.${_PKG_EXT}" || ret=$? else pacman $_PACMAN_OPTS -U "${PKGDEST}/${_PACKAGE_NAME}.${_PKG_EXT}" || ret=$? fi exit $ret } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Load config files #---------------------------------------------------------------------- # Preserve enviroment _PKGDEST="${PKGDEST}" _SRCDEST="${SRCDEST}" if [ -r /etc/makepkg.conf ]; then . /etc/makepkg.conf else error "/etc/makepkg.conf not found. cannot continue" exit $E_CONFIG_ERROR fi [ -r ~/.makepkg.conf ] && . ~/.makepkg.conf if check_buildenv color; then _USE_COLOR='y' fi # Environment overrules config file. PKGDEST="${_PKGDEST:-$PKGDEST}"; PKGDEST="${PKGDEST:-$startdir}" # default to $startdir if undefined SRCDEST="${_SRCDEST:-$SRCDEST}"; SRCDEST="${SRCDEST:-$startdir}" # default to $startdir if undefined unset _PKGDEST _SRCDEST #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Parse command line options #---------------------------------------------------------------------- _OPT_SHORT="bcCdefFghiLmop:rRsSV" _OPT_LONG="builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help," _OPT_LONG="${_OPT_LONG}install,log,nocolor,nobuild,rmdeps,repackage,syncdeps," _OPT_LONG="${_OPT_LONG}version,usesudo,noconfirm,noprogressbar" _OPT_TEMP=$(getopt -o $_OPT_SHORT --long $_OPT_LONG -n "$0" -- "$@") eval set -- "$_OPT_TEMP" unset _OPT_SHORT _OPT_LONG _OPT_TEMP while true; do case $1 in # makepkg Options -b|--builddeps) _BUILD_DEPS='y';; -c|--clean) _CLEANUP='y';; -C|--cleancache) _CLEAN_CACHE='y';; -d|--nodeps) _CHECK_DEPS='n';; -e|--noextract) _EXTRACT_SOURCE='n';; -f|--force) _FORCE='y';; -F) _IN_FAKEROOT='y';; -g|--geninteg) _GENERATE_CHKSUM='y';; -i|--install) _INSTALL_PACKAGE='y';; -L|--log) _LOG_BUILD='y';; -m|--nocolor) _USE_COLOR='n';; -o|--nobuild) _BUILD_PACKAGE='n';; -r|--rmdeps) _REMOVE_DEPS='y';; -R|--repackage) _REPACKAGE='y';; -s|--syncdeps) _SYNC_DEPS='y';; -S|--usesudo) _USE_SUDO='y';; -p) _BUILD_SCRIPT="$2"; shift;; # pacman Options --noconfirm) _PACMAN_OPTS="$_PACMAN_OPTS --noconfirm";; --noprogressbar) _PACMAN_OPTS="$_PACMAN_OPTS --noprogressbar";; -h|--help) display_usage; exit $E_OK;; -V|--version) display_version; exit $E_OK;; --) OPTIND=0; shift; break;; *) display_usage; exit $E_UNKNOWN;; esac shift done #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Clean Cache #---------------------------------------------------------------------- if [ $_CLEAN_CACHE = 'y' ]; then #fix flyspray feature request #5223 if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then msg "Cleaning up ALL files from ${SRCDEST}." if yn_question "Are you sure you wish to do this? [Y/n]"; then ret=0 rm "$SRCDEST"/* || ret=$? if [ $ret -ne 0 ]; then error "Problem removing files; you may not have correct permissions in $SRCDEST" exit 1 # TODO: error code else # removal worked msg "Source cache cleaned." exit $E_OK fi else # answer = no msg "No files have been removed." exit $E_OK fi else # $SRCDEST is $startdir, two possibilities error "Source destination must be defined in makepkg.conf." plain "In addition, please run makepkg -C outside of your cache directory." exit $E_CONFIG_ERROR fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Privilage checks #---------------------------------------------------------------------- if [ $_IN_FAKEROOT = 'n' ]; then if [ $EUID -eq 0 ]; then warning "Running makepkg as root is a \033[1;31mBAD\033[1;37m idea!" plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi elif check_buildenv fakeroot; then if ! type -p fakeroot &>/dev/null; then warning "Fakeroot is not installed. Building as an unprivileged user" plain "will result in non-root ownership of the packaged files. Install" plain "the fakeroot package to correctly build as a non-root user." plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi fi else warning "Running makepkg as an unprivileged user will result in non-root" plain "ownership of the packaged files. Try using the fakeroot environment by" plain "placing 'fakeroot' in the BUILDENV array in /etc/makepkg.conf." plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi fi else if [ -z "$FAKEROOTKEY" ]; then error "Do not use the -F option. This option is only used by makepkg when" plain "it is calling it's self inside fakeroot." plain "" exit 1 # TODO: error code fi fi if [ $_USE_SUDO = 'y' -a ! "$(type -p sudo)" ]; then error "Can not find the sudo binary! Is sudo installed?" exit $E_MISSING_PROGRAM elif [ $EUID -gt 0 -a $_INSTALL_PACKAGE = 'y' ]; then # TODO: Should this be an error and exit? warning "makepkg will not be able to install this package as an unprivilaged user." plain "Use the --usesudo (or -s) option to install this package after it has been" plain "built." plain "" sleep 3 fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Load $_BUILD_SCRIPT. #---------------------------------------------------------------------- unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract if [ ! -r "$_BUILD_SCRIPT" ]; then error "$_BUILD_SCRIPT does not exist." exit $E_INVALID_BUILD_SCRIPT #TODO this is an attempt at a generic way to unset all package specific #variables in a PKGBUILD #else # #this is fun.... we'll unset # for var in $(grep "=" $_BUILD_SCRIPT | sed "s|.*$\<.*\>$=.*|\1|g"); do # unset $var # done fi source "$_BUILD_SCRIPT" #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Sanity checks for $_BUILD_SCRIPT. #---------------------------------------------------------------------- # check for no-no's in the build script if [ -z "$pkgver" ]; then error "pkgver is not allowed to be empty." exit $E_INVALID_BUILD_SCRIPT fi if echo "$pkgver" | grep -q '-'; then error "pkgver is not allowed to contain hyphens." exit $E_INVALID_BUILD_SCRIPT fi if [ -z "$pkgrel" ]; then error "pkgrel is not allowed to be empty." exit $E_INVALID_BUILD_SCRIPT fi if echo "$pkgrel" | grep -q '-'; then error "pkgrel is not allowed to contain hyphens." exit $E_INVALID_BUILD_SCRIPT 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 $_BUILD_SCRIPT" plain "such as arch=('$CARCH')." exit 1 # TODO: error code fi _PACKAGE_NAME="${pkgname}-${pkgver}-${pkgrel}-${CARCH}" if [ "$install" -a ! -f "$install" ]; then error "install scriptlet ($install) does not exist." exit $E_INVALID_BUILD_SCRIPT fi if [ -f "$PKGDEST/${_PACKAGE_NAME}.${_PKG_EXT}" \ -a $_FORCE = 'n' -a $_GENERATE_CHKSUM = 'n' ]; then if [ $_INSTALL_PACKAGE = 'y' ]; then warning "a package has already been built, installing existing package." installpackage else error "a package has already been built. (use -f to overwrite)" exit 1 # TODO: error code fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Build package inside fakeroot. #---------------------------------------------------------------------- # Run the bear minimum in fakeroot. # flyspray bug 6208 -- using makepkg with fakeroot gives an error if [ $_IN_FAKEROOT = 'y' ]; then if [ $_REPACKAGE = 'y' ]; then warning "Skipping build..." else if [ "$(type -t fake_install)" != "function" ]; then run_build build else run_build fake_install fi tidy_install fi create_package msg "Leaving fakeroot enviroment." exit $E_OK fi msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" if [ $_REPACKAGE = 'n' ]; then msg "Preparing work area..." if [ -d "${startdir}/src" ]; then msg2 "Removing existing src/ directory..." rm -rf "${startdir}/src" fi if [ -d "${startdir}/pkg" ]; then msg2 "Removing existing pkg/ directory..." rm -rf "${startdir}/pkg" fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Check dependencies. #---------------------------------------------------------------------- # fix flyspray bug #5973 if [ $_CHECK_DEPS = 'n' -o $_GENERATE_CHKSUM = 'y' -o \ $_BUILD_PACKAGE = 'n' -o $_REPACKAGE = 'y' ]; then if [ $_CHECK_DEPS = 'n' ]; then warning "Skipping dependecy checks." fi elif [ ! "$(type -p pacman)" ]; then warning "pacman was not found in PATH. skipping dependency checks." else deperr=0 unset runtimedeps buildtimedeps msg "Checking Runtime Dependencies..." if resolvedeps ${depends[@]}; then # deplist is a global variable set by resolvedeps runtimedeps="$deplist" else deperr=1 fi msg "Checking Buildtime Dependencies..." if resolvedeps ${makedepends[@]}; then # deplist is a global variable set by resolvedeps buildtimedeps="$deplist" else deperr=1 fi if [ $deperr -eq 1 ]; then error "could not resolve all dependencies." exit 1 # TODO: error code fi unset deperr fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Retrieve source. #---------------------------------------------------------------------- msg "Retrieving source files..." cd "${startdir}" mkdir -p src; cd src for netfile in ${source[@]}; do file="$(strip_url "$netfile")" if [ -f "../$file" ]; then msg2 "Found $file in build directory." cp "../$file" . elif [ -f "$SRCDEST/$file" ]; then msg2 "Using cached copy of ${file}." cp "$SRCDEST/$file" . else # check for a download utility if [ -z "$FTPAGENT" ]; then error "FTPAGENT is not configured. Check the /etc/makepkg.conf file." msg "Aborting..." exit $E_CONFIG_ERROR fi ftpclient="$(echo $FTPAGENT | awk {'print $1'})" if [ ! -x "$ftpclient" ]; then error "ftpclient $(basename $ftpclient) is not installed." msg "Aborting..." exit $E_MISSING_PROGRAM fi 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 # TODO: error code fi msg2 "Downloading ${file}..." ret=0 $FTPAGENT "$netfile" || ret=$? # fix flyspray bug #3289 if [ $ret -gt 0 ]; then error "Failure while downloading $file" msg "Aborting..." #rm "$file" exit 1 # TODO: error code fi if [ -n "$SRCDEST" ]; then ret=0 mkdir -p "$SRCDEST" && cp "$file" "$SRCDEST" || ret=$? if [ $ret -ne 0 ]; then warning "You do not have correct permissions to cache source in $SRCDEST" cp "$file" .. fi else cp "$file" .. fi fi done unset netfile file ftpclient proto ret #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Generate source file checksums. #---------------------------------------------------------------------- if [ $_GENERATE_CHKSUM = 'y' ]; then msg "Generating checksums for source files..." plain "" for integ in ${INTEGRITY_CHECK[@]}; do integ="$(echo $integ | tr [:upper:] [:lower:])" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) error "Invalid integrity algorithm '$integ' specified." exit $E_CONFIG_ERROR;; esac if ! type -p "${integ}sum" &>/dev/null; then error "Can not find the ${integ}sum program." exit $E_MISSING_PROGRAM fi ct=0 numsrc=${#source[@]} echo -n "${integ}sums=(" for netfile in "${source[@]}"; do file="$(strip_url "$netfile")" if [ ! -r "${file}" ]; then plain "" error "Unable to find '${file}' to generate checksum." exit 1 # TODO: error code fi sum=$(${integ}sum "$file" | cut -d ' ' -f 1) [ $ct -gt 0 ] && echo -ne "\t " echo -n "'$sum'" ct=$(($ct+1)) [ $ct -lt $numsrc ] && echo done echo ')' done exit $E_OK fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Validate source file checksums. #---------------------------------------------------------------------- if [ $_EXTRACT_SOURCE = 'n' -o $_REPACKAGE = 'y' ]; then warning "Skipping source integrity checks." elif [ $_VALIDATE_CHKSUM = 'y' ]; then for integ in ${INTEGRITY_CHECK[@]}; do integ="$(echo $integ | tr [:upper:] [:lower:])" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) error "Invalid integrity algorithm '$integ' specified." exit $E_CONFIG_ERROR;; esac if ! type -p "${integ}sum" &>/dev/null; then error "Can not find the ${integ}sum program." exit $E_MISSING_PROGRAM fi chksums=($(eval echo \${${integ}sums[@]})) if [ ${#chksums[@]} -ne ${#source[@]} ]; then warning "Integrity checks (${integ}) are missing or incomplete." else msg "Validating source files with ${integ}sums..." errors=0 idx=0 for netfile in "${source[@]}"; do file="$(strip_url "$netfile")" echo -n " $file ... " >&2 if echo "${chksums[$idx]} $file" | ${integ}sum --status -c -; then echo "Passed" >&2 else echo "FAILED" >&2 errors=1 fi idx=$(($idx+1)) done if [ $errors -gt 0 ]; then error "One or more files did not pass the validity check!" exit 1 # TODO: error code fi fi done unset integ chksums errors idx netfile file fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Extract sources. #---------------------------------------------------------------------- if [ $_EXTRACT_SOURCE = 'n' -o $_REPACKAGE = 'y' ]; then warning "Skipping source extraction -- using existing src/ tree." else msg "Extracting Sources..." for netfile in "${source[@]}"; do unziphack=0 file="$(strip_url "$netfile")" if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi # fix flyspray #6246 file_type="$(file -biz "$file")" cmd='' case "$file_type" in *application/x-tar*) cmd="tar --no-same-owner -xf $file" ;; *application/x-zip*) unziphack=1 cmd="unzip -qqo $file" ;; *application/x-cpio*) cmd="bsdtar -x -f $file" ;; *application/x-gzip*) cmd="gunzip -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; esac if [ "$cmd" != "" ]; then msg2 "$cmd" ret=0 $cmd || ret=$? if [ $ret -ne 0 ]; then # unzip will return a 1 as a warning, it is not an error if [ $unziphack -eq 1 -o $ret -ne 1 ]; then error "Failed to extract $file" msg "Aborting..." exit 1 # TODO: error code fi fi fi done unset netfile file file_type cmd unziphack ret fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Build package #---------------------------------------------------------------------- if [ $_BUILD_PACKAGE = 'n' ]; then msg "Sources are ready." exit $E_OK else cd "$startdir" mkdir -p pkg if [ $EUID -eq 0 ]; then warning "It is not a good idea to run makepkg as root." if [ $_REPACKAGE = 'y' ]; then warning "Skipping build." else cd "${startdir}/src" run_build build [ "$(type -t fake_install)" = "function" ] && run_build fake_install tidy_install fi create_package else cd "${startdir}/src" if [ $_REPACKAGE = 'n' -a "$(type -t fake_install)" = "function" ]; then run_build build fi msg "Entering fakeroot environment." cd "${startdir}" ret=0 fakeroot -- $0 -F $_ARG_LIST || ret=$? [ $ret -ne 0 ] && exit $ret unset ret fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Clean up #---------------------------------------------------------------------- if [ $_CLEANUP = 'y' ]; then msg "Cleaning up..." cd "$startdir" rm -rf src pkg rm -f "${_PACKAGE_NAME}.log*" fi removedeps msg "Finished making: $pkgname ($(date))" install_package exit $E_OK # vim:set ts=2 sw=2 noet:

4 10

[pacman-dev] makepkg patch to create $pkgname-docs package for docs
by Alessio 'mOLOk' Bolognino 19 Sep '07

19 Sep '07

This patch is a proof of concept to create a separate package for docs file ($pkgname-docs) with an only PKGBUILD. Do you like it? --- scripts/makepkg.in | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.in b/scripts/makepkg.in index 1125e85..0fa9015 100755 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -414,6 +414,27 @@ installpackage() { fi } +installdocspackage() { + if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then + msg "$(gettext "Installing docs package with pacman -U...")" + if [ "$INFAKEROOT" = "1" ]; then + FAKEROOTKEY2=$FAKEROOTKEY + unset FAKEROOTKEY + fi + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-docs-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + local exitcode=$? + if [ "$INFAKEROOT" = "1" ]; then + export FAKEROOTKEY=$FAKEROOTKEY2 + unset FAKEROOTKEY2 + fi + exit $exitcode + elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then + msg "$(gettext "Installing docs package with pacman -U...")" + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-docs-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + exit $? + fi +} + usage() { echo "$(eval_gettext "makepkg version \$myver")" echo @@ -961,9 +982,90 @@ else fi fi -if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "$(gettext "Removing info/doc files...")" + +if [ "$(check_option packdocs)" = "y" ]; then + msg "Packaging docs" + + rm -fr $startdir/pkg-docs + + cd "$startdir/pkg" + for ddir in ${DOC_DIRS[@]}; do + if [ -d $ddir ]; then + mkdir -p "$startdir/pkg-docs/$ddir" + mv $ddir/* "$startdir/pkg-docs/$ddir" + fi + done + + # remove docs from the master package + rm -rf ${DOC_DIRS[@]} + find -depth -type d -empty -delete; + + cd "$startdir/pkg-docs" + tar cvf /dev/null * | sort >.FILELIST + + builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + if [ "$PACKAGER" != "" ]; then + packager="$PACKAGER" + else + packager="Arch Linux (http://www.archlinux.org)" + fi + + size=$(du -cb "$startdir/pkg-docs" | tail -n 1 | awk '{print $1}') + + # write the .PKGINFO file + msg "$(gettext "Generating .PKGINFO file...")" + echo "# Generated by makepkg $myver" >.PKGINFO + echo -n "# " >>.PKGINFO + date >>.PKGINFO + echo "pkgname = $pkgname-docs" >>.PKGINFO + echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO + + # You may want to change this + echo "pkgdesc = $pkgname docs" >>.PKGINFO + + echo "url = $url" >>.PKGINFO + echo "builddate = $builddate" >>.PKGINFO + echo "packager = $packager" >>.PKGINFO + echo "size = $size" >>.PKGINFO + + # maybe put NOARCH or something similar? + if [ "$CARCH" != "" ]; then + echo "arch = $CARCH" >>.PKGINFO + fi + + # and which license? should docs package + # inherit master package license? (I don't think so) + # maybe we could add a docslicense var into the PKGBUILD + for it in "${license[@]}"; do + echo "license = $it" >>.PKGINFO + done + + # We could use a 'docs' group, or inherit master package group + for it in "${groups[@]}"; do + echo "group = $it" >>.PKGINFO + done + +# I don't think these are needed for a -docs package +# echo "replaces = $it" >>.PKGINFO +# echo "depend = $it" >>.PKGINFO +# echo "conflict = $it" >>.PKGINFO +# echo "provides = $it" >>.PKGINFO +# echo "backup = $it" >>.PKGINFO + + pkg_docs_file="$PKGDEST/$pkgname-docs-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" + comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" + + msg "$(gettext "Compressing docs package...")" + if ! tar czf $pkg_docs_file $comp_files *; then + error "$(gettext "Failed to create docs package file.")" + exit 1 + fi + +elif [ "$(check_option docs)" = "n" ]; then +# maybe "else" instead of "elif" would be better? + + # remove info/doc files + msg "$(gettext "Removing info/doc files...")" cd "$startdir/pkg" #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} @@ -1122,6 +1224,9 @@ msg "$(eval_gettext "Finished making: \$pkgname (\$date)")" installpackage +if [ "$(check_option packdocs)" = "y" ]; then + installdocspackage +fi exit 0 # vim: set ts=2 sw=2 noet: -- 1.5.1 -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User Public Key @ http://themolok.netsons.org/uploads/themolok.asc Key ID = 1024D / FE0270FB 2007-04-11 Key Fingerprint = 9AF8 9011 F271 450D 59CF 2D7D 96C9 8F2A FE02 70FB

9 20

[pacman-dev] pacman -Qo takes a very long time
by solsTiCe d'Hiver 14 Jul '07

14 Jul '07

hi. so i just installed pacman 3.0.4 during my daily pacman -Syu. no pb libarchive and libdownlaod already installed so the first command i run was: pacman -Qo /usr/bin/versionpkg and it takes a avery long time !!! wtf ! during a compilation . so i stop the comilation and i time it: time pacman -Qo /usr/bin/versionpkg /usr/bin/versionpkg appartient à versionpkg 0.7.2-1 real 0m19.933s user 0m17.049s sys 0m2.316s and with 100% cpu usage the last 10 second !!?? i run /var/lib/pacman in a tmpfs so the pb of the filesystem fragmentation is not a pb. so i tried without the tmpfs. the same. i run pacman-optimize. it takes 51s this time !? now it's 19s again

2 1

[pacman-dev] [patch] I. deps.c/checkdeps bugfix + upgrade059.py
by Nagy Gabor 18 Jun '07

18 Jun '07

Hi! I started to work on deps.c. I send smaller patches instead of a big one. At first I rewrite alpm_*deps functions (implement topological sort...); I merge them later (which would be the most optimal imho) after testing. I found a bug: ---upgrade059.py--- self.description = "Try to upgrade packages which would break a multiple-depend" lp1 = pmpkg("pkg1") lp1.depends = ["imaginary"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") lp2.provides = ["imaginary"] lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3", "1.0-1") lp3.provides = ["imaginary"] lp3.requiredby = [ "pkg1" ] self.addpkg2db("local", lp3) p2 = pmpkg("pkg2", "1.0-2") self.addpkg(p2) p3 = pmpkg("pkg3", "1.0-2") self.addpkg(p3) self.args = "-U %s" % " ".join([p.filename() for p in p2, p3]) self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-1") self.addrule("PKG_VERSION=pkg3|1.0-1") ------------------- Here is my patch (WARNING: with large targetlist this may cause notable slowdown). ------------------- diff -Naur pacman-lib/lib/libalpm/deps.c pacman-lib.new/lib/libalpm/deps.c --- pacman-lib/lib/libalpm/deps.c 2007-03-19 05:23:45.000000000 +0100 +++ pacman-lib.new/lib/libalpm/deps.c 2007-04-21 16:42:29.000000000 +0200 @@ -271,8 +271,9 @@ for(l = _alpm_db_get_pkgcache(db); l; l = l->next) { pmpkg_t *pkg = l->data; - if(strcmp(alpm_pkg_get_name(pkg), alpm_pkg_get_name(oldpkg)) == 0) { - /* well, we know this one succeeds, but we're removing it... skip it */ + if(_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) { + /* we ignore packages that will be updated because we know that + updated ones don't satisfy depend.*/ continue; } ------------------ Bye, ngaba

6 32

[pacman-dev] -Sc and -Scc default actions
by Roman Kyrylych 06 Jun '07

06 Jun '07

Hi! I've upgraded to pacman3 and did this: [root@server ~]# pacman -Sc Do you want to remove old packages from cache? [Y/n] removing old packages from cache... done. [root@server ~]# pacman -Scc Do you want to remove all packages from cache? [Y/n] n IMO -Scc default choice should be N, because it's easy to do -Scc instead of -Sc and hit Enter as usual. -- Roman Kyrylych (Роман Кирилич)

3 4

[pacman-dev] [patch] makepkg3 -- cleanup dep check functions
by Andrew Fyfe 01 Jun '07

01 Jun '07

Another patch :) This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily. This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch. Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature_handledeps timestamp: Sat 2007-03-24 12:12:48 +0000 message: * cleaned up handledeps () resolvedeps () removedeps () === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-24 12:12:35 +0000 @@ -191,91 +191,85 @@ } handledeps() { - local missingdeps=0 + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=1 + + [ $# -eq 0 ] && return $R_DEPS_SATISFIED + local deplist="$*" - local depstrip="" - local striplist="" - local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then - haveperm=1 - fi - + local striplist + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.&$||' -e 's|<.*$||')" done - if [ "$deplist" != "" -a $haveperm -eq 1 ]; then - if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then - # install missing deps from binary packages (using pacman -S and sudo) - msg "Installing missing dependencies..." + if [ "$DEP_SRC" = "0" -a "$DEP_BIN" = "0" ]; then + return $R_DEPS_MISSING + elif [ "$SUDO" = 0 -a $EUID -gt 0 ]; then + warning "Cannot auto-install missing dependencies as a normal user without sudo!" + plain "Run makepkg as root or with -S to resolve dependencies automatically." + return $R_DEPS_MISSING + fi + + if [ "$DEP_BIN" = "1" ]; then + # install missing deps from binary packages (using pacman -S) + msg "Installing missing dependencies..." + local ret=0 + + if [ "$SUDO" = 1 ]; then if [ "$INFAKEROOT" = "1" ]; then # kinda hacky, but we need to make pacman think that we're NOT # in fakeroot so it will go ahead and install the dependencies. FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - fi + sudo pacman $PACMAN_OPTS -S $striplist || ret=$? if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$DEP_BIN" = "1" ]; then - # install missing deps from binary packages (using pacman -S) - msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - 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" - exit 1 - fi - # TODO: handle version comparators (eg, glibc>=2.2.5) - msg "Building missing dependencies..." - for dep in $striplist; do - candidates=$(find $SRCROOT -type d -name "$dep") - if [ "$candidates" = "" ]; then - error "Could not find \"$dep\" under $SRCROOT" - exit 1 - fi - success=0 - for pkgdir in $candidates; do - if [ -f "$pkgdir/$BUILDSCRIPT" ]; then - cd "$pkgdir" - if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST - else - makepkg -i -c -b -w $PKGDEST - fi - if [ $? -eq 0 ]; then - success=1 - break - fi - fi - done - if [ "$success" = "0" ]; then - error "Failed to build \"$dep\"" - exit 1 + else + pacman $PACMAN_OPTS -S $striplist || ret=$? + fi + + if [ $ret -ne 0 ]; then + error "Pacman failed to install missing dependencies." + exit 1 # TODO: error code + fi + elif [ "$DEP_SRC" = "1" ]; then + msg "Building missing dependencies..." + + # 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" + exit 1 # TODO: error code + fi + + # TODO: handle version comparators (eg, glibc>=2.2.5) + for dep in $striplist; do + local candidates="$(find "$SRCROOT" -type d -name "$dep")" + if [ "$candidates" = "" ]; then + error "Could not find \"$dep\" under $SRCROOT" + exit 1 # TODO: error code + fi + + local makepkg_opts='-i -c -b' + [ "$RMDEPS" = "1" ] && makepkg_opts="$makepkg_opts -r" + local ret + local pkgdir + for pkgdir in $candidates; do + if [ -f "$pkgdir/$BUILDSCRIPT" ]; then + cd "$pkgdir" + ret=0 + PKGDEST="$PKGDEST" makepkg $makepkg_opts || ret=$? + [ $ret -eq 0 ] && continue 2 fi done - else - missingdeps=1 - fi - elif [ "$deplist" != "" -a $haveperm -eq 0 ]; then - if [ "$DEP_SRC" = "1" -o "$DEP_BIN" = "1" ]; then - warning "Cannot auto-install missing dependencies as a normal user without sudo!" - plain "Run makepkg as root or with -S to resolve dependencies automatically." - fi - missingdeps=1 + + error "Failed to build \"$dep\"" + exit 1 # TODO: error code + done fi # rerun any additional sh scripts found in /etc/profile.d/ @@ -286,53 +280,51 @@ fi done - return $missingdeps + return $R_DEPS_SATISFIED } resolvedeps() { - deplist="" - newdeplist="" - - deplist=$(checkdeps $*) - if [ -n "${deplist}" ]; then - handledeps $deplist - if [ $? -eq 0 ]; then - # check deps again to make sure they were resolved - newdeplist=$(checkdeps $*) - if [ -n "${newdeplist}" ]; then - error "Failed to install all missing dependencies." - fi - else - newdeplist="$deplist" - fi - fi - - # if new dep list is not empty, print the list - if [ -n "${newdeplist}" ]; then - msg "Missing Dependencies:" - for dep in ${newdeplist}; do - msg2 "${dep}" - done - return 1 - else - return 0 - fi + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=0 + + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + + if handledeps $deplist; then + # check deps again to make sure they were resolved + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + elif [ "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" ]; then + error "Failed to install all missing dependencies." + fi + + msg "Missing Dependencies:" + local dep + for dep in $deplist; do + msg2 "$dep" + done + + return $R_DEPS_MISSING } # fix flyspray bug #5923 removedeps() { + [ "$RMDEPS" = "0" ] && return + [ "$SUDO" = "0" -a $EUID -gt 0 ] && return + # runtimedeps and buildtimedeps are set when resolving deps local deplist="$runtimedeps $buildtimedeps" - local depstrip="" - local striplist="" - + local striplist + + [ "$deplist" = "" ] && return + + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" done - if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + msg "Removing installed dependencies..." + if [ "$SUDO" = "1" ]; then if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY @@ -342,8 +334,7 @@ export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + else pacman $PACMAN_OPTS -Rs $striplist fi }

4 18

[pacman-dev] [PATCH] Change -z|--showsize flag to ShowSize pacman.conf option
by Nathan Jones 01 Jun '07

01 Jun '07

Also, some duplicate printf lines related to the ShowSize option were cleaned up. Dan, I created this diff against your tree not the official one, if it makes a difference when applying. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- doc/pacman.conf.5 | 4 ++++ lib/libalpm/alpm.c | 3 +++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 6 ++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.h | 1 - src/pacman/pacman.c | 4 ---- src/pacman/query.c | 12 +++++------- src/pacman/sync.c | 15 ++++++--------- src/pacman/util.c | 3 ++- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/doc/pacman.conf.5 b/doc/pacman.conf.5 index 15f7b95..f7304aa 100644 --- a/doc/pacman.conf.5 +++ b/doc/pacman.conf.5 @@ -85,6 +85,10 @@ Log action messages through \fBsyslog()\fP. This will insert log entries into .TP .B LogFile = \fI/path/to/file\fP Log actions directly to a file. Default is \fI/var/log/pacman.log\fP. +.TP +.B ShowSize +Display the size of individual packages for \fB--sync\fP and \fB--query\fP +modes. .SH REPOSITORY SECTIONS Each repository section defines a section name and at least one location where diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 4239430..db66092 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -959,6 +959,9 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) { alpm_option_set_usecolor(1); _alpm_log(PM_LOG_DEBUG, _("config: usecolor")); + } else if(strcmp(origkey, "ShowSize") == 0 || strcmp(key, "SHOWSIZE") == 0) { + alpm_option_set_showsize(1); + _alpm_log(PM_LOG_DEBUG, _("config: showsize")); } else { RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e2d2b0e..047048c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -144,6 +144,9 @@ void alpm_option_set_needles(alpm_list_t *needles); unsigned short alpm_option_get_usecolor(); void alpm_option_set_usecolor(unsigned short usecolor); +unsigned short alpm_option_get_showsize(); +void alpm_option_set_showsize(unsigned short showsize); + pmdb_t *alpm_option_get_localdb(); alpm_list_t *alpm_option_get_syncdbs(); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 47abcb3..39caaa9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -137,6 +137,7 @@ const char *alpm_option_get_xfercommand() { return handle->xfercommand; } unsigned short alpm_option_get_nopassiveftp() { return handle->nopassiveftp; } unsigned short SYMEXPORT alpm_option_get_chomp() { return handle->chomp; } unsigned short alpm_option_get_usecolor() { return handle->use_color; } +unsigned short SYMEXPORT alpm_option_get_showsize() { return handle->showsize; } pmdb_t SYMEXPORT *alpm_option_get_localdb() { return handle->db_local; } alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() @@ -297,4 +298,9 @@ void alpm_option_set_usecolor(unsigned short usecolor) handle->use_color = usecolor; } +void alpm_option_set_showsize(unsigned short showsize) +{ + handle->showsize = showsize; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 0790ad1..b80f751 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -65,6 +65,7 @@ typedef struct _pmhandle_t { unsigned short nopassiveftp; /* Don't use PASV ftp connections */ unsigned short chomp; /* I Love Candy! */ unsigned short use_color; /* enable colorful output */ + unsigned short showsize; /* Show individual package sizes */ } pmhandle_t; extern pmhandle_t *handle; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 11aa41b..4fff0ab 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -54,7 +54,6 @@ typedef struct __config_t { pmtransflag_t flags; unsigned short noask; unsigned int ask; - unsigned short showsize; } config_t; config_t *config_new(void); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe70ea1..50265e4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -131,7 +131,6 @@ static void usage(int op, char *myname) printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); - printf(_(" -z, --showsize display installed size of each package\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -147,7 +146,6 @@ static void usage(int op, char *myname) printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); - printf(_(" -z, --showsize display download size of each package\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); } printf(_(" --config <path> set an alternate configuration file\n")); @@ -293,7 +291,6 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"showsize", no_argument, 0, 'z'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -426,7 +423,6 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'y': (config->op_s_sync)++; break; - case 'z': config->showsize = 1; break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index bb4cfb9..aa360f1 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -146,16 +146,14 @@ int pacman_query(alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(i); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("local/%s %s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("local/%s %s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f11bb4..bb2b977 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -251,18 +251,15 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(j); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("%s/%s %s [%.2f MB]", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("%s/%s %s", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/util.c b/src/pacman/util.c index f38be60..7b7ec0b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -294,7 +294,8 @@ void display_targets(alpm_list_t *syncpkgs) size += dispsize; isize += alpm_pkg_get_isize(pkg); - if(config->showsize) { + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ mbdispsize = dispsize / (1024.0 * 1024.0); -- 1.5.1.3

4 4

[pacman-dev] french man pages for pacman 3
by marc[i1] 01 Jun '07

01 Jun '07

Hello, I translate pacman man pages, I make a PKGBUILD in AUR for french people who does not want to read in english. http://aur.archlinux.org/packages.php?do_Details=1&ID=11180 I ask here if some dev wants to add those man pages on pacman. Thanks. -- + - - - - - - - - - - - - - - - - - - - + + (o< -! marc[i1] #363392 + + //\ http://poiroud.free.fr/dotclear + + \\/_ Linux for Free Generation + + - - - - - - - - - - - - - - - - - - - +

2 1