WIP: First pass at adding a pkgdiff script

Signed-off-by: Allan McRae <allan@archlinux.org>

.gitlab-ci.yml

@@ -16,10 +16,6 @@ default:
       python
       fakeroot fakechroot
       meson
-  artifacts:
-      when: always
-      paths:
-        - build/meson-logs/meson-log.txt
 
 arch:
   extends: .arch-test

build-aux/script-wrapper.sh.in

@@ -3,4 +3,4 @@
 # This script serves as a trampoline for running scripts which depend on
 # libmakepkg with the libmakepkg within the build tree.
 
-MAKEPKG_LIBRARY=@BUILDDIR@/libmakepkg exec @BASH@ -$- @REAL_PROGPATH@ "$@"
+LIBRARY=@BUILDDIR@/libmakepkg exec @BASH@ -$- @REAL_PROGPATH@ "$@"

doc/PKGBUILD-example.txt

@@ -12,8 +12,8 @@ depends=('glibc')
 makedepends=('ed')
 optdepends=('ed: for "patch -e" functionality')
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb'
-            'SKIP')
+md5sums=('e9ae5393426d3ad783a300a338c09b72'
+         'SKIP')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"

doc/PKGBUILD.5.asciidoc

@@ -336,13 +336,6 @@ function.
 	the optional functions listed below. The packaging stage is run using
 	fakeroot to ensure correct file permissions in the resulting package.
 	All other functions will be run as the user calling makepkg.
-	This function is run inside `$srcdir`.
-
-*verify() Function*::
-	An optional `verify()` function can be specified to implement arbitrary
-	source authentication. The function should return a non-zero exit code when
-	verification fails. This function is run before sources are extracted.
-	This function is run inside `$startdir`.
 
 *prepare() Function*::
 	An optional `prepare()` function can be specified in which operations to
@@ -350,19 +343,16 @@ function.
 	function is run after the source extraction and before the `build()`
 	function. The `prepare()` function is skipped when source extraction
 	is skipped.
-	This function is run inside `$srcdir`.
 
 *build() Function*::
 	The optional `build()` function is used to compile and/or adjust the source
 	files in preparation to be installed by the `package()` function.
-	This function is run inside `$srcdir`.
 
 *check() Function*::
 	An optional `check()` function can be specified in which a package's
 	test-suite may be run. This function is run between the `build()` and
 	`package()` functions. Be sure any exotic commands used are covered by the
 	`checkdepends` array.
-	This function is run inside `$srcdir`.
 
 All of the above variables such as `$pkgname` and `$pkgver` are available for
 use in the packaging functions. In addition, makepkg defines the following
@@ -372,6 +362,7 @@ variables:
 	This contains the directory where makepkg extracts, or copies, all source
 	files.
 +
+All of the packaging functions defined above are run starting inside `$srcdir`
 
 *pkgdir*::
 	This contains the directory where makepkg bundles the installed package.
@@ -473,9 +464,6 @@ Currently makepkg supports the Bazaar, Git, Subversion, Fossil and Mercurial
 version control systems. For other version control systems, manual cloning of
 upstream repositories must be done in the `prepare()` function.
 
-Some <<VCS,VCS Sources>> like Git support pinning the checkout by a checksum of
-its content using deterministic export functionality like ``git archive''.
-
 The source URL is divided into four components:
 
 *directory*::

doc/makepkg-template.1.asciidoc

@@ -85,7 +85,7 @@ Example PKGBUILD
 	license=('PerlArtistic' 'GPL')
 	depends=('perl')
 	source=("http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/Config-Simple-${pkgver}.tar.gz")
-	sha256sums=('dd9995706f0f9384a15ccffe116c3b6e22f42ba2e58d8f24ed03c4a0e386edb4')
+	md5sums=('f014aec54f0a1e2e880d317180fce502')
 	_distname="Config-Simple"
 
 	# template start; name=perl-module; version=1.0;

doc/makepkg.8.asciidoc

@@ -146,9 +146,6 @@ Options
 *-C, \--cleanbuild*::
 	Remove the $srcdir before building the package.
 
-*-D* <dir>, *\--dir* <dir> ::
-	Change to directory <dir> before reading the PKGBUILD or doing anything else.
-	
 *\--allsource*::
 	Do not actually build the package, but build a source-only tarball that
 	includes all sources, including those that are normally downloaded via
@@ -171,9 +168,6 @@ Options
 *\--noprepare*::
 	Do not run the prepare() function in the PKGBUILD.
 
-*\--noverify*::
-	Do not run the verify() function in the PKGBUILD.
-
 *\--sign*::
 	Sign the resulting package with gpg, overriding the setting in
 	linkman:makepkg.conf[5].
@@ -233,9 +227,6 @@ before building.
 
 Environment Variables
 ---------------------
-**MAKEPKG_LIBRARY**="/path/to/directory"::
-	Use an alternative libmakepkg path instead of the {libmakepkgdir} default.
-
 **PACMAN**::
 	The command that will be used to check for missing dependencies and to
 	install and remove packages. Pacman's '-Qq', '-Rns', '-S', '-T', and '-U'

doc/meson.build

@@ -35,7 +35,6 @@ asciidoc_opts = [
  '-a', 'sysconfdir=@0@'.format(SYSCONFDIR),
  '-a', 'datarootdir=@0@'.format(DATAROOTDIR),
  '-a', 'rootdir=@0@'.format(ROOTDIR),
- '-a', 'libmakepkgdir=@0@'.format(LIBMAKEPKGDIR),
 ]
 
 html_targets = []

doc/pacman.8.asciidoc

@@ -237,12 +237,10 @@ Transaction Options (apply to '-S', '-R' and '-U')
 	Specify a printf-like format to control the output of the '\--print'
 	operation. The possible attributes are: "%a" for arch, "%b" for
 	builddate, "%d" for description, "%e" for pkgbase, "%f" for filename,
-	"%g" for base64 encoded PGP signature, "%h" for sha256sum, "%m" for
-	md5sum, "%n" for pkgname, "%p" for packager, "%v" for pkgver, "%l" for
-	location, "%r" for repository, "%s" for size, "%C" for checkdepends,
-	"%D" for depends, "%G" for groups, "%H" for conflicts, "%L" for
-	licenses, "%M" for makedepends, "%O" for optional depends, "%P" for
-	provides and "%R" for replaces.
+	"%g" for base64 encoded PGP signature, "%h" for sha256sum, "%n" for
+	pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r"
+	for repository, "%s" for size, "%C" for checkdepends, "%D" for depends
+	and "%M" for makedepends.
 	Implies '\--print'.
 
 
@@ -456,11 +454,11 @@ Additional targets can also be specified manually, so that '-Su foo' will do a
 system upgrade and install/upgrade the "foo" package in the same operation.
 
 *-y, \--refresh*::
-	Download a fresh copy of the master package databases '(repo.db)' from the
-	server(s) defined in linkman:pacman.conf[5]. This should typically be used
-	each time you use '\--sysupgrade' or '-u'. Passing two '\--refresh' or '-y'
-	flags will force a refresh of all package databases, even if they appear to
-	be up-to-date.
+	Download a fresh copy of the master package database from the server(s)
+	defined in linkman:pacman.conf[5]. This should typically be used each time
+	you use	'\--sysupgrade' or '-u'. Passing two '\--refresh' or '-y' flags
+	will force a refresh of all package databases, even if they appear to be
+	up-to-date.
 
 
 Database Options (apply to '-D')[[QO]]
@@ -489,8 +487,8 @@ Database Options (apply to '-D')[[QO]]
 File Options (apply to '-F')[[FO]]
 ----------------------------------
 *-y, --refresh*::
-	Download fresh package file databases '(repo.files)' from the server.
-	Use twice to force a refresh even if databases are up to date.
+	Download fresh package databases from the server. Use twice to force a
+	refresh even if databases are up to date.
 
 *-l, \--list*::
 	List the files owned by the queried package.

etc/makepkg.conf.in

@@ -23,7 +23,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'

lib/libalpm/add.c

@@ -415,7 +415,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		size_t pkg_current, size_t pkg_count)
 {
-	int ret = 0, errors = 0;
+	int i, ret = 0, errors = 0;
 	int is_upgrade = 0;
 	alpm_pkg_t *oldpkg = NULL;
 	alpm_db_t *db = handle->db_local;
@@ -469,7 +469,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 			!(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
 		const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
 
-		_alpm_runscriptlet(handle, newpkg->name, pkgfile, scriptlet_name,
+		_alpm_runscriptlet(handle, pkgfile, scriptlet_name,
 				newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
 	}
 
@@ -538,7 +538,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		/* call PROGRESS once with 0 percent, as we sort-of skip that here */
 		PROGRESS(handle, progress, newpkg->name, 0, pkg_count, pkg_current);
 
-		while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
+		for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) {
 			int percent;
 
 			if(newpkg->size != 0) {
@@ -641,7 +641,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install");
 		const char *scriptlet_name = is_upgrade ? "post_upgrade" : "post_install";
 
-		_alpm_runscriptlet(handle, newpkg->name, scriptlet, scriptlet_name,
+		_alpm_runscriptlet(handle, scriptlet, scriptlet_name,
 				newpkg->version, oldpkg ? oldpkg->version : NULL, 0);
 		free(scriptlet);
 	}

lib/libalpm/alpm.h

@@ -600,10 +600,16 @@ typedef struct _alpm_depmissing_t {
 
 /** A conflict that has occurred between two packages. */
 typedef struct _alpm_conflict_t {
-	/** The first package */
-	alpm_pkg_t *package1;
-	/** The second package */
-	alpm_pkg_t *package2;
+	/** Hash of the first package name
+	 * (used internally to speed up conflict checks) */
+	unsigned long package1_hash;
+	/** Hash of the second package name
+	 * (used internally to speed up conflict checks) */
+	unsigned long package2_hash;
+	/** Name of the first package */
+	char *package1;
+	/** Name of the second package */
+	char *package2;
 	/** The conflict */
 	alpm_depend_t *reason;
 } alpm_conflict_t;
@@ -750,10 +756,6 @@ typedef enum _alpm_event_type_t {
 	ALPM_EVENT_LOAD_START,
 	/** Target package is finished loading. */
 	ALPM_EVENT_LOAD_DONE,
-	/** An install file is about to be ran */
-	ALPM_EVENT_INSTALL_RUN_START,
-	/** An install file has finished running */
-	ALPM_EVENT_INSTALL_RUN_DONE,
 	/** Scriptlet has printed information; See alpm_event_scriptlet_info_t for
 	 * arguments. */
 	ALPM_EVENT_SCRIPTLET_INFO,
@@ -844,32 +846,10 @@ typedef struct _alpm_event_optdep_removal_t {
 	alpm_depend_t *optdep;
 } alpm_event_optdep_removal_t;
 
-/** Enum of the kinds of scriptlets */
-typedef enum _alpm_scriptlet_kind_t {
-	/** We are running an install file */
-	ALPM_SCRIPTLET_KIND_INSTALL_FILE,
-	/** We are running a hook */
-	ALPM_SCRIPTLET_KIND_HOOK,
-	/** We are running a command */
-	ALPM_SCRIPTLET_KIND_COMMAND,
-} alpm_scriptlet_kind_t;
-
-/** We are running an install file. */
-typedef struct _alpm_event_install_run_t {
-	/** Type of event */
-	alpm_event_type_t type;
-	/** The name of the package */
-	const char *pkgname;
-} alpm_event_install_run_t;
-
 /** A scriptlet was ran. */
 typedef struct _alpm_event_scriptlet_info_t {
 	/** Type of event */
 	alpm_event_type_t type;
-	/** The kind of scriptlet being ran */
-	alpm_scriptlet_kind_t kind;
-	/** The name of the scriptlet **/
-	const char *name;
 	/** Line of scriptlet output */
 	const char *line;
 } alpm_event_scriptlet_info_t;
@@ -972,8 +952,6 @@ typedef union _alpm_event_t {
 	alpm_event_package_operation_t package_operation;
 	/** An optdept was remove */
 	alpm_event_optdep_removal_t optdep_removal;
-	/** An install file is about to be run */
-	alpm_event_install_run_t install_run;
 	/** A scriptlet was ran */
 	alpm_event_scriptlet_info_t scriptlet_info;
 	/** A database is missing */

lib/libalpm/conflict.c

@@ -50,8 +50,10 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2,
 
 	CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL);
 
-	ASSERT(_alpm_pkg_dup(pkg1, &conflict->package1) == 0, goto error);
-	ASSERT(_alpm_pkg_dup(pkg2, &conflict->package2) == 0, goto error);
+	conflict->package1_hash = pkg1->name_hash;
+	conflict->package2_hash = pkg2->name_hash;
+	STRDUP(conflict->package1, pkg1->name, goto error);
+	STRDUP(conflict->package2, pkg2->name, goto error);
 	conflict->reason = reason;
 
 	return conflict;
@@ -64,9 +66,8 @@ error:
 void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict)
 {
 	ASSERT(conflict != NULL, return);
-	_alpm_pkg_free(conflict->package1);
-	_alpm_pkg_free(conflict->package2);
-
+	FREE(conflict->package2);
+	FREE(conflict->package1);
 	FREE(conflict);
 }
 
@@ -78,8 +79,10 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict)
 	alpm_conflict_t *newconflict;
 	CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL);
 
-	ASSERT(_alpm_pkg_dup(conflict->package1, &newconflict->package1) == 0, goto error);
-	ASSERT(_alpm_pkg_dup(conflict->package2, &newconflict->package2) == 0, goto error);
+	newconflict->package1_hash = conflict->package1_hash;
+	newconflict->package2_hash = conflict->package2_hash;
+	STRDUP(newconflict->package1, conflict->package1, goto error);
+	STRDUP(newconflict->package2, conflict->package2, goto error);
 	newconflict->reason = conflict->reason;
 
 	return newconflict;
@@ -102,10 +105,10 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack)
 	alpm_list_t *i;
 	for(i = haystack; i; i = i->next) {
 		alpm_conflict_t *conflict = i->data;
-		if(needle->package1->name_hash == conflict->package1->name_hash
-				&& needle->package2->name_hash == conflict->package2->name_hash
-				&& strcmp(needle->package1->name, conflict->package1->name) == 0
-				&& strcmp(needle->package2->name, conflict->package2->name) == 0) {
+		if(needle->package1_hash == conflict->package1_hash
+				&& needle->package2_hash == conflict->package2_hash
+				&& strcmp(needle->package1, conflict->package1) == 0
+				&& strcmp(needle->package2, conflict->package2) == 0) {
 			return 1;
 		}
 	}

lib/libalpm/hook.c

@@ -522,10 +522,10 @@ static int _alpm_hook_run_hook(alpm_handle_t *handle, struct _alpm_hook_t *hook)
 				alpm_list_count(hook->matches), (alpm_list_fn_cmp)strcmp);
 		/* hooks with multiple triggers could have duplicate matches */
 		ctx = hook->matches = _alpm_strlist_dedup(hook->matches);
-		return _alpm_run_chroot(handle, hook->name, ALPM_SCRIPTLET_KIND_HOOK, hook->cmd[0], hook->cmd,
+		return _alpm_run_chroot(handle, hook->cmd[0], hook->cmd,
 				(_alpm_cb_io) _alpm_hook_feed_targets, &ctx);
 	} else {
-		return _alpm_run_chroot(handle, hook->name, ALPM_SCRIPTLET_KIND_HOOK, hook->cmd[0], hook->cmd, NULL, NULL);
+		return _alpm_run_chroot(handle, hook->cmd[0], hook->cmd, NULL, NULL);
 	}
 }
 

lib/libalpm/remove.c

@@ -692,7 +692,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 				!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
 			char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
 					oldpkg, "install");
-			_alpm_runscriptlet(handle, oldpkg->name, scriptlet, "pre_remove", pkgver, NULL, 0);
+			_alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0);
 			free(scriptlet);
 		}
 	}
@@ -712,7 +712,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 			!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
 		char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
 				oldpkg, "install");
-		_alpm_runscriptlet(handle, oldpkg->name, scriptlet, "post_remove", pkgver, NULL, 0);
+		_alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0);
 		free(scriptlet);
 	}
 

lib/libalpm/sync.c

@@ -517,23 +517,21 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 
 		for(i = deps; i; i = i->next) {
 			alpm_conflict_t *conflict = i->data;
-			const char *name1 = conflict->package1->name;
-			const char *name2 = conflict->package2->name;
 			alpm_pkg_t *rsync, *sync, *sync1, *sync2;
 
 			/* have we already removed one of the conflicting targets? */
-			sync1 = alpm_pkg_find(trans->add, name1);
-			sync2 = alpm_pkg_find(trans->add, name2);
+			sync1 = alpm_pkg_find(trans->add, conflict->package1);
+			sync2 = alpm_pkg_find(trans->add, conflict->package2);
 			if(!sync1 || !sync2) {
 				continue;
 			}
 
 			_alpm_log(handle, ALPM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n",
-					name1, name2);
+					conflict->package1, conflict->package2);
 
 			/* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */
-			alpm_depend_t *dep1 = alpm_dep_from_string(name1);
-			alpm_depend_t *dep2 = alpm_dep_from_string(name2);
+			alpm_depend_t *dep1 = alpm_dep_from_string(conflict->package1);
+			alpm_depend_t *dep2 = alpm_dep_from_string(conflict->package2);
 			if(_alpm_depcmp(sync1, dep2)) {
 				rsync = sync2;
 				sync = sync1;
@@ -561,8 +559,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 
 			/* Prints warning */
 			_alpm_log(handle, ALPM_LOG_WARNING,
-					_("removing '%s-%s' from target list because it conflicts with '%s-%s'\n"),
-					rsync->name, rsync->version, sync->name, sync->version);
+					_("removing '%s' from target list because it conflicts with '%s'\n"),
+					rsync->name, sync->name);
 			trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
 			/* rsync is not a transaction target anymore */
 			trans->unresolvable = alpm_list_add(trans->unresolvable, rsync);
@@ -583,18 +581,16 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 				.conflict = i->data
 			};
 			alpm_conflict_t *conflict = i->data;
-			const char *name1 = conflict->package1->name;
-			const char *name2 = conflict->package2->name;
 			int found = 0;
 
-			/* if name2 (the local package) is not elected for removal,
+			/* if conflict->package2 (the local package) is not elected for removal,
 			   we ask the user */
-			if(alpm_pkg_find(trans->remove, name2)) {
+			if(alpm_pkg_find(trans->remove, conflict->package2)) {
 				found = 1;
 			}
 			for(j = trans->add; j && !found; j = j->next) {
 				alpm_pkg_t *spkg = j->data;
-				if(alpm_pkg_find(spkg->removes, name2)) {
+				if(alpm_pkg_find(spkg->removes, conflict->package2)) {
 					found = 1;
 				}
 			}
@@ -602,15 +598,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 				continue;
 			}
 
-			_alpm_log(handle, ALPM_LOG_DEBUG, "package '%s-%s' conflicts with '%s-%s'\n",
-					name1, conflict->package1->version, name2,conflict->package2->version);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
+					conflict->package1, conflict->package2);
 
 			QUESTION(handle, &question);
 			if(question.remove) {
 				/* append to the removes list */
-				alpm_pkg_t *sync = alpm_pkg_find(trans->add, name1);
-				alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, name2);
-				_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", name2);
+				alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1);
+				alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2);
+				_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);
 				sync->removes = alpm_list_add(sync->removes, local);
 			} else { /* abort */
 				_alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
@@ -995,13 +991,6 @@ static int check_validity(alpm_handle_t *handle,
 
 		current_bytes += v.pkg->size;
 		v.path = _alpm_filecache_find(handle, v.pkg->filename);
-
-		if(!v.path) {
-			_alpm_log(handle, ALPM_LOG_ERROR,
-					_("%s: could not find package in cache\n"), v.pkg->name);
-			RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, -1);
-		}
-
 		v.siglevel = alpm_db_get_siglevel(alpm_pkg_get_db(v.pkg));
 
 		if(_alpm_pkg_validate_internal(handle, v.path, v.pkg,
@@ -1093,12 +1082,6 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
 		current_bytes += spkg->size;
 		filepath = _alpm_filecache_find(handle, spkg->filename);
 
-		if(!filepath) {
-			_alpm_log(handle, ALPM_LOG_ERROR,
-					_("%s: could not find package in cache\n"), spkg->name);
-			RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, -1);
-		}
-
 		/* load the package file and replace pkgcache entry with it in the target list */
 		/* TODO: alpm_pkg_get_db() will not work on this target anymore */
 		_alpm_log(handle, ALPM_LOG_DEBUG,

lib/libalpm/trans.c

@@ -334,7 +334,7 @@ static int grep(const char *fn, const char *needle)
 	return 0;
 }
 
-int _alpm_runscriptlet(alpm_handle_t *handle, const char *pkgname, const char *filepath,
+int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
 		const char *script, const char *ver, const char *oldver, int is_archive)
 {
 	char arg0[64], arg1[3], cmdline[PATH_MAX];
@@ -407,16 +407,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *pkgname, const char *f
 
 	_alpm_log(handle, ALPM_LOG_DEBUG, "executing \"%s\"\n", cmdline);
 
-	alpm_event_install_run_t event = {
-		.type = ALPM_EVENT_INSTALL_RUN_START,
-		.pkgname = pkgname,
-	};
-	EVENT(handle, &event);
-
-	retval = _alpm_run_chroot(handle, pkgname, ALPM_SCRIPTLET_KIND_INSTALL_FILE, SCRIPTLET_SHELL, argv, NULL, NULL);
-
-	event.type = ALPM_EVENT_INSTALL_RUN_DONE;
-	EVENT(handle, &event);
+	retval = _alpm_run_chroot(handle, SCRIPTLET_SHELL, argv, NULL, NULL);
 
 cleanup:
 	if(scriptfn && unlink(scriptfn)) {

lib/libalpm/trans.h

@@ -49,7 +49,7 @@ typedef struct _alpm_trans_t {
 void _alpm_trans_free(alpm_trans_t *trans);
 /* flags is a bitfield of alpm_transflag_t flags */
 int _alpm_trans_init(alpm_trans_t *trans, int flags);
-int _alpm_runscriptlet(alpm_handle_t *handle, const char *name, const char *filepath,
+int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
 		const char *script, const char *ver, const char *oldver, int is_archive);
 
 #endif /* ALPM_TRANS_H */

lib/libalpm/util.c

@@ -31,7 +31,6 @@
 #include <limits.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#include <fcntl.h>
 #include <fnmatch.h>
 #include <poll.h>
 #include <signal.h>
@@ -497,21 +496,18 @@ static int _alpm_chroot_write_to_child(alpm_handle_t *handle, int fd,
 	return 0;
 }
 
-static void _alpm_chroot_process_output(alpm_handle_t *handle, const char *name,
-		alpm_scriptlet_kind_t kind, const char *line)
+static void _alpm_chroot_process_output(alpm_handle_t *handle, const char *line)
 {
 	alpm_event_scriptlet_info_t event = {
 		.type = ALPM_EVENT_SCRIPTLET_INFO,
-		.kind = kind,
-		.name = name,
 		.line = line
 	};
 	alpm_logaction(handle, "ALPM-SCRIPTLET", "%s", line);
 	EVENT(handle, &event);
 }
 
-static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, const char *name,
-		alpm_scriptlet_kind_t kind, char *buf, ssize_t *buf_size, ssize_t buf_limit)
+static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd,
+		char *buf, ssize_t *buf_size, ssize_t buf_limit)
 {
 	ssize_t space = buf_limit - *buf_size - 2; /* reserve 2 for "\n\0" */
 	ssize_t nread = read(fd, buf + *buf_size, space);
@@ -523,7 +519,7 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, const cha
 				size_t linelen = newline - buf + 1;
 				char old = buf[linelen];
 				buf[linelen] = '\0';
-				_alpm_chroot_process_output(handle, name, kind, buf);
+				_alpm_chroot_process_output(handle, buf);
 				buf[linelen] = old;
 
 				*buf_size -= linelen;
@@ -533,14 +529,14 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, const cha
 		} else if(nread == space) {
 			/* we didn't read a full line, but we're out of space */
 			strcpy(buf + *buf_size, "\n");
-			_alpm_chroot_process_output(handle, name, kind, buf);
+			_alpm_chroot_process_output(handle, buf);
 			*buf_size = 0;
 		}
 	} else if(nread == 0) {
 		/* end-of-file */
 		if(*buf_size) {
 			strcpy(buf + *buf_size, "\n");
-			_alpm_chroot_process_output(handle, name, kind, buf);
+			_alpm_chroot_process_output(handle, buf);
 		}
 		return -1;
 	} else if(should_retry(errno)) {
@@ -549,7 +545,7 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, const cha
 		/* read error */
 		if(*buf_size) {
 			strcpy(buf + *buf_size, "\n");
-			_alpm_chroot_process_output(handle, name, kind, buf);
+			_alpm_chroot_process_output(handle, buf);
 		}
 		_alpm_log(handle, ALPM_LOG_ERROR,
 				_("unable to read from pipe (%s)\n"), strerror(errno));
@@ -585,16 +581,14 @@ static void _alpm_reset_signals(void)
 
 /** Execute a command with arguments in a chroot.
  * @param handle the context handle
- * @param name a human readable name to describe the command
- * @param kind what kind of scriptlet is running
  * @param cmd command to execute
  * @param argv arguments to pass to cmd
  * @param stdin_cb callback to provide input to the chroot on stdin
  * @param stdin_ctx context to be passed to @a stdin_cb
  * @return 0 on success, 1 on error
  */
-int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kind_t kind,
-		const char *cmd, char *const argv[], _alpm_cb_io stdin_cb, void *stdin_ctx)
+int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[],
+		_alpm_cb_io stdin_cb, void *stdin_ctx)
 {
 	pid_t pid;
 	int child2parent_pipefd[2], parent2child_pipefd[2];
@@ -655,15 +649,12 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 		close(parent2child_pipefd[HEAD]);
 		close(child2parent_pipefd[TAIL]);
 		close(child2parent_pipefd[HEAD]);
-
 		if(cwdfd >= 0) {
 			close(cwdfd);
 		}
 
 		/* use fprintf instead of _alpm_log to send output through the parent */
-		/* don't chroot() to "/": this allows running with less caps when the
-		 * caller puts us in the right root */
-		if(strcmp(handle->root, "/") != 0 && chroot(handle->root) != 0) {
+		if(chroot(handle->root) != 0) {
 			fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno));
 			exit(1);
 		}
@@ -683,38 +674,24 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 		_alpm_reset_signals();
 		execv(cmd, argv);
 		/* execv only returns if there was an error */
-		fprintf(stderr, _("%s: failed to execv '%s' (%s)\n"), name, cmd, strerror(errno));
+		fprintf(stderr, _("call to execv failed (%s)\n"), strerror(errno));
 		exit(1);
 	} else {
 		/* this code runs for the parent only (wait on the child) */
 		int status;
 		char obuf[PIPE_BUF]; /* writes <= PIPE_BUF are guaranteed atomic */
 		char ibuf[LINE_MAX];
-		char sciptlet_name[32];
 		ssize_t olen = 0, ilen = 0;
 		nfds_t nfds = 2;
 		struct pollfd fds[2], *child2parent = &(fds[0]), *parent2child = &(fds[1]);
 		int poll_ret;
 
-		switch(kind) {
-			case ALPM_SCRIPTLET_KIND_HOOK:
-				snprintf(sciptlet_name, 32, "hook '%s'", name);
-				break;
-			case ALPM_SCRIPTLET_KIND_INSTALL_FILE:
-				snprintf(sciptlet_name, 32, "'%s.install'", name);
-				break;
-			case ALPM_SCRIPTLET_KIND_COMMAND:
-				strncpy(sciptlet_name, "ldconfig", 32);
-				break;
-		}
-
 		child2parent->fd = child2parent_pipefd[TAIL];
 		child2parent->events = POLLIN;
 		fcntl(child2parent->fd, F_SETFL, O_NONBLOCK);
 		close(child2parent_pipefd[HEAD]);
 		close(parent2child_pipefd[TAIL]);
 
-
 		if(stdin_cb) {
 			parent2child->fd = parent2child_pipefd[HEAD];
 			parent2child->events = POLLOUT;
@@ -737,7 +714,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 				}
 			}
 			if(child2parent->revents & POLLIN) {
-				if(_alpm_chroot_read_from_child(handle, child2parent->fd, name, kind,
+				if(_alpm_chroot_read_from_child(handle, child2parent->fd,
 							ibuf, &ilen, sizeof(ibuf)) != 0) {
 					/* we encountered end-of-file or an error */
 					STOP_POLLING(child2parent);
@@ -760,7 +737,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 		if(ilen) {
 			/* buffer would have already been flushed if it had a newline */
 			strcpy(ibuf + ilen, "\n");
-			_alpm_chroot_process_output(handle, name, kind, ibuf);
+			_alpm_chroot_process_output(handle, ibuf);
 		}
 
 #undef STOP_POLLING
@@ -776,7 +753,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 
 		while(waitpid(pid, &status, 0) == -1) {
 			if(errno != EINTR) {
-				_alpm_log(handle, ALPM_LOG_ERROR, _("failed to run %s: call to waitpid failed (%s)\n"), sciptlet_name, strerror(errno));
+				_alpm_log(handle, ALPM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno));
 				retval = 1;
 				goto cleanup;
 			}
@@ -786,8 +763,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 		if(WIFEXITED(status)) {
 			_alpm_log(handle, ALPM_LOG_DEBUG, "call to waitpid succeeded\n");
 			if(WEXITSTATUS(status) != 0) {
-				_alpm_log(handle, ALPM_LOG_ERROR, _("%s did not complete sucessfully (%s exited %d)\n"),
-						sciptlet_name, cmd, WEXITSTATUS(status));
+				_alpm_log(handle, ALPM_LOG_ERROR, _("command failed to execute correctly\n"));
 				retval = 1;
 			}
 		} else if(WIFSIGNALED(status) != 0) {
@@ -796,8 +772,8 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kin
 			if(signal_description == NULL) {
 				signal_description = _("Unknown signal");
 			}
-			_alpm_log(handle, ALPM_LOG_ERROR, _("%s terminated by signal %d: %s\n"),
-						sciptlet_name, WTERMSIG(status), signal_description);
+			_alpm_log(handle, ALPM_LOG_ERROR, _("command terminated by signal %d: %s\n"),
+						WTERMSIG(status), signal_description);
 			retval = 1;
 		}
 	}
@@ -828,9 +804,10 @@ int _alpm_ldconfig(alpm_handle_t *handle)
 	if(access(line, F_OK) == 0) {
 		snprintf(line, PATH_MAX, "%s%s", handle->root, LDCONFIG);
 		if(access(line, X_OK) == 0) {
-			char *arg0 = strdup(LDCONFIG);
+			char arg0[32];
 			char *argv[] = { arg0, NULL };
-			return _alpm_run_chroot(handle, "ldconfig", ALPM_SCRIPTLET_KIND_COMMAND, LDCONFIG, argv, NULL, NULL);
+			strcpy(arg0, "ldconfig");
+			return _alpm_run_chroot(handle, LDCONFIG, argv, NULL, NULL);
 		}
 	}
 
@@ -865,17 +842,10 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename)
 	for(i = handle->cachedirs; i; i = i->next) {
 		snprintf(path, PATH_MAX, "%s%s", (char *)i->data,
 				filename);
-		if(stat(path, &buf) == 0) {
-			if(S_ISREG(buf.st_mode)) {
-				retpath = strdup(path);
-				_alpm_log(handle, ALPM_LOG_DEBUG, "found cached pkg: %s\n", retpath);
-				return retpath;
-			} else {
-				_alpm_log(handle, ALPM_LOG_WARNING,
-						"cached pkg '%s' is not a regular file: mode=%i\n", path, buf.st_mode);
-			}
-		} else if(errno != ENOENT) {
-			_alpm_log(handle, ALPM_LOG_WARNING, "could not open '%s'\n: %s", path, strerror(errno));
+		if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) {
+			retpath = strdup(path);
+			_alpm_log(handle, ALPM_LOG_DEBUG, "found cached pkg: %s\n", retpath);
+			return retpath;
 		}
 	}
 	/* package wasn't found in any cachedir */
@@ -1382,11 +1352,6 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a
 	size_t len = 0;
 	int ret = 0;
 
-	int flag = 0;
-#ifdef AT_SYMLINK_NOFOLLOW
-	flag |= AT_SYMLINK_NOFOLLOW;
-#endif
-
 	if(dir) {
 		char *check_path;
 
@@ -1394,11 +1359,11 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a
 		CALLOC(check_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 		snprintf(check_path, len, "%s%s", dir, file);
 
-		ret = faccessat(AT_FDCWD, check_path, amode, flag);
+		ret = access(check_path, amode);
 		free(check_path);
 	} else {
 		dir = "";
-		ret = faccessat(AT_FDCWD, file, amode, flag);
+		ret = access(file, amode);
 	}
 
 	if(ret != 0) {

lib/libalpm/util.h

@@ -129,8 +129,8 @@ ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, int fu
 
 typedef ssize_t (*_alpm_cb_io)(void *buf, ssize_t len, void *ctx);
 
-int _alpm_run_chroot(alpm_handle_t *handle, const char *name, alpm_scriptlet_kind_t kind,
-		const char *cmd, char *const argv[], _alpm_cb_io in_cb, void *in_ctx);
+int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[],
+		_alpm_cb_io in_cb, void *in_ctx);
 int _alpm_ldconfig(alpm_handle_t *handle);
 int _alpm_str_cmp(const void *s1, const void *s2);
 char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename);

meson.build

@@ -182,22 +182,7 @@ foreach type : [
   endif
 endforeach
 
-
-if conf.has('HAVE_GETMNTINFO')
-  if cc.compiles('''
-      #include <sys/types.h>
-      #include <sys/statvfs.h>
-
-      void func() {
-        struct statvfs *buf;
-        getmntinfo(&buf, 0);
-      }
-      ''')
-      conf.set('FSSTATSTYPE', 'struct statvfs')
-  else
-      conf.set('FSSTATSTYPE', 'struct statfs')
-  endif
-elif conf.has('HAVE_STRUCT_STATVFS_F_FLAG')
+if conf.has('HAVE_STRUCT_STATVFS_F_FLAG')
   conf.set('FSSTATSTYPE', 'struct statvfs')
 elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS')
   conf.set('FSSTATSTYPE', 'struct statfs')

proto/PKGBUILD-split.proto

@@ -28,7 +28,7 @@ changelog=
 source=("$pkgbase-$pkgver.tar.gz"
         "$pkgname-$pkgver.patch")
 noextract=()
-sha256sums=()
+md5sums=()
 validpgpkeys=()
 
 prepare() {

proto/PKGBUILD-vcs.proto

@@ -25,7 +25,7 @@ options=()
 install=
 source=('FOLDER::VCS+URL#FRAGMENT')
 noextract=()
-sha256sums=('SKIP')
+md5sums=('SKIP')
 
 # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for
 # a description of each element in the source array.

proto/PKGBUILD.proto

@@ -27,7 +27,7 @@ changelog=
 source=("$pkgname-$pkgver.tar.gz"
         "$pkgname-$pkgver.patch")
 noextract=()
-sha256sums=()
+md5sums=()
 validpgpkeys=()
 
 prepare() {

scripts/completion/zsh_completion.in

@@ -553,7 +553,7 @@ _pacman_conf_directive() {
 
 _pacman_conf_commands=(
 	{-l,--repo-list}'[List configured repositories]:*: :->repo_list'
-	{-h,--help}'[Output syntax and command line options]:*: :->complete'
+	{-h,--help}'[Output systax and command line options]:*: :->complete'
 	{-V,--version}'[Display version and exit]:*: :->complete'
 )
 
@@ -564,7 +564,7 @@ _pacman_conf_options=(
 
 _pacman_conf_options_common=(
 	'*'{-c,--config=}'[Specify an alternate configuration file]: :_files'
-	'*'{-R,--rootdir=}'[Specify an alternate installation root]: :_files'
+	'*'{-R,--rootdir=}'[Specify an alternate insallation root]: :_files'
 )
 
 _pacman_conf() {

scripts/libmakepkg/autodep.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_AUTODEP_SH" ]] && return
 LIBMAKEPKG_AUTODEP_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 declare -a autodep_functions
 
-for lib in "$MAKEPKG_LIBRARY/autodep/"*.sh; do
+for lib in "$LIBRARY/autodep/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/autodep/library_depends.sh.in

@@ -21,7 +21,7 @@
 [[ -n "$LIBMAKEPKG_AUTODEP_LIBRARY_DEPENDS_SH" ]] && return
 LIBMAKEPKG_AUTODEP_LIBRARY_DEPENDS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 autodep_functions+=('library_depends')
 

scripts/libmakepkg/autodep/library_provides.sh.in

@@ -21,7 +21,7 @@
 [[ -n "$LIBMAKEPKG_AUTODEP_LIBRARY_PROVIDES_SH" ]] && return
 LIBMAKEPKG_AUTODEP_LIBRARY_PROVIDES_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 autodep_functions+=('library_provides')
 

scripts/libmakepkg/buildenv.sh.in

@@ -22,12 +22,12 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return
 LIBMAKEPKG_BUILDENV_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 declare -a buildenv_functions build_options
 buildenv_vars=('CPPFLAGS' 'CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
 
-for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
+for lib in "$LIBRARY/buildenv/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/buildenv/buildflags.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH" ]] && return
 LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/option.sh"
 
 build_options+=('buildflags')
 

scripts/libmakepkg/buildenv/compiler.sh.in

@@ -23,9 +23,9 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_COMPILER_SH" ]] && return
 LIBMAKEPKG_BUILDENV_COMPILER_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/option.sh"
 
 build_options+=('ccache' 'distcc')
 buildenv_functions+=('buildenv_ccache' 'buildenv_distcc')

scripts/libmakepkg/buildenv/debugflags.sh.in

@@ -22,18 +22,17 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_DEBUGFLAGS_SH" ]] && return
 LIBMAKEPKG_BUILDENV_DEBUGFLAGS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/option.sh"
 
 buildenv_functions+=('buildenv_debugflags')
 
 buildenv_debugflags() {
 	if check_option "debug" "y" && ! check_option "buildflags" "n"; then
-		append_once DEBUG_CFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
-		append_once DEBUG_CXXFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
-		append_once CFLAGS "$DEBUG_CFLAGS"
-		append_once CXXFLAGS "$DEBUG_CXXFLAGS"
+		DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
+		DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
+		CFLAGS+=" $DEBUG_CFLAGS"
+		CXXFLAGS+=" $DEBUG_CXXFLAGS"
 	fi
 }

scripts/libmakepkg/buildenv/lto.sh.in

@@ -22,18 +22,17 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_LTO_SH" ]] && return
 LIBMAKEPKG_BUILDENV_LTO_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/option.sh"
 
 build_options+=('lto')
 buildenv_functions+=('buildenv_lto')
 
 buildenv_lto() {
 	if check_option "lto" "y" && ! check_option "buildflags" "n"; then
-		append_once CFLAGS "${LTOFLAGS:--flto}"
-		append_once CXXFLAGS "${LTOFLAGS:--flto}"
-		append_once LDFLAGS "${LTOFLAGS:--flto}"
+		CFLAGS+=" ${LTOFLAGS:--flto}"
+		CXXFLAGS+=" ${LTOFLAGS:--flto}"
+		LDFLAGS+=" ${LTOFLAGS:--flto}"
 	fi
 }

scripts/libmakepkg/buildenv/makeflags.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH" ]] && return
 LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/option.sh"
 
 build_options+=('makeflags')
 buildenv_functions+=('buildenv_makeflags')

scripts/libmakepkg/buildenv/rust.sh.in

@@ -21,17 +21,16 @@
 [[ -n "$LIBMAKEPKG_BUILDENV_RUST_SH" ]] && return
 LIBMAKEPKG_BUILDENV_RUST_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/option.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/option.sh"
 
 buildenv_var+=('RUSTFLAGS' 'DEBUG_RUSTFLAGS')
 buildenv_functions+=('buildenv_rust')
 
 buildenv_rust() {
 	if check_option "debug" "y" && ! check_option "buildflags" "n"; then
-		append_once DEBUG_RUSTFLAGS "--remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
-		append_once RUSTFLAGS "$DEBUG_RUSTFLAGS"
+		DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
+		RUSTFLAGS+=" $DEBUG_RUSTFLAGS"
 	fi
 }

scripts/libmakepkg/executable.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 declare -a executable_functions
 
-for lib in "$MAKEPKG_LIBRARY/executable/"*.sh; do
+for lib in "$LIBRARY/executable/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/executable/ccache.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_CCACHE_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_CCACHE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_ccache')
 

scripts/libmakepkg/executable/checksum.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_CHECKSUM_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_CHECKSUM_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 executable_functions+=('executable_checksum')
 

scripts/libmakepkg/executable/debugedit.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_debugedit')
 

scripts/libmakepkg/executable/distcc.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_DISTCC_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_DISTCC_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_distcc')
 

scripts/libmakepkg/executable/fakeroot.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_FAKEROOT_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_FAKEROOT_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 executable_functions+=('executable_fakeroot')
 

scripts/libmakepkg/executable/gpg.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_GPG_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_GPG_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_gpg')
 

scripts/libmakepkg/executable/gzip.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_GZIP_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_GZIP_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_gzip')
 

scripts/libmakepkg/executable/pacman.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_PACMAN_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_PACMAN_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 executable_functions+=('executable_pacman')
 

scripts/libmakepkg/executable/strip.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_STRIP_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_STRIP_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 executable_functions+=('executable_strip')
 

scripts/libmakepkg/executable/sudo.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_SUDO_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_SUDO_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 executable_functions+=('executable_sudo')
 

scripts/libmakepkg/executable/vcs.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_EXECUTABLE_VCS_SH" ]] && return
 LIBMAKEPKG_EXECUTABLE_VCS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/error.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/error.sh"
+source "$LIBRARY/util/message.sh"
 
 executable_functions+=('executable_vcs')
 

scripts/libmakepkg/integrity.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_INTEGRITY_SH" ]] && return
 LIBMAKEPKG_INTEGRITY_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
-for lib in "$MAKEPKG_LIBRARY/integrity/"*.sh; do
+for lib in "$LIBRARY/integrity/"*.sh; do
 	source "$lib"
 done
 
@@ -42,7 +42,4 @@ check_source_integrity() {
 		check_checksums "$@"
 		check_pgpsigs "$@"
 	fi
-	if (( VERIFYFUNC )); then
-		run_verify
-	fi
 }

scripts/libmakepkg/integrity/generate_checksum.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_INTEGRITY_GENERATE_CHECKSUM_SH" ]] && return
 LIBMAKEPKG_INTEGRITY_GENERATE_CHECKSUM_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
 
 generate_one_checksum() {
 	local integ=$1 arch=$2 sources numsrc indentsz idx
@@ -54,17 +54,7 @@ generate_one_checksum() {
 
 		case $proto in
 			bzr|git|hg|svn)
-				if declare -f "calc_checksum_$proto" > /dev/null; then
-					if ! sum=$("calc_checksum_$proto" "$netfile" "$integ"); then
-						local name
-						name=$(get_filename "$netfile")
-						error "$(gettext "Failure while calculating %s %s checksum")" "${name}" "${proto}"
-						plainerr "$(gettext "Aborting...")"
-						exit 1
-					fi
-				else
-					sum="SKIP"
-				fi
+				sum="SKIP"
 				;;
 			*)
 				if [[ ${netfile%%::*} != *.@(sig?(n)|asc) ]]; then

scripts/libmakepkg/integrity/generate_signature.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_INTEGRITY_GENERATE_SIGNATURE_SH" ]] && return
 LIBMAKEPKG_INTEGRITY_GENERATE_SIGNATURE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 create_signature() {
 	local ret=0

scripts/libmakepkg/integrity/verify_checksum.sh.in

@@ -21,12 +21,11 @@
 [[ -n "$LIBMAKEPKG_INTEGRITY_VERIFY_CHECKSUM_SH" ]] && return
 LIBMAKEPKG_INTEGRITY_CHECKSUM_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
-source "$MAKEPKG_LIBRARY/source.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
 
 check_checksums() {
 	local integ a
@@ -69,9 +68,9 @@ check_checksums() {
 }
 
 verify_integrity_one() {
-	local source_name=$1 integ=$2 expectedsum=$3 file proto realsum
+	local source_name=$1 integ=$2 expectedsum=$3
 
-	file="$(get_filename "$source_name")"
+	local file="$(get_filename "$source_name")"
 	printf '    %s ... ' "$file" >&2
 
 	if [[ $expectedsum = 'SKIP' ]]; then
@@ -79,18 +78,20 @@ verify_integrity_one() {
 		return
 	fi
 
-	proto="$(get_protocol "$source_name")"
-	if declare -f "calc_checksum_${proto}" > /dev/null; then
-		realsum=$("calc_checksum_${proto}" "$source_name" "$integ") || return 1
-	else
-		realsum=$(calc_checksum_file "$source_name" "$integ") || return 1
+	if ! file="$(get_filepath "$file")"; then
+		printf '%s\n' "$(gettext "NOT FOUND")" >&2
+		return 1
 	fi
 
-	if [[ ${expectedsum,,} != "$realsum" ]]; then
+	local realsum="$("${integ}sum" "$file")"
+	realsum="${realsum%% *}"
+	if [[ ${expectedsum,,} = "$realsum" ]]; then
+		printf '%s\n' "$(gettext "Passed")" >&2
+	else
 		printf '%s\n' "$(gettext "FAILED")" >&2
 		return 1
 	fi
-	printf '%s\n' "$(gettext "Passed")" >&2
+
 	return 0
 }
 

scripts/libmakepkg/integrity/verify_signature.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_INTEGRITY_VERIFY_SIGNATURE_SH" ]] && return
 LIBMAKEPKG_INTEGRITY_VERIFY_SIGNATURE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 check_pgpsigs() {
 	(( SKIPPGPCHECK )) && return 0

scripts/libmakepkg/lint_config.sh.in

@@ -21,15 +21,15 @@
 [[ -n "$LIBMAKEPKG_LINT_CONFIG_SH" ]] && return
 LIBMAKEPKG_LINT_CONFIG_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'/usr/share/makepkg'}
+LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/util.sh"
 
 
 declare -a lint_config_functions
 
-for lib in "$MAKEPKG_LIBRARY/lint_config/"*.sh; do
+for lib in "$LIBRARY/lint_config/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/lint_config/ext.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_CONFIG_EXT_SH" ]] && return
 LIBMAKEPKG_LINT_CONFIG_EXT_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_config_functions+=('lint_ext')
 

scripts/libmakepkg/lint_config/paths.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_CONFIG_PATHS_SH" ]] && return
 LIBMAKEPKG_LINT_CONFIG_PATHS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 lint_config_functions+=('lint_paths')
 

scripts/libmakepkg/lint_config/source_date_epoch.sh.in

@@ -21,9 +21,9 @@
 [[ -n $LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH ]] && return
 LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_config_functions+=('lint_source_date_epoch')
 

scripts/libmakepkg/lint_config/variable.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_CONFIG_VARIABLE_SH" ]] && return
 LIBMAKEPKG_LINT_CONFIG_VARIABLE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_config_functions+=('lint_config_variables')
 

scripts/libmakepkg/lint_package.sh.in

@@ -21,15 +21,15 @@
 [[ -n "$LIBMAKEPKG_LINT_PACKAGE_SH" ]] && return
 LIBMAKEPKG_LINT_PACKAGE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/util.sh"
 
 
 declare -a lint_package_functions
 
-for lib in "$MAKEPKG_LIBRARY/lint_package/"*.sh; do
+for lib in "$LIBRARY/lint_package/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/lint_package/build_references.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH" ]] && return
 LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_package_functions+=('warn_build_references')
 

scripts/libmakepkg/lint_package/dotfiles.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH" ]] && return
 LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_package_functions+=('check_dotfiles')
 

scripts/libmakepkg/lint_package/file_names.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PACKAGE_FILE_NAMES_SH" ]] && return
 LIBMAKEPKG_LINT_PACKAGE_FILE_NAMES_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 lint_package_functions+=('lint_file_names')
 

scripts/libmakepkg/lint_package/missing_backup.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH" ]] && return
 LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_package_functions+=('warn_missing_backup')

scripts/libmakepkg/lint_pkgbuild.sh.in

@@ -21,14 +21,14 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 declare -a lint_pkgbuild_functions
 
-for lib in "$MAKEPKG_LIBRARY/lint_pkgbuild/"*.sh; do
+for lib in "$LIBRARY/lint_pkgbuild/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/lint_pkgbuild/arch.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_ARCH_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_ARCH_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_arch')

scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_ARCH_SPECIFIC_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_ARCH_SPECIFIC_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
+source "$LIBRARY/util/util.sh"
 
 
 lint_pkgbuild_functions+=('lint_arch_specific')

scripts/libmakepkg/lint_pkgbuild/backup.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_BACKUP_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_BACKUP_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_backup')

scripts/libmakepkg/lint_pkgbuild/changelog.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CHANGELOG_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_CHANGELOG_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/util.sh"
 
 
 lint_pkgbuild_functions+=('lint_changelog')

scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_checkdepends')

scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_conflicts')

scripts/libmakepkg/lint_pkgbuild/depends.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_depends')

scripts/libmakepkg/lint_pkgbuild/epoch.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_EPOCH_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_EPOCH_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_epoch')

scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/epoch.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgrel.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgver.sh"
+source "$LIBRARY/lint_pkgbuild/epoch.sh"
+source "$LIBRARY/lint_pkgbuild/pkgrel.sh"
+source "$LIBRARY/lint_pkgbuild/pkgver.sh"
 
 
 check_fullpkgver() {

scripts/libmakepkg/lint_pkgbuild/install.sh.in

@@ -21,11 +21,11 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_INSTALL_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_INSTALL_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/util.sh"
 
 
 lint_pkgbuild_functions+=('lint_install')

scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_makedepends')

scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_OPTDEPENDS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_OPTDEPENDS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_optdepends')

scripts/libmakepkg/lint_pkgbuild/options.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_OPTIONS_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_OPTIONS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_options')

scripts/libmakepkg/lint_pkgbuild/package_function.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PACKAGE_FUNCTION_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PACKAGE_FUNCTION_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_package_function')

scripts/libmakepkg/lint_pkgbuild/package_function_variable.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PACKAGE_FUNCTION_VARIABLE_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PACKAGE_FUNCTION_VARIABLE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
+source "$LIBRARY/util/util.sh"
 
 
 lint_pkgbuild_functions+=('lint_package_function_variable')

scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_pkgbase')

scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGLIST_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PKGLIST_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/util.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/util.sh"
 
 
 lint_pkgbuild_functions+=('lint_pkglist')

scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGNAME_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PKGNAME_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_pkgname')

scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGREL_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PKGREL_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_pkgrel')

scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGVER_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PKGVER_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_pkgver')

scripts/libmakepkg/lint_pkgbuild/provides.sh.in

@@ -21,12 +21,12 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PROVIDES_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_PROVIDES_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/fullpkgver.sh"
-source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgname.sh"
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/lint_pkgbuild/fullpkgver.sh"
+source "$LIBRARY/lint_pkgbuild/pkgname.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 lint_pkgbuild_functions+=('lint_provides')

scripts/libmakepkg/lint_pkgbuild/source.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_SOURCE_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_SOURCE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 lint_pkgbuild_functions+=('lint_source')

scripts/libmakepkg/lint_pkgbuild/util.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_UTIL_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_UTIL_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 check_files_exist() {

scripts/libmakepkg/lint_pkgbuild/variable.sh.in

@@ -21,14 +21,14 @@
 [[ -n "$LIBMAKEPKG_LINT_PKGBUILD_VARIABLE_SH" ]] && return
 LIBMAKEPKG_LINT_PKGBUILD_VARIABLE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
 
 lint_pkgbuild_functions+=('lint_variable')
-lint_pkgbuild_functions+=('lint_array')
+
 
 lint_variable() {
 	local i a pkg out bad ret=0
@@ -95,21 +95,3 @@ lint_variable() {
 
 	return $ret
 }
-
-lint_array() {
-	local i var ret=0
-
-	for i in ${pkgbuild_schema_arrays[@]}; do
-		local l=()
-		get_pkgbuild_all_split_attributes $i l
-
-		for var in "${l[@]}"; do
-			if [[ -z $var ]]; then
-				error "$(gettext "%s does not allow empty values.")" "$i"
-				ret=1
-			fi
-		done
-	done
-
-	return $ret
-}

scripts/libmakepkg/reproducible.sh.in

@@ -21,9 +21,9 @@
 [[ -n "$LIBMAKEPKG_REPRODUCIBLE_SH" ]] && return
 LIBMAKEPKG_REPRODUCIBLE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 
-for lib in "$MAKEPKG_LIBRARY/reproducible/"*.sh; do
+for lib in "$LIBRARY/reproducible/"*.sh; do
 	source "$lib"
 done

scripts/libmakepkg/reproducible/python.sh.in

@@ -22,7 +22,7 @@
 LIBMAKEPKG_REPRODUCIBLE_PYTHON_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 
 # disable hash randomization when creating .pyc files

scripts/libmakepkg/source.sh.in

@@ -21,14 +21,14 @@
 [[ -n "$LIBMAKEPKG_SOURCE_SH" ]] && return
 LIBMAKEPKG_SOURCE_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/source.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/source.sh"
 
 
-for lib in "$MAKEPKG_LIBRARY/source/"*.sh; do
+for lib in "$LIBRARY/source/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/source/bzr.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_BZR_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_bzr() {
@@ -109,29 +109,3 @@ extract_bzr() {
 
 	popd &>/dev/null
 }
-
-calc_checksum_bzr() {
-	local netfile=$1 integ=$2 ret=0 shellopts dir url fragment fragval sum
-
-	# this function requires pipefail - save current status to restore later
-	shellopts=$(shopt -p -o pipefail)
-	shopt -s -o pipefail
-
-	dir=$(get_filepath "$netfile")
-	url=$(get_url "$netfile")
-	fragment=$(get_uri_fragment "$url")
-
-	case ${fragment%%=*} in
-		revision)
-			fragval=${fragment##*=}
-			sum=$(bzr export --directory "$dir" --format tar --revision "$fragval" - | "${integ}sum" 2>&1) || ret=1
-			sum="${sum%% *}"
-			;;
-		*)
-			sum="SKIP"
-	esac
-
-	eval "$shellopts"
-	printf '%s' "$sum"
-	return $ret
-}

scripts/libmakepkg/source/file.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_FILE_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_file() {
@@ -151,18 +151,3 @@ extract_file() {
 		chown -R 0:0 "$srcdir"
 	fi
 }
-
-calc_checksum_file() {
-	local netfile=$1 integ=$2 ret=0 file sum
-
-	if ! file="$(get_filepath "$netfile")"; then
-		printf '%s\n' "$(gettext "NOT FOUND")" >&2
-		return 1
-	fi
-
-	sum="$("${integ}sum" "$file")" || ret=1
-	sum="${sum%% *}"
-
-	printf '%s' "$sum"
-	return $ret
-}

scripts/libmakepkg/source/fossil.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_FOSSIL_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 download_fossil() {
 	# abort early if parent says not to fetch

scripts/libmakepkg/source/git.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_GIT_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_git() {
@@ -48,7 +48,7 @@ download_git() {
 
 	if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then
 		msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
-		if ! git clone --origin=origin ${GITFLAGS:---mirror} "$url" "$dir"; then
+		if ! git clone ${GITFLAGS:---mirror} "$url" "$dir"; then
 			error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
 			plainerr "$(gettext "Aborting...")"
 			exit 1
@@ -56,8 +56,7 @@ download_git() {
 	elif (( ! HOLDVER )); then
 		cd_safe "$dir"
 		# Make sure we are fetching the right repo
-		local remote_url="$(git config --get remote.origin.url)"
-		if [[ "${url%%.git}" != "${remote_url%%.git}" ]] ; then
+		if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then
 			error "$(gettext "%s is not a clone of %s")" "$dir" "$url"
 			plainerr "$(gettext "Aborting...")"
 			exit 1
@@ -92,7 +91,7 @@ extract_git() {
 			exit 1
 		fi
 		cd_safe "$srcdir"
-	elif ! git clone --origin=origin -s "$dir" "${dir##*/}"; then
+	elif ! git clone -s "$dir" "${dir##*/}"; then
 		error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git"
 		plainerr "$(gettext "Aborting...")"
 		exit 1
@@ -135,30 +134,3 @@ extract_git() {
 
 	popd &>/dev/null
 }
-
-calc_checksum_git() {
-	local netfile=$1 integ=$2 ret=0 shellopts dir url fragment sum
-
-	# this function requires pipefail - save current status to restore later
-	shellopts=$(shopt -p -o pipefail)
-	shopt -s -o pipefail
-
-	dir=$(get_filepath "$netfile")
-	url=$(get_url "$netfile")
-	fragment=$(get_uri_fragment "$url")
-
-	case ${fragment%%=*} in
-		tag|commit)
-			fragval=${fragment##*=}
-			sum=$(git -c core.abbrev=no -C "$dir" archive --format tar "$fragval" | "${integ}sum" 2>&1) || ret=1
-			sum="${sum%% *}"
-			;;
-		*)
-			sum="SKIP"
-			;;
-	esac
-
-	eval "$shellopts"
-	printf '%s' "$sum"
-	return $ret
-}

scripts/libmakepkg/source/hg.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_HG_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_hg() {
@@ -111,30 +111,3 @@ extract_hg() {
 
 	popd &>/dev/null
 }
-
-calc_checksum_hg() {
-	local netfile=$1 integ=$2 ret=0 shellopts dir url fragment fragval sum
-
-	# this function requires pipefail - save current status to restore later
-	shellopts=$(shopt -p -o pipefail)
-	shopt -s -o pipefail
-
-	dir=$(get_filepath "$netfile")
-	url=$(get_url "$netfile")
-	fragment=$(get_uri_fragment "$url")
-
-	case ${fragment%%=*} in
-		tag|revision)
-			fragval=${fragment##*=}
-			sum=$(hg --repository "$dir" archive --type tar --rev "$fragval" - | "${integ}sum" 2>&1) || ret=1
-			sum="${sum%% *}"
-			;;
-		*)
-			sum="SKIP"
-			;;
-	esac
-
-	eval "$shellopts"
-	printf '%s' "$sum"
-	return $ret
-}

scripts/libmakepkg/source/local.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_LOCAL_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_local() {

scripts/libmakepkg/source/svn.sh.in

@@ -22,10 +22,10 @@
 LIBMAKEPKG_SOURCE_SVN_SH=1
 
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/pkgbuild.sh"
 
 
 download_svn() {

scripts/libmakepkg/srcinfo.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_SRCINFO_SH" ]] && return
 LIBMAKEPKG_SRCINFO_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/pkgbuild.sh"
-source "$MAKEPKG_LIBRARY/util/schema.sh"
+source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
 
 srcinfo_open_section() {
 	printf '%s = %s\n' "$1" "$2"

scripts/libmakepkg/tidy.sh.in

@@ -22,14 +22,14 @@
 [[ -n "$LIBMAKEPKG_TIDY_SH" ]] && return
 LIBMAKEPKG_TIDY_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
+source "$LIBRARY/util/message.sh"
 
 
 declare -a packaging_options tidy_remove tidy_modify
 
-for lib in "$MAKEPKG_LIBRARY/tidy/"*.sh; do
+for lib in "$LIBRARY/tidy/"*.sh; do
 	source "$lib"
 done
 

scripts/libmakepkg/tidy/docs.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_TIDY_DOCS_SH" ]] && return
 LIBMAKEPKG_TIDY_DOCS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 packaging_options+=('docs')
 tidy_remove+=('tidy_docs')

scripts/libmakepkg/tidy/emptydirs.sh.in

@@ -21,10 +21,10 @@
 [[ -n "$LIBMAKEPKG_TIDY_EMPTYDIRS_SH" ]] && return
 LIBMAKEPKG_TIDY_EMPTYDIRS_SH=1
 
-MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$MAKEPKG_LIBRARY/util/message.sh"
-source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
 
 
 packaging_options+=('emptydirs')