Radish alpha
H
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Fix typos in source code
Jose Luis Duran committed 27 days ago
commit 10f92f12c4ddebd9407d5de4ed5ae27da58f282d
parent 7726ba72a0ddd129448831c6c4a4778949b4cb32
24 files changed +48 -48
modified FAQ.md
@@ -22,7 +22,7 @@ Table of Contents
* [How can I use pkgng with portmaster?](#15)
* [How can I use pkgng with portupgrade?](#16)
* [pkgng does not work it says: /usr/local/sbin/pkg: Undefined symbol "pkg_event_register"](#17)
-
* [Can pkgng cope with parallel installs?  What happpens if I simultaneously (attempt to) install conflicting packages?](#18)
+
* [Can pkgng cope with parallel installs?  What happens if I simultaneously (attempt to) install conflicting packages?](#18)
* [If I use "pkg delete -f", what happens to packages that depended on the forcibly-deleted package?](#19)
* [What happens if I delete a package where I've modified one of the files managed by the package?](#20)
* [What facilities does it have for auditing and repairing the package database? (ie checking for inconsistencies between installed files and the content of the package database)?](#21)
@@ -161,7 +161,7 @@ shared library: libpkg.so.0. This has been reverted, this error message means
that this library is still on your system. Check for and delete /usr/lib/libpkg.so.0.

<a name="18"></a>
-
### Q: Can pkgng cope with parallel installs?  What happpens if I simultaneously (attempt to) install conflicting packages?
+
### Q: Can pkgng cope with parallel installs?  What happens if I simultaneously (attempt to) install conflicting packages?

No.  Parallel installs will not work -- the first to start will lock the DB, and
the second won't be able to proceed.
modified TODO.md
@@ -120,10 +120,10 @@ exec: { type = shell; script: ...}

The exec part is an optional script which could be use to regenerate caches if needed for example

-
In case pkg 2 pkg have the default symlink then the regular conflict mechanism would be used
-
By default pkg priorize user defined default before package defined repo
-
if user defined repo to not exists then it switches to the global defaut if in non interactive
-
or as the user if in interractives mode
+
In case pkg 2 pkg have the default symlink then the regular conflict mechanism would be used.
+
By default, pkg prioritizes user-defined defaults before package-defined repos.
+
If the user-defined repo do not exist, then it switches to the global default if in non-interactive mode,
+
or asks the user if in interactive mode.

# List of "broken builds" in pkg repo metadata

modified features.md
@@ -96,7 +96,7 @@ create the package is crontrol activating the reproducible build support.

## graphviz/dot file visualisation

-
by running pkg -o DOT\_FILE=something.dot or by exporting the environement
+
by running pkg -o DOT\_FILE=something.dot or by exporting the environment
variable, pkg can generate a dot file allowing to visualise the internal
dependency tree via graphviz

@@ -132,7 +132,7 @@ it may remove during upgrades

It is possible to ask pkg to create a metalog file to keep trace of what files
are being installed and how they should be packaged (mode, user, group etc)
-
usefull when installing in rootdir
+
useful when installing in rootdir

## Provides/Requires

modified libpkg/json.c
@@ -33,7 +33,7 @@ jsmntok_nextchild(jsmntok_t *tok, int tokcount, int parent, int me)
	for (int i = me + 1; i < tokcount; i++) {
		if ((tok + i)->parent == parent)
			return (i);
-
		/* skip all the objet child, useful if this is an array
+
		/* skip all the object children, useful if this is an array
		 * or an object
		 */
		i += (tok + i)->size;
modified libpkg/pkg.h.in
@@ -140,8 +140,8 @@ struct pkg_kv {
typedef vec_t(struct pkg_kv *) pkg_kvl_t;

/**
-
 * The system-wide pkg(8) status: ie. is it a) installed or otherwise
-
 * available on the sysem, b) database (local.sqlite) initialised and
+
 * The system-wide pkg(8) status: i.e. it is a) installed or otherwise
+
 * available on the system, b) database (local.sqlite) initialised and
 * c) has at least one package installed (which should be pkg
 * itself). PKG_STATUS_UNINSTALLED logically cannot be returned by
 * pkg(8) itself, but it can be useful for the pkg bootstrapper
@@ -211,7 +211,7 @@ typedef enum {
} match_t;

/**
-
 * Specify on which field the pattern will be matched uppon.
+
 * Specify on which field the pattern will be matched upon.
 */

typedef enum {
@@ -249,7 +249,7 @@ typedef enum {
	 */
	PKG_REMOTE = (1U << 2),
	/**
-
	 * The pkg refers to a localy installed package.
+
	 * The pkg refers to a locally installed package.
	 */
	PKG_INSTALLED = (1U << 3),
	/**
@@ -513,7 +513,7 @@ typedef enum {
	 */
	EPKG_UPTODATE,
	/**
-
	 * unkown keyword
+
	 * unknown keyword
	 */
	EPKG_UNKNOWN,
	/**
@@ -649,7 +649,7 @@ void pkg_free(struct pkg *);
int pkg_is_valid(const struct pkg * restrict);

/**
-
 * Open a package file archive and retrive informations.
+
 * Open a package file archive and retrieve informations.
 * @param p A pointer to pkg allocated by pkg_new(), or if it points to a
 * NULL pointer, the function allocate a new pkg using pkg_new().
 * @param path The path to the local package archive.
@@ -936,7 +936,7 @@ void pkgdb_close(struct pkgdb *db);
void pkgdb_set_case_sensitivity(bool);

/**
-
 * Query the state of the case sensitity setting.
+
 * Query the state of the case sensitivity setting.
 */
bool pkgdb_case_sensitive(void);

modified libpkg/pkg_abi_macho.c
@@ -15,7 +15,7 @@
/**
 * Routines to support pkg_abi.c functions when dealing with Mach-O files.
 * Supports getting struct pkg_abi from the binary's load commands.
-
 * Supports getting shared libary information (needed, provided & loader).
+
 * Supports getting shared library information (needed, provided & loader).
 * Picks right binary in Universal binary based on ABI.
 */

modified libpkg/pkg_delete.c
@@ -228,9 +228,9 @@ rmdir_p(struct pkgdb *db, struct pkg *pkg, char *dir, const char *prefix_r)
	pkg_debug(1, "Number of packages owning the directory '%s': %d",
	    fullpath, (int)cnt);
	/*
-
	 * At this moment the package we are removing have already been removed
-
	 * from the local database so if anything else is owning the directory
-
	 * that is another package meaning only remove the diretory is cnt == 0
+
	 * At this moment, the package we are removing has already been removed
+
	 * from the local database, so if anything else is owning the directory,
+
	 * that is another package, meaning only remove the directory if cnt == 0
	 */
	if (cnt > 0)
		return;
modified libpkg/pkg_osvf.c
@@ -1051,7 +1051,7 @@ pkg_osvf_parse_reference(struct pkg_audit_reference *ref, const ucl_object_t *re
	}

	/*
-
	   Parses refrence to struct
+
	   Parses reference to struct
	   {
	     "type": "ADVISORY",
	     "url": "https://www.freebsd.org/"
@@ -1077,7 +1077,7 @@ pkg_osvf_parse_references(struct pkg_audit_entry *entry, const ucl_object_t *ref
	}

	/*
-
	   Parses refereces array to linked list
+
	   Parses references array to linked list
	   "references": [
	     {
	       "type": "ADVISORY",
@@ -1214,7 +1214,7 @@ pkg_osvf_print_version_type(struct pkg_audit_versions_range *versions)
		printf("UNKNOWN\n");
		break;
	case OSVF_EVENT_VERSION_SEMVER:
-
		printf("Sematic Version 2.0\n");
+
		printf("Semantic Version 2.0\n");
		break;
	case OSVF_EVENT_VERSION_ECOSYSTEM:
		printf("Ecosystem\n");
modified libpkg/pkg_ports.c
@@ -1010,7 +1010,7 @@ plist_parse_line(struct plist *plist, char *line)
		buf = line;
		strlcpy(plist->last_file, buf, sizeof(plist->last_file));

-
		/* remove spaces at the begining and at the end */
+
		/* remove spaces at the beginning and at the end */
		while (isspace(buf[0]))
			buf++;

modified libpkg/pkg_printf.c
@@ -2329,7 +2329,7 @@ mode_val(xstring *buf, mode_t mode, struct percent_esc *p)
{
	/*
         * Print mode as an octal integer '%o' by default.
-
	 * PP_ALTERNATE_FORM2 generates '%#o' pased to regular
+
	 * PP_ALTERNATE_FORM2 generates '%#o' passed to regular
	 * printf(). PP_ALTERNATE_FORM1 will generate 'drwxr-x--- '
	 * style from strmode(3).
	 */
modified libpkg/pkg_solve.c
@@ -452,7 +452,7 @@ pkg_solve_add_conflict_rule(struct pkg_solve_problem *problem,
	LL_FOREACH(confvar, curvar) {
		other = curvar->unit->pkg;
		if (conflict->type == PKG_CONFLICT_REMOTE_LOCAL) {
-
			/* Skip unappropriate packages */
+
			/* Skip inappropriate packages */
			if (pkg->type == PKG_INSTALLED) {
				if (other->type == PKG_INSTALLED)
					continue;
modified libpkg/pkgdb.c
@@ -1341,8 +1341,8 @@ pkgdb_transaction_rollback(struct pkgdb *db, const char *savepoint)

/* By default, MATCH_EXACT and MATCH_REGEX are case sensitive.  This
 * is modified in many actions according to the value of
-
 * CASE_SENSITIVE_MATCH in pkg.conf and then possbily reset again in
-
 * pkg search et al according to command line flags */
+
 * CASE_SENSITIVE_MATCH in pkg.conf and then possibly reset again in
+
 * pkg search et al. according to command line flags */

void
pkgdb_set_case_sensitivity(bool case_sensitive)
modified libpkg/rcscripts.c
@@ -118,7 +118,7 @@ rc_stop(const char *rc_file)
	if (rc_file == NULL)
		return (0);

-
	/* use faststrop to avoid checking if the servie was running */
+
	/* use faststop to avoid checking if the service was running */
	return (service_cmd(rc_file, "faststop"));
}

@@ -128,7 +128,7 @@ rc_stop_with_script(const char *script_path)
	if (script_path == NULL)
		return (0);

-
	/* use faststrop to avoid checking if the servie was running */
+
	/* use faststop to avoid checking if the service was running */
	return (script_cmd(script_path, "faststop"));
}

modified libpkg/scripts.c
@@ -163,8 +163,8 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade, bool noexe
			posix_spawn_file_actions_adddup2(&action, cur_pipe[1], 4);
			posix_spawn_file_actions_addclose(&action, cur_pipe[0]);
			/*
-
			 * consider cur_pipe[1] to probably be the lastest
-
			 * opened fd close all unuseful fd up to there
+
			 * consider cur_pipe[1] to probably be the latest
+
			 * opened fd, close all useless fds up to there
			 */
			for (int k = 5; k <= cur_pipe[1]; k++) {
				if (k != cur_pipe[0] && k != ctx.devnullfd)
modified libpkg/utils.c
@@ -415,7 +415,7 @@ check_for_hardlink(hardlinks_t *hl, struct stat *st)
 *
 * A package which is valid for installation on any FreeBSD now simply has
 * to define itself as: abi: "FreeBSD" or "FreeBSD:*"
-
 * A package which is valid for installation on any FreeBSD 15 regarless of
+
 * A package which is valid for installation on any FreeBSD 15 regardless of
 * the arch
 * abi: "FreeBSD:15" or "FreeBSD:15:*"
 *
modified scripts/completion/_pkg.bash.in
@@ -444,7 +444,7 @@ _pkg () {
		'-r[Root directory] -/'
		'-m[Manifest directory] -/'
		'-f[format]'
-
		'-o[Ouput directory] -/'
+
		'-o[Output directory] -/'
		'(-g -x -X)-a[Process all packages]'
		'(-x -X -a)-g[Process packages that match the glob pattern]'
		'(-g -X -a)-x[Process packages that match the regex pattern]'
@@ -530,7 +530,7 @@ _pkg () {
		'(-g -x -a -F -e)-X[Process packages that match the extended regex pattern]'
		'(-g -x -X -a -F)-e[Process packages that match the evaluation]'
		'(-g -x -X -a -e)-F[Process the specified package]'
-
		':Ouput format:'
+
		':Output format:'
	    )
	    return 0 
	    ;;
modified scripts/completion/_pkg.in
@@ -448,7 +448,7 @@ _pkg_args() {
			;;
		(repo)
			_arguments -A '-*' -s \
-
				'(-h --hash)'{-h,--hash}'[Rename repo files with a short hash appeneded]' \
+
				'(-h --hash)'{-h,--hash}'[Rename repo files with a short hash appended]' \
				'(-l --list-files)'{-l,--list-files}'[generate list of all files in repo as filesite.txz archive]' \
				'(-q --quiet)'{-q,--quiet}'[force quiet output]' \
				'(-o --output-dir)'{-o+,--output-dir=}'[specify the location of the new repo]:repo location:_files -/' \
modified src/info.c
@@ -266,7 +266,7 @@ exec_info(int argc, char **argv)
	argv += optind;

	if (argc == 0 && file == NULL && match != MATCH_ALL) {
-
		/* which -O bsd.*.mk always execpt clean output */
+
		/* which -O bsd.*.mk always expect clean output */
		if (origin_search)
			return (EXIT_SUCCESS);
		usage_info();
modified src/main.c
@@ -385,7 +385,7 @@ start_process_worker(char *const *save_argv)

	/* Fork off a child process to do the actual package work.
	 * The child may be jailed or chrooted.  If a restart is required
-
	 * (eg. pkg(8) inself was upgraded) the child can exit with
+
	 * (eg. pkg(8) itself was upgraded) the child can exit with
	 * 'EX_NEEDRESTART' and the same forking process will be
	 * replayed.  This function returns control in the child
	 * process only. */
@@ -472,7 +472,7 @@ expand_aliases(int argc, char ***argv)
	/* Estimate how many args alias_value will split into by
	 * counting the number of whitespace characters in it. This
	 * will be at minimum one less than the final argc. We'll be
-
	 * consuming one of the orginal argv, so that balances
+
	 * consuming one of the original argv, so that balances
	 * out. */

	spaces = pkg_utils_count_spaces(alias_value);
modified src/search.c
@@ -217,7 +217,7 @@ modifier_opt(const char *optionarg)
		break;
	default:
		usage_search();
-
		errx(EXIT_FAILURE, "Unkown modifier option %s", optionarg);
+
		errx(EXIT_FAILURE, "Unknown modifier option %s", optionarg);
		/* NOTREACHED */
	}
	return opt;
modified tests/frontend/abi.sh
@@ -132,7 +132,7 @@ machoparse_body() {
			pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/${bin} config altabi
	done

-
	# explicitely select a fat entry that is not in the ABI_FILE
+
	# explicitly select a fat entry that is not in the ABI_FILE
	_expected="Scanned 2 entries, found none matching selector i386\n"
	atf_check \
		-s exit:1 \
@@ -146,7 +146,7 @@ machoparse_body() {
		-e match:"Unable to determine ABI" \
		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/macosfat.bin#i386 config altabi

-
	# explicitely select a fat entry that is not a valid architecture, hence not in the ABI_FILE
+
	# explicitly select a fat entry that is not a valid architecture, hence not in the ABI_FILE
	_expected=""
	atf_check \
		-s exit:1 \
modified tests/frontend/config.sh
@@ -149,8 +149,8 @@ EOF

nameserver_body()
{
-
	atf_skip_on Darwin Not possible to inject a namserver on OSX
-
	atf_skip_on Linux Not possible to inject a namserver on OSX
+
	atf_skip_on Darwin Not possible to inject a nameserver on OSX
+
	atf_skip_on Linux Not possible to inject a nameserver on OSX

	atf_check \
		-o inline:"\n" \
modified tests/frontend/issue1425.sh
@@ -7,9 +7,9 @@
# - pkgB
#    - pkgC
#      - pkgD
-
#1. Two repos (repoA and repoB) with same set of packages. repoB last in the list, so all packages must be prefered from this one.
-
#2. On upgrade we must stick to same repo
-
#3. Two repos (repoA and repoB) with same set of packages. repoA has a higher priority, so all packages must be prefered from this one.
+
#1. Two repos (repoA and repoB) with same set of packages. repoB last in the list, so all packages must be preferred from this one.
+
#2. On upgrade we must stick to same repo.
+
#3. Two repos (repoA and repoB) with same set of packages. repoA has a higher priority, so all packages must be preferred from this one.

tests_init \
        issue1425
modified tests/frontend/issue1440.sh
@@ -9,7 +9,7 @@
#    - pkgC
#      - pkgD
#1. Two repos (repoA and repoB) with same set of packages. pkgA for repoA and repoB have different options set.
-
#   repoB has prio 100, so all packages must be prefered from this one.
+
#   repoB has prio 100, so all packages must be preferred from this one.
#2. On upgrade pkg wants to reinstall pkgA due options changed from repoA which is wrong.

tests_init \