diff -u apt-mirror-0.4.5/debian/control apt-mirror-0.4.5/debian/control --- apt-mirror-0.4.5/debian/control +++ apt-mirror-0.4.5/debian/control @@ -6,7 +6,7 @@ Homepage: http://apt-mirror.sourceforge.net/ Build-Depends: debhelper (>= 5), dpatch Build-Depends-Indep: lsb-release -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: apt-mirror Architecture: all @@ -26,4 +26,2 @@ * It works on all POSIX complied systems with perl and wget - . - Homepage: http://apt-mirror.sourceforge.net/ diff -u apt-mirror-0.4.5/debian/changelog apt-mirror-0.4.5/debian/changelog --- apt-mirror-0.4.5/debian/changelog +++ apt-mirror-0.4.5/debian/changelog @@ -1,3 +1,16 @@ +apt-mirror (0.4.5-1ubuntu2) jaunty; urgency=low + + * Add 02-fix-invalid-dirhandle.dpatch (LP: #244613) + * debian/Ubuntu-mirror.list: + - fix typo (privlages -> privileges) + - update distribution to jaunty + * debian/rules: Move binary-arch commands to binary-indep + * debian/control: + - remove homepage from description + - bump Debian standards version to 3.8.0, no changes needed + + -- Benjamin Drung Sat, 01 Nov 2008 20:41:20 +0100 + apt-mirror (0.4.5-1ubuntu1) intrepid; urgency=low * Add 01-ubuntu-mirror-bz2.patch (LP: #184063) diff -u apt-mirror-0.4.5/debian/patches/00list apt-mirror-0.4.5/debian/patches/00list --- apt-mirror-0.4.5/debian/patches/00list +++ apt-mirror-0.4.5/debian/patches/00list @@ -1,0 +2 @@ +02-fix-invalid-dirhandle.dpatch diff -u apt-mirror-0.4.5/debian/Ubuntu-mirror.list apt-mirror-0.4.5/debian/Ubuntu-mirror.list --- apt-mirror-0.4.5/debian/Ubuntu-mirror.list +++ apt-mirror-0.4.5/debian/Ubuntu-mirror.list @@ -2,7 +2,7 @@ # # set base_path /var/spool/apt-mirror # -# if you change the base path you must create the directories below with write privlages +# if you change the base path you must create the directories below with write privileges # # set mirror_path $base_path/mirror # set skel_path $base_path/skel @@ -14,17 +14,17 @@ # ############# end config ############## -deb http://archive.ubuntu.com/ubuntu hardy main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu hardy-updates main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu hardy-backports main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu hardy-proposed main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu jaunty main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu jaunty-updates main restricted universe multiverse +#deb http://archive.ubuntu.com/ubuntu jaunty-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu jaunty-security main restricted universe multiverse +#deb http://archive.ubuntu.com/ubuntu jaunty-proposed main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu hardy main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu hardy-updates main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu hardy-backports main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu hardy-proposed main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu jaunty main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu jaunty-updates main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu jaunty-backports main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu jaunty-security main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu jaunty-proposed main restricted universe multiverse clean http://archive.ubuntu.com/ubuntu diff -u apt-mirror-0.4.5/debian/rules apt-mirror-0.4.5/debian/rules --- apt-mirror-0.4.5/debian/rules +++ apt-mirror-0.4.5/debian/rules @@ -40,10 +40,6 @@ # Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install dh_testdir dh_testroot dh_installdocs @@ -59,3 +55,7 @@ -binary: binary-indep binary-arch +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep .PHONY: build clean binary-indep binary-arch binary install configure only in patch2: unchanged: --- apt-mirror-0.4.5.orig/debian/patches/02-fix-invalid-dirhandle.dpatch +++ apt-mirror-0.4.5/debian/patches/02-fix-invalid-dirhandle.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-fix-invalid-dirhandle.dpatch by Benjamin Drung +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix invalid dirhandle (LP: #244613) + +#@DPATCH@ +diff -Nurp apt-mirror-0.4.5.old/apt-mirror apt-mirror-0.4.5/apt-mirror +--- apt-mirror-0.4.5.old/apt-mirror 2008-11-01 16:19:45.000000000 +0100 ++++ apt-mirror-0.4.5/apt-mirror 2008-11-01 18:51:22.000000000 +0100 +@@ -527,14 +527,14 @@ sub process_directory { + my $dir = shift; + my $is_needed = 0; + return 1 if $skipclean{$dir}; +- opendir(DIR, $dir) or die "apt-mirror: can't opendir $dir: $!"; +- foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir(DIR)) { ++ opendir(my $dir_h, $dir) or die "apt-mirror: can't opendir $dir: $!"; ++ foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir($dir_h)) { + my $item = $dir . "/". $_; + $is_needed |= process_directory($item) if -d $item && ! -l $item; + $is_needed |= process_file($item) if -f $item; + $is_needed |= process_symlink($item) if -l $item; + } +- closedir DIR; ++ closedir $dir_h; + push @rm_dirs, $dir unless $is_needed; + return $is_needed; + }