From acdd8da1f53c69e8d3a8e3c8430470752aa3df3a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Dec 2009 23:28:57 +0100 Subject: * apt-pkg/init.h: - add compatibilty with old ABI name until the next ABI break --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1f4fa38b8..64e676709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low (thanks also to Jussi Hakala and Julian Andres Klode) * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions + * apt-pkg/init.h: + - add compatibilty with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3 From bb1293d975294884a95b9cb298432c9cf9ecc995 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:23:18 +0100 Subject: Backport rred patches from my own sid branch to the 0.7.25 branch * rewrite and refactor rred method to be able to handle even big (>30 MB) patches (Closes: #554349) and hardening the method itself by using more constants and a return value which can't be misinterpreted as linenumber * Finally adope the patch from Morten Hustveit to be able to optional use mmaps and iovec to increase patch speed - but as this increase memory usage we can always fall back to the "old" method which doesn't depend on mmaps. --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64e676709..c54fb431b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,10 @@ apt (0.7.25) UNRELEASED; urgency=low - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) + * methods/rred.cc: + - rewrite to be able to handle even big patch files + - adopt optional mmap+iovec patch from Morten Hustveit + (Closes: #463354) which should speed up a bit. Thanks! [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From 9f542bae2b3620887345ebc3e61970f8903123a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:32:01 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c54fb431b..0cfd36c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,9 @@ apt (0.7.25) UNRELEASED; urgency=low - rewrite to be able to handle even big patch files - adopt optional mmap+iovec patch from Morten Hustveit (Closes: #463354) which should speed up a bit. Thanks! + * methods/http{,s}.cc + - add config setting for User-Agent to the Acquire group, + thanks Timothy J. Miller! (Closes: #355782) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From b9e9a44b3377cae2fb9aca3210f379ae1cb802ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:38:13 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0cfd36c00..e930de0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: @@ -97,6 +98,7 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) + - add https options which default to http ones (Closes: #557085) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From d746ad6e049c472339003396f934e8ee93a0a378 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:42:43 +0100 Subject: add AI_ADDRCONFIG to ai_flags in connect.cc as suggested by Aurelien Jarno in his response to Bernhard R. Link's patch, thanks! (Closes: #505020) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e930de0dd..b8e435330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno + in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead -- cgit v1.2.3 From 879cbcc8685781ba6f89a9123acd50c794490f2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:44:32 +0100 Subject: check cache size even if we do nothing else otherwise in apt.cron.daily, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) --- debian/apt.cron.daily | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b6099ee75..e59b05ee4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) -# check if we actually have to do anything +# check if we actually have to do anything that requires locking the cache if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + exit 0 fi diff --git a/debian/changelog b/debian/changelog index b8e435330..7fa06e02c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) + * debian/apt.cron.daily: + - check cache size even if we do nothing else otherwise, thanks + Francesco Poli for patch(s) and patience! (Closes: #459344) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From ca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:48:52 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7fa06e02c..af68b8ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,9 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.cron.daily: - check cache size even if we do nothing else otherwise, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) + * ftparchive/*: + - fix a few typos in strings, comments and manpage, + thanks Karl Goetz! (Closes: #558757) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From c0a73937424fa427972835342f12f5fbaa6d0c88 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Dec 2009 01:54:33 +0100 Subject: revert this commit as fast as possible (aka next ABI break) This commit sets up our faked library extension to trick the build system into building the packages with libc6.9-6 while we are actually already at libc6.10-6. Oh dear... --- debian/rules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index f69c0cffb..d01b57cd6 100755 --- a/debian/rules +++ b/debian/rules @@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets # the right overrides.. rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ build: build/build-stamp build-doc: build/build-doc-stamp -- cgit v1.2.3 From c42d68057cf711b53e9da0217a0ec54cffef4036 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Dec 2009 16:28:25 +0100 Subject: refactor the current changelog a bit --- debian/changelog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af68b8ec2..d60bdb51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,6 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #548571 * German translation update by Holger Wansing Closes: #551534 - * German translation of manpages by Chris Leick - Closes: #552606 * Italian translation update by Milo Casagrande Closes: #555797 * Simplified Chinese translation update by Aron Xu @@ -37,7 +35,7 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions * apt-pkg/init.h: - - add compatibilty with old ABI name until the next ABI break + - add compatibility with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: @@ -62,7 +60,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/apt-mark.8.xml: - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) * cmdline/apt-get.cc: - - source should displays his final pkg pick (Closes: #249383, #550952) + - source should display his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) @@ -84,11 +82,6 @@ apt (0.7.25) UNRELEASED; urgency=low - bump policy to 3.8.3 as we have no outdated manpages anymore * debian/NEWS: - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) - * cmdline/apt-mark: - - print an error if a new state file can't be created, - thanks Carl Chenet! (Closes: #521289) - - print an error and exit if python-apt is not installed, - thanks Carl Chenet! (Closes: #521284) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: @@ -108,7 +101,14 @@ apt (0.7.25) UNRELEASED; urgency=low - fix a few typos in strings, comments and manpage, thanks Karl Goetz! (Closes: #558757) + [ Carl Chenet ] + * cmdline/apt-mark: + - print an error if a new state file can't be created + (Closes: #521289) and + - exit nicely if python-apt is not installed (Closes: #521284) + [ Chris Leick ] + * doc/de: German translation of manpages (Closes: #552606) * doc/ various manpages: - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: -- cgit v1.2.3 From f8b832bdbe85ca315404edcf1159fb1225fddfbf Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Dec 2009 16:32:18 +0100 Subject: remove informalexample tag which hides the programlisting in the tree section of the apt-ftparchive manpage, thanks Chris Leick for noticing it! --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d60bdb51f..2b09c9b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,8 @@ apt (0.7.25) UNRELEASED; urgency=low - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: - replace literal with emphasis tags in Archive configuration + * doc/apt-ftparchive.1.xml: + - remove informalexample tag which hides the programlisting [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h -- cgit v1.2.3 From 5d70f74c114450f001d415eea101610eedaee05b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Dec 2009 19:06:01 +0100 Subject: fix to other oddities observed by Chris Leick while translating in doc/apt-get.8.xml, namely: - change equivalent "for" to "to the" (purge command) - clarify --fix-broken sentence about specifying packages --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2b09c9b68..cd4573468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,9 @@ apt (0.7.25) UNRELEASED; urgency=low - replace literal with emphasis tags in Archive configuration * doc/apt-ftparchive.1.xml: - remove informalexample tag which hides the programlisting + * doc/apt-get.8.xml: + - change equivalent "for" to "to the" (purge command) + - clarify --fix-broken sentence about specifying packages [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h -- cgit v1.2.3 From 6847d275374c198f787c4978a49e7056f65a0a3d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Dec 2009 17:45:51 +0100 Subject: merge segfault fix from Mario Sanchez Prada, many thanks (closes: #561109) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cd4573468..c2a253484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add "purge" to list of known actions * apt-pkg/init.h: - add compatibility with old ABI name until the next ABI break + * merge segfault fix from Mario Sanchez Prada, many thanks + (closes: #561109) [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3 From 82c9bbffa2a8c9d614514d24eff0842961212486 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Dec 2009 13:49:21 +0100 Subject: releasing version 0.7.25 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c2a253484..53dfcce12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25) UNRELEASED; urgency=low +apt (0.7.25) unstable; urgency=low [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. @@ -139,7 +139,7 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.conf.autoremove: - Add kfreebsd-image-* to the list (Closes: #558803) - -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 + -- Michael Vogt Tue, 15 Dec 2009 09:21:55 +0100 apt (0.7.24) unstable; urgency=low -- cgit v1.2.3