diff -Nru apt-mirror-0.4.8/debian/changelog apt-mirror-0.4.8/debian/changelog
--- apt-mirror-0.4.8/debian/changelog	2012-05-28 23:06:32.000000000 +0000
+++ apt-mirror-0.4.8/debian/changelog	2012-07-26 23:11:15.000000000 +0000
@@ -1,8 +1,11 @@
-apt-mirror (0.4.8-5build1) quantal; urgency=low
+apt-mirror (0.4.8-6) unstable; urgency=low
 
-  * No-change rebuild to update the repository to quantal (LP: #1005581).
+  * Fix regex problem: arm overrides armhf. Thanks to hawken. (Closes: #682395)
+  * Bump Standard-Version to 3.9.3 (no changes needed).
+  * Add support for HTTPS with basic HTTP authentication. Thanks to Pali
+    for the patch. (LP: #1015131)
 
- -- Benjamin Drung <bdrung@debian.org>  Tue, 29 May 2012 01:04:44 +0200
+ -- Benjamin Drung <bdrung@debian.org>  Fri, 27 Jul 2012 00:51:30 +0200
 
 apt-mirror (0.4.8-5) unstable; urgency=low
 
diff -Nru apt-mirror-0.4.8/debian/control apt-mirror-0.4.8/debian/control
--- apt-mirror-0.4.8/debian/control	2011-07-25 06:29:56.000000000 +0000
+++ apt-mirror-0.4.8/debian/control	2012-07-26 22:52:34.000000000 +0000
@@ -7,7 +7,7 @@
 Dm-Upload-Allowed: yes
 Homepage: http://apt-mirror.sourceforge.net/
 Build-Depends: debhelper (>= 7.0.50~), lsb-release
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=collab-maint/apt-mirror.git
 Vcs-Git: git://git.debian.org/collab-maint/apt-mirror.git
 
diff -Nru apt-mirror-0.4.8/debian/patches/apt-mirror-https.patch apt-mirror-0.4.8/debian/patches/apt-mirror-https.patch
--- apt-mirror-0.4.8/debian/patches/apt-mirror-https.patch	1970-01-01 00:00:00.000000000 +0000
+++ apt-mirror-0.4.8/debian/patches/apt-mirror-https.patch	2012-07-26 23:05:32.000000000 +0000
@@ -0,0 +1,56 @@
+Description: Add support for HTTPS with basic HTTP authentication
+Author: Pali <pali.rohar@gmail.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1015131
+
+--- a/apt-mirror
++++ b/apt-mirror
+@@ -68,6 +68,15 @@
+ HTTP and FTP Auth or non-standard port:
+ deb http://user:pass@example.com:8080/debian stable main contrib non-free
+ 
++HTTPS with sending Basic HTTP authentication information (plaintext username and password) for all requests:
++(this was default behaviour of Wget 1.10.2 and prior and is needed for some servers with new version of Wget)
++set auth_no_challenge 1
++deb https://user:pass@example.com:443/debian stable main contrib non-free
++
++HTTPS without checking certificate:
++set no_check_certificate 1
++deb https://example.com:443/debian stable main contrib non-free
++
+ Source Mirroring:
+ deb-src http://example.com/debian stable main contrib non-free
+ 
+@@ -103,6 +112,8 @@
+     "_tilde"	  => 0,
+     "limit_rate"  => '100m',
+     "run_postmirror" => 1,
++    "auth_no_challenge" => 0,
++    "no_check_certificate" => 0,
+     "postmirror_script" => '$var_path/postmirror.sh'
+ );
+ 
+@@ -198,11 +209,15 @@
+     my $i = 0;
+     my $pid;
+     my $nthreads = get_variable("nthreads");
++    my @args = ();
+     local $| = 1;
+ 
+     @urls = @_;
+     $nthreads = @urls if @urls < $nthreads;
+ 
++    if(get_variable("auth_no_challenge") == 1) { push(@args, "--auth-no-challenge"); }
++    if(get_variable("no_check_certificate") == 1) { push(@args, "--no-check-certificate"); }
++
+     print "Downloading " . scalar(@urls) . " $stage files using $nthreads threads...\n";
+     
+     while(scalar @urls) {
+@@ -216,7 +231,7 @@
+ 	die("apt-mirror: can't do fork in download_urls") if $pid < 0;
+ 	
+ 	if($pid == 0) {
+-	    exec 'wget', '--no-cache', '--limit-rate='.get_variable("limit_rate"), '-t', '5', '-r', '-N', '-l', 'inf', '-o', get_variable("var_path") . "/$stage-log.$i", '-i', get_variable("var_path") . "/$stage-urls.$i";
++	    exec 'wget', '--no-cache', '--limit-rate='.get_variable("limit_rate"), '-t', '5', '-r', '-N', '-l', 'inf', '-o', get_variable("var_path") . "/$stage-log.$i", '-i', get_variable("var_path") . "/$stage-urls.$i", @args;
+ 	    # shouldn't reach this unless exec fails
+ 	    die("\n\nCould not run wget, please make sure its installed and in your path\n\n");
+ 	}
diff -Nru apt-mirror-0.4.8/debian/patches/architecture-match.patch apt-mirror-0.4.8/debian/patches/architecture-match.patch
--- apt-mirror-0.4.8/debian/patches/architecture-match.patch	1970-01-01 00:00:00.000000000 +0000
+++ apt-mirror-0.4.8/debian/patches/architecture-match.patch	2012-07-26 22:49:51.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Fix regex problem: arm overrides armhf.
+Author: hawken <haakonsh@gmail.com>
+Bug-Debian: http://bugs.debian.org/682395
+
+--- a/apt-mirror
++++ b/apt-mirror
+@@ -253,7 +253,7 @@
+ 	next;
+     }
+ 
+-    if($config_line =~ /deb-(alpha|amd64|armel|arm|armhf|hppa|hurd-i386|i386|ia64|kfreebsd-i386|kfreebsd-amd64|lpia|m68k|mipsel|mips|powerpc|s390|s390x|sh|sparc)/) {
++    if($config_line =~ /^deb-(alpha|amd64|armel|arm|armhf|hppa|hurd-i386|i386|ia64|kfreebsd-i386|kfreebsd-amd64|lpia|m68k|mipsel|mips|powerpc|s390|s390x|sh|sparc)$/) {
+ 	push @config_binaries, [$1, @config_line];
+ 	next;
+     }
diff -Nru apt-mirror-0.4.8/debian/patches/series apt-mirror-0.4.8/debian/patches/series
--- apt-mirror-0.4.8/debian/patches/series	2012-01-28 13:24:19.000000000 +0000
+++ apt-mirror-0.4.8/debian/patches/series	2012-07-26 23:01:57.000000000 +0000
@@ -2,3 +2,5 @@
 additional_archs.patch
 create_dirs.patch
 lock.patch
+architecture-match.patch
+apt-mirror-https.patch