diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 92 | ||||
| -rw-r--r-- | debian/changelog | 182 |
2 files changed, 246 insertions, 28 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 472d20c6d..cdec7eea0 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -102,6 +102,96 @@ update_stamp() touch $stamp } +# we check here if autoclean was enough sizewise +check_size_constraints() +{ + # min-age in days + MaxAge=0 + MinAge=2 + MaxSize=0 + CacheDir="var/cache/apt" + CacheArchive="archives/" + eval $(apt-config shell MaxAge APT::Archives::MaxAge) + eval $(apt-config shell MinAge APT::Archives::MinAge) + eval $(apt-config shell MaxSize APT::Archives::MaxSize) + eval $(apt-config shell Dir Dir) + eval $(apt-config shell CacheDir Dir::Cache) + eval $(apt-config shell CacheArchive Dir::Cache::archives) + + # sanity check + if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then + echo "empty Dir::Cache or Dir::Cache::archives, exiting" + exit + fi + + Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" + + # check age + if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then + find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f + elif [ ! $MaxAge -eq 0 ]; then + find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f + fi + + # check size + if [ ! $MaxSize -eq 0 ]; then + # maxSize is in MB + MaxSize=$(($MaxSize*1024)) + + #get current time + now=$(date --date=$(date --iso-8601) +%s) + MinAge=$(($MinAge*24*60*60)) + + # reverse-sort by mtime + for file in $(ls -rt $Cache/*.deb 2>/dev/null); do + du=$(du -s $Cache) + size=${du%%/*} + # check if the cache is small enough + if [ $size -lt $MaxSize ]; then + break + fi + + # check for MinAge of the file + if [ ! $MinAge -eq 0 ]; then + # check both ctime and mtime + mtime=$(stat -c %Y $file) + ctime=$(stat -c %Z $file) + if [ $mtime -gt $ctime ]; then + delta=$(($now-$mtime)) + else + delta=$(($now-$ctime)) + fi + #echo "$file ($delta), $MinAge" + if [ $delta -le $MinAge ]; then + #echo "Skiping $file (delta=$delta)" + break + fi + fi + + # delete oldest file + rm -f $file + done + fi +} + +# sleep for a random interval of time (default 30min) +# (some code taken from cron-apt, thanks) +random_sleep() +{ + RandomSleep=1800 + eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) + if [ $RandomSleep -eq 0 ]; then + return + fi + if [ -z "$RANDOM" ] ; then + # A fix for shells that do not have this bash feature. + RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + fi + TIME=$(($RANDOM % $RandomSleep)) + sleep $TIME +} + + debug_echo() { # Display message if $VERBOSE >= 1 @@ -110,6 +200,8 @@ debug_echo() fi } +# main + # check apt-config exstance if ! which apt-config >/dev/null ; then exit 0 diff --git a/debian/changelog b/debian/changelog index bef67eb6f..283c49fd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.15) UNRELEASED; urgency=low +apt (0.7.17) UNRELEASED; urgency=low [ Osamu Aoki ] * Updated cron script to support backups by hardlinks and @@ -10,23 +10,11 @@ apt (0.7.15) UNRELEASED; urgency=low configure-index. [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - improve apt progress reporting, display trigger actions * apt-pkg/depcache.cc: - when checking for new important deps, skip critical ones (LP: #236360) - * merge patch that enforces stricter https server certificate - checking (thanks to Arnaud Ebalard, closes: #485960) - * allow per-mirror specific https settings - (thanks to Arnaud Ebalard, closes: #485965) - * add doc/examples/apt-https-method-example.cof - (thanks to Arnaud Ebalard, closes: #485964) - * add DPkg::NoTriggers option so that applications that call - apt/aptitude (like the installer) defer trigger processing - (thanks to Joey Hess) * document --install-recommends and --no-install-recommends (thanks to Dereck Wonnacott, LP: #126180) - * fix various -Wall warnings * make "apt-get build-dep" installed packages marked automatic by default. This can be changed by setting the value of APT::Get::Build-Dep-Automatic to false (thanks to Aaron @@ -38,25 +26,163 @@ apt (0.7.15) UNRELEASED; urgency=low * cmdline/apt-cache.cc: - remove the gettext from a string that consists entirely of variables (LP: #56792) - * doc/makefile: - - add examples/apt-https-method-example.conf * apt-pkg/cacheiterators.h: - add missing checks for Owner == 0 in end() - * apt-pkg/pkgcachegen.cc: - - do not add multiple identical descriptions for the same - language (closes: #400768) + + [ Dereck Wonnacott ] + * apt-ftparchive might write corrupt Release files (LP: #46439) + * Apply --important option to apt-cache depends (LP: #16947) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Sep 2008 11:34:24 +0200 + +apt (0.7.17~exp2) experimental; urgency=low + + [ Eugene V. Lyubimkin ] + * apt-pkg/acquire-item.cc: + - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' + available. (Closes: #409284) + * apt-pkg/algorithm.cc: + - Strip username and password from source URL in error message. + (Closes: #425150) + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300 + + +apt (0.7.17~exp1) experimental; urgency=low + + [ Luca Bruno ] + * Fix typos: + - apt-pkg/depcache.cc + * Fix compilation warnings: + - apt-pkg/acquire.cc + - apt-pkg/versionmatch.cc + * Compilation fixes and portability improvement for compiling APT against non-GNU libc + (thanks to Martin Koeppe, closes: #392063): + - buildlib/apti18n.h.in: + + textdomain() and bindtextdomain() must not be visible when --disable-nls + - buildlib/inttypes.h.in: undefine standard int*_t types + - Append INTLLIBS to SLIBS: + + cmdline/makefile + + ftparchive/makefile + + methods/makefile + * doc/apt.conf.5.xml: + - clarify whether configuration items of apt.conf are case-sensitive + (thanks to Vincent McIntyre, closes: #345901) + + -- Luca Bruno <lethalman88@gmail.com> Sat, 11 Oct 2008 09:17:46 +0200 + +apt (0.7.16) unstable; urgency=low + + [ Luca Bruno ] + * doc/apt-cache.8.xml: + - search command uses POSIX regex, and searches for virtual packages too + (closes: #277536) + * doc/offline.sgml: clarify remote and target hosts + (thanks to Nikolaus Schulz, closes: #175940) + * Fix several typos in docs, translations and debian/changelog + (thanks to timeless, Nicolas Bonifas and Josh Triplett, + closes: #368665, #298821, #411532, #431636, #461458) + * Document apt-key finger and adv commands + (thanks to Stefan Schmidt, closes: #350575) + * Better documentation for apt-get --option + (thanks to Tomas Pospisek, closes: #386579) + * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276) + * Better documentation on using both APT::Default-Release and + /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575) + + [ Michael Vogt ] + * doc/apt-cache.8.xml: + - add missing citerefentry + + -- Michael Vogt <mvo@debian.org> Fri, 10 Oct 2008 23:44:50 +0200 + +apt (0.7.15) unstable; urgency=low + + * Upload to unstable + + -- Michael Vogt <mvo@debian.org> Sun, 05 Oct 2008 13:23:47 +0200 + +apt (0.7.15~exp3) experimental; urgency=low + + [Daniel Burrows] + * apt-pkg/deb/dpkgpm.cc: + - Store the trigger state descriptions in a way that does not break + the ABI. The approach taken makes the search for a string O(n) rather + than O(lg(n)), but since n == 4, I do not consider this a major + concern. If it becomes a concern, we can sort the static array and + use std::equal_range(). (Closes: #499322) + + [ Michael Vogt ] * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc: - move the state file writting into the Go() implementation of dpkgpm (closes: #498799) * apt-pkg/algorithms.cc: - fix simulation performance drop (thanks to Ferenc Wagner for reporting the issue) - - [ Dereck Wonnacott ] - * apt-ftparchive might write corrupt Release files (LP: #46439) - * Apply --important option to apt-cache depends (LP: #16947) - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Sep 2008 11:34:24 +0200 + -- Michael Vogt <mvo@debian.org> Wed, 01 Oct 2008 18:09:49 +0200 + +apt (0.7.15~exp2) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - do not add multiple identical descriptions for the same + language (closes: #400768) + + [ Program translations ] + * Catalan updated. Closes: #499462 + + -- Michael Vogt <mvo@debian.org> Tue, 23 Sep 2008 07:29:59 +0200 + +apt (0.7.15~exp1) experimental; urgency=low + + [ Christian Perrier ] + * Fix typo in cron.daily script. Closes: #486179 + + [ Program translations ] + * Traditional Chinese updated. Closes: #488526 + * German corrected and completed. Closes: #490532, #480002, #498018 + * French completed + * Bulgarian updated. Closes: #492473 + * Slovak updated. Closes: #492475 + * Galician updated. Closes: #492794 + * Japanese updated. Closes: #492975 + * Fix missing space in Greek translation. Closes: #493922 + * Greek updated. + * Brazilian Portuguese updated. + * Basque updated. Closes: #496754 + * Romanian updated. Closes: #492773, #488361 + * Portuguese updated. Closes: #491790 + * Simplified Chinese updated. Closes: #489344 + * Norwegian Bokmål updated. Closes: #480022 + * Czech updated. Closes: #479628, #497277 + * Korean updated. Closes: #464515 + * Spanish updated. Closes: #457706 + * Lithuanian added. Closes: #493328 + * Swedish updated. Closes: #497496 + * Vietnamese updated. Closes: #497893 + * Portuguese updated. Closes: #498411 + * Greek updated. Closes: #498687 + * Polish updated. + + [ Michael Vogt ] + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (closes: #485943) + * improve apt progress reporting, display trigger actions + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * doc/makefile: + - add examples/apt-https-method-example.conf + + -- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200 apt (0.7.14) unstable; urgency=low @@ -78,7 +204,7 @@ apt (0.7.14) unstable; urgency=low * Korean updated. Closes: #479426 * Basque updated. Closes: #479452 * Vietnamese updated. Closes: #479748 - * Russian updated. Closes: #479777 + * Russian updated. Closes: #479777, #499029 * Galician updated. Closes: #479792 * Portuguese updated. Closes: #479847 * Swedish updated. Closes: #479871 @@ -486,7 +612,7 @@ apt (0.7.3) unstable; urgency=low Daniel Burrows, closes: #429378) * fixes in the auto-mark code (thanks to Daniel Burrows) - * fix FTFBFS by changing build-depends to + * fix FTBFS by changing build-depends to libcurl4-gnutls-dev (closes: #428363) * cmdline/apt-get.cc: - fix InstallTask code when a pkgRecord ends @@ -550,7 +676,7 @@ apt (0.7.2) unstable; urgency=low apt (0.7.1) experimental; urgency=low - * ABI library name change because its build against + * ABI library name change because it's built against new glibc * implement SourceVer() in pkgRecords (thanks to Daniel Burrows for the patch!) @@ -600,9 +726,9 @@ apt (0.7.1) experimental; urgency=low apt (0.7.0) experimental; urgency=low - * Package that contains tall the new features + * Package that contains all the new features * Removed all #pragma interface/implementation - * Branch that contains tall the new features: + * Branch that contains all the new features: * translated package descriptions * task install support * automatic dependency removal (thanks to Daniel Burrows) |