- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg developmental version
by Allan McRae 25 Dec '08

25 Dec '08

Hi all, I have just packaged a version of makepkg from my git working branch for people to test out. This installs alongside the makepkg from pacman so won't affect your regular package building. i686: http://dev.archlinux.org/~allan/makepkg-git-20081223-1-i686.pkg.tar.gz x86_64: http://dev.archlinux.org/~allan/makepkg-git-20081223-1-x86_64.pkg.tar.gz New features of interest: Package splitting support! - multiple packages are specified in the pkgname variable - each package gets its own packaging function where package variables can be overridden - see PKGBUILD-split.proto (in /usr/share/pacman) for "documentation" Added optional package() function in PKGBUILDs - limits fakeroot usage to packaging stages - see "man PKGBUILD-git.conf" for more info Treat info pages like man pages: - automatically compress info pages - info pages are not removed with the !docs options Added purge option: - automatically removes common conflicting or removed files - specify files in PURGE_TARGETS in makepkg.conf - default PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) Replace getopt usage with internal function: - allows makepkg to run on systems with old getopt version (e.g. Mac OS X) Other smaller changes: - ability to pass PKGBUILD from pipe - package compression type auto-detection - add configuration option to specify man/info page directories - specify alternative configuration file using the --config option - all integrity sums provided are checked - some fixes from the pacman 3.2 maintenance branch: - detect CRLF line endings - when automatically updating an SCM package pkgver, pkgrel is reset to 1 - speed up mercurial package revision checking - improved compatibility with older bash versions Known issues: - The -p flag to specify an alternative name for a PKGBUILD is broken - Repackaging with split-packages definitely does not work - Repackaging when using package() function probably does not work... - Some minor output changes are needed for package splitting Bug reports either to the pacman-dev list or the pacman/makepkg section of the bug tracker. Enjoy, Allan

2 7

[pacman-dev] [PATCH] Remove libdownload support and fix libfetch one.
by Xavier Chantry 25 Dec '08

25 Dec '08

Aaron said to consider libdownload a dead project so libdownload support was removed to more easily fix libfetch one (otherwise many ifdef needed). There was no direct replacement for ferror to detect an error while downloading. So instead, I added a check at the end to see if the file was fully downloaded, which is just a small chunk of code taken from here: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/files/fetch.c?only_… Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- configure.ac | 13 +++++-------- lib/libalpm/dload.c | 37 ++++++++++++++++--------------------- lib/libalpm/error.c | 5 +---- 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index c7841b8..1b3d702 100644 --- a/configure.ac +++ b/configure.ac @@ -88,9 +88,9 @@ AC_ARG_WITH(db-ext, AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) -# Help line for libdownload/libfetch +# Help line for libfetch AC_ARG_ENABLE(internal-download, - AS_HELP_STRING([--disable-internal-download], [do not build with libdownload/libfetch support]), + AS_HELP_STRING([--disable-internal-download], [do not build with libfetch support]), [internaldownload=$enableval], [internaldownload=yes]) # Help line for documentation @@ -131,17 +131,14 @@ AM_GNU_GETTEXT_VERSION(0.13.1) AC_CHECK_LIB([archive], [archive_read_data], , AC_MSG_ERROR([libarchive is needed to compile pacman!])) -# Enable or disable usage of libdownload/libfetch -# - this is a nested check- first see if we need a library, if we do then -# check for libdownload first, then fallback to libfetch, then die +# Enable or disable usage of libfetch AC_MSG_CHECKING(whether to link with download library) if test "x$internaldownload" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library]) # Check for a download library if it was actually requested - AC_CHECK_LIB([download], [downloadParseURL], , - AC_CHECK_LIB([fetch], [fetchParseURL], , - AC_MSG_ERROR([libdownload or libfetch are needed to compile with internal download support])) ) + AC_CHECK_LIB([fetch], [fetchParseURL], , + AC_MSG_ERROR([libfetch is needed to compile with internal download support]) ) else AC_MSG_RESULT(no) fi diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9934f30..c0ee28d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -34,15 +34,7 @@ #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -#if defined(HAVE_LIBDOWNLOAD) -#include <download.h> -#define fetchFreeURL downloadFreeURL -#define fetchLastErrCode downloadLastErrCode -#define fetchLastErrString downloadLastErrString -#define fetchParseURL downloadParseURL -#define fetchTimeout downloadTimeout -#define fetchXGet downloadXGet -#elif defined(HAVE_LIBFETCH) +#if defined(INTERNAL_DOWNLOAD) #include <fetch.h> #endif @@ -109,7 +101,8 @@ static struct url *url_for_string(const char *url) static int download_internal(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew) { - FILE *dlf, *localf = NULL; + fetchIO *dlf = NULL; + FILE *localf = NULL; struct url_stat ust; struct stat st; int chk_resume = 0, ret = 0; @@ -208,16 +201,8 @@ static int download_internal(const char *url, const char *localpath, handle->dlcb(filename, 0, ust.size); } - while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) { + while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) { size_t nwritten = 0; - if(ferror(dlf)) { - pm_errno = PM_ERR_LIBFETCH; - _alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s\n"), - filename, fetchLastErrString); - ret = -1; - goto cleanup; - } - while(nwritten < nread) { nwritten += fwrite(buffer, 1, (nread - nwritten), localf); if(ferror(localf)) { @@ -233,12 +218,22 @@ static int download_internal(const char *url, const char *localpath, handle->dlcb(filename, dl_thisfile, ust.size); } } + + /* did the transfer complete normally? */ + if (ust.size != -1 && dl_thisfile < ust.size) { + pm_errno = PM_ERR_LIBFETCH; + _alpm_log(PM_LOG_ERROR, _("%s appears to be truncated: %jd/%jd bytes\n"), + filename, (intmax_t)dl_thisfile, (intmax_t)ust.size); + ret = -1; + goto cleanup; + } + /* probably safer to close the file descriptors now before renaming the file, * for example to make sure the buffers are flushed. */ fclose(localf); localf = NULL; - fclose(dlf); + fetchIO_close(dlf); dlf = NULL; rename(tempfile, destfile); @@ -254,7 +249,7 @@ cleanup: fclose(localf); } if(dlf != NULL) { - fclose(dlf); + fetchIO_close(dlf); } fetchFreeURL(fileurl); return(ret); diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 80a4fb1..df93cb7 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -30,10 +30,7 @@ #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -#if defined(HAVE_LIBDOWNLOAD) -#include <download.h> /* downloadLastErrString */ -#define fetchLastErrString downloadLastErrString -#elif defined(HAVE_LIBFETCH) +#if defined(INTERNAL_DOWNLOAD) #include <fetch.h> /* fetchLastErrString */ #endif -- 1.6.0.6

1 0

[pacman-dev] [PATCH] Fix asciidoc manpage creation.
by Xavier Chantry 25 Dec '08

25 Dec '08

As reported here, man pages could no longer be built : http://archlinux.org/pipermail/pacman-dev/2008-December/007726.html I found the explanation here : http://www.methods.co.nz/asciidoc/source-highlight-filter.html "If you use a2x(1) to generate PDF you need to include the --no-xmllint option to suppress xmllint(1) checking — the programlisting language attribute (required by the dblatex source highlighter) is not part of the DocBook 4 specification (but it is in the newer DocBook 5 specification)." Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/Makefile.am | 1 + doc/PKGBUILD.5.txt | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index cce0a71..7992e54 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \ -a pacman_date="`date +%Y-%m-%d`" \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ + --no-xmllint \ -d manpage \ -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e42a8b8..466ef17 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -367,11 +367,10 @@ The following is an example PKGBUILD for the 'patch' package. For more examples, look through the build files of your distribution's packages. For those using Arch Linux, consult the ABS tree. -[sh] -source~~~~~ +[source,sh] +------------------------------- include::PKGBUILD-example.txt[] -source~~~~~ - +------------------------------- See Also -------- -- 1.6.0.6

1 0

[pacman-dev] Dan's pacman tree build&test
by Gerhard Brauer 25 Dec '08

25 Dec '08

Hi Dan, git clone http://code.toofishes.net/gitprojects/pacman.git (branch is master) 1. if have to install asciidox (for a2x), that's current not a (build)depend of pacman make stops with an error make[2]: Entering directory `/home/gerhard/al-de/pac-git/pacman/doc' a2x -d manpage -f manpage --xsltproc-opts='-param man.endnotes.list.enabled 0' --xsltproc-opts='-param man.en dnotes.are.numbered 0' --asciidoc-opts="-f asciidoc.conf -a pacman_version="3.2.1" -a pacman_date="`date +%Y- %m-%d`" -a sysconfdir=/etc" PKGBUILD.5.txt ./PKGBUILD.5.xml:148: element literal: validity error : Element emphasis is not declared in literal list of p ossible children e. The syntax is: <literal>source=(<emphasis>filename::url</emphasis>)</literal> ^ ./PKGBUILD.5.xml:780: element programlisting: validity error : No declaration for attribute language of eleme nt programlisting <programlisting language="sh" linenumbering="unnumbered"># Maintainer: Joe User ^ ./PKGBUILD.5.xml:780: parser error : error parsing attribute name isting language="sh" linenumbering="unnumbered"># Maintainer: Joe User <joe.user ^ ./PKGBUILD.5.xml:780: parser error : attributes construct error isting language="sh" linenumbering="unnumbered"># Maintainer: Joe User <joe.user ^ ./PKGBUILD.5.xml:780: parser error : Couldn't find end of Start Tag joe.user line 780 isting language="sh" linenumbering="unnumbered"># Maintainer: Joe User <joe.user ^ a2x: failed: xmllint --nonet --noout --valid "./PKGBUILD.5.xml" make[2]: *** [PKGBUILD.5] Fehler 1 make[2]: Leaving directory `/home/gerhard/al-de/pac-git/pacman/doc' make[1]: *** [all-recursive] Fehler 1 make[1]: Leaving directory `/home/gerhard/al-de/pac-git/pacman' make: *** [all] Fehler 2 Seems any error in XML-Input doc file. Is it ok to post to this ML? Or better a private mail address? Gerhard

5 7

Re: [pacman-dev] makepkg: package splitting
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 23 Dec '08

23 Dec '08

Am Montag, den 15.12.2008, 21:43 +1000 schrieb Allan McRae: > Allan McRae wrote: > > Marc - A. Dahlhaus [ Administration | Westermann GmbH ] wrote: > >> i think i found another bug. Every package that is a split-build and not > >> in the first position in the pkgname build-order shows an empty > >> "Optional dependencies" string during installation. I think there is > >> something wrong in restore_package_variables during variable resetting > >> to initial values or in backup_package_variables during the backup > >> declaration. It looks like there are to much quotes around the > >> declaration so that it declares an empty string. Maybe a "-z" check > >> before the actual variable declaration could fix that particular > >> problem. > >> > > > > Fix now on my working branch: > > http://dev.archlinux.org/~allan/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff… > > > > > > And when I say my working branch, I mean my splitpkg branch... Nice, i'll test and report back... Is there any schedule on when it will be merged to mainline? Marc

3 3

[pacman-dev] [PATCH] makepkg: Add docmunetation for separate pacakge function
by Allan McRae 22 Dec '08

22 Dec '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e42a8b8..5171798 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -254,6 +254,15 @@ If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside the build function. +package() Function +------------------ +An optional package() function can be specified in addtion to the build() function. +This function is directly sourced by makepkg and run immediately after the build() +function. When specified in combination with the fakeroot BUILDENV option in +linkman:makepkg.conf[5], fakeroot usage will be limited to running the package() +function and the subsequent packing of the package. The build() function will be +run as the user calling makepkg. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it -- 1.6.0.5

3 6

[pacman-dev] [PATCH] makepkg: Replace getopt with internal function
by Allan McRae 22 Dec '08

22 Dec '08

This will allow makepkg to work on systems like Mac OS X where the default getopt is too old to properly handle long options. The new parse_options function should replicate getopt's behaviour completely. Original work: Yun Zheng Hu <yunzheng.hu(a)gmail.com> [Allan: Rewrite and bug fixes] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ea034ad..8cf301c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1186,6 +1186,93 @@ devel_update() { fi } +# getopt like parser +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + local ret=0; + local unused_options="" + + while [ -n "$1" ]; do + if [ ${1:0:2} = '--' ]; then + if [ -n "${1:2}" ]; then + local match="" + for i in ${long_options//,/ }; do + if [ ${1:2} = ${i//:} ]; then + match=$i + break + fi + done + if [ -n "$match" ]; then + if [ ${1:2} = $match ]; then + printf ' %s' "$1" + else + if [ -n "$2" ]; then + printf ' %s' "$1" + shift + printf " '%s'" "$1" + else + echo "makepkg: option '$1' $(gettext "requires an argument")" >&2 + ret=1 + fi + fi + else + echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 + ret=1 + fi + else + shift + break + fi + elif [ ${1:0:1} = '-' ]; then + for ((i=1; i<${#1}; i++)); do + if [[ "$short_options" =~ "${1:i:1}" ]]; then + if [[ "$short_options" =~ "${1:i:1}:" ]]; then + if [ -n "${1:$i+1}" ]; then + printf ' -%s' "${1:i:1}" + printf " '%s'" "${1:$i+1}" + else + if [ -n "$2" ]; then + printf ' -%s' "${1:i:1}" + shift + printf " '%s'" "${1}" + else + echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 + ret=1 + fi + fi + break + else + printf ' -%s' "${1:i:1}" + fi + else + echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2 + ret=1 + fi + done + else + unused_options="${unused_options} '$1'" + fi + shift + done + + printf " --" + if [ -n "$unused_options" ]; then + for i in ${unused_options[@]}; do + printf ' %s' "$i" + done + fi + if [ -n "$1" ]; then + while [ -n "$1" ]; do + printf " '%s'" "${1}" + shift + done + fi + printf "\n" + + return $ret +} + usage() { printf "makepkg (pacman) %s\n" "$myver" echo @@ -1251,8 +1338,8 @@ OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" -if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then +OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" +if echo "$OPT_TEMP" | grep -q 'PARSE_OPTIONS FAILED'; then # This is a small hack to stop the script bailing with 'set -e' echo; usage; exit 1 # E_INVALID_OPTION; fi -- 1.6.0.5

1 0

[pacman-dev] [PATCH] Added the function parse_options to replace getopt
by Yun Zheng Hu 22 Dec '08

22 Dec '08

This will make makepkg work properly on systems like Mac OS X, where the default installed getopt does not handle long options. The new parse_options function tries to behave like the original getopt command as much as possible. see also: http://www.archlinux.org/pipermail/pacman-dev/2008-May/011830.html Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- scripts/makepkg.sh.in | 81 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6dc7db4..8e3ad25 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1117,6 +1117,83 @@ devel_update() { fi } +## +# usage : match_long_opt( $needle, $options ) +# return : matched option +## +match_long_opt() { + local needle=$1; shift + local matches item + for item in "$@"; do + [[ "$item" =~ ^"$needle" ]] && matches="$matches $item" + done + matches=( $matches ) + [[ ${#matches[@]} == 1 ]] && echo ${matches[0]} +} + +# getopt like parser, returns 1 on error +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + + local needs_args=0 consume_args=0 retcode=0 + local opt_args="" last_opt="" + until [ -z "$1" ]; do + local handle_opt=$((!$needs_args && !$consume_args)) + + if [[ ${1:0:2} = '--' && $handle_opt == 1 ]]; then + # handle long option + opt=${1:2} + if [ ! -z "$opt" ]; then + longopt_match=$(match_long_opt $opt ${long_options//,/ }) + longopt_real="${longopt_match/:/}" # strip possible ':' + [[ "${longopt_match}" == "${longopt_real}:" ]] && needs_args=1 + [[ ! -z "$longopt_match" ]] && printf ' --%s' "$longopt_real" || { + echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 + retcode=1 + } + elif [ $consume_args == 0 ]; then + # option '--', stop parsing options + consume_args=1 + fi + elif [[ ${1:0:1} = '-' && $handle_opt == 1 ]]; then + # handle short option(s) + opts=${1:1} + local i=0 args="" + while [ $i -lt ${#opts} ]; do + opt=${opts:$((i++)):1} + [[ "$needs_args" == 1 ]] && args="${param}${opt}" && continue + [[ "$short_options" =~ "${opt}:" ]] && needs_args=1 + [[ "$short_options" =~ "${opt}" ]] && printf ' -%s' "${opt}" || { + echo "makepkg: $(gettext "invalid option") -- '$opt'" >&2 + retcode=1 + } + done + # check if the user supplied the argument directly after the option + [ ! -z "$args" ] && printf " '$param'" && needs_args=0 + else + # handle non option + [ "$needs_args" == 1 ] && printf " '$1'" && needs_args=0 + [ "$consume_args" == 1 ] && opt_args="$opt_args '$1'" + fi + last_opt="$1" + shift + done + + # check if the user forgot to supply a required argument + if [[ "$needs_args" == 1 ]]; then + if [[ ${last_opt:0:2} = '--' ]]; then + echo "makepkg: option '$last_opt' $(gettext "requires an argument")" >&2 + else + echo "makepkg: option $(gettext "requires an argument") -- '${last_opt:1}'" >&2 + fi + retcode=1 + fi + + printf " --$opt_args\n" + return $retcode +} + usage() { printf "makepkg (pacman) %s\n" "$myver" echo @@ -1182,8 +1259,8 @@ OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" -if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then +OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" +if echo "$OPT_TEMP" | grep -q 'PARSE_OPTIONS FAILED'; then # This is a small hack to stop the script bailing with 'set -e' echo; usage; exit 1 # E_INVALID_OPTION; fi -- 1.5.6.5

3 6

[pacman-dev] PKGBUILD.proto - Take3
by Jud 19 Dec '08

19 Dec '08

Hi, Edit: Take3, suggested changes - thanks everyone! Dan suggested I send this to the pacman-dev list. After completing some research and asking alot of questions I present some minor changes to PKGBUILD.proto supplied as a .diff to be merged after your approval. I believe it helps the intended audience create a better PKGBUILD in less time according to the latest Arch Packaging Standards. Cheers Jud Inline: --- PKGBUILD.proto 2008-12-05 23:32:33.000005000 +1000 +++ PKGBUILD.proto.new 2008-12-08 17:17:15.536302100 +1000 @@ -4,12 +4,13 @@ # then please put 'unknown'. # Contributor: Your Name <youremail(a)domain.com> + pkgname=NAME -pkgver=VERSION +pkgver=VERSION # Note: Cannot contain hyphens pkgrel=1 pkgdesc="" +url="http://ADDRESS/" arch=() -url="" license=('GPL') groups=() depends=() @@ -20,17 +21,14 @@ replaces=() backup=() options=() -install= -source=($pkgname-$pkgver.tar.gz) +install=$pkgname.install +source=(http://ADDRESS/TO/FILE/$pkgname-$pkgver.tar.gz) noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # Generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make || return 1 - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install || return 1 } - -# vim:set ts=2 sw=2 et:

4 3

[pacman-dev] [PATCH] (newgpg) Let pacman specify GnuPG's home directory.
by Chris Brannon 18 Dec '08

18 Dec '08

GnuPG looks for configuration files and keyrings in its home directory. For a user, that is typically ~/.gnupg. This patch causes pacman to use /etc/pacman.d/gnupg/ as the default GnuPG home. One may override the default using --gpgdir on the command-line or GPGDir in pacman's configuration file. Signed-off-by: Chris Brannon <cmbrannon(a)cox.net> --- doc/pacman.8.txt | 7 +++++++ doc/pacman.conf.5.txt | 6 ++++++ src/pacman/Makefile.am | 2 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 25 +++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 6f071ba..a780627 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -136,6 +136,13 @@ Options *\--config* <'file'>:: Specify an alternate configuration file. +*\--gpgdir* <'dir':: + Specify a directory of files used by GnuPG to verify package + signatures. This directory should contain two files: + ``pubring.gpg'' and ``trustdb.gpg''. ``pubring.gpg'' holds the public + keys of all packagers. ``trustdb.gpg'' contains a so-called + trust database, which specifies that the keys are authentic and trusted. + *\--logfile* <'file'>:: Specify an alternate log file. This is an absolute path, regardless of the installation root setting. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 8ef11ec..fa69bfa 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -69,6 +69,12 @@ Options path, the root path is not automatically prepended. +*GPGDir =* path/to/gpg/dir:: + Overrides the default location of the directory containing + configuration files for GnuPG. + A typical default is ``/etc/pacman.d/gnupg''. + This is an absolute path, and the root directory is not prepended. + *LogFile =* '/path/to/file':: Overrides the default location of the pacman log file. A typical default is ``/var/log/pacman.log''. This is an absolute path and the root directory diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 220ee9c..4da6ef3 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -1,6 +1,7 @@ # paths set at make time conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ +gpgdir = ${sysconfdir}/pacman.d/gnupg/ cachedir = ${localstatedir}/cache/pacman/pkg/ logfile = ${localstatedir}/log/pacman.log @@ -10,6 +11,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ -DROOTDIR=\"$(ROOTDIR)\" \ -DDBPATH=\"$(dbpath)\" \ + -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" \ @DEFS@ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 8ea6662..f491057 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -37,6 +37,7 @@ typedef struct __config_t { char *rootdir; char *dbpath; char *logfile; + char *gpgdir; /* TODO how to handle cachedirs? */ unsigned short op_q_isfile; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3255cdf..18fd3a8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -138,6 +138,7 @@ static void usage(int op, const char * const myname) printf(_(" -q, --quiet show less information for query and search\n")); } printf(_(" --config <path> set an alternate configuration file\n")); + printf(_(" --gpgdir <path> set an alternate home directory for GnuPG\n")); printf(_(" --logfile <path> set an alternate log file\n")); printf(_(" --noconfirm do not ask for any confirmation\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); @@ -306,6 +307,20 @@ static void setlibpaths(void) } } + /* + * Set GnuPG's home directory. This is not relative to + * rootdir, even if rootdir is defined. + * Reasoning: gpgdir contains configuration data. +*/ + if(config->gpgdir) { + ret = alpm_option_set_signaturedir(config->gpgdir); + if(ret != 0) { + pm_printf(PM_LOG_ERROR, _("problem setting gpgdir '%s' (%s)\n"), + config->gpgdir, alpm_strerrorlast()); + cleanup(ret); + } + } + /* add a default cachedir if one wasn't specified */ if(alpm_option_get_cachedirs() == NULL) { alpm_option_add_cachedir(CACHEDIR); @@ -366,6 +381,7 @@ static int parseargs(int argc, char *argv[]) {"debug", optional_argument, 0, 1003}, {"noprogressbar", no_argument, 0, 1004}, {"noscriptlet", no_argument, 0, 1005}, + {"gpgdir", required_argument, 0, 1006}, {"cachedir", required_argument, 0, 1007}, {"asdeps", no_argument, 0, 1008}, {"logfile", required_argument, 0, 1009}, @@ -446,6 +462,9 @@ static int parseargs(int argc, char *argv[]) case 1012: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; + case 1006: + config->gpgdir = strdup(optarg); + break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; @@ -725,6 +744,11 @@ static int _parseconfig(const char *file, const char *givensection, config->rootdir = strdup(ptr); pm_printf(PM_LOG_DEBUG, "config: rootdir: %s\n", ptr); } + } else if (strcmp(key, "GPGDir") == 0) { + if(!config->gpgdir) { + config->gpgdir = strdup(ptr); + pm_printf(PM_LOG_DEBUG, "config: gpgdir: %s\n", ptr); + } } else if (strcmp(key, "LogFile") == 0) { if(!config->logfile) { config->logfile = strdup(ptr); @@ -864,6 +888,7 @@ int main(int argc, char *argv[]) /* define paths to reasonable defaults */ alpm_option_set_root(ROOTDIR); alpm_option_set_dbpath(DBPATH); + alpm_option_set_signaturedir(GPGDIR); alpm_option_set_logfile(LOGFILE); /* Priority of options: -- 1.6.0.5

6 16