9 files changed, 88 insertions, 14 deletions
diff --git a/recipes/apt/apt-0.7.20.2/no-doxygen.patch b/recipes/apt/apt-0.7.20.2/no-doxygen.patch
new file mode 100644
index 0000000000..74fde5f0ce
--- /dev/null
+++ b/recipes/apt/apt-0.7.20.2/no-doxygen.patch
@@ -0,0 +1,12 @@
+diff -urN apt-0.7.20.2.orig/doc/makefile apt-0.7.20.2/doc/makefile
+--- apt-0.7.20.2.orig/doc/makefile	2009-02-07 16:09:35.000000000 +0100
++++ apt-0.7.20.2/doc/makefile	2009-09-30 09:25:59.000000000 +0200
+@@ -43,7 +43,7 @@
+ doc.pl: %.pl:
+ 	$(MAKE) -C pl $*
+ 
+-ifdef DOXYGEN
++ifdef DOXYGEN_IS_DISABLED
+ DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
+ 
+ clean: doxygen-clean
diff --git a/recipes/apt/apt-0.7.20.2/no-ko-translation.patch b/recipes/apt/apt-0.7.20.2/no-ko-translation.patch
new file mode 100644
index 0000000000..5f3634b32a
--- /dev/null
+++ b/recipes/apt/apt-0.7.20.2/no-ko-translation.patch
@@ -0,0 +1,9 @@
+---
+ po/LINGUAS |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- apt-0.7.14.orig/po/LINGUAS
++++ apt-0.7.14/po/LINGUAS
+@@ -1 +1 @@
+-ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW
++ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW
diff --git a/recipes/apt/apt-0.7.20.2/use-host.patch b/recipes/apt/apt-0.7.20.2/use-host.patch
new file mode 100644
index 0000000000..894a697661
--- /dev/null
+++ b/recipes/apt/apt-0.7.20.2/use-host.patch
@@ -0,0 +1,44 @@
+---
+ buildlib/sizetable |    4 +++-
+ configure.in       |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- apt-0.7.14.orig/buildlib/sizetable
++++ apt-0.7.14/buildlib/sizetable
+@@ -9,16 +9,19 @@
+ #
+ # This is used primarily for the MD5 algorithm.
+ # The format is:-
+ # CPU endian sizeof: char, int, short, long
+ i386    little  1 4 2 4
++i486    little  1 4 2 4
++i586    little  1 4 2 4
++i686    little  1 4 2 4
+ armeb   big     1 4 2 4
+ arm     little  1 4 2 4
+ alpha   little  1 4 2 8
+ mipsel  little  1 4 2 4
+ sparc   big     1 4 2 4
+ sparc64 big     1 4 2 8
+ m68k    big     1 4 2 4
+ powerpc big     1 4 2 4
+ mips    big     1 4 2 4
+ hppa    big     1 4 2 4
+-m32r	big	1 4 2 4
+\ No newline at end of file
++m32r	big	1 4 2 4
+--- apt-0.7.14.orig/configure.in
++++ apt-0.7.14/configure.in
+@@ -86,11 +86,11 @@ AC_SUBST(BDBLIB)
+ dnl Converts the ARCH to be something singular for this general CPU family
+ dnl This is often the dpkg architecture string.
+ dnl First check against the full canonical canoncial-system-type in $target
+ dnl and if that fails, just look for the cpu
+ AC_MSG_CHECKING(debian architecture)
+-archset="`dpkg-architecture -qDEB_HOST_ARCH`"
++archset="`echo $host_alias|cut -d'-' -f1`"
+ if test "x$archset" = "x"; then
+    AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
+ fi
+ AC_MSG_RESULT($archset)
+ AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset")
diff --git a/recipes/apt/apt-package.inc b/recipes/apt/apt-package.inc
index 2b4f6d54a8..350bebd7f6 100644
--- a/recipes/apt/apt-package.inc
+++ b/recipes/apt/apt-package.inc
@@ -99,4 +99,11 @@ do_install () {
 	install -d ${D}${localstatedir}/cache/apt/archives/partial
 	install -d ${D}${docdir}/apt/examples
 	install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
+
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_apt
+}
+
+pkg_postinst_${PN} () {
+	/etc/init.d/populate-volatile.sh update
 }
diff --git a/recipes/apt/apt.inc b/recipes/apt/apt.inc
index 4a4de1788a..2e1524a376 100644
--- a/recipes/apt/apt.inc
+++ b/recipes/apt/apt.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg."
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+           file://volatiles "
 
 S = "${WORKDIR}/apt-${PV}"
 
diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb
index 251ed6416d..f64fa0019a 100644
--- a/recipes/apt/apt_0.7.14.bb
+++ b/recipes/apt/apt_0.7.14.bb
@@ -3,10 +3,9 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
-PR = "r2"
+SRC_URI += "file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb
index 251ed6416d..f64fa0019a 100644
--- a/recipes/apt/apt_0.7.19.bb
+++ b/recipes/apt/apt_0.7.19.bb
@@ -3,10 +3,9 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
-PR = "r2"
+SRC_URI += "file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb
index 318b94c642..d696ca2cf5 100644
--- a/recipes/apt/apt_0.7.20.2.bb
+++ b/recipes/apt/apt_0.7.20.2.bb
@@ -3,11 +3,10 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
-
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://no-doxygen.patch;patch=1 \
+            file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r1"
 
 require apt-package.inc
 
diff --git a/recipes/apt/files/volatiles b/recipes/apt/files/volatiles
new file mode 100644
index 0000000000..96f7e872e1
--- /dev/null
+++ b/recipes/apt/files/volatiles
@@ -0,0 +1,4 @@
+d root root 0755 /var/cache/apt none
+d root root 0755 /var/cache/apt/archives none
+d root root 0755 /var/cache/apt/archives/partial none
+d root root 0755 /var/log/apt none