diff --git a/configure b/configure index d53628f..b275ca2 100755 --- a/configure +++ b/configure @@ -19312,9 +19312,7 @@ if test "$PERL" = "no" || test ! -x "$PERL"; then fi # Let the user override the variable. if test -z "$PERL_LIBDIR"; then -PERL_LIBDIR=$($PERL -MConfig -e 'my $r = $Config{vendorlibexp}; - $r =~ s/$Config{vendorprefixexp}/\$(prefix)/; - print $r') +PERL_LIBDIR="$prefix/perl" fi diff --git a/scripts/Dpkg/Checksums.pm b/scripts/Dpkg/Checksums.pm index 41865f3..c61cbca 100644 --- a/scripts/Dpkg/Checksums.pm +++ b/scripts/Dpkg/Checksums.pm @@ -51,15 +51,15 @@ about supported checksums. my $CHECKSUMS = { md5 => { - program => [ 'md5sum' ], + program => [ 'md5', '-q' ], regex => qr/[0-9a-f]{32}/, }, sha1 => { - program => [ 'sha1sum' ], + program => [ 'shasum', '-a', '1' ], regex => qr/[0-9a-f]{40}/, }, sha256 => { - program => [ 'sha256sum' ], + program => [ 'shasum', '-a', '256' ], regex => qr/[0-9a-f]{64}/, }, }; diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index 2f76ea9..8eaebde 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/scripts/Dpkg/Source/Archive.pm @@ -48,7 +48,7 @@ sub create { $spawn_opts{from_pipe} = \*$self->{tar_input}; # Call tar creation process $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; - $spawn_opts{exec} = [ 'tar', '--null', '-T', '-', '--numeric-owner', + $spawn_opts{exec} = [ 'gtar', '--null', '-T', '-', '--numeric-owner', '--owner', '0', '--group', '0', '--format=gnu', @{$opts{options}}, '-cf', '-' ]; *$self->{pid} = spawn(%spawn_opts); @@ -125,7 +125,7 @@ sub extract { # Call tar extraction process $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; - $spawn_opts{exec} = [ 'tar', '--no-same-owner', '--no-same-permissions', + $spawn_opts{exec} = [ 'gtar', '--no-same-owner', '--no-same-permissions', @{$opts{options}}, '-xf', '-' ]; spawn(%spawn_opts); $self->close(); diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8ffae3a..12ceb32 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -120,7 +120,7 @@ nobase_dist_perllib_DATA = \ man3_MANS = do_perl_subst = $(AM_V_GEN) \ - sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \ + sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL) -I$(PERL_LIBDIR):" \ -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \ -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \ -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 754f423..e131341 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -513,7 +513,7 @@ nobase_dist_perllib_DATA = \ # Keep it even if empty to have man3dir correctly set man3_MANS = do_perl_subst = $(AM_V_GEN) \ - sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \ + sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL) -I$(PERL_LIBDIR):" \ -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \ -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \ -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \