From: Michael Vogt Date: Wed, 10 Dec 2008 01:49:46 +0000 (-0800) Subject: merged from the debian-sid branch X-Git-Tag: 0.7.22~6^2~32 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/de4e6f6b78154cf2c4afea4aea74b5bca3fba96f?ds=inline;hp=-c merged from the debian-sid branch --- de4e6f6b78154cf2c4afea4aea74b5bca3fba96f diff --combined cmdline/apt-cache.cc index 11bc4fe03,4431fd4f9..425df6994 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@@ -102,13 -102,15 +102,13 @@@ bool UnMet(CommandLine &CmdL if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends && - End->Type != pkgCache::Dep::DpkgBreaks) + End->Type != pkgCache::Dep::Recommends) continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends && - End->Type != pkgCache::Dep::DpkgBreaks) + End->Type != pkgCache::Dep::Depends) continue; // Verify the or group @@@ -555,7 -557,6 +555,7 @@@ bool Depends(CommandLine &CmdL bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); bool Installed = _config->FindB("APT::Cache::Installed",false); + bool Important = _config->FindB("APT::Cache::Important",false); bool DidSomething; do { @@@ -578,12 -579,7 +578,12 @@@ for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) { - + // Important deps only + if (Important == true) + if (D->Type != pkgCache::Dep::PreDepends && + D->Type != pkgCache::Dep::Depends) + continue; + pkgCache::PkgIterator Trg = D.TargetPkg(); if((Installed && Trg->CurrentVer != 0) || !Installed) @@@ -1533,8 -1529,7 +1533,8 @@@ bool Policy(CommandLine &CmdL if (SrcList->FindIndex(F,Indx) == false && _system->FindIndex(F,Indx) == false) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(_("%4i %s\n"), + + printf("%4i %s\n", Plcy.GetPriority(F),Indx->Describe(true).c_str()); // Print the reference information for the package @@@ -1744,8 -1739,8 +1744,8 @@@ bool ShowHelp(CommandLine &Cmd " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" - " dotty - Generate package graphs for GraphVis\n" + " pkgnames - List the names of all packages in the system\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" diff --combined cmdline/apt-get.cc index 2ef32a615,43f8ec8b8..4dbc4873f --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -1295,9 -1295,9 +1295,9 @@@ pkgSrcRecords::Parser *FindSrc(const ch { string Ver = Parse->Version(); - // Skip name mismatches - if (IsMatch == true && Parse->Package() != Src) - continue; + // show name mismatches + if (IsMatch == true && Parse->Package() != Src) + ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) { @@@ -1721,6 -1721,7 +1721,7 @@@ bool DoInstall(CommandLine &CmdL "requested an impossible situation or if you are using the unstable\n" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming.") << endl; + /* if (Packages == 1) { c1out << endl; @@@ -1729,6 -1730,7 +1730,7 @@@ "the package is simply not installable and a bug report against\n" "that package should be filed.") << endl; } + */ c1out << _("The following information may help to resolve the situation:") << endl; c1out << endl; @@@ -2513,7 -2515,7 +2515,7 @@@ bool DoBuildDep(CommandLine &CmdL { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; - if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) + if(_config->FindB("APT::Get::Build-Dep-Automatic", true) == true) Cache->MarkAuto(Pkg, true); continue; } @@@ -2730,6 -2732,7 +2732,7 @@@ int main(int argc,const char *argv[] {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"auto-remove","APT::Get::AutomaticRemove",0}, + {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, diff --combined debian/changelog index e2a0365ac,5b3c1a470..c113a9597 --- a/debian/changelog +++ b/debian/changelog @@@ -1,56 -1,190 +1,237 @@@ - apt (0.7.17) UNRELEASED; urgency=low ++apt (0.7.21) UNRELEASED; urgency=low + + [ Osamu Aoki ] + * Updated cron script to support backups by hardlinks and + verbose levels. All features turned off by default. + * Added more error handlings. Closes: #438803, #462734, #454989, + * Refactored condition structure to make download and upgrade performed + if only previous steps succeeded. Closes: #341970 + * Documented all cron script related configuration items in + configure-index. + + [ Michael Vogt ] - * apt-pkg/depcache.cc: - - when checking for new important deps, skip critical ones - (LP: #236360) - * document --install-recommends and --no-install-recommends - (thanks to Dereck Wonnacott, LP: #126180) - * 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 - Haviland, closes: #44874, LP: #248268) + * apt-pkg/indexcopy.cc: + - support having CDs with no Packages file (just a Packages.gz) + by not forcing a verification on non-existing files + (LP: #255545) - * 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/deb/dpkgpm.cc: + - fix potential hang when in a backgroud process group - - fix SIGHUP handling (closes: #463030) + * apt-pkg/indexrecords.cc: + - fix some i18n issues + * apt-pkg/contrib/strutl.h: + - add new strprintf() function to make i18n strings easier + * methods/gpgv.cc: + - fix compiler warning + * cmdline/apt-get.cc: + - fix "apt-get source pkg=ver" if binary name != source name + and show a message (LP: #202219) + * apt-pkg/deb/debsystem.cc: + - make strings i18n able + + [ Dereck Wonnacott ] + * apt-ftparchive might write corrupt Release files (LP: #46439) + * Apply --important option to apt-cache depends (LP: #16947) + + -- Michael Vogt Fri, 12 Sep 2008 11:34:24 +0200 + + apt (0.7.20) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/changelog: + - Fixed place of 'merged install-recommends and install-task branches' + from 0.6.46.1 to 0.7.0. (Closes: #439866) + * buildlib/config.{sub,guess}: + - Renewed. This fixes lintian errors. + * doc/apt.conf.5.xml, debian/apt-transport-https: + - Documented briefly 'APT::https' group of options. (Closes: #507398) + - Applied patch from Daniel Burrows to document 'Debug' group of options. + (Closes: #457265) + - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. + (Closes: #438559) + + [ Michael Vogt ] ++ * apt-pkg/depcache.cc: ++ - when checking for new important deps, skip critical ones ++ (LP: #236360) ++ * document --install-recommends and --no-install-recommends ++ (thanks to Dereck Wonnacott, LP: #126180) + * 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 + Haviland, closes: #44874, LP: #248268) + + -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 + + apt (0.7.20~exp2) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * doc/examples/sources.list: + - Removed obsolete commented non-us deb-src entry, replaced it with + 'deb-src security.debian.org' one. (Closes: #411298) + * apt-pkg/contrib/mmap.cc: + - Added instruction how to work around MMap error in MMap error message. + (Closes: #385674, 436028) + + [ Christian Perrier ] + * Translations: + - French corrected (remove awful use of first person) + + -- Michael Vogt Tue, 02 Dec 2008 20:30:14 +0100 + + apt (0.7.19) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * doc/sources.list.5.xml: + - Mentioned allowed characters in file names in /etc/apt/sources.list.d. + Thanks to Matthias Urlichs. (Closes: #426913) + * doc/apt-get.8.xml: + - Explicitly say that 'dist-upgrade' command may remove packages. + - Included '-v'/'--version' as a command to synopsis. + * cmdline/apt-cache.cc: + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) + - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) + - Removed asking to file a release-critical bug against a package if there + is a request to install only one package and it is not installable. + (Closes: #419521) + + + [ Michael Vogt ] + - fix SIGHUP handling (closes: #463030) + + [ Christian Perrier ] + * Translations: + - French updated + - Bulgarian updated. Closes: #505476 + - Slovak updated. Closes: #505483 + - Swedish updated. Closes: #505491 + - Japanese updated. Closes: #505495 + - Korean updated. Closes: #505506 + - Catalan updated. Closes: #505513 + - British English updated. Closes: #505539 + - Italian updated. Closes: #505518, #505683 + - Polish updated. Closes: #505569 + - German updated. Closes: #505614 + - Spanish updated. Closes: #505757 + - Romanian updated. Closes: #505762 + - Simplified Chinese updated. Closes: #505727 + - Portuguese updated. Closes: #505902 + - Czech updated. Closes: #505909 + - Norwegian Bokmål updated. Closes: #505934 + - Brazilian Portuguese updated. Closes: #505949 + - Basque updated. Closes: #506085 + - Russian updated. Closes: #506452 + - Marathi updated. + - Ukrainian updated. Closes: #506545 + + -- Michael Vogt Mon, 24 Nov 2008 10:33:54 +0100 + + apt (0.7.18) unstable; urgency=low + + [ Christian Perrier ] + * Translations: + - French updated + - Thai updated. Closes: #505067 + + [ Eugene V. Lyubimkin ] + * doc/examples/configure-index: + - Removed obsoleted header line. (Closes: #417638) + - Changed 'linux-kernel' to 'linux-image'. + * doc/sources.list.5.xml: + - Fixed typo and grammar in 'sources.list.d' section. Thanks to + Timothy G Abbott . (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) + + [ Michael Vogt ] + * fix depend on libdb4.4 (closes: #501253) + + -- Michael Vogt Fri, 07 Nov 2008 22:13:39 +0100 + + apt (0.7.17) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/control: + - 'Vcs-Bzr' field is official, used it. + - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Actualized 'Uploaders' field. + * doc/: + - Substituded 'apt-archive' with 'apt-ftparchive' in docs. + Patch based on work of Andre Felipe Machado. (Closes: #350865) + - Mentioned '/' and '=' for 'apt-get install' and + '=' for 'apt-get source' in apt-get manpage. Patch based on + work of Andre Felipe Machado. (Closes: #399673) + - Mentioned more short options in the apt-get manpage. Documented 'xvcg' + option in the apt-cache manpage. The part of patch by Andre Felipe + Machado. (Closes: #176106, #355945) + - Documented that 'apt-get install' command should be used for upgrading + some of installed packages. Based on patch by Nori Heikkinen and + Andre Felipe Machado. (Closes: #267087) + - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) + - Documented 'APT::Default-Release' in apt.conf manpage. (Closes: #430399) + - APT::Install-Recommends is now true by default, mentioned this in + configure-index example. (Closes: #463268) + - Added 'APT::Get::AllowUnauthenticated' to configure-index example. + (Closes: #320225) + - Documented '--no-install-recommends' option in apt-get manpage. + (Closes: #462962) + - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) + - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in + sources.list manpage, as they are already described under in the manpage. + - Removed notice that ssh/rsh access cannot use password authentication + from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894) + - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by + Andre Felipe Machado. (Closes: #309893) + - Added 'dist-upgrade' apt-get synopsis in apt-get manpage. + (Closes: #323866) + + -- Michael Vogt Wed, 05 Nov 2008 13:14:56 +0100 + + apt (0.7.17~exp4) experimental; urgency=low + + * debian/rules: + - Fixed lintian warnings "debian/rules ignores make errors". + * debian/control: + - Substituted outdated "Source-Version" fields with "binary:Version". + - Added 'python-apt' to Suggests, as apt-mark need it for work. + - Drop Debian revision from 'doc-base' build dependency, this fixes + appropriate lintian warning. + * debian/libapt-pkg-doc.doc-base.*: + - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate + lintian warnings. + * debian/{postrm,prerm,preinst}: + - Added 'set -e', fixes lintian warnings + 'maintainer-script-ignores-error'. + * dselect/makefile: + - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. + * share/lintian-overrides: + - Added with override of 'apt must depend on python'. Script 'apt-mark' + needs apt-python for working and checks this on fly. We don't want + python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) + + -- Eugene V. Lyubimkin Fri, 31 Oct 2008 23:45:17 +0300 + + apt (0.7.17~exp3) experimental; urgency=low + + * apt-pkg/acquire-item.cc: + - fix a merge mistake that prevents the fallback to the + uncompressed 'Packages' to work correctly (closes: #409284) + + -- Michael Vogt Wed, 29 Oct 2008 09:36:24 +0100 + apt (0.7.17~exp2) experimental; urgency=low [ Eugene V. Lyubimkin ] @@@ -60,9 -194,11 +241,11 @@@ * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + + [ Michael Vogt ] + * fix various -Wall warnings - -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 - + -- Michael Vogt Tue, 28 Oct 2008 18:06:38 +0100 apt (0.7.17~exp1) experimental; urgency=low @@@ -754,6 -890,16 +937,16 @@@ apt (0.7.0) experimental; urgency=lo * support for unattended-upgrades (via unattended-upgrades package) * added apt-transport-https method + * merged "install-recommends" branch (ABI break): + - new "--install-recommends" + - install new recommends on "upgrade" if --install-recommends is + given + - new "--fix-policy" option to install all packages with unmet + important dependencies (usefull with --install-recommends to + see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + * merged "install-task" branch (use with "apt-get install taskname^") -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 @@@ -844,16 -990,6 +1037,6 @@@ apt (0.6.46.2) unstable; urgency=lo apt (0.6.46.1) unstable; urgency=low - * merged "install-recommends" branch (ABI break): - - new "--install-recommends" - - install new recommends on "upgrade" if --install-recommends is - given - - new "--fix-policy" option to install all packages with unmet - important dependencies (usefull with --install-recommends to - see what not-installed recommends are on the system) - - fix of recommended packages display (only show CandidateVersion - fix or-group handling) - * merged "install-task" branch (use with "apt-get install taskname^") * methods/gzip.cc: - deal with empty files * Applied patch from Daniel Schepler to make apt bin-NMU able. diff --combined doc/apt-cache.8.xml index c375f3893,21605ff0e..6c8938d8c --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@@ -51,6 -51,7 +51,7 @@@ rdepends pkg pkgnames prefix dotty pkg + xvcg pkg policy pkgs madison pkgs @@@ -249,6 -250,11 +250,11 @@@ Reverse Provides Caution, dotty cannot graph larger sets of packages. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + policy [ pkg(s) ] policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the @@@ -294,7 -300,7 +300,7 @@@ - Print only important dependencies; for use with unmet. Causes only Depends and + Print only important dependencies; for use with unmet and depends. Causes only Depends and Pre-Depends relations to be printed. Configuration Item: APT::Cache::Important. diff --combined doc/apt-get.8.xml index b164022bd,ace7f9e1b..64c3a35e4 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@@ -15,7 -15,7 +15,7 @@@ &apt-email; &apt-product; - 29 February 2004 + 08 November 2008 @@@ -33,22 -33,74 +33,74 @@@ apt-get - - - + + + + + + + + + + + + target_release_name + + + target_release_number_expression + + + + - update - upgrade - dselect-upgrade - install pkg - remove pkg - purge pkg - source pkg - build-dep pkg - check - clean - autoclean - autoremove + update + upgrade + dselect-upgrade + dist-upgrade + install + pkg + + + + =pkg_version_number + + + /target_release_name + + + + + + remove pkg + purge pkg + source + pkg + + =pkg_version_number + + + + build-dep pkg + check + clean + autoclean + autoremove + + + -v + --version + + + + + -h + --help + + @@@ -56,8 -108,8 +108,8 @@@ Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as dselect(8), - aptitude, synaptic, gnome-apt and wajig. + library. Several "front-end" interfaces exist, such as &dselect;, + &aptitude;, &synaptic;, &gnome-apt; and &wajig;. Unless the , or option is given, one of the commands below must be present. @@@ -104,6 -156,7 +156,7 @@@ with new versions of packages; apt-get has a "smart" conflict resolution system, and it will attempt to upgrade the most important packages at the expense of less important ones if necessary. + So, dist-upgrade command may remove some packages. The /etc/apt/sources.list file contains a list of locations from which to retrieve desired package files. See also &apt-preferences; for a mechanism for @@@ -111,17 -164,24 +164,24 @@@ install - install is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not libc6_1.9.6-2.deb) All packages required - by the package(s) specified for installation will also be retrieved and - installed. The /etc/apt/sources.list file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system. + + install is followed by one or more + packages desired for installation or upgrading. + Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, + libc6 would be the argument provided, not + libc6_1.9.6-2.deb). All packages required + by the package(s) specified for installation will also + be retrieved and installed. + The /etc/apt/sources.list file is + used to locate the desired packages. If a hyphen is + appended to the package name (with no intervening space), + the identified package will be removed if it is installed. + Similarly a plus sign can be used to designate a + package to install. These latter features may be used + to override decisions made by apt-get's conflict + resolution system. + A specific version of a package can be selected for installation by following the package name with an equals and the version of the package @@@ -133,6 -193,17 +193,17 @@@ Both of the version selection mechanisms can downgrade packages and must be used with care. + This is also the target to use if you want to upgrade one or + more already-installed packages without upgrading every package + you have on your system. Unlike the "upgrade" target, which + installs the newest version of all currently installed packages, + "install" will install the newest version of only the package(s) + specified. Simply provide the name of the package(s) you wish + to upgrade, and if a newer version is available, it (and its + dependencies, as described above) will be downloaded and + installed. + + Finally, the &apt-preferences; mechanism allows you to create an alternative installation policy for individual packages. @@@ -148,14 -219,15 +219,15 @@@ remove remove is identical to install except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. purge purge is identical to remove except that packages are - removed and purged. + removed and purged (any configuration files are deleted too). source @@@ -222,6 -294,11 +294,11 @@@ &apt-cmdblurb; + + Do not consider recommended packages as a dependency for installing. + Configuration Item: APT::Install-Recommends. + + Download only; package files are only retrieved, not unpacked or installed. Configuration Item: APT::Get::Download-Only. @@@ -313,14 -390,6 +390,14 @@@ Configuration Item: APT::Get::Compile. + + Also install recommended packages. + + + + Do not install recommended packages. + + Ignore package Holds; This causes apt-get to ignore a hold placed on a package. This may be useful in conjunction with @@@ -357,7 -426,8 +434,8 @@@ Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. is equivalent for + command. Configuration Item: APT::Get::Purge. @@@ -458,7 -528,7 +536,7 @@@ /etc/apt/apt.conf.d/ - APT configuration file fragments + APT configuration file fragments. Configuration Item: Dir::Etc::Parts. @@@ -503,7 -573,16 +581,16 @@@ Diagnostics apt-get returns zero on normal operation, decimal 100 on error. - + + ORIGINAL AUTHORS + &apt-author.jgunthorpe; + + + CURRENT AUTHORS + + &apt-author.team; + &apt-qapage; + + &manbugs; - diff --combined doc/examples/configure-index index 0bab8e0f8,db07f189e..84b1d8829 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -1,4 -1,3 +1,3 @@@ - // $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default @@@ -25,13 -24,14 +24,14 @@@ AP Architecture "i386"; Build-Essential "build-essential"; - NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + NeverAutoRemove { "linux-image.*"; }; // packages that should never // considered for autoRemove // Options for apt-get Get { Arch-Only "false"; + AllowUnauthenticated "false"; AutomaticRemove "false"; HideAutoRemove "false"; Download-Only "false"; @@@ -104,7 -104,7 +104,7 @@@ // consider Recommends, Suggests as important dependencies that should // be installed by default - Install-Recommends "false"; + Install-Recommends "true"; Install-Suggests "false"; // consider dependencies of packages in this section manual @@@ -115,56 -115,6 +115,56 @@@ // Keep the list of FDs open (normally apt closes all fds when it // does a ExecFork) Keep-Fds {}; + + // control parameters for cron jobs by /etc/cron.daily/apt + Periodic + { + BackupArchiveInterval "0"; + // - Backup after n-days if archive contents changed.(0=disable) + + BackupLevel "3"; + // - Backup level.(0=disable), 1 is invalid. + + // APT::Archives::MaxAge "0"; (old, deprecated) + MaxAge "0"; // (new) + // - Set maximum allowed age of a cache package file. If a cache + // package file is older it is deleted (0=disable) + + // APT::Archives::MinAge "2"; (old, deprecated) + MinAge "2"; // (new) + // - 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. + + // APT::Archives::MaxSize "0"; (old, deprecated) + MaxSize "0"; // (new) + // - 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). + + Update-Package-Lists "0"; + // - Do "apt-get update" automatically every n-days (0=disable) + // + Download-Upgradeable-Packages "0"; + // - Do "apt-get upgrade --download-only" every n-days (0=disable) + // + Unattended-Upgrade "0"; + // - Run the "unattended-upgrade" security upgrade script + // every n-days (0=disabled) + // Requires the package "unattended-upgrades" and will write + // a log in /var/log/unattended-upgrades + // + AutocleanInterval "0"; + // - Do "apt-get autoclean" every n-days (0=disable) + + Verbose "0"; + // - Send report mail to root + // 0: no report (or null string) + // 1: progress report (actually any string) + // 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) + // 3: + trace on + }; }; // Options for the downloading routines @@@ -261,8 -211,6 +261,8 @@@ Dir "/ // Location of the cache dir Cache "var/cache/apt/" { Archives "archives/"; + // backup directory created by /etc/cron.daily/apt + Backup "backup/"; srcpkgcache "srcpkgcache.bin"; pkgcache "pkgcache.bin"; };