From 9da165db08e69a0a5a467b4d02d414006590308e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 2 Aug 2009 19:37:05 +0200 Subject: * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). --- apt-pkg/contrib/mmap.cc | 2 +- debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa52b4c30..4d5fcf71e 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String, but why we should not at least try to grow it before we give up? */ bool DynamicMMap::Grow() { -#ifdef _POSIX_MAPPED_FILES +#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) unsigned long newSize = WorkSpace + 1024*1024; if(Fd != 0) diff --git a/debian/changelog b/debian/changelog index cb5e74cb6..4e3177efe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ apt (0.7.23) unstable; urgency=low + [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) - -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on + non-Linux architectures (as it uses mremap). + + -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3 From 67793cf3c90c40941d5445335345cf4042d44206 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:02:14 +0200 Subject: * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). --- apt-pkg/sourcelist.cc | 9 ++++++--- debian/changelog | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 47a08ad90..4b3abe918 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -157,15 +157,18 @@ bool pkgSourceList::ReadMainList() // CNC:2003-11-28 - Entries in sources.list have priority over // entries in sources.list.d. string Main = _config->FindFile("Dir::Etc::sourcelist"); + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Main) == true) Res &= ReadAppend(Main); - else + else if (FileExists(Parts) == false) + // Only warn if there are no sources.list.d. _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); - string Parts = _config->FindDir("Dir::Etc::sourceparts"); if (FileExists(Parts) == true) Res &= ReadSourceDir(Parts); - else + else if (FileExists(Main) == false) + // Only warn if there is no sources.list file. _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); return Res; diff --git a/debian/changelog b/debian/changelog index 4e3177efe..b360a0b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). + * apt-pkg/sourcelist.cc: + - Only warn about missing sources.list if there is no sources.list.d + and vice versa as only one of them is needed (Closes: #539731). - -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 + -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3 From 48778d1198eb37dca437a878cd0b97a7cfb4e32e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:20:07 +0200 Subject: debian/control: Add myself to Uploaders. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b360a0b23..2e4923740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). + * debian/control: + - Add myself to Uploaders. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 84c411509..910436d19 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno + Luca Bruno , Julian Andres Klode Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From 05ecd9b6027842cbdbc461b0eeb48c74bc8accbe Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:34:39 +0200 Subject: Set version to 0.7.22.1. --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 48b1def5c..9131e2fbe 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.7.21") +AC_DEFINE_UNQUOTED(VERSION,"0.7.22.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2e4923740..646bf745c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -apt (0.7.23) unstable; urgency=low +apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) + Martin Pitt for reporting the problem), also Closes: #535362. [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: -- cgit v1.2.3 From 00388ba3ec5af81f529d038f0c44eb4e20504f14 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:40:11 +0200 Subject: debian/changelog: Close the FTBFS on kFreeBSD bug. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 646bf745c..f2e7552dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.22.1) unstable; urgency=low [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on - non-Linux architectures (as it uses mremap). + non-Linux architectures as it uses mremap (Closes: #539742). * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). -- cgit v1.2.3 From e0423680dc09d64afdc62bf3a756a8ef9849365b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:48:29 +0200 Subject: debian/control: Increase Standards-Version to 3.8.2.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f2e7552dd..59d9a0b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.7.22.1) unstable; urgency=low and vice versa as only one of them is needed (Closes: #539731). * debian/control: - Add myself to Uploaders. + - Increase Standards-Version to 3.8.2.0. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 910436d19..cb20e2864 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.1.0 +Standards-Version: 3.8.2.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From 6985efb330487fb4ceb3fea0b4bfc86010c6d7f8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:12:20 +0200 Subject: debian/apt.cron.daily: Make sure that VERBOSE is always set before accessing it (Closes: #539366) --- debian/apt.cron.daily | 4 +--- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 4f47ccfab..35ee5db6c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -320,11 +320,9 @@ if ! which apt-config >/dev/null ; then fi # Set VERBOSE mode from apt-config (or inherit from environment) +VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) debug_echo "verbose level $VERBOSE" -if [ -z "$VERBOSE" ]; then - VERBOSE="0" -fi if [ "$VERBOSE" -le 2 ]; then # quiet for 0,1,2 XSTDOUT=">/dev/null" diff --git a/debian/changelog b/debian/changelog index 59d9a0b27..377cc6b57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.22.2) unstable; urgency=low + + * debian/apt.cron.daily: Make sure that VERBOSE is always set + before accessing it (Closes: #539366) + + -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 17443d48b60b1abad4d16a2b6a3e3b3199bfa7d3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:33:57 +0200 Subject: debian/apt.cron.daily: Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) --- debian/apt.cron.daily | 11 +++++++++++ debian/changelog | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 35ee5db6c..3973e63b5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,9 @@ # Dir::Cache::Archive "archives/"; # - Set package archive directory # +# APT::Periodic::Enable "1"; +# - Enable the update/upgrade script (0=disable) +# # APT::Periodic::BackupArchiveInterval "0"; # - Backup after n-days if archive contents changed.(0=disable) # @@ -319,6 +322,14 @@ if ! which apt-config >/dev/null ; then exit 0 fi +# check if the user really wants to do something +AutoAptEnable=1 # default is yes +eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) + +if [ AutoAptEnable -eq 0 ]; then + exit 0 +fi + # Set VERBOSE mode from apt-config (or inherit from environment) VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) diff --git a/debian/changelog b/debian/changelog index 377cc6b57..21772e5df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ apt (0.7.22.2) unstable; urgency=low - * debian/apt.cron.daily: Make sure that VERBOSE is always set - before accessing it (Closes: #539366) + * debian/apt.cron.daily: + - Make sure that VERBOSE is always set (Closes: #539366) + - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) - -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 apt (0.7.22.1) unstable; urgency=low -- cgit v1.2.3 From 6b519e4227f41980b6de18a882808df92f1e36f1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:48:41 +0200 Subject: debian/apt.cron.daily: Support using debdelta to download packages (Closes: #532079) --- debian/apt.cron.daily | 11 ++++++++++- debian/changelog | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3973e63b5..a09eeaca8 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -49,7 +49,10 @@ # # APT::Periodic::Download-Upgradeable-Packages "0"; # - Do "apt-get upgrade --download-only" every n-days (0=disable) -# +# +# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; +# - Use debdelta-upgrade to download updates if available (0=disable) +# # APT::Periodic::Unattended-Upgrade "0"; # - Run the "unattended-upgrade" security upgrade script # every n-days (0=disabled) @@ -395,6 +398,9 @@ eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) BackupArchiveInterval=0 eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) +Debdelta=1 +eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) + # check if we actually have to do anything if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && @@ -438,6 +444,9 @@ fi # download all upgradeable packages (if it is requested) DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if [ $Debdelta -eq 1 ]; then + debdelta-upgrade >/dev/null 2>&1 || true + fi if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "download upgradable (success)" diff --git a/debian/changelog b/debian/changelog index 21772e5df..2d3446d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ apt (0.7.22.2) unstable; urgency=low * debian/apt.cron.daily: - Make sure that VERBOSE is always set (Closes: #539366) - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) + - Support using debdelta to download packages (Closes: #532079) -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 -- cgit v1.2.3 From 9a64707c285290c4e191e04d92c0fab9f6f118f5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:54:27 +0200 Subject: debian/apt.cron.daily: Fix issue related to APT::Periodic::Enable. --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index a09eeaca8..b6099ee75 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -329,7 +329,7 @@ fi AutoAptEnable=1 # default is yes eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) -if [ AutoAptEnable -eq 0 ]; then +if [ $AutoAptEnable -eq 0 ]; then exit 0 fi -- cgit v1.2.3