prep release

There are some OS like Tizne which use rpm's and build
them for armv7l architecture. In debain nomenclature
this architecture is armel, so armv7l should be
an alias to armel.

Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>

.gitignore

@@ -1,2 +0,0 @@
-alien.lsm
-alien.spec

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");
 
@@ -443,18 +443,16 @@ EOF
 	close OUT;
 	$this->do("chmod", 755, "$dir/debian/rules");
 
-	# Save any scripts.
 	if ($this->usescripts) {
 		foreach my $script (qw{postinst postrm preinst prerm}) {
-			my $data=$this->$script();
+			$this->savescript($script, $this->$script());
-			next unless defined $data;
-			next if $data =~ m/^\s*$/;
-			open (OUT,">$dir/debian/$script") ||
-				die "$dir/debian/$script: $!";
-			print OUT $data;
-			close OUT;
 		}
 	}
+	else {
+		# There may be a postinst with permissions fixups even when
+		# scripts are disabled.
+		$this->savescript("postinst", undef);
+	}
 	
 	my %dirtrans=( # Note: no trailing slashes on these directory names!
 		# Move files to FHS-compliant locations, if possible.
@@ -596,12 +594,13 @@ sub version {
 	# get
 	return unless defined wantarray; # optimization
 	$_=$this->{version};
-	# Make sure the version contains digets.
+	# Make sure the version contains a digit at the start, as required
-	unless (/[0-9]/) {
+	# by dpkg-deb.
-		# Drat. Well, add some. dpkg-deb won't work
+	unless (/^[0-9]/) {
-		# on a version w/o numbers!
+		$_="0".$_;
-		return $_."0";
 	}
+	# filter out some characters not allowed in debian versions
+	s/[^-.+~:A-Za-z0-9]//g; # see lib/dpkg/parsehelp.c parseversion
 	return $_;
 }
 
@@ -727,30 +726,50 @@ sub username {
 	return $username;
 }
 
-=item postinst
+=item savescript
 
-Returns the postinst. This may include generated shell code to set owners
+Saves script to debian directory.
-and groups from the owninfo field, and update modes from the modeinfo field.
 
 =cut
 
-sub postinst {
+sub savescript {
 	my $this=shift;
+	my $script=shift;
+	my $data=shift;
 
-	if (@_) {
+	if ($script eq 'postinst') {
-		$this->{postinst}=shift;
+		$data=$this->gen_postinst($data);
 	}
 
+	my $dir=$this->unpacked_tree;
+
+	return unless defined $data;
+	next if $data =~ m/^\s*$/;
+	open (OUT,">$dir/debian/$script") ||
+		die "$dir/debian/$script: $!";
+	print OUT $data;
+	close OUT;
+}
+
+=item gen_postinst
+
+Modifies or creates a postinst. This may include generated shell code to set
+owners and groups from the owninfo field, and update modes from the modeinfo
+field.
+
+=cut
+
+sub gen_postinst {
+	my $this=shift;
+	my $postinst=shift;
+
 	my $owninfo = $this->owninfo;
 	my $modeinfo = $this->modeinfo;
-	my $postinst = $this->{postinst};
+	return $postinst unless ref $owninfo && %$owninfo;
-	return $postinst unless ref $owninfo;
 
 	# If there is no postinst, let's make one up..
 	$postinst="#!/bin/sh\n" unless defined $postinst && length $postinst;
 	
-	return $postinst unless %$owninfo;
-	
 	my ($firstline, $rest)=split(/\n/, $postinst, 2);
 	if ($firstline !~ m/^#!\s*\/bin\/(ba)?sh/) {
 		print STDERR "warning: unable to add ownership fixup code to postinst as the postinst is not a shell script!\n";

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;
 }
@@ -96,8 +96,8 @@ sub revert {
 
 =item build
 
-Uses the parent's build method. If a lsb-rpm is available, uses it to build
+Uses the parent's build method. If a lsb-rpmbuild is available, uses it to
-the package.
+build the package.
 
 =cut
 
@@ -105,8 +105,8 @@ sub build {
 	my $this=shift;
 	my $buildcmd=shift || 'rpmbuild';
 	foreach (split(/:/,$ENV{PATH})) {
-		if (-x "$_/lsb-rpm") {
+		if (-x "$_/lsb-rpmbuild") {
-			$buildcmd='lsb-rpm';
+			$buildcmd='lsb-rpmbuild';
 			last;
 		}
 	}

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) {
@@ -161,11 +161,11 @@ sub unpack {
 	
 	# Check if we need to use lzma to uncompress the cpio archive
 	my $decomp='';
-	if ($this->do("rpm2cpio ".$this->filename." | lzma -t -q > /dev/null 2>&1")) {
+	if ($this->do("rpm2cpio '".$this->filename."' | lzma -t -q > /dev/null 2>&1")) {
 		$decomp = 'lzma -d -q |';
 	}
 
-	$this->do("rpm2cpio ".$this->filename." | (cd $workdir; $decomp cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>&1")
+	$this->do("rpm2cpio '".$this->filename."' | (cd $workdir; $decomp cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>&1")
 		or die "Unpacking of '".$this->filename."' failed";
 	
 	# cpio does not necessarily store all parent directories in an
@@ -174,7 +174,7 @@ sub unpack {
 	# Find those directories and make them mode 755, which is more
 	# reasonable.
 	my %seenfiles;
-	open (RPMLIST, "rpm2cpio ".$this->filename." | $decomp cpio -it --quiet |")
+	open (RPMLIST, "rpm2cpio '".$this->filename."' | $decomp cpio -it --quiet |")
 		or die "File list of '".$this->filename."' failed";
 	while (<RPMLIST>) {
 		chomp;
@@ -184,7 +184,7 @@ sub unpack {
 	foreach my $file (`cd $workdir; find ./`) {
 		chomp $file;
 		if (! $seenfiles{$file} && -d "$workdir/$file" && ! -l "$workdir/$file") {
-			$this->do("chmod 755 $workdir/$file");
+			$this->do("chmod 755 '$workdir/$file'");
 		}
 	}
 
@@ -248,7 +248,7 @@ sub unpack {
 	# postinst.
 	my %owninfo = ();
 	my %modeinfo = ();
-	open (GETPERMS, 'rpm --queryformat \'[%{FILEMODES} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILENAMES}\n]\' -qp '.$this->filename.' |');
+	open (GETPERMS, 'rpm --queryformat \'[%{FILEMODES} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILENAMES}\n]\' -qp \''.$this->filename.'\' |');
 	while (<GETPERMS>) {
 		chomp;
 		my ($mode, $owner, $group, $file) = split(/ /, $_, 4);
@@ -424,7 +424,7 @@ sub build {
 		$opts="--buildarch ".$this->arch;
 	}
 	else {
-		# Presumably we're delaing with rpm 3.0 or above, which
+		# Presumably we're dealing with rpm 3.0 or above, which
 		# doesn't output rpmdir in any format I'd care to try to
 		# parse. Instead, rpm is now of a late enough version to
 		# notice the %define's in the spec file, that will make the
@@ -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;
@@ -607,9 +607,16 @@ sub arch {
 			# Treat armv4l as arm.
 			$arch='arm';
 		}
+		elsif ($arch eq 'armv7l') {
+			# Treat armv7l as armel.
+			$arch='armel';
+		}
 		elsif ($arch eq 'parisc') {
 			$arch='hppa';
 		}
+		elsif ($arch eq 'ppc64le') {
+			$arch='ppc64el';
+		}
 		
 		$this->{arch}=$arch;
 	}
@@ -629,6 +636,9 @@ sub arch {
 	elsif ($arch eq 'all') {
 		$arch='noarch';
 	}
+	elsif ($arch eq 'ppc64el') {
+		$arch='ppc64le';
+	}
 
 	return $arch
 }

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;

alien.lsm

@@ -0,0 +1,14 @@
+Begin3
+Title:		alien
+Version:	8.90
+Entered-date:	31MAR97
+Description:	Alien converts Slackware .tgz packages, Red Hat .rpm packages,
+                Debian .deb packages, and Stampede .slp packages. It can 
+                convert from any of the formats to any other format. It works
+                only on binary packages. It also support LSB packages.
+Keywords:	debian dpkg deb red hat redhat rpm slackware tgz stampede slp convert package LSB
+Author:		joey@kitenet.net
+Primary-site:	sunsite.unc.edu /pub/Linux/utils/package
+		80	alien-8.90.tar.gz
+Copying-policy:	GPL
+End

alien.pl

@@ -193,6 +193,10 @@ some things to mess with their permissions and owners to the degree this does,
 so it defaults to off. This can only be used when converting to debian
 packages.
 
+=item B<--target=>I<architecture>
+
+Force the architecture of the generated package to the given string.
+
 =item B<-v>, B<--verbose>
 
 Be verbose: Display each command B<alien> runs in the process of converting a
@@ -246,7 +250,7 @@ B<alien> recognizes the following environment variables:
 
 =over 4
 
-=item RPMBUILDOPTS
+=item RPMBUILDOPT
 
 Options to pass to rpm when it is building a package.
 
@@ -330,6 +334,7 @@ Usage: alien [options] file [...]
   -i, --install             Install generated package.
   -g, --generate            Generate build tree, but do not build package.
   -c, --scripts             Include scripts in package.
+      --target=<arch>       Set architecture of the generated package.
   -v, --verbose             Display each command alien runs.
       --veryverbose         Be verbose, and also display output of run commands.
   -k, --keep-version        Do not change version of generated package.
@@ -344,7 +349,7 @@ EOF
 # Start by processing the parameters.
 my (%destformats, $generate, $install, $single, $scripts, $patchfile,
     $nopatch, $tgzdescription, $tgzversion, $keepversion, $fixperms,
-    $test, $anypatch);
+    $test, $anypatch, $target);
 my $versionbump=1;
 
 # Bundling is nice anyway, and it is required or Getopt::Long will confuse
@@ -366,6 +371,7 @@ GetOptions(
 	"patch=s"        => \$patchfile,
 	"nopatch"        => \$nopatch,
 	"anypatch"       => \$anypatch,
+	"target=s"       => \$target,
 	"description=s"  => \$tgzdescription,
 	"V"              => \&version,
         "version:s"      => sub { length $_[1] ? $tgzversion=$_[1] : version() },
@@ -446,6 +452,10 @@ foreach my $file (@ARGV) {
 		die "Unknown type of package, $file.\n";
 	}
 
+	if ($target) {
+		$package->arch($target);
+	}
+
 	if (! $package->usescripts && $package->scripts) {
 		$package->usescripts($scripts);
 		if (! $scripts) {

alien.spec

@@ -0,0 +1,34 @@
+Summary: Install Debian, Slackware, and Stampede packages with rpm.
+Name: alien
+Packager: Joey Hess <joey@kitenet.net>
+Version: 8.90
+Release: 1
+Source: ftp://kitenet.net/pub/code/debian/alien_8.90.tar.gz
+License: GPL
+Group: Utilities/File
+Buildroot: /tmp/alien-8.90.build
+Requires: perl
+BuildArchitectures: noarch
+
+%description
+Alien allows you to convert Debian, Slackware, and Stampede Packages into Red
+Hat packages, which can be installed with rpm.
+
+It can also generate Slackware, Debian and Stampede packages.
+
+This is a tool only suitable for binary packages.
+
+%prep
+%setup -n alien
+rm -rf /tmp/alien-8.90.build
+
+%install
+perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr
+make
+make pure_install VARPREFIX=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -not -type d -printf "/%%P\n" | \
+	sed '/\/man\//s/$/\*/' > manifest
+
+%files -f manifest
+%defattr(-,root,root)
+%doc debian/changelog GPL README alien.lsm

debian/changelog

@@ -1,3 +1,48 @@
+alien (8.90) unstable; urgency=medium
+
+  * Add --target=<arch> option for setting architecture. Closes: #260948
+    (Thanks, Teemu Ikonen)
+  * Add conversion from ppc64le (rpm) to ppc64el (deb).
+  * debhelper v9
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Feb 2014 11:59:07 -0400
+
+alien (8.89) unstable; urgency=low
+
+  * Correct man page to say RPMBUILDOPT (not RPMBUILDOPTS). Closes: #701106
+  * Handle whitespace in path to RPMs. Closes: #719776
+    (Thanks, Christopher Huhn)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Aug 2013 21:53:44 -0400
+
+alien (8.88) unstable; urgency=low
+
+  * Ensure that version numbers begin with well, a number, when building a
+    deb, otherwise dpkg-deb will refuse to build it.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 09 Aug 2012 14:44:49 -0400
+
+alien (8.87) unstable; urgency=low
+
+  * Use lsb-rpmbuild, not lsb-rpm. Closes: #667044
+  * Fix adding of postinst script to deb, containing rpm permissions
+    fixups code. Closes: #667651
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Apr 2012 13:53:29 -0400
+
+alien (8.86) unstable; urgency=low
+
+  * Filter out illegal characters in version number when building a deb.
+    Closes: #648531
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 12 Nov 2011 13:12:35 -0400
+
+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,

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -1,9 +1,9 @@
 Source: alien
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 9)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
 Vcs-Git: git://git.kitenet.net/alien
 Homepage: http://kitenet.net/~joey/code/alien/
 

debian/copyright

@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: native package
 
 Files: *