summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* pacman-key: remake of --reload commandDenis A. Altoé Falqueto2011-03-23
| | | | | | | | | | | | | | | | | | | | | | | The --reload command was refactored to allow a more flexible management. There are two sets of keys that will be added, one that will be removed and one that will be kept. The set of keys to be kept are configured in pacman.conf, with the option HoldKeys, with the same meaning of HoldPkgs. It can be repeated and several values can be put in the same entry. The new behavior allows a key to be marked for removal, but the user can decide if that key must be kept. For example, if a developer has a public repository, signed with his own key, that key must be added to the HoldKeys option. If the key is marked for removal from pacman's keyring, it will not be removed for the users that have configured HoldKeys correctly. There are other minor fixes, mainly in the handling of --add command when there is no aditional parameter. In that case, pacman-key will behave just like gpg, adding the contents of stdin into pacman's keyring. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto@gmail.com>
* pacman-key: keyring management toolDenis A. Altoé Falqueto2011-03-23
| | | | | | | | | The script pacman-key will manage pacman's keyring. It imports, exports, fetches from keyservers, helps in the process of trusting and updates the trust database. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* Merge branch 'maint'Dan McGee2011-03-21
|\ | | | | | | | | | | | | | | Conflicts due to change in return calling style. Conflicts: src/pacman/pacman.c src/pacman/sync.c
| * Do not query group selection when using -SpAllan McRae2011-03-21
| | | | | | | | | | | | | | Remove unnecessary output when using -Sp. Fixes FS#23340. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Some more zsh completion tidy upAllan McRae2011-03-21
| | | | | | | | | | | | | | Changes for consistency across functions Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix zsh completionAllan McRae2011-03-21
| | | | | | | | | | | | | | | | Fixes completion for "pacman -S <tab>" and "pacman -S repo/<tab>" Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Restore --debug/--verbose output without a primary operationDan McGee2011-03-21
| | | | | | | | | | | | | | | | | | This is by no means a guarantee of this behavior remaining the same in the future, but it is easy enough to do what we used to in this case by delaying any sort of error condition until after we are completely done parsing options. Addresses FS#23370. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Add a few more notes about translating using TransifexDan McGee2011-03-20
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update source translation files in prep for 3.5.1Dan McGee2011-03-20
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Remove unnecessary NULL checkDan McGee2011-03-20
| | | | | | | | | | | | fp can never be NULL at this point in the code, proven by Coccinelle. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix comparison to 0 rather than NULLDan McGee2011-03-20
| | | | | | | | | | | | Another fix found by Coccinelle example semantic patches. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix assignment before NULL checkDan McGee2011-03-20
| | | | | | | | | | | | Easy fix, found using null_ref.cocci example Coccinelle script. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Don't initialize progress to zero before calling curl_easy_perform().Lukas Fleischer2011-03-21
| | | | | | | | | | | | | | | | | | | | Drawing progress bars before calling curl_easy_perform() is needless as the curl progress callback is called with zero progress before actually downloading the file anyways. Fixes display of "0%" progress bars when sync'ing package databases that are already up to date. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Ensure dlcb is defined before calling itDan McGee2011-03-21
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Style change: return(x) --> return xDan McGee2011-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was discussed and more or less agreed upon on the mailing list. A huge checkin, but if we just do it and let people adjust the pain will end soon enough. Rebasing should be relatively straighforward for anyone that sees conflicts; just be sure you use the new return style if possible. The following semantic patch was used to do the change, along with some hand-massaging in order to preserve parenthesis where appropriate: The semantic match that finds this problem is as follows, although some hand-massaging was done in order to keep parenthesis where appropriate: (http://coccinelle.lip6.fr/) // <smpl> @@ expression a; @@ - return(a); + return a; // </smpl> A macros_file was also provided with the following content: Additional steps taken, mainly for ASSERT() macros: $ sed -i -e 's#return(NULL)#return NULL#' lib/libalpm/*.c $ sed -i -e 's#return(-1)#return -1#' lib/libalpm/*.c Signed-off-by: Dan McGee <dan@archlinux.org>
* | lib/dload.c: fix opening braces to conform with coding styleDave Reisner2011-03-20
| | | | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2011-03-20
|\|
| * Add missing include for size_tDan McGee2011-03-20
| | | | | | | | | | | | Needed for things like our strndup() substitute function. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix libtool and LDFLAGS reordering issuesLukas Fleischer2011-03-20
| | | | | | | | | | | | | | | | This is a Debian patch (from #347650) that makes libtool play nicely with "-Wl,--as-needed". Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix handling of ignored packagesPang Yan Han2011-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noted in FS#23342. When the user attempts to install an ignored package and answers no when asked whether to install it, pacman bails out with: "error: target not found: packagename" This is because satisfiers are not found for the package and execution continues to process_group(), where the package is treated as a group (which does not exist). In addition, test ignore006.py is updated with PACMAN_RETCODE=0 since saying no to installing an ignored package should not be considered an error. Signed-off-by: Pang Yan Han <pangyanhan@gmail.com> Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Use sane umask for repo db downloadsAllan McRae2011-03-20
| | | | | | | | | | | | | | Fixes FS#23343. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * makepkg: Improve optdepends extractionAllan McRae2011-03-20
| | | | | | | | | | | | | | | | | | | | Prevents issues where optdepends descriptions contain a bracket. Also, strip all comments from arrays before joining them. Fixes FS#23307. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Correctly parse %DELTAS% entries in sync DBtuxce2011-03-17
| | | | | | | | | | | | | | We erroniously dropped the call to _alpm_delta_parse() when macro-izing, causing segfaults for repos that provide deltas. Addresses FS#23314. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Ensure we have a root partition when checking spaceDan McGee2011-03-17
| | | | | | | | | | | | | | | | | | Partially addresses the "why doesn't CheckSpace work in a chroot" issue. We can't make it work, but we can at least detect when it won't work by checking for a partition for our given installation root. If we can't determine the mountpoint for this, bail out with an error. Signed-off-by: Dan McGee <dan@archlinux.org>
* | INSTALL: replace libfetch with libcurlDave Reisner2011-03-20
| | | | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | lib/dload.c: remove lingering libfetch specific headersDave Reisner2011-03-20
| | | | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | remove antiquated contrib/wget-xdelta.shDave Reisner2011-03-17
| | | | | | | | | | | | | | | | Support for this script was removed in makepkg by commit b4e1365. Delta creation support has been provided by scripts/pkgdelta. Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Fix triple progress bars on downloadDave Reisner2011-03-17
| | | | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2011-03-16
|\|
| * pacman.8: (re)document behavior of reading from stdinDave Reisner2011-03-16
| | | | | | | | | | | | | | | | Change the term 'packages' to 'targets' in the synopsis as well, since command line parameters could just as well be groups, repos, or URLs. Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Warn but don't error for unknown pacman.conf directivesDan McGee2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes all the pacman developers' jobs harder as we have to switch files whenever running multiple pacman versions and are using newly introduced options. Instead of erroring out, print warnings and continue on. This patch also fixes a const-correctness issue. We immediately cast a 'const char *' to a 'char *' in setrepeatingoption(), which is just plain wrong as we manipulate the underlying string. Fix the types and remove the now unnecessary variable. Finally, a few messages change here for consistency and clarity and because we continue parsing rather than bailing out on a problem. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Only read from stdin if '-' is provided as a targetDave Reisner2011-03-16
| | | | | | | | | | | | | | | | This prevents a regression for people who enjoy piping yes to pacman to avoid prompts. Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * alpm_list: fix typo in doxygen commentDave Reisner2011-03-16
| | | | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update translations for message with added newlineDan McGee2011-03-16
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Add missing newline to warning messageAllan McRae2011-03-16
| | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update index.txt with 3.5.0 releaseDan McGee2011-03-16
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'download'Dan McGee2011-03-16
|\ \ | |/ |/|
| * Remove all traces of libfetchDave Reisner2011-03-09
| | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com>
| * dload: temp patch to allow curl/fetch coexistanceDave Reisner2011-03-09
| | | | | | | | | | | | | | | | this is just some debuggery to allow pacman to operate with both fetch and curl at the same time. use the PACMANDL variable to control which library is used. Signed-off-by: Dave Reisner <d@falconindy.com>
| * dload.c: add curl_download_internalDave Reisner2011-03-09
| | | | | | | | | | | | | | | | | | | | | | | | This is a feature complete re-implementation of the fetch based internal downloader, with a few improvements: * support for SSL * gzip and deflate compression on HTTP connections * reuses a single connection over the entire session for lower resource usage. Signed-off-by: Dave Reisner <d@falconindy.com>
| * handle error case for PM_ERR_LIBCURLDave Reisner2011-03-09
| | | | | | | | | | | | | | | | Add PM_ERR_LIBCURL to error enum and handle case in error.c by returning curl_easy_strerror() based on the error number carried by the gloabl alpm handle. Signed-off-by: Dave Reisner <d@falconindy.com>
| * share code between libfetch and libcurlDave Reisner2011-03-09
| | | | | | | | | | | | | | | | no actual code changes here. change preprocessor logic to include get_tempfile, get_destfile, signal handler enum, and the interrupt handler logic when either HAVE_LIBCURL or HAVE_LIBFETCH are defined. Signed-off-by: Dave Reisner <d@falconindy.com>
| * prefix fetch based functions with fetch_Dave Reisner2011-03-09
| | | | | | | | | | | | | | Do this in preparation for implementing similar curl based functionality. We want the ability to test these side by side. Signed-off-by: Dave Reisner <d@falconindy.com>
| * handle: Add CURL* and CURLcode vars to structDave Reisner2011-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding the CURLcode is necessary in order to return an error string from pm_error. Unlike libfetch, curl returns numerical error numbers and does not maintain a staticly allocated string with the last error generated. Adding the curl object itself to the handle is advantageous (and encouraged by curl_easy_perform(3)) because the handle is reusable for successive operations. This cuts back on overhead when downloading multiple files in a single transaction. Signed-off-by: Dave Reisner <d@falconindy.com>
| * add curl to alpm initialization and teardown routinesDave Reisner2011-03-09
| | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com>
| * Add configure.ac option for --with-curlDave Reisner2011-03-09
| | | | | | | | | | | | | | To avoid breaking compilation, fetch defaults to 'no', and curl defaults to 'check'. Signed-off-by: Dave Reisner <d@falconindy.com>
* | Bump pacman versionsDan McGee2011-03-16
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | contrib/Makefile.am: don't simplify what you don't understandDan McGee2011-03-16
| | | | | | | | | | | | | | | | This was totally screwed under a 'make distcheck' invocation. Bring it inline with what we have (and what works!) in scripts/Makefile.am. This was broken/introduced in commit 05f0a28932. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Updated translations for 3.5.0 from TransifexDan McGee2011-03-16
|/ | | | | | Thanks to all translators that contributed! Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix value of ngettext() count parameter in callbackDan McGee2011-03-07
| | | | | | I was awesome and ran alpm_list_count() on an empty list. Fail. Signed-off-by: Dan McGee <dan@archlinux.org>