← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dpkg-sig/utopic-proposed

« back to all changes in this revision

Viewing changes to dpkg-sig

  • Committer: Package Import Robot
  • Author(s): Guillem Jover
  • Date: 2014-06-10 19:53:53 UTC
  • Revision ID: package-import@ubuntu.com-20140610195353-ela90tqdbbgi39at
Tags: 0.13.1+nmu2
http://bugs.debian.org/356509
http://bugs.debian.org/703437
http://bugs.debian.org/635232
http://bugs.debian.org/422175
* Non-maintainer upload.
* Handle trailing slashes in ar member names in deb archives created with
  GNU ar. (Closes: #356509)
* Add support for control.tar, control.tar.xz, data.tar, data.tar.xz,
  data.tar.lzma and data.tar.bz2. (Closes: #703437)
  Based on a patch by Christoph Berg <myon@debian.org>.
* Use correct get_deb_parts() function name instead of undefined
  get_deb_part(). (Closes: #635232)
* Remove dead website URL from package description in debian/control and
  dpkg-sig(1) man page. Change dpkg-sig and debian/copyright to mention
  the URL used to be the website. (Closes: #422175)
* Add build-arch and build-indep targets in debian/rules.
* Fix typo in man page for “overridden”.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dpkg-sig
19
19
#    along with this program; if not, write to the Free Software
20
20
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
21
#
22
 
#    Upstream web site is http://dpkg-sig.turmzimmer.net/
 
22
#    Upstream web site used to be <http://dpkg-sig.turmzimmer.net/>.
23
23
 
24
24
=pod
25
25
 
633
633
                return "FORCE_BAD";
634
634
        }
635
635
 
636
 
        return "FORCE_BAD" unless ($seen_files{"control.tar.gz"} &&
637
 
                             $seen_files{"data.tar.gz"} &&
638
 
                             $seen_files{"debian-binary"});
 
636
        return "FORCE_BAD" unless ($seen_files{'debian-binary'} &&
 
637
            ($seen_files{'control.tar'} || $seen_files{'control.tar.gz'} || $seen_files{'control.tar.xz'}) &&
 
638
            ($seen_files{'data.tar'} || $seen_files{'data.tar.gz'} || $seen_files{'data.tar.xz'} || $seen_files{'data.tar.bz2'} || $seen_files{'data.tar.lzma'}));
639
639
 
640
640
        return "GOOD";
641
641
}
918
918
 
919
919
=cut
920
920
 
921
 
sub get_ar_parts { get_deb_part(@_) }
 
921
sub get_ar_parts { get_deb_parts(@_) }
922
922
sub get_deb_parts {
923
923
        my ($deb) = shift;
924
924
 
956
956
                        if ($line =~ /\S/) { #This should help with additional newlines
957
957
                                #debian-binary   1075243548  0     0     100644  4         `
958
958
                                my $name   = substr($line, 0, 16);
959
 
                                $name =~ s/\s*//g;
 
959
                                $name =~ s{/?\s*$}{}g;
960
960
                                my $length = substr($line, 48, 10);
961
961
                                $length =~ s/\s*//g;
962
962
                                next if (!$name && $length && $length =~ /^\d+\s*$/);
1087
1087
                                
1088
1088
                                #debian-binary   1075243548  0     0     100644  4         `
1089
1089
                                   $name   = substr($line, 0, 16);
1090
 
                                   $name =~ s/\s*//g;
 
1090
                                   $name =~ s{/?\s*$}{}g;
1091
1091
                                my $length = substr($line, 48, 10);
1092
1092
                                   $length =~ s/\s*//g;
1093
1093
                                next if (!$name && $length && $length =~ /^\d+\s*$/);
1210
1210
                        my $line = <DEB>;
1211
1211
                        #debian-binary   1075243548  0     0     100644  4         `
1212
1212
                        my $name   = substr($line, 0, 16);
 
1213
                        $name =~ s{/?\s*$}{}g;
1213
1214
                        my $length = substr($line, 48, 10);
1214
1215
                        next if (!$name && $length && $length =~ /^\d+\s*$/);
1215
1216
                        
1221
1222
                                die _die("Couldn't read $name in $deb: File too short!");                       
1222
1223
                        }
1223
1224
 
1224
 
                        if ($name =~ /^$part_name\s*$/) {
 
1225
                        if ($name eq $part_name) {
1225
1226
                                $part = $tmp_part;
1226
1227
                                last;
1227
1228
                        }