January 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] lib/dload: enforce usage of TCP keepalives
by Dave Reisner 23 Jan '12

23 Jan '12

This is particularly important in the case of FTP control connections, which may be closed by rogue NAT/firewall devices detecting idle connections on larger transfers which may take 5-10+ minutes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is basically on the advice of Daniel Stenberg, who mentions that it's a common problem that he's aware of. I have no idea if this is actually the fix we're looking for and I'm still unable to reproduce, but it seems plausible solution. Also, fuck FTP. configure.ac | 7 +++-- lib/libalpm/dload.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6941054..c8ba03f 100644 --- a/configure.ac +++ b/configure.ac @@ -174,9 +174,10 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \ - mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \ - sys/param.h sys/statvfs.h sys/time.h sys/types.h \ - sys/ucred.h syslog.h termios.h wchar.h]) + mntent.h netinet/in.h netinet/tcp.h stddef.h string.h \ + sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ + sys/time.h sys/types.h sys/ucred.h syslog.h termios.h \ + wchar.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a3980d6..790080c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -23,11 +23,19 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <sys/socket.h> /* setsockopt, SO_KEEPALIVE */ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> #include <signal.h> +#ifdef _HAVE_NETINET_IN_H +#include <netinet/in.h> /* IPPROTO_TCP */ +#endif +#ifdef _HAVE_NETINET_TCP_H +#include <netinet/tcp.h> /* TCP_KEEPINTVL, TCP_KEEPIDLE */ +#endif + #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif @@ -215,6 +223,53 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) return realsize; } +static int curl_sockopt_cb(void *userdata, curl_socket_t curlfd, + curlsocktype purpose) +{ + alpm_handle_t *handle = userdata; + + int onoff = 1; + +#ifdef TCP_KEEPIDLE + int keepidle = TCP_KEEPIDLE; +#endif +#ifdef TCP_KEEPINTVL + int keepintvl = TCP_KEEPINTVL; +#endif + + switch(purpose) { + case CURLSOCKTYPE_IPCXN: + if(setsockopt(curlfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&onoff, + sizeof(onoff)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set SO_KEEPALIVE on fd %d\n", + curlfd); + } + else { +#ifdef TCP_KEEPIDLE + if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, + sizeof(keepidle)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set TCP_KEEPIDLE on fd %d\n", + curlfd); + } +#endif +#ifdef TCP_KEEPINTVL + if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, + sizeof(keepintvl)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set TCP_KEEPINTVL on fd %d\n", + curlfd); + } +#endif + } + default: + break; + } + + return 0; +} + static void curl_set_handle_opts(struct dload_payload *payload, CURL *curl, char *error_buffer) { @@ -239,6 +294,8 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_headers); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, curl_sockopt_cb); + curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA, (void *)handle); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); @@ -388,6 +445,8 @@ static int curl_download_internal(struct dload_payload *payload, /* perform transfer */ payload->curlerr = curl_easy_perform(curl); + _alpm_log(handle, ALPM_LOG_DEBUG, "curl returned error %d from transfer\n", + payload->curlerr); /* disconnect relationships from the curl handle for things that might go out * of scope, but could still be touched on connection teardown. This really -- 1.7.8.4

3 5

[pacman-dev] [PATCH] makepkg: fix error on unnecessary -r
by Allan McRae 23 Jan '12

23 Jan '12

The grep statement used to check for a difference between the installed package list before and after resolving dependencies returns 1 if there is no difference. This sets of the error trap when "-r" is used "unnecessarily". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Dave: would you prefer this fix or just using $(set +E; grep ...) scripts/makepkg.sh.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f6d8294..4792c5c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -507,14 +507,15 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ - <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + <(printf '%s\n' "${original_packagelist[@]}") || true) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi local deplist - if ! deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}"))); then + deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") || true)) + if [[ -n deplist ]]; then return fi -- 1.7.8.4

2 5

[pacman-dev] compiling pacman and python wrapper
by Andrea Crotti 22 Jan '12

22 Jan '12

I would like to create a python wrapper to access to pacman features, and so I started to take a look about how it works.. The first thing that I noted is that the INSTALL instructions are a bit confusing. Because it says: --8<---------------cut here---------------start------------->8--- Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following instructions are generic. Run `./configure --help` for specific options. --8<---------------cut here---------------end--------------->8--- But actually there is no "configure" until autoconf is run, but that is explained only later. So maybe just inverting the order might be fine, first talking about autoconf and configure.ac and after talking about configure && make. Then I was actually trying to compile it myself but I get on configure: --8<---------------cut here---------------start------------->8--- configure: creating ./config.status config.status: error: cannot find input file: `lib/libalpm/Makefile.in' --8<---------------cut here---------------end--------------->8--- (from the git repository). And about my original idea, is anyone interested? From what I've understood I think I might use SWIG using the file alpm.h as header and export all the symbols in a nice Python wrapper, does it make sense?

4 6

[pacman-dev] Checking whether a package was signed
by kachelaqa 22 Jan '12

22 Jan '12

I'm still trying to get to grips with package signing, so this question may not make complete sense, but: Is there a way to check whether the signature was verified when a package was installed?

3 6

[pacman-dev] [PATCH] makepkg: retrist usage of flags passed to pacman
by Allan McRae 20 Jan '12

20 Jan '12

With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T results in pacman reporting an "invalid option" error. Restrict the passing of these options to pacman. Fixes FS#28012. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4792c5c..4f95b73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -412,7 +412,11 @@ download_file() { run_pacman() { local cmd - printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + if [[ ! $1 = -@(T|Qq) ]]; then + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + else + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then cmd="sudo $cmd" -- 1.7.8.4

2 3

[pacman-dev] [PATCH 1/2] Add diskspace checking support for Solaris/Illumos
by Dan McGee 19 Jan '12

19 Jan '12

Was able to get my hands on one of these boxes today, so add yet another new way of doing this. I'm glad these calls are so standardized. This was compile tested on Linux and Illumos and seems to still be working in both places. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 3 +- lib/libalpm/diskspace.c | 54 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0de908a..a8b142e 100644 --- a/configure.ac +++ b/configure.ac @@ -173,7 +173,8 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \ - mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \ + mntent.h stddef.h string.h sys/ioctl.h \ + sys/mnttab.h sys/mount.h \ sys/param.h sys/statvfs.h sys/time.h sys/types.h \ sys/ucred.h syslog.h termios.h wchar.h]) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index fe2036d..4127153 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.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 @@ -19,10 +19,15 @@ #include "config.h" +#include <stdio.h> #include <errno.h> + #if defined(HAVE_MNTENT_H) #include <mntent.h> #endif +#if defined(HAVE_MNTTAB_H) +#include <mnttab.h> +#endif #if defined(HAVE_SYS_STATVFS_H) #include <sys/statvfs.h> #endif @@ -60,10 +65,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; -#if defined HAVE_GETMNTENT +#if defined(HAVE_GETMNTENT) && defined(HAVE_MNTENT_H) + /* Linux */ struct mntent *mnt; FILE *fp; - struct statvfs fsp; fp = setmntent(MOUNTED, "r"); @@ -72,8 +77,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((mnt = getmntent(fp))) { + struct statvfs fsp; if(!mnt) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n")); + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); continue; } if(statvfs(mnt->mnt_dir, &fsp) != 0) { @@ -93,7 +100,44 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } endmntent(fp); -#elif defined HAVE_GETMNTINFO +#elif defined(HAVE_GETMNTENT) && defined(HAVE_MNTTAB_H) + /* Solaris, Illumos */ + struct mnttab mnt; + FILE *fp; + int ret; + + fp = fopen("/etc/mnttab", "r"); + + if(fp == NULL) { + return NULL; + } + + while((ret = getmntent(fp, &mnt)) == 0) { + struct statvfs fsp; + if(statvfs(mnt->mnt_mountp, &fsp) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information for %s: %s\n"), + mnt->mnt_mountp, strerror(errno)); + continue; + } + + CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + mp->mount_dir = strdup(mnt->mnt_mountp); + mp->mount_dir_len = strlen(mp->mount_dir); + memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); + mp->read_only = fsp.f_flag & ST_RDONLY; + + mount_points = alpm_list_add(mount_points, mp); + } + /* -1 == EOF */ + if(ret != -1) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); + } + + fclose(fp); +#elif defined(HAVE_GETMNTINFO) + /* FreeBSD (statfs), NetBSD (statvfs), OpenBSD (statfs), OS X (statfs) */ int entries; FSSTATSTYPE *fsp; -- 1.7.8.3

1 1

[pacman-dev] [PATCH] Fix missing [removal] output
by Allan McRae 19 Jan '12

19 Jan '12

Currently, a transaction is considered to be purely package removal until the first package install is found. This resulted in the removed packages at the start of a combined upgrade/removal transaction not getting the "[removal]" output. Fixes FS#27981. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 40690e8..2eac429 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -898,8 +898,12 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* add up size of all removed packages */ rsize += alpm_pkg_get_isize(target->remove); } + } + + /* form data for both verbose and non-verbose display */ + for(i = targets; i; i = alpm_list_next(i)) { + pm_target_t *target = i->data; - /* form data for both verbose and non-verbose display */ rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size)); if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), -- 1.7.8.3

1 0

[pacman-dev] Rationale for the patch for case insensitive configuration values
by Alexander Rødseth 18 Jan '12

18 Jan '12

Hi, I understand that case sensitivity can, perhaps, bring clarity for configuration values like ILoveCandy, but IMO, both "Never" and "never" should be allowed, as the uppercase letters bring no more clarity, but add an additional requirement for the users to conform to. That is the reason for the patch. Also, in the name of consistency, I changed all the checks in conf.c, not just the check for the word "Never". This is about simplicity and removing a constraint that users shouldn't have to relate to when editing pacman.conf. I tested both compilation and execution of the resulting pacman binary and it works fine here. -- Sincerely, Alexander Rødseth Arch Linux Trusted User (xyproto on IRC, trontonic on AUR)

3 4

[pacman-dev] XfreCommand curl option in pacman.conf and makepkg.conf
by Keshav P R 18 Jan '12

18 Jan '12

Hi, Using XferCommand = /usr/bin/curl -C - -f -o %o %u XferCommand = /usr/bin/curl -C - -f %u > %o enables curl to resume downloads to %o , if it is supported. Using file redirection "> %o" makes curl restart the (partial) downloads from first. The same goes for makepkg.conf . Please change it. Regards. Keshav

2 1

[pacman-dev] [PATCH] Case insensitive configuration values (to allow both SigLevel = Never and SigLevel = never)
by Alexander Rødseth 17 Jan '12

17 Jan '12

--- src/pacman/conf.c | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..f114339 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -225,7 +225,7 @@ cleanup: int config_set_arch(const char *arch) { - if(strcmp(arch, "auto") == 0) { + if(strcasecmp(arch, "auto") == 0) { struct utsname un; uname(&un); config->arch = strdup(un.machine); @@ -272,14 +272,14 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, } /* now parse out and store actual flag if it is valid */ - if(strcmp(value, "Never") == 0) { + if(strcasecmp(value, "Never") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE; } if(database) { level &= ~ALPM_SIG_DATABASE; } - } else if(strcmp(value, "Optional") == 0) { + } else if(strcasecmp(value, "Optional") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level |= ALPM_SIG_PACKAGE_OPTIONAL; @@ -288,7 +288,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level |= ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "Required") == 0) { + } else if(strcasecmp(value, "Required") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level &= ~ALPM_SIG_PACKAGE_OPTIONAL; @@ -297,7 +297,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level &= ~ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "TrustedOnly") == 0) { + } else if(strcasecmp(value, "TrustedOnly") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -306,7 +306,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; } - } else if(strcmp(value, "TrustAll") == 0) { + } else if(strcasecmp(value, "TrustAll") == 0) { if(package) { level |= ALPM_SIG_PACKAGE_MARGINAL_OK; level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -345,9 +345,9 @@ static int process_cleanmethods(alpm_list_t *values, alpm_list_t *i; for(i = values; i; i = alpm_list_next(i)) { const char *value = i->data; - if(strcmp(value, "KeepInstalled") == 0) { + if(strcasecmp(value, "KeepInstalled") == 0) { config->cleanmethod |= PM_CLEAN_KEEPINST; - } else if(strcmp(value, "KeepCurrent") == 0) { + } else if(strcasecmp(value, "KeepCurrent") == 0) { config->cleanmethod |= PM_CLEAN_KEEPCUR; } else { pm_printf(ALPM_LOG_ERROR, @@ -387,22 +387,22 @@ static int _parse_options(const char *key, char *value, { if(value == NULL) { /* options without settings */ - if(strcmp(key, "UseSyslog") == 0) { + if(strcasecmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); - } else if(strcmp(key, "ILoveCandy") == 0) { + } else if(strcasecmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "VerbosePkgLists") == 0) { + } else if(strcasecmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); - } else if(strcmp(key, "UseDelta") == 0) { + } else if(strcasecmp(key, "UseDelta") == 0) { config->usedelta = 1; pm_printf(ALPM_LOG_DEBUG, "config: usedelta\n"); - } else if(strcmp(key, "TotalDownload") == 0) { + } else if(strcasecmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); - } else if(strcmp(key, "CheckSpace") == 0) { + } else if(strcasecmp(key, "CheckSpace") == 0) { config->checkspace = 1; } else { pm_printf(ALPM_LOG_WARNING, @@ -411,50 +411,50 @@ static int _parse_options(const char *key, char *value, } } else { /* options with settings */ - if(strcmp(key, "NoUpgrade") == 0) { + if(strcasecmp(key, "NoUpgrade") == 0) { setrepeatingoption(value, "NoUpgrade", &(config->noupgrade)); - } else if(strcmp(key, "NoExtract") == 0) { + } else if(strcasecmp(key, "NoExtract") == 0) { setrepeatingoption(value, "NoExtract", &(config->noextract)); - } else if(strcmp(key, "IgnorePkg") == 0) { + } else if(strcasecmp(key, "IgnorePkg") == 0) { setrepeatingoption(value, "IgnorePkg", &(config->ignorepkg)); - } else if(strcmp(key, "IgnoreGroup") == 0) { + } else if(strcasecmp(key, "IgnoreGroup") == 0) { setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp)); - } else if(strcmp(key, "HoldPkg") == 0) { + } else if(strcasecmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); - } else if(strcmp(key, "SyncFirst") == 0) { + } else if(strcasecmp(key, "SyncFirst") == 0) { setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); - } else if(strcmp(key, "CacheDir") == 0) { + } else if(strcasecmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); - } else if(strcmp(key, "Architecture") == 0) { + } else if(strcasecmp(key, "Architecture") == 0) { if(!config->arch) { config_set_arch(value); } - } else if(strcmp(key, "DBPath") == 0) { + } else if(strcasecmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { config->dbpath = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: dbpath: %s\n", value); } - } else if(strcmp(key, "RootDir") == 0) { + } else if(strcasecmp(key, "RootDir") == 0) { /* don't overwrite a path specified on the command line */ if(!config->rootdir) { config->rootdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: rootdir: %s\n", value); } - } else if(strcmp(key, "GPGDir") == 0) { + } else if(strcasecmp(key, "GPGDir") == 0) { if(!config->gpgdir) { config->gpgdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: gpgdir: %s\n", value); } - } else if(strcmp(key, "LogFile") == 0) { + } else if(strcasecmp(key, "LogFile") == 0) { if(!config->logfile) { config->logfile = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: logfile: %s\n", value); } - } else if(strcmp(key, "XferCommand") == 0) { + } else if(strcasecmp(key, "XferCommand") == 0) { config->xfercommand = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: xfercommand: %s\n", value); - } else if(strcmp(key, "CleanMethod") == 0) { + } else if(strcasecmp(key, "CleanMethod") == 0) { alpm_list_t *methods = NULL; setrepeatingoption(value, "CleanMethod", &methods); if(process_cleanmethods(methods, file, linenum)) { @@ -462,7 +462,7 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(methods); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(process_siglevel(values, &config->siglevel, file, linenum)) { @@ -751,7 +751,7 @@ static int _parseconfig(const char *file, struct section_t *section, } pm_printf(ALPM_LOG_DEBUG, "config: new section '%s'\n", name); section->name = name; - section->is_options = (strcmp(name, "options") == 0); + section->is_options = (strcasecmp(name, "options") == 0); continue; } @@ -777,7 +777,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } /* Include is allowed in both options and repo sections */ - if(strcmp(key, "Include") == 0) { + if(strcasecmp(key, "Include") == 0) { glob_t globbuf; int globret; size_t gindex; @@ -824,7 +824,7 @@ static int _parseconfig(const char *file, struct section_t *section, } } else if(!parse_options && !section->is_options) { /* ... or in a repo section */ - if(strcmp(key, "Server") == 0) { + if(strcasecmp(key, "Server") == 0) { if(value == NULL) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), file, linenum, key); @@ -832,7 +832,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } section->servers = alpm_list_add(section->servers, strdup(value)); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(values) { -- 1.7.8.3

1 0