--- pve-access-control/src/Makefile.alt	2021-06-01 09:29:49.000000000 +0000
+++ pve-access-control/src/Makefile	2021-07-27 14:16:29.588439512 +0000
@@ -1,10 +1,5 @@
-include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
-
 PACKAGE=libpve-access-control
 
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
-
 DESTDIR=
 PREFIX=/usr
 BINDIR=${PREFIX}/bin
@@ -12,7 +7,7 @@ SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
 MAN1DIR=${MANDIR}/man1/
-BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
+BASHCOMPLDIR=/etc/bash_completion.d/
 ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 
 export PERLDIR=${PREFIX}/share/perl5
@@ -21,11 +16,11 @@ export PERLDIR=${PREFIX}/share/perl5
 all:
 
 pveum.bash-completion: PVE/CLI/pveum.pm
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
+	perl -I../data -I../../data -I../data/PVE -I../../data/PVE -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 pveum.zsh-completion: PVE/CLI/pveum.pm
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_zsh_completions();" >$@.tmp
+	perl -I../data -I../../data -I../data/PVE -I../../data/PVE -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_zsh_completions();" >$@.tmp
 	mv $@.tmp $@
 
 .PHONY: install
@@ -44,7 +39,7 @@ install: pveum.1 oathkeygen pveum.bash-c
 .PHONY: test
 test:
 	perl -I. ./pveum verifyapi
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
+	perl -I../data -I../../data -I../data/PVE -I../../data/PVE -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 	make -C test check
 
 .PHONY: clean distclean
--- pve-access-control/src/PVE/Auth/PAM.pm.alt	2021-06-01 09:29:49.000000000 +0000
+++ pve-access-control/src/PVE/Auth/PAM.pm	2021-07-27 14:20:27.409180812 +0000
@@ -27,7 +27,7 @@ sub authenticate_user {
     # user (www-data) need to be able to read /etc/passwd /etc/shadow
     die "no password\n" if !$password;
 
-    my $pamh = new Authen::PAM('proxmox-ve-auth', $username, sub {
+    my $pamh = new Authen::PAM('passwd', $username, sub {
 	my @res;
 	while(@_) {
 	    my $msg_type = shift;
--- pve-access-control/src/PVE/Auth/Plugin.pm.alt	2021-06-01 09:29:49.000000000 +0000
+++ pve-access-control/src/PVE/Auth/Plugin.pm	2021-07-27 14:20:27.409180812 +0000
@@ -224,7 +224,7 @@ sub parse_config {
     # add default domains
 
     $cfg->{ids}->{pve}->{type} = 'pve'; # force type
-    $cfg->{ids}->{pve}->{comment} = "Proxmox VE authentication server"
+    $cfg->{ids}->{pve}->{comment} = "PVE authentication server"
 	if !$cfg->{ids}->{pve}->{comment};
 
     $cfg->{ids}->{pam}->{type} = 'pam'; # force type