Merge branch 'maint'

Conflicts:
	scripts/repo-add.sh.in

1 files changed, 5 insertions, 0 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8b3c80ce..125f68c7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1497,6 +1497,11 @@ check_sanity() {
 			error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname"
 			ret=1
 		fi
+		if [[ $i = *[^[:alnum:]+_.@-]* ]]; then
+			error "$(gettext "%s contains invalid characters: '%s'")" \
+					'pkgname' "${pkgname//[[:alnum:]+_.@-]}"
+			ret=1
+		fi
 	done
 
 	if [[ ${pkgbase:0:1} = "-" ]]; then