X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Lib.pm;h=960f2721e6444a2fc619bb402a524de2d536ca35;hb=ded6ce59e1ba8fb00122297948e8589001b96909;hp=f42f8bd2820c172a473d9bcb570152adec60d725;hpb=4f162e192c3563d740490cc99ced1513104ac34c;p=debhelper.git

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index f42f8bd..960f272 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -2,7 +2,7 @@
 #
 # Library functions for debhelper programs, perl version.
 #
-# Joey Hess, GPL copyright 1997-2000.
+# Joey Hess, GPL copyright 1997-2008.
 
 package Debian::Debhelper::Dh_Lib;
 use strict;
@@ -13,35 +13,27 @@ use vars qw(@ISA @EXPORT %dh);
 @EXPORT=qw(&init &doit &complex_doit &verbose_print &error &warning &tmpdir
 	    &pkgfile &pkgext &pkgfilename &isnative &autoscript &filearray
 	    &filedoublearray &getpackages &basename &dirname &xargs %dh
-	    &compat &addsubstvar &delsubstvar &excludefile &is_udeb
-	    &udeb_filename);
+	    &compat &addsubstvar &delsubstvar &excludefile &package_arch
+	    &is_udeb &udeb_filename &debhelper_script_subst &escape_shell
+	    &inhibit_log &load_log &write_log &dpkg_architecture_value
+	    &sourcepackage
+	    &is_make_jobserver_unavailable &clean_jobserver_makeflags);
 
-my $max_compat=4;
+my $max_compat=7;
 
 sub init {
-	# If DH_OPTIONS is set, prepend it @ARGV.
-	if (defined($ENV{DH_OPTIONS})) {
-		# Ignore leading/trailing whitespace.
-		$ENV{DH_OPTIONS}=~s/^\s+//;
-		$ENV{DH_OPTIONS}=~s/\s+$//;
-		unshift @ARGV,split(/\s+/,$ENV{DH_OPTIONS});
-	}
+	my %params=@_;
 
-	# Check to see if an argument on the command line starts with a dash.
-	# if so, we need to pass this off to the resource intensive 
+	# Check to see if an option line starts with a dash,
+	# or DH_OPTIONS is set.
+	# If so, we need to pass this off to the resource intensive 
 	# Getopt::Long, which I'd prefer to avoid loading at all if possible.
-	my $parseopt=undef;
-	my $arg;
-	foreach $arg (@ARGV) {
-		if ($arg=~m/^-/) {
-			$parseopt=1;
-			last;
-		}       
-	}
-	if ($parseopt) {
+	if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) ||
+ 	    (defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) ||
+	    grep /^-/, @ARGV) {
 		eval "use Debian::Debhelper::Dh_Getopt";
-		error($!) if $@;
-		%dh=Debian::Debhelper::Dh_Getopt::parseopts();
+		error($@) if $@;
+		Debian::Debhelper::Dh_Getopt::parseopts($params{options});
 	}
 
 	# Another way to set excludes.
@@ -55,8 +47,8 @@ sub init {
 		foreach (@{$dh{EXCLUDE}}) {
 			my $x=$_;
 			$x=escape_shell($x);
-			$x=~s/\./\\./g;
-			$dh{EXCLUDE_FIND}.="-regex .*$x.* -or ";
+			$x=~s/\./\\\\./g;
+			$dh{EXCLUDE_FIND}.="-regex .\\*$x.\\* -or ";
 		}
 		$dh{EXCLUDE_FIND}=~s/ -or $//;
 	}
@@ -84,9 +76,6 @@ sub init {
 	# Check if packages to build have been specified, if not, fall back to
 	# the default, doing them all.
 	if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
-		if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
-			error("You asked that all arch in(dep) packages be built, but there are none of that type.");
-		}
 		push @{$dh{DOPACKAGES}},@allpackages;
 	}
 
@@ -100,6 +89,53 @@ sub init {
 	# This package gets special treatement: files and directories specified on
 	# the command line may affect it.
 	$dh{FIRSTPACKAGE}=${$dh{DOPACKAGES}}[0];
+
+	# If no error handling function was specified, just propigate
+	# errors out.
+	if (! exists $dh{ERROR_HANDLER} || ! defined $dh{ERROR_HANDLER}) {
+		$dh{ERROR_HANDLER}='exit \$?';
+	}
+}
+
+# Run at exit. Add the command to the log files for the packages it acted
+# on, if it's exiting successfully.
+my $write_log=1;
+sub END {
+	if ($? == 0 && $write_log) {
+		write_log(basename($0), @{$dh{DOPACKAGES}});
+	}
+}
+
+sub load_log {
+	my ($package, $db)=@_;
+	my $ext=pkgext($package);
+
+	my @log;
+	open(LOG, "<", "debian/${ext}debhelper.log") || return;
+	while (<LOG>) {
+		chomp;
+		push @log, $_;
+		$db->{$package}{$_}=1 if defined $db;
+	}
+	close LOG;
+	return @log;
+}
+
+sub write_log {
+	my $cmd=shift;
+	my @packages=@_;
+
+	foreach my $package (@packages) {
+		my $ext=pkgext($package);
+		my $log="debian/${ext}debhelper.log";
+		open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
+		print LOG $cmd."\n";
+		close LOG;
+	}
+}
+
+sub inhibit_log {
+	$write_log=0;
 }
 
 # Pass it an array containing the arguments of a shell command like would
@@ -140,8 +176,7 @@ sub doit {
 	verbose_print(escape_shell(@_));
 
 	if (! $dh{NO_ACT}) {
-		my $ret=system(@_);
-		$ret == 0 || error("command returned error code $ret");
+		system(@_) == 0 || _error_exitcode(join(" ", @_));
 	}
 }
 
@@ -154,11 +189,23 @@ sub complex_doit {
 	
 	if (! $dh{NO_ACT}) {
 		# The join makes system get a scalar so it forks off a shell.
-		system(join(" ",@_)) == 0
-			|| error("command returned error code");
+		system(join(" ", @_)) == 0 || _error_exitcode(join(" ", @_))
 	}			
 }
 
+sub _error_exitcode {
+	my $command=shift;
+	if ($? == -1) {
+		error("$command failed to to execute: $!");
+	}
+	elsif ($? & 127) {
+		error("$command died with signal ".($? & 127));
+        }
+	else {
+		error("$command returned exit code ".($? >> 8));
+	}
+}
+
 # Run a command that may have a huge number of arguments, like xargs does.
 # Pass in a reference to an array containing the arguments, and then other
 # parameters that are the command and any parameters that should be passed to
@@ -239,25 +286,44 @@ sub dirname {
 
 # Pass in a number, will return true iff the current compatibility level
 # is less than or equal to that number.
-sub compat {
-	my $num=shift;
+{
+	my $warned_compat=0;
+	my $c;
+
+	sub compat {
+		my $num=shift;
 	
-	my $c=1;
-	if (defined $ENV{DH_COMPAT}) {
-		$c=$ENV{DH_COMPAT};
-	}
-	elsif (-e 'debian/compat') {
-		# Try the file..
-		open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
-		$c=<COMPAT_IN>;
-		chomp $c;
-	}
+		if (! defined $c) {
+			$c=1;
+			if (defined $ENV{DH_COMPAT}) {
+				$c=$ENV{DH_COMPAT};
+			}
+			elsif (-e 'debian/compat') {
+				# Try the file..
+				open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
+				my $l=<COMPAT_IN>;
+				close COMPAT_IN;
+				if (! defined $l || ! length $l) {
+					warning("debian/compat is empty, assuming level $c");
+				}
+				else {
+					chomp $l;
+					$c=$l;
+				}
+			}
+		}
 
-	if ($c > $max_compat) {
-		error("Sorry, but $max_compat is the highest compatibility level of debhelper currently supported.");
-	}
+		if ($c <= 4 && ! $warned_compat) {
+			warning("Compatibility levels before 5 are deprecated.");
+			$warned_compat=1;
+		}
+	
+		if ($c > $max_compat) {
+			error("Sorry, but $max_compat is the highest compatibility level supported by this debhelper.");
+		}
 
-	return ($c <= $num);
+		return ($c <= $num);
+	}
 }
 
 # Pass it a name of a binary package, it returns the name of the tmp dir to
@@ -282,12 +348,15 @@ sub tmpdir {
 #
 # It tries several filenames:
 #   * debian/package.filename.buildarch
+#   * debian/package.filename.buildos
 #   * debian/package.filename
-#   * debian/file (if the package is the main package)
-# If --name was specified then tonly the first two are tried, and they must
-# have the name after the pacage name:
+#   * debian/filename (if the package is the main package)
+# If --name was specified then the files
+# must have the name after the package name:
 #   * debian/package.name.filename.buildarch
+#   * debian/package.name.filename.buildos
 #   * debian/package.name.filename
+#   * debian/name.filename (if the package is the main package)
 sub pkgfile {
 	my $package=shift;
 	my $filename=shift;
@@ -296,18 +365,23 @@ sub pkgfile {
 		$filename="$dh{NAME}.$filename";
 	}
 	
-	if (-f "debian/$package.$filename.".buildarch()) {
-		return "debian/$package.$filename.".buildarch();
-	}
-	elsif (-f "debian/$package.$filename") {
-		return "debian/$package.$filename";
+	my @try=("debian/$package.$filename.".buildarch(),
+		 "debian/$package.$filename.".buildos(),
+		 "debian/$package.$filename");
+	if ($package eq $dh{MAINPACKAGE}) {
+		push @try, "debian/$filename";
 	}
-	elsif ($package eq $dh{MAINPACKAGE} && -f "debian/$filename") {
-		return "debian/$filename";
-	}
-	else {
-		return "";
+	
+	foreach my $file (@try) {
+		if (-f $file &&
+		    (! $dh{IGNORE} || ! exists $dh{IGNORE}->{$file})) {
+			return $file;
+		}
+
 	}
+
+	return "";
+
 }
 
 # Pass it a name of a binary package, it returns the name to prefix to files
@@ -381,7 +455,7 @@ sub autoscript {
 	my $filename=shift;
 	my $sed=shift || "";
 
-	# This is the file we will append to.
+	# This is the file we will modify.
 	my $outfile="debian/".pkgext($package)."$script.debhelper";
 
 	# Figure out what shell script snippet to use.
@@ -399,9 +473,20 @@ sub autoscript {
 		}
 	}
 
-	complex_doit("echo \"# Automatically added by ".basename($0)."\">> $outfile");
-	complex_doit("sed \"$sed\" $infile >> $outfile");
-	complex_doit("echo '# End automatically added section' >> $outfile");
+	if (-e $outfile && ($script eq 'postrm' || $script eq 'prerm')
+	   && !compat(5)) {
+		# Add fragments to top so they run in reverse order when removing.
+		complex_doit("echo \"# Automatically added by ".basename($0)."\"> $outfile.new");
+		complex_doit("sed \"$sed\" $infile >> $outfile.new");
+		complex_doit("echo '# End automatically added section' >> $outfile.new");
+		complex_doit("cat $outfile >> $outfile.new");
+		complex_doit("mv $outfile.new $outfile");
+	}
+	else {
+		complex_doit("echo \"# Automatically added by ".basename($0)."\">> $outfile");
+		complex_doit("sed \"$sed\" $infile >> $outfile");
+		complex_doit("echo '# End automatically added section' >> $outfile");
+	}
 }
 
 # Removes a whole substvar line.
@@ -453,7 +538,7 @@ sub addsubstvar {
 		else {
 			delete $items{$str};
 		}
-		$line=join(", ", keys %items);
+		$line=join(", ", sort keys %items);
 	}
 	elsif (! $remove) {
 		$line=$str;
@@ -480,6 +565,11 @@ sub filedoublearray {
 	my @ret;
 	open (DH_FARRAY_IN, $file) || error("cannot read $file: $1");
 	while (<DH_FARRAY_IN>) {
+		chomp;
+		# Only ignore comments and empty lines in v5 mode.
+		if (! compat(4)) {
+			next if /^#/ || /^$/;
+		}
 		my @line;
 		# Only do glob expansion in v3 mode.
 		#
@@ -517,23 +607,69 @@ sub excludefile {
         return 0;
 }
 
+sub dpkg_architecture_value {
+	my $var = shift;
+	my $value=`dpkg-architecture -q$var` || error("dpkg-architecture failed");
+	chomp $value;
+	return $value;
+}
+
 # Returns the build architecture. (Memoized)
 {
 	my $arch;
 	
 	sub buildarch {
-  		return $arch if defined $arch;
-
-		$arch=`dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null` || error($!);
-		chomp $arch;
+		if (!defined $arch) {
+		    $arch=dpkg_architecture_value('DEB_HOST_ARCH');
+		}
 		return $arch;
 	}
 }
 
+# Returns the build OS. (Memoized)
+{
+	my $os;
+
+	sub buildos {
+		if (!defined $os) {
+			$os=dpkg_architecture_value("DEB_HOST_ARCH_OS");
+		}
+		return $os;
+	}
+}
+
+# Passed an arch and a list of arches to match against, returns true if matched
+sub samearch {
+	my $arch=shift;
+	my @archlist=split(/\s+/,shift);
+
+	foreach my $a (@archlist) {
+		system("dpkg-architecture", "-a$arch", "-i$a") == 0 && return 1;
+	}
+
+	return 0;
+}
+
+# Returns source package name
+sub sourcepackage {
+	open (CONTROL, 'debian/control') ||
+	    error("cannot read debian/control: $!\n");
+	while (<CONTROL>) {
+		chomp;
+		s/\s+$//;
+		if (/^Source:\s*(.*)/) {
+			close CONTROL;
+			return $1;
+		}
+	}
+
+	close CONTROL;
+	error("could not find Source: line in control file.");
+}
+
 # Returns a list of packages in the control file.
-# Must pass "arch" or "indep" or "same" to specify arch-dependant or
-# -independant or same arch packages. If nothing is specified, returns all
-# packages.
+# Pass "arch" or "indep" to specify arch-dependant or
+# independant. If nothing is specified, returns all packages.
 # As a side effect, populates %package_arches and %package_types with the
 # types of all packages (not only those returned).
 my (%package_types, %package_arches);
@@ -544,12 +680,6 @@ sub getpackages {
 	%package_arches=();
 	
 	$type="" if ! defined $type;
-	
-	# Look up the build arch if we need to.
-	my $buildarch='';
-	if ($type eq 'same') {
-		$buildarch=buildarch();
-	}
 
 	my $package="";
 	my $arch="";
@@ -575,7 +705,7 @@ sub getpackages {
 		if (/^Architecture:\s*(.*)/) {
 			$arch=$1;
 		}
-		if (/^X[BC]*-Package-Type:\s*(.*)/) {
+		if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/) {
 			$package_type=$1;
 		}
 		
@@ -584,10 +714,12 @@ sub getpackages {
 				$package_types{$package}=$package_type;
 				$package_arches{$package}=$arch;
 			}
+
 			if ($package &&
 			    (($type eq 'indep' && $arch eq 'all') ||
-			     ($type eq 'arch' && $arch ne 'all') ||
-			     ($type eq 'same' && ($arch eq 'any' || $arch =~ /\b$buildarch\b/)) ||
+			     ($type eq 'arch' && ($arch eq 'any' ||
+					     ($arch ne 'all' &&
+			                      samearch(buildarch(), $arch)))) ||
 			     ! $type)) {
 				push @list, $package;
 				$package="";
@@ -600,18 +732,95 @@ sub getpackages {
 	return @list;
 }
 
+# Returns the arch a package will build for.
+sub package_arch {
+	my $package=shift;
+	
+	if (! exists $package_arches{$package}) {
+		warning "package $package is not in control info";
+		return buildarch();
+	}
+	return $package_arches{$package} eq 'all' ? "all" : buildarch();
+}
+
+# Return true if a given package is really a udeb.
 sub is_udeb {
 	my $package=shift;
 	
+	if (! exists $package_types{$package}) {
+		warning "package $package is not in control info";
+		return 0;
+	}
 	return $package_types{$package} eq 'udeb';
 }
 
+# Generates the filename that is used for a udeb package.
 sub udeb_filename {
 	my $package=shift;
 	
-	my $filearch=$package_arches{$package} eq 'all' ? "all" : buildarch();
+	my $filearch=package_arch($package);
 	isnative($package); # side effect
-	return "${package}_$dh{VERSION}_$filearch.udeb";
+	my $version=$dh{VERSION};
+	$version=~s/^[0-9]+://; # strip any epoch
+	return "${package}_${version}_$filearch.udeb";
+}
+
+# Handles #DEBHELPER# substitution in a script; also can generate a new
+# script from scratch if none exists but there is a .debhelper file for it.
+sub debhelper_script_subst {
+	my $package=shift;
+	my $script=shift;
+	
+	my $tmp=tmpdir($package);
+	my $ext=pkgext($package);
+	my $file=pkgfile($package,$script);
+
+	if ($file ne '') {
+		if (-f "debian/$ext$script.debhelper") {
+			# Add this into the script, where it has #DEBHELPER#
+			complex_doit("perl -pe 's~#DEBHELPER#~qx{cat debian/$ext$script.debhelper}~eg' < $file > $tmp/DEBIAN/$script");
+		}
+		else {
+			# Just get rid of any #DEBHELPER# in the script.
+			complex_doit("sed s/#DEBHELPER#// < $file > $tmp/DEBIAN/$script");
+		}
+		doit("chown","0:0","$tmp/DEBIAN/$script");
+		doit("chmod",755,"$tmp/DEBIAN/$script");
+	}
+	elsif ( -f "debian/$ext$script.debhelper" ) {
+		complex_doit("printf '#!/bin/sh\nset -e\n' > $tmp/DEBIAN/$script");
+		complex_doit("cat debian/$ext$script.debhelper >> $tmp/DEBIAN/$script");
+		doit("chown","0:0","$tmp/DEBIAN/$script");
+		doit("chmod",755,"$tmp/DEBIAN/$script");
+	}
+}
+
+# Checks if make's jobserver is enabled via MAKEFLAGS, but
+# the FD used to communicate with it is actually not available.
+sub is_make_jobserver_unavailable {
+	if (exists $ENV{MAKEFLAGS} && 
+	    $ENV{MAKEFLAGS} =~ /(?:^|\s)--jobserver-fds=(\d+)/) {
+		if (!open(my $in, "<&$1")) {
+			return 1; # unavailable
+		}
+		else {
+			close $in;
+			return 0; # available
+		}
+	}
+
+	return; # no jobserver specified
+}
+
+# Cleans out jobserver options from MAKEFLAGS.
+sub clean_jobserver_makeflags {
+	if (exists $ENV{MAKEFLAGS}) {
+		if ($ENV{MAKEFLAGS} =~ /(?:^|\s)--jobserver-fds=(\d+)/) {
+			$ENV{MAKEFLAGS} =~ s/(?:^|\s)--jobserver-fds=\S+//g;
+			$ENV{MAKEFLAGS} =~ s/(?:^|\s)-j\b//g;
+		}
+		delete $ENV{MAKEFLAGS} if $ENV{MAKEFLAGS} =~ /^\s*$/;
+	}
 }
 
 1