diff options
| -rwxr-xr-x | cmdline/apt-key | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 104 | ||||
| -rw-r--r-- | debian/changelog | 16 |
4 files changed, 121 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index a96afe944..be2b19a1a 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -21,7 +21,7 @@ update() { fi # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import # remove no-longer used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'` diff --git a/configure.in b/configure.in index 8c2fcbae6..3c5d6d69d 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.32") +AC_DEFINE_UNQUOTED(VERSION,"0.6.35") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3e6b384d2..7ee7e46db 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -2,6 +2,33 @@ # #set -e +# +# This file understands the following apt configuration variables: +# +# "APT::Periodic::Update-Package-Lists=1" +# - Do "apt-get update" automatically every n-days (0=disable) +# +# "APT::Periodic::Download-Upgradeable-Packages=0", +# - Do "apt-get upgrade --download-only" every n-days (0=disable) +# +# "APT::Periodic::AutocleanInterval" +# - Do "apt-get autoclean" every n-days (0=disable) +# +# "APT::Archives::MaxAge", +# - Set maximum allowed age of a cache package file. If a cache +# package file is older it is deleted (0=disable) +# +# "APT::Archives::MaxSize", +# - Set maximum size of the cache in MB (0=disable). If the cache +# is bigger, cached package files are deleted until the size +# requirement is met (the biggest packages will be deleted +# first). +# +# "APT::Archives::MinAge" +# - Set minimum age of a package file. If a file is younger it +# will not be deleted (0=disable). Usefull to prevent races +# and to keep backups of the packages for emergency. +# check_stamp() { @@ -21,6 +48,11 @@ check_stamp() now=$(date --date=$(date --iso-8601) +%s) delta=$(($now-$stamp)) + # intervall is in days, + interval=$(($interval*60*60*24)) + #echo "stampfile: $1" + #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta" + if [ $delta -ge $interval ]; then return 0 fi @@ -35,6 +67,75 @@ update_stamp() touch $stamp } + + +# we check here if autoclean was enough sizewise +check_size_constraints() +{ + # min-age in days + MaxAge=0 + MinAge=1 + 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 -not -mtime -$MinAge -print0 | xargs -r -0 rm -f + elif [ ! $MaxAge -eq 0 ]; then + find $Cache -name "*.deb" -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); 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 + mtime=$(date --date=$(date -r $file --iso-8601) +%s) + delta=$(($now-$mtime)) + #echo "$file ($delta), $MinAge" + if [ $delta -le $MinAge ]; then + #echo "Skiping $file (delta=$delta)" + continue + fi + fi + + # delete oldest file + rm -f $file + done + fi +} + + UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) @@ -74,3 +175,6 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then apt-get -qq autoclean update_stamp $AUTOCLEAN_STAMP fi + +# check cache size +check_size_constraints diff --git a/debian/changelog b/debian/changelog index 70aa27365..f20dcc313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,21 @@ -apt (0.6.34) UNRELEASED; urgency=low +apt (0.6.35) hoary; urgency=low + + * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1): + - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache + from growing too large (Ubuntu #6761) + * some comments about the pkgAcqMetaSig::Custom600Headers() added + * use gpg --with-colons + * commented the ftp no_proxy unseting in methods/ftp.cc + * added support for "Acquire::gpgv::options" in methods/gpgv.cc + + -- Matt Zimmerman <mdz@ubuntu.com> Mon, 7 Mar 2005 20:08:33 -0800 + +apt (0.6.34) hoary; urgency=low * Add missing semicolon to configure-index (Closes: #295773) * Update build-depends on gettext to 0.12 (Closes: #295077) + * Merge from bubulle@debian.org--2005/apt--main--0 to get + translation updates -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Mar 2005 16:13:15 -0800 |