June 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] Dangling symlink to libtool file - Was: Re: [arch-dev-public] signoff: xfsprogs 2.9.8-1 for i686
by Allan McRae 27 Jun '08

27 Jun '08

Eric Belanger wrote: > > Although the '!libtool' option is used, there is a libtool file in the > package: lib/libhandle.la > I'm guessing that makepkg doesn't search /lib for libtool files so it > needs to be manually removed. Of course, I assume that it's not needed. > That is actually a dangling symlink to the actual libtool file which was removed. Sending to pacman-dev so this can be fixed. Allan

2 5

Re: [pacman-dev] pac-file utility script
by pete morris 26 Jun '08

26 Jun '08

On Thu Jun 26, 2008 at 10:07AM, Allan McRae wrote: > Hi Pete, > > Can you post the script inline so it would be easier for us to comment > on. Sure, see below: #!/bin/bash #----------------------------------------------------------- # A utility for discovering which ArchLinux package contains # a given file. Downloads filelists for all active repos in # pacman.conf; uses mirrors in order according to pacman's # mirrorlist file. # # Peter Morris 2008 #----------------------------------------------------------- db=/var/lib/pacman/filelists pacmanconf=/etc/pacman.conf mirrorlist=/etc/pacman.d/mirrorlist #----------------------------------------------------------- # Print active repos in $pacmanconf. #----------------------------------------------------------- function list_repos() { sed -n '/REPOSITORIES/,$ s/^\[$.*$\]/\1/p' $pacmanconf } #----------------------------------------------------------- # Print active mirrors in $mirrorlist. #----------------------------------------------------------- function list_mirrors() { sed -n 's/^Server = $.*$$/\1/p' $mirrorlist } #----------------------------------------------------------- # Download the filelist for repo $1. Assumes $mirrors # is an array of urls to check for $file. #----------------------------------------------------------- function download() { repo=$1 file="${repo}.files.tar.gz" i=0 while [[ ! -e "${db}/${file}" ]]; do if (( $i >= ${#mirrors[@]} )); then return 1 fi url=$(echo "${mirrors[$i]}" | sed "s/\$repo/$repo/g") wget --connect-timeout=15 -P "$db" "${url}/${file}" let i+=1 done } #----------------------------------------------------------- # Decompress $1 into dir $2. #----------------------------------------------------------- function decompress() { file=$1 repo=$2 mkdir "${db}/${repo}" tar -xzf "${db}/${file}" -C "${db}/${repo}" rm -f "${db}/${file}" } #----------------------------------------------------------- # Download the filelist for each active repo in # pacman.conf. Tries mirrors in order until successful. #----------------------------------------------------------- function sync() { mirrors=($(list_mirrors)) for repo in $(list_repos); do echo "Fetching filelist for $repo" download "$repo" if [[ $? == 0 ]]; then decompress "$file" "$repo" else echo echo "Error: unable to retrieve $file from any mirror." echo fi done } #----------------------------------------------------------- # Print usage message. #----------------------------------------------------------- function usage() { echo "usage: $(basename $0) [options] [pattern]" echo echo "Search package filelists for [pattern]." echo "options:" echo " $(basename $0) [-h --help] Print this help message." echo " $(basename $0) [-S --sync] Syncronize package filelists." } #----------------------------------------------------------- # Start of `main'. #----------------------------------------------------------- case "$1" in -S|--sync) if [[ $EUID != 0 ]]; then echo "error: you cannot perform this operation unless you are root." exit 1; fi echo "Syncronizing ${db}..."; echo rm -rf "$db" && mkdir -p "$db" sync ;; -h|--help) usage ;; *) if [[ $# < 1 ]]; then echo "not enough parameters"; echo usage exit 1 fi if [[ ! -d "$db" ]]; then echo "File database \"$db\" does not exist!" echo "Have you synchronized the database?" echo exit 1 fi grep -rE "$@" "$db" | sed "s|$db/$.*$/files:|\1 |g" ;; esac

1 0

[pacman-dev] pactest coverage
by Allan McRae 23 Jun '08

23 Jun '08

Hi all, I "discovered" gcov so was testing out the coverage of the pactests. During searching for more info about gcov I saw Dan already had written something on it (http://toofishes.net/blog/using-gcov-code-coverage-testing/) so not as novel as I thought... Anyway, as an FYI, here is a list of functions/important sections of the code that are not covered by pactests. libalpm/add.c 372-375: case 11 - symlink in package to existing dir 386-389: dir in package, symlink to non-dir in filesystem 393-396: case 10 - trying to overwrite dir tree with file, don't allow it 399: case 6 - trying to overwrite file with dir libalpm/package.c changelog functions libalpm/remove.c 191-192: -Rcs libalpm/sync.c 290-300: _alpm_sync_addtarget() - adding target from given repo pacman/package.c dump_pkg_backups() dump_pkg_files() dump_pkg_changelog() pacman/query.c resolve_path() query_fileowner() query_group() query_upgrades() is_foreign() is_unrequired() pacman/sync.c sync_cleandb() sync_cleandb_all() sync_cleancache() sync_group() pacman/upgrade.c pacman_upgrade() - URL targets pacman/util.c needs_transaction() makepath() rmrf() mdirname() strtoupper() pm_vasprintf() and everything to do with deltas... We really should have coverage for the sections in libalpm/add.c so I am writing pactests for those now. It would be easy to add one for -Rcs and changelogs as well so that will give fairly complete coverage of libalpm. Allan

2 1

[pacman-dev] [PATCH] Additional path quoting and srcdir/pkgdir usage
by Allan McRae 23 Jun '08

23 Jun '08

Removes the remaining $startdir/{src,pkg} usage and adds quoting around (hopefully) all remaining path variables Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..4fa6945 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -148,8 +148,7 @@ clean_up() { if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" - cd "$startdir" - rm -rf pkg src + rm -rf "$pkgdir" "$srcdir" if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" @@ -510,7 +509,7 @@ generate_checksums() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -557,7 +556,7 @@ check_checksums() { errors=1 continue else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -598,7 +597,7 @@ extract_sources() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -960,7 +959,7 @@ create_srcpackage() { local file=$(strip_url "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s $netfile ${srclinks}/${pkgname} + ln -s $netfile "${srclinks}/${pkgname}" elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" @@ -971,13 +970,13 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" - cd ${srclinks} + cd "${srclinks}" if ! bsdtar -czLf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi - cd ${startdir} - rm -rf ${srclinks} + cd "${startdir}" + rm -rf "${srclinks}" } install_package() { -- 1.5.6

2 1

[pacman-dev] [PATCH] Add information on version comparison to manpages
by Dan McGee 20 Jun '08

20 Jun '08

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 3 ++- doc/pacman.8.txt | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index b90d67a..0b1ce64 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -214,7 +214,8 @@ similar to `$_basekernver`. Force the package to be upgraded by a pacman system upgrade operation, even if the version number would normally not trigger such an upgrade. This is useful when the version numbering scheme - of a package changes (or is alphanumeric). + of a package changes (or is alphanumeric). See linkman:pacman[8] for + more infomation on version comparisons. build() Function diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 5594ac6..08764de 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -61,7 +61,13 @@ provide the same functionality as foo will be searched for. If any package is found, it will be installed. + You can also use `pacman -Su` to upgrade all packages that are out of date. See -<<SO,Sync Options>> below. +<<SO,Sync Options>> below. When upgrading, pacman performs version comparison +to determine which packages need upgrading. This behavior operates as follows: + + Alphanumeric: + 1.0 < 1.0a < 1.0alpha < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc + Numeric: + 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 *-U, \--upgrade*:: Upgrade or add a package to the system. Either a URL or file path can be -- 1.5.6

5 10

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-20-gdeec3c8
by Dan McGee 19 Jun '08

19 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 (commit) via d88524ea0ee533ed8f4f3029fa08c446ec2d58db (commit) via 2158b8e29839e99b4f5a3420d9896dd9da223b0b (commit) via fff746052cd224bd8c6db44c8fdc8ff7f4d08510 (commit) from 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 8 +- doc/PKGBUILD.5.txt | 44 +++++- doc/pacman.8.txt | 10 ++ lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{zh_CN.po => tr.po} | 303 ++++++++++++++++++------------------ 5 files changed, 209 insertions(+), 157 deletions(-) copy lib/libalpm/po/{zh_CN.po => tr.po} (53%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-218-gd594b6e
by Dan McGee 19 Jun '08

19 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via d594b6e7978d14b5ca4cd9c295fa9b829c5565bd (commit) via 5c6809987e235fea760c6feb6deaceaada09b53f (commit) via deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 (commit) via d88524ea0ee533ed8f4f3029fa08c446ec2d58db (commit) via 29bf6814f74096e5d8ea22058e638eb362717b8a (commit) via 7ff5a917fd0a91cd03ba61419a57053e4ae17e92 (commit) via b9445c12cf9e958d8e62f9f9ecb5c1352010cdf4 (commit) via b8a66d68593d1f267c3bb8cd8943724711626903 (commit) via 2158b8e29839e99b4f5a3420d9896dd9da223b0b (commit) via fff746052cd224bd8c6db44c8fdc8ff7f4d08510 (commit) via a1dfa8e61f385a6b388b66f4860e96a62f3edae6 (commit) via 89819b3f9268062ee54c35a16876474414d94bf5 (commit) via c11bdf19b1b8ab40468561dc592b9c6bd7f86acf (commit) from 7313c8546ae0a2c38768d665b3f314ee0cf959c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d594b6e7978d14b5ca4cd9c295fa9b829c5565bd Merge: 5c6809987e235fea760c6feb6deaceaada09b53f deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 19 08:51:36 2008 -0500 Merge branch 'maint' commit 5c6809987e235fea760c6feb6deaceaada09b53f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 15 23:10:04 2008 -0500 makepkg.conf: make keeping docs the default Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29bf6814f74096e5d8ea22058e638eb362717b8a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 15 19:15:36 2008 -0500 Use access() instead of stat() when possible We were using the stat() system call in quite a few places when we didn't actually need anything the stat struct returned- we were simply checking for file existence. access() will be more efficient in those cases. Before (strace pacman -Ss pacman): % time seconds usecs/call calls errors syscall ------ ----------- ----------- --------- --------- ---------------- 33.16 0.005987 0 19016 stat64 After: % time seconds usecs/call calls errors syscall ------ ----------- ----------- --------- --------- ---------------- 34.85 0.003863 0 12633 1 access 7.95 0.000881 0 6391 7 stat64 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ff5a917fd0a91cd03ba61419a57053e4ae17e92 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jun 15 12:56:40 2008 +0200 makepkg: add several quotes needed after nullglob. After the "shopt -s nullglob" change, all regular expressions should be properly quoted. This commit only fixes the ones I found, there are probably others left, so this should be kept in mind for easier future fixing. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9445c12cf9e958d8e62f9f9ecb5c1352010cdf4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jun 15 12:10:31 2008 +0200 makepkg: Add missing quotes for the source array. Now makepkg can handle filenames with whitespaces in the source array. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8a66d68593d1f267c3bb8cd8943724711626903 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Sat May 31 14:35:16 2008 +0800 Use openssl for checksum verification instead of *sum utilities md5sum, sha1sum, etc, do not exist on BSD systems by default. Openssl is a good portable alternative. This also brings in a dependency for openssl. Closes FS#10530. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a1dfa8e61f385a6b388b66f4860e96a62f3edae6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 14 11:29:29 2008 -0500 Combine repo-add and repo-remove into one script They shared about 75% of their code, so there is no real reason we should maintain them separately. Merge the differences accordingly and add a check based on the basename of the command used to decide what behavior to follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89819b3f9268062ee54c35a16876474414d94bf5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 14 10:48:28 2008 -0500 repo-*: allow use of readlink or realpath Linux coreutils provides readlink, and BSD systems tend to have realpath available. Both commands provide similar functionality but of course have different names. Add a check for either and use what is available. While doing this, also unify some of the differences that have cropped up between repo-add and repo-remove. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c11bdf19b1b8ab40468561dc592b9c6bd7f86acf Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon May 26 16:27:22 2008 +1000 Move geninteg block in makepkg before error checking This patch moves the generating of integrity checks to before any error checking takes place in the PKGBUILD file. This allows integrity generation to complete when unrelated errors exist in a PKGBUILD file and allows the removal of multiple checks of the GENINTEG variable that would otherwise be needed. In addition a minor fix is made to a comment. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 8 +- doc/PKGBUILD.5.txt | 44 +++++- doc/makepkg.conf.5.txt | 2 +- doc/pacman.8.txt | 10 ++ etc/makepkg.conf.in | 4 +- lib/libalpm/be_files.c | 5 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{zh_CN.po => tr.po} | 303 ++++++++++++++++++------------------ lib/libalpm/trans.c | 8 +- lib/libalpm/util.c | 12 +- po/POTFILES.in | 1 - scripts/Makefile.am | 16 +- scripts/makepkg.sh.in | 57 ++++---- scripts/repo-add.sh.in | 116 ++++++++++---- scripts/repo-remove.sh.in | 199 ----------------------- src/pacman/package.c | 5 +- src/pacman/util.c | 6 +- src/util/testdb.c | 8 +- 18 files changed, 351 insertions(+), 454 deletions(-) copy lib/libalpm/po/{zh_CN.po => tr.po} (53%) delete mode 100644 scripts/repo-remove.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add Keyring/--keyring option in alpm/pacman
by geoffroy.carrier＠koon.fr 19 Jun '08

19 Jun '08

From: Geoffroy Carrier <geoffroy.carrier(a)koon.fr> Keyring in pacman.conf, --keyring in pacman, support for this option in libalpm and pacman. Documentation in: . pacman.conf(5) . pacman(8) . README --- It is very similar to LogFile... README | 1 + doc/pacman.8.txt | 3 +++ doc/pacman.conf.5.txt | 6 +++++- etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 33 +++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/Makefile.am | 2 ++ src/pacman/conf.c | 2 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 5 +++++ 11 files changed, 57 insertions(+), 1 deletions(-) diff --git a/README b/README index 46b5bb2..251862c 100644 --- a/README +++ b/README @@ -58,6 +58,7 @@ library is initialized. * dbpath: The base path to pacman's databases (Default: var/lib/pacman) * cachedir: The base path to pacman's download cache (Default: var/cache/pacman) * logfile: The base path to pacman's log file (Default: var/log/pacman.log) +* keyring: The base path to pacman's GnuPG keyring (Default: etc/pacman.d/keyring.gpg) * usesyslog: Log to syslog instead of `logfile` for file-base logging. * xfercommand: The command to use for downloading instead of pacman's internal downloading functionality. diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a6bc3d9..33ac7b5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -129,6 +129,9 @@ Options *\--config* <'file'>:: Specify an alternate configuration file. +*\--keyring* <'file'>:: + Specify an alternate GnuPG keyring. + *\--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 eb9285c..44417be 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -49,7 +49,7 @@ Options Set the default root directory for pacman to install to. This option is used if you want to install a package on a temporary mounted partition which is "owned" by another system, or for a chroot install. - *NOTE*: If database path or logfile are not specified on either the + *NOTE*: If database path, logfile or keyring are not specified on either the command line or in linkman:pacman.conf[5], their default location will be inside this root path. @@ -68,6 +68,10 @@ Options path, the root path is not automatically prepended. This behavior changed in pacman 3.1.0. +*Keyring =* '/path/to/file':: + Overrides the default location of the GnuPG keyring file. A typical default + is ``/etc/pacman.d/keyring.gpg''. If this file does not exist, packages + signatures will not be checked. *LogFile =* '/path/to/file':: Log actions directly to a file. A typical default is diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 582fe94..9d20a6e 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -13,6 +13,7 @@ #DBPath = @localstatedir@/lib/pacman/ #CacheDir = @localstatedir@/cache/pacman/pkg/ #LogFile = @localstatedir@/log/pacman.log +#Keyring = @sysconfdir@/pacman.d/keyring.gpg HoldPkg = pacman glibc #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 62a517b..ab60a4b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -110,6 +110,9 @@ int alpm_option_set_logfile(const char *logfile); const char *alpm_option_get_lockfile(); /* no set_lockfile, path is determined from dbpath */ +const char *alpm_option_get_keyring(); +int alpm_option_set_keyring(const char *keyring); + unsigned short alpm_option_get_usesyslog(); void alpm_option_set_usesyslog(unsigned short usesyslog); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index c01dd55..c7f2329 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -57,6 +57,7 @@ pmhandle_t *_alpm_handle_new() handle->cachedirs = NULL; handle->lockfile = NULL; handle->logfile = NULL; + handle->keyring = NULL; handle->usedelta = 0; return(handle); @@ -86,6 +87,7 @@ void _alpm_handle_free(pmhandle_t *handle) FREE(handle->dbpath); FREELIST(handle->cachedirs); FREE(handle->logfile); + FREE(handle->keyring); FREE(handle->lockfile); FREE(handle->xfercommand); FREELIST(handle->dbs_sync); @@ -151,6 +153,15 @@ const char SYMEXPORT *alpm_option_get_logfile() return handle->logfile; } +const char SYMEXPORT *alpm_option_get_keyring() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->keyring; +} + const char SYMEXPORT *alpm_option_get_lockfile() { if (handle == NULL) { @@ -427,6 +438,28 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) return(0); } +int SYMEXPORT alpm_option_set_keyring(const char *keyring) +{ + char *oldkeyring = handle->keyring; + + ALPM_LOG_FUNC; + + if(!keyring) { + pm_errno = PM_ERR_WRONG_ARGS; + return(-1); + } + + handle->keyring = strdup(keyring); + + /* free the old keyring path string, and close the stream so logaction + * will reopen a new stream on the new logfile */ + if(oldkeyring) { + FREE(oldkeyring); + } + _alpm_log(PM_LOG_DEBUG, "option 'keyring' = %s\n", handle->keyring); + return(0); +} + void SYMEXPORT alpm_option_set_usesyslog(unsigned short usesyslog) { handle->usesyslog = usesyslog; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 9c537b1..2255f43 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -45,6 +45,7 @@ typedef struct _pmhandle_t { char *dbpath; /* Base path to pacman's DBs */ char *logfile; /* Name of the log file */ char *lockfile; /* Name of the lock file */ + char *keyring; /* Name of the GnuPG keyring */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ /* package lists */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5d6fef3..16c0332 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -3,6 +3,7 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ cachedir = ${localstatedir}/cache/pacman/pkg/ logfile = ${localstatedir}/log/pacman.log +keyring = ${sysconfdir}/pacman.d/keyring.gpg bin_PROGRAMS = pacman @@ -16,6 +17,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DDBPATH=\"$(dbpath)\" \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" \ + -DKEYRING=\"$(keyring)\" \ @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 48c927b..ec9a370 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -47,6 +47,7 @@ config_t *config_new(void) newconfig->rootdir = NULL; newconfig->dbpath = NULL; newconfig->logfile = NULL; + newconfig->keyring = NULL; newconfig->syncfirst = NULL; return(newconfig); @@ -63,6 +64,7 @@ int config_free(config_t *oldconfig) free(oldconfig->rootdir); free(oldconfig->dbpath); free(oldconfig->logfile); + free(oldconfig->keyring); free(oldconfig); oldconfig = NULL; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 874ce70..8be6414 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 *keyring; /* TODO how to handle cachedirs? */ unsigned short op_q_isfile; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 66fafa1..98bfa5f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -131,6 +131,7 @@ static void usage(int op, const char * const myname) } printf(_(" --config <path> set an alternate configuration file\n")); printf(_(" --logfile <path> set an alternate log file\n")); + printf(_(" --keyring <path> set an alternate keyring\n")); printf(_(" --noconfirm do not ask for any confirmation\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); @@ -262,6 +263,10 @@ static void setlibpaths(void) snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE); config->logfile = strdup(path); } + if(!config->keyring) { + snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), KEYRING); + config->keyring = strdup(path); + } } /* Set other paths if they were configured. Note that unless rootdir * was left undefined, these two paths (dbpath and logfile) will have -- 1.5.5.3

5 10

[pacman-dev] pacman Turkish translation
by Alper KANAT 19 Jun '08

19 Jun '08

It's 15K now.. :) -- Alper KANAT http://raptiye.org

3 3

[pacman-dev] [PATCH] Remove --asroot switch from makepkg.
by Loui 18 Jun '08

18 Jun '08

I've found --asroot to be kind of a hand holding hindrance so I decided to remove it. Here's the patch if anyone is interested. Cheers.

7 15