releasing version 8.85

The runpipe interface is not a good one, it would be better to use
something that does not expose to the shell.

As a quick fix, quote filenames in runpipe calls. Too bad if you have a
quote character in a file though. Later need to find a better interface
or do full shell escaping.

.gitattributes

@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs

Alien/Package.pm

@@ -339,14 +339,17 @@ sub DESTROY {
 		die "alien internal error: unpacked_tree is set to '/'. Please file a bug report!";
 	}
 
-	# Just in case some dir perms are too screwed up for rm to work and
+	if (-d $this->unpacked_tree) {
-	# we're not running as root. NB: can't use xargs
+		# Just in case some dir perms are too screwed up for
+		# rm to work and we're not running as root. NB: can't
+		# use xargs
 		$this->do('find', $this->unpacked_tree, '-type', 'd', 
 		                  '-exec', 'chmod', '755', '{}', ';');
 	
 		$this->do('rm', '-rf', $this->unpacked_tree)
 			or die "unable to delete temporary directory '".$this->unpacked_tree."': $!";
 		$this->unpacked_tree('');
+	}
 
 	$?=$exitcode;
 }

Alien/Package/Deb.pm

@@ -110,7 +110,7 @@ sub test {
 		return map { s/\n//; $_ }
 		       grep {
 		       		! /unknown-section alien/
-		       } $this->runpipe(1, "lintian $deb");
+		       } $this->runpipe(1, "lintian '$deb'");
 	}
 	else {
 		return "lintian not available, so not testing";
@@ -130,7 +130,7 @@ sub getcontrolfile {
 	my $file=$this->filename;
 	
 	if ($this->have_dpkg_deb) {
-		return $this->runpipe(1, "dpkg-deb --info $file $controlfile 2>/dev/null");
+		return $this->runpipe(1, "dpkg-deb --info '$file' $controlfile 2>/dev/null");
 	}
 	else {
 		# Solaris tar doesn't support O
@@ -139,10 +139,10 @@ sub getcontrolfile {
 
 			return "(mkdir /tmp/tar_out.$$ &&".
 				" cd /tmp/tar_out.$$ &&".
-				" tar xf - ./$file &&".
+				" tar xf - './$file' &&".
-				" cat $file; cd /; rm -rf /tmp/tar_out.$$)";
+				" cat '$file'; cd /; rm -rf /tmp/tar_out.$$)";
 		}
-		my $getcontrol = "ar -p $file control.tar.gz | gzip -dc | ".tar_out($controlfile)." 2>/dev/null";
+		my $getcontrol = "ar -p '$file' control.tar.gz | gzip -dc | ".tar_out($controlfile)." 2>/dev/null";
 		return $this->runpipe(1, $getcontrol);
 	}
 }
@@ -212,11 +212,11 @@ sub scan {
 	my @filelist;
 	if ($this->have_dpkg_deb) {
 		@filelist=map { chomp; s:\./::; "/$_" }
-			  $this->runpipe(0, "dpkg-deb --fsys-tarfile $file | tar tf -");
+			  $this->runpipe(0, "dpkg-deb --fsys-tarfile '$file' | tar tf -");
 	}
 	else {
 		@filelist=map { chomp; s:\./::; "/$_" }
-			  $this->runpipe(0, "ar -p $file data.tar.gz | gzip -dc | tar tf -");
+			  $this->runpipe(0, "ar -p '$file' data.tar.gz | gzip -dc | tar tf -");
 	}
 	$this->filelist(\@filelist);
 
@@ -307,7 +307,7 @@ sub prep {
 			or die "patch error: $!";
 		# Look for .rej files.
 		die "patch failed with .rej files; giving up"
-			if $this->runpipe(1, "find $dir -name \"*.rej\"");
+			if $this->runpipe(1, "find '$dir' -name \"*.rej\"");
 		$this->do('find', '.', '-name', '*.orig', '-exec', 'rm', '{}', ';');
 		$this->do("chmod", 755, "$dir/debian/rules");
 
@@ -383,6 +383,11 @@ sub prep {
 		close OUT;
 	}
 
+	# Use debhelper v7
+	open (OUT, ">$dir/debian/compat") || die "$dir/debian/compat: $!";
+	print OUT "7\n";
+	close OUT;
+
 	# A minimal rules file.
 	open (OUT, ">$dir/debian/rules") || die "$dir/debian/rules: $!";
 	my $fixpermscomment = $this->fixperms ? "" : "#";
@@ -390,12 +395,6 @@ sub prep {
 #!/usr/bin/make -f
 # debian/rules for alien
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Use v4 compatability mode, so ldconfig gets added to maint scripts.
-export DH_COMPAT=4
-
 PACKAGE=\$(shell dh_listpackages)
 
 build:
@@ -411,7 +410,7 @@ binary-indep: build
 binary-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 	dh_installdirs
 
 	dh_installdocs
@@ -489,6 +488,16 @@ Build a deb.
 sub build {
 	my $this=shift;
 	
+	# Detect architecture mismatch and abort with a comprehensible
+	# error message.
+	my $arch=$this->arch;
+	if ($arch ne 'all') {
+		my $ret=system("dpkg-architecture", "-i".$arch);
+		if ($ret != 0) {
+			die $this->filename." is for architecture ".$this->arch." ; the package cannot be built on this system"."\n";
+		}
+	}
+
 	chdir $this->unpacked_tree;
 	my $log=$this->runpipe(1, "debian/rules binary 2>&1");
 	chdir "..";
@@ -738,7 +747,7 @@ sub postinst {
 	return $postinst unless ref $owninfo;
 
 	# If there is no postinst, let's make one up..
-	$postinst="#!/bin/sh\n" unless length $postinst;
+	$postinst="#!/bin/sh\n" unless defined $postinst && length $postinst;
 	
 	return $postinst unless %$owninfo;
 	

Alien/Package/Lsb.pm

@@ -30,7 +30,7 @@ sub checkfile {
 	my $this=shift;
 	my $file=shift;
 	return unless $file =~ m/^lsb-.*\.rpm$/;
-	my @deps=$this->runpipe(1, "LANG=C rpm -qp -R $file");
+	my @deps=$this->runpipe(1, "LANG=C rpm -qp -R '$file'");
 	return 1 if grep { s/\s+//g; $_ eq 'lsb' } @deps;
 	return;
 }

Alien/Package/Rpm.pm

@@ -83,7 +83,7 @@ sub scan {
 	foreach my $field (qw{NAME VERSION RELEASE ARCH CHANGELOGTEXT
 		              SUMMARY DESCRIPTION PREFIXES},
 	                   keys(%fieldtrans)) {
-		my $value=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file");
+		my $value=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} '$file'");
 		next if $? || $value eq '(none)';
 		my $key;
 		if (exists $fieldtrans{$field}) {
@@ -96,16 +96,16 @@ sub scan {
 	}
 
 	# Get the conffiles list.
-	$this->conffiles([map { chomp; $_ } $this->runpipe(0, "LANG=C rpm -qcp $file")]);
+	$this->conffiles([map { chomp; $_ } $this->runpipe(0, "LANG=C rpm -qcp '$file'")]);
 	if (defined $this->conffiles->[0] &&
 	    $this->conffiles->[0] eq '(contains no files)') {
 		$this->conffiles([]);
 	}
 
-	$this->binary_info(scalar $this->runpipe(0, "rpm -qpi $file"));
+	$this->binary_info(scalar $this->runpipe(0, "rpm -qpi '$file'"));
 
 	# Get the filelist.
-	$this->filelist([map { chomp; $_ } $this->runpipe(0, "LANG=C rpm -qpl $file")]);
+	$this->filelist([map { chomp; $_ } $this->runpipe(0, "LANG=C rpm -qpl '$file'")]);
 	if (defined $this->filelist->[0] &&
 	    $this->filelist->[0] eq '(contains no files)') {
 		$this->filelist([]);
@@ -128,7 +128,7 @@ sub scan {
 	}
 	unless (defined $this->copyright) {
 		# Older rpms have no licence tag, but have a copyright.
-		$this->copyright($this->runpipe(0, "LANG=C rpm -qp --queryformat \%{COPYRIGHT} $file"));
+		$this->copyright($this->runpipe(0, "LANG=C rpm -qp --queryformat \%{COPYRIGHT} '$file'"));
 
 		# Fallback.
 		if (! $this->copyright) {
@@ -439,7 +439,7 @@ sub build {
 	$opts.=" $ENV{RPMBUILDOPT}" if exists $ENV{RPMBUILDOPT};
 	my $pwd=`pwd`;
 	chomp $pwd;
-	my $command="cd $dir; $buildcmd --buildroot=$pwd/$dir -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec";
+	my $command="cd $dir; $buildcmd --buildroot='$pwd/$dir' -bb $opts '".$this->name."-".$this->version."-".$this->release.".spec'";
 	my $log=$this->runpipe(1, "$command 2>&1");
 	if ($?) {
 		die "Package build failed. Here's the log of the command ($command):\n", $log;

Alien/Package/Slp.pm

@@ -166,7 +166,7 @@ sub scan {
 	# Read in the file list.
 	my @filelist;
 	# FIXME: support gzip files too!
-	foreach ($this->runpipe(0, "bzip2 -d < $file | tar -tf -")) {
+	foreach ($this->runpipe(0, "bzip2 -d < '$file' | tar -tf -")) {
 		chomp;
 		s:^\./:/:;
 		$_="/$_" unless m:^/:;
@@ -179,7 +179,7 @@ sub scan {
 	$this->distribution('Stampede');
 	$this->origformat('slp');
 	$this->changelogtext('');
-	$this->binary_info($this->runpipe(0, "ls -l $file"));
+	$this->binary_info($this->runpipe(0, "ls -l '$file'"));
 	
 	return 1;
 }

Alien/Package/Tgz.pm

@@ -118,7 +118,7 @@ sub scan {
 	$this->group("unknown");
 	$this->origformat('tgz');
 	$this->changelogtext('');
-	$this->binary_info($this->runpipe(0, "ls -l $file"));
+	$this->binary_info($this->runpipe(0, "ls -l '$file'"));
 
 	# Now figure out the conffiles. Assume anything in etc/ is a
 	# conffile.
@@ -152,7 +152,7 @@ sub scan {
 
 	# Now get the scripts.
 	foreach my $script (keys %{scripttrans()}) {
-		$this->$script(scalar $this->runpipe(1, "tar Oxf $file install/${scripttrans()}{$script} 2>/dev/null"));
+		$this->$script(scalar $this->runpipe(1, "tar Oxf '$file' install/${scripttrans()}{$script} 2>/dev/null"));
 	}
 
 	return 1;

debian/changelog

@@ -1,3 +1,33 @@
+alien (8.85) unstable; urgency=low
+
+  * Avoid breaking on spaces in filenames. Closes: #618636
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 19 Jun 2011 15:43:49 -0400
+
+alien (8.84) unstable; urgency=low
+
+  * Silence error message when deleting build tree after making an rpm,
+    if rpmbuild has already deleted it. Closes: #622846
+  * Squash an uninitialized value when creating a deb.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Apr 2011 14:13:20 -0400
+
+alien (8.83) unstable; urgency=low
+
+  * Correct handling of arch all packages in deb arch check. Closes: #596209
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 09 Sep 2010 08:24:58 -0400
+
+alien (8.82) unstable; urgency=low
+
+  * Use debhelper compat level v7 when building packages. All changes
+    since v4 seem safe for alien's generated rules files.
+  * Use dh_prep instead of deprecated dh_clean -k.
+  * Print a nice error message when attempting to build a deb from a package
+    of an unsupported architecture. Closes: #592625
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 30 Aug 2010 17:04:24 -0400
+
 alien (8.81) unstable; urgency=low
 
   * Avoid uninitialized value warning when debian/rules fails to run

debian/control

@@ -3,14 +3,14 @@ Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Git: git://git.kitenet.net/alien
 Homepage: http://kitenet.net/~joey/code/alien/
 
 Package: alien
 Architecture: all
 Section: admin
-Depends: debhelper (>= 3), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
+Depends: debhelper (>= 7), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
 Suggests: patch, bzip2, lsb-rpm, lintian, lzma
 Description: convert and install rpm and other packages
  Alien allows you to convert LSB, Red Hat, Stampede and Slackware Packages

debian/copyright

@@ -1,35 +1,13 @@
-This is a program originally written by Christoph Lameter
+Format: http://dep.debian.net/deps/dep5/
-<clameter@debian.org>.
+Source: native package
 
-Deb to rpm conversion code was taken from the Martian program by
+Files: *
-Randolph Chung <randolph@tausq.org>.
+Copyright:
-
+ 1996, 1997 Christoph Lameter
-The Solaris pkg code was written by Mark A. Hershberger
+ 1997 Randolph Chung
-<mah@everybody.org>.
+ 2001 Mark A. Hershberger
-
+ 1997-2011 Joey Hess
-This program is now maintained by Joey Hess <joeyh@debian.org>.
+License: GPL-2+
-
+ On Debian systems, the complete text of the GPL can be found in
-Copyright 1996, 1997 Christoph Lameter
+ /usr/share/common-licenses/GPL.
-Portions copyright 1997 Randolph Chung
-Portions copyright 2001 Mark A. Hershberger
-Copyright 1997-2007 Joey Hess
-
-License:
-
-    alien is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GPL can be found in
-/usr/share/common-licenses/GPL.