Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS12
-rw-r--r--configure.ac2
-rw-r--r--doc/PKGBUILD.5.asciidoc4
-rw-r--r--lib/libalpm/package.h2
-rw-r--r--lib/libalpm/signing.c2
-rw-r--r--meson_options.txt2
-rw-r--r--scripts/libmakepkg/executable/strip.sh.in2
-rw-r--r--scripts/libmakepkg/util/pkgbuild.sh.in2
-rw-r--r--src/pacman/util.c2
9 files changed, 15 insertions, 15 deletions
diff --git a/NEWS b/NEWS
index a182d65e..6ae93a9d 100644
--- a/NEWS
+++ b/NEWS
@@ -167,7 +167,7 @@ VERSION DESCRIPTION
- fix triggering of Install hooks (FS#47996)
- fix handling of stdin scripts called by pacman
- hook activity is logged
- - documentataion updates for alpm-hooks (FS#48080)
+ - documentation updates for alpm-hooks (FS#48080)
- makepkg:
- increase robustness of variable array checks
- makepkg -g does not perform current architecture checks
@@ -259,9 +259,9 @@ VERSION DESCRIPTION
- Fix removal of static libraries when the shared library
uses the absolute path in symbolic links (FS#43395)
- Improve Bazaar cloning (FS#43448)
- - Fix issues with architecture dependant checksum
+ - Fix issues with architecture dependent checksum
verification (FS#43192)
- - Fix .SRCINFO file with architecture dependant fields
+ - Fix .SRCINFO file with architecture dependent fields
(FS#43247)
- Fix compatibility with older bash versions
- Allow git checkouts to be downloaded into directory ending
@@ -351,7 +351,7 @@ VERSION DESCRIPTION
- checkupdates: rename CHECKUPDATE_DB to CHECKUPDATES_DB
- pacdiff: add a "Quit" option, and many other improvements
- pacsysclean is removed
-4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitary
+4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitrary
file overwrites from malicious databases
- makepkg:
- restrict package name from starting with a dot
@@ -816,7 +816,7 @@ VERSION DESCRIPTION
- repo-add: use openssl instead of md5sum
- simplify doc building process for ease of development
- ensure correct handling of syscall interruptions
- - readd missing newline on -Qi/-Si output (FS#11331)
+ - read missing newline on -Qi/-Si output (FS#11331)
- fix TotalDownload regression (FS#11339)
- makepkg:
- replace getopt with an internal function
@@ -1262,7 +1262,7 @@ VERSION DESCRIPTION
external download utility like wget
- added a license field to package meta-data
- add url support to -A and -U operations (download packages)
- - -Ss now searches thru provides fields
+ - -Ss now searches through provides fields
- added --dbonly option to -R
2.7.6 - added --print-uris option
- fixed an http download bug (FS#667)
diff --git a/configure.ac b/configure.ac
index 6f336022..415ed3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ if test "x$CFLAGS" = "x"; then
CFLAGS=""
fi
-# Set subsitution values for version stuff in Makefiles and anywhere else,
+# Set substitution values for version stuff in Makefiles and anywhere else,
# and put LIB_VERSION in config.h
AC_SUBST(LIB_VERSION)
AC_SUBST(LIB_VERSION_INFO)
diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc
index f12effde..32668adc 100644
--- a/doc/PKGBUILD.5.asciidoc
+++ b/doc/PKGBUILD.5.asciidoc
@@ -60,8 +60,8 @@ systems (see below).
allows package maintainers to make updates to the package's configure
flags, for example. This is typically set to '1' for each new upstream
software release and incremented for intermediate PKGBUILD updates. The
- variable is a postive integer, with an optional subrelease level
- specified by adding another postive integer separated by a period
+ variable is a positive integer, with an optional subrelease level
+ specified by adding another positive integer separated by a period
(i.e. in the form x.y).
*epoch*::
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index b11d5dda..fbcde266 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -38,7 +38,7 @@
/** Package operations struct. This struct contains function pointers to
* all methods used to access data in a package to allow for things such
* as lazy package initialization (such as used by the file backend). Each
- * backend is free to define a stuct containing pointers to a specific
+ * backend is free to define a struct containing pointers to a specific
* implementation of these methods. Some backends may find using the
* defined default_pkg_ops struct to work just fine for their needs.
*/
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index df7ac6ca..92598b0e 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -182,7 +182,7 @@ static int init_gpgme(alpm_handle_t *handle)
#endif
/* NOTE:
* The GPGME library installs a SIGPIPE signal handler automatically if
- * the default signal hander is in use. The only time we set a handler
+ * the default signal handler is in use. The only time we set a handler
* for SIGPIPE is in dload.c, and we reset it when we are done. Given that
* we do this, we can let GPGME do its automagic. However, if we install
* a library-wide SIGPIPE handler, we will have to be careful.
diff --git a/meson_options.txt b/meson_options.txt
index 422a9ae4..bf3fc22d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,7 +2,7 @@
option('use-git-version', type : 'boolean', value : false,
description : 'take version information from git')
option('buildstatic', type : 'boolean', value : false,
- description : 'if true, build staticly linked binaries')
+ description : 'if true, build statically linked binaries')
# directories and filenames
option('root-dir', type : 'string', value : '/',
diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in
index 867dc928..ab069a45 100644
--- a/scripts/libmakepkg/executable/strip.sh.in
+++ b/scripts/libmakepkg/executable/strip.sh.in
@@ -1,6 +1,6 @@
#!/usr/bin/bash
#
-# strip.sh - Confirm presense of strip binary
+# strip.sh - Confirm presence of strip binary
#
# Copyright (c) 2011-2018 Pacman Development Team <pacman-dev@archlinux.org>
#
diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index 298275a8..4163805d 100644
--- a/scripts/libmakepkg/util/pkgbuild.sh.in
+++ b/scripts/libmakepkg/util/pkgbuild.sh.in
@@ -38,7 +38,7 @@ array_build() {
# it's an error to try to copy a value which doesn't exist.
declare -p "$2" &>/dev/null || return 1
- # Build an array of the indicies of the source array.
+ # Build an array of the indices of the source array.
eval "keys=(\"\${!$2[@]}\")"
# Clear the destination array
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 74e1037d..8f6290db 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1359,7 +1359,7 @@ static int multiselect_parse(char *array, int count, char *response)
len--;
include = 0;
} else if(str) {
- /* if first token is including, we unselect all targets */
+ /* if first token is including, we deselect all targets */
memset(array, 0, count);
}