diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-08-27 16:53:12 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:49 +0100 |
| commit | 0401cfd4ecac218c5c0be6568bdfe31b9ccd5df6 (patch) | |
| tree | 61e0be33e430324a6244015d709d9ad5ef5458b9 /meta | |
| parent | ee03f92a5684336f07214261942b5121985b4ad6 (diff) | |
| download | openembedded-core-contrib-0401cfd4ecac218c5c0be6568bdfe31b9ccd5df6.tar.gz | |
apt: update to 1.0.9
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta')
21 files changed, 266 insertions, 349 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch deleted file mode 100644 index 801ae6dddb..0000000000 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: Pending - ---- a/apt-pkg/contrib/weakptr.h -+++ b/apt-pkg/contrib/weakptr.h -@@ -21,6 +21,7 @@ - #ifndef WEAK_POINTER_H - #define WEAK_POINTER_H - -+#include <cstdlib> - #include <set> - /** - * Class for objects providing support for weak pointers. diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch deleted file mode 100644 index 7aa408f19e..0000000000 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch +++ /dev/null @@ -1,11 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - po/LINGUAS | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -1 +1 @@ --ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -+ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ku lt 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/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch deleted file mode 100644 index 712d5e7296..0000000000 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: apt-0.9.7.7/apt-pkg/packagemanager.cc -=================================================================== ---- apt-0.9.7.7.orig/apt-pkg/packagemanager.cc -+++ apt-0.9.7.7/apt-pkg/packagemanager.cc -@@ -893,10 +893,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - return false; - - if (Immediate == true) { -+#if 0 - // Perform immedate configuration of the package. - if (SmartConfigure(Pkg, Depth + 1) == false) - _error->Warning(_("Could not perform immediate configuration on '%s'. " - "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); -+#endif - } - - return true; -@@ -986,6 +988,7 @@ pkgPackageManager::OrderResult pkgPackag - } - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -1000,6 +1003,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch deleted file mode 100644 index 449e42df4a..0000000000 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable documentation - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: apt-0.9.7.7/Makefile -=================================================================== ---- apt-0.9.7.7.orig/Makefile -+++ apt-0.9.7.7/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - $(MAKE) -C test $@ - diff --git a/meta/recipes-devtools/apt/apt-1.0.9/Fix-regression-for-file-uris-from-CVE-2014-0487.patch b/meta/recipes-devtools/apt/apt-1.0.9/Fix-regression-for-file-uris-from-CVE-2014-0487.patch new file mode 100644 index 0000000000..807ca0455a --- /dev/null +++ b/meta/recipes-devtools/apt/apt-1.0.9/Fix-regression-for-file-uris-from-CVE-2014-0487.patch @@ -0,0 +1,94 @@ +From daff4aa356128310f022370f7825bdc369c66ba8 Mon Sep 17 00:00:00 2001 +From: Michael Vogt <mvo@ubuntu.com> +Date: Wed, 17 Sep 2014 14:57:05 +0200 +Subject: [PATCH] Fix regression for file:/// uris from CVE-2014-0487 + +Do not run ReverifyAfterIMS() for local file URIs as this will +causes apt to mess around in the file:/// uri space. This is +wrong in itself, but it will also cause a incorrect verification +failure when the archive and the lists directory are on different +partitions as rename(). +--- + apt-pkg/acquire-item.cc | 18 ++++++------------ + test/integration/test-apt-update-file | 27 +++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 12 deletions(-) + create mode 100755 test/integration/test-apt-update-file + +diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc +index 058b8bf..2ced65a 100644 +--- a/apt-pkg/acquire-item.cc ++++ b/apt-pkg/acquire-item.cc +@@ -1120,12 +1120,6 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, + string FileName = LookupTag(Message,"Alt-Filename"); + if (FileName.empty() == false) + { +- // The files timestamp matches +- if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true) +- { +- ReverifyAfterIMS(FileName); +- return; +- } + Decompression = true; + Local = true; + DestFile += ".decomp"; +@@ -1142,18 +1136,18 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, + ErrorText = "Method gave a blank filename"; + } + ++ if (FileName == DestFile) ++ Erase = true; ++ else ++ Local = true; ++ + // The files timestamp matches +- if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) ++ if (!Local && StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) + { + ReverifyAfterIMS(FileName); + return; + } + +- if (FileName == DestFile) +- Erase = true; +- else +- Local = true; +- + string decompProg; + + // If we enable compressed indexes, queue for hash verification +diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file +new file mode 100755 +index 0000000..069f8ba +--- /dev/null ++++ b/test/integration/test-apt-update-file +@@ -0,0 +1,27 @@ ++#!/bin/sh ++# ++# Ensure that we do not modify file:/// uris (regression test for ++# CVE-2014-0487 ++# ++set -e ++ ++TESTDIR=$(readlink -f $(dirname $0)) ++. $TESTDIR/framework ++ ++setupenvironment ++configarchitecture "amd64" ++configcompression 'bz2' 'gz' ++ ++insertpackage 'unstable' 'foo' 'all' '1.0' ++ ++umask 022 ++setupaptarchive --no-update ++ ++# ensure the archive is not writable ++chmod 550 aptarchive/dists/unstable/main/binary-amd64 ++ ++testsuccess aptget update -qq ++testsuccess aptget update -qq ++ ++# the cleanup should still work ++chmod 750 aptarchive/dists/unstable/main/binary-amd64 +-- +1.9.1 + diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/apt-1.0.9/apt.conf.in index 03351356bc..7f6de0e405 100644 --- a/meta/recipes-devtools/apt/files/apt.conf +++ b/meta/recipes-devtools/apt/apt-1.0.9/apt.conf.in @@ -1,4 +1,4 @@ -Dir "${STAGING_DIR_NATIVE}/" +Dir "@STAGING_DIR_NATIVE@/" { State "var/lib/apt/" { @@ -11,9 +11,9 @@ Dir "${STAGING_DIR_NATIVE}/" pkgcache ""; srcpkgcache ""; }; - Bin "${STAGING_BINDIR_NATIVE}/" + Bin "@STAGING_BINDIR_NATIVE@/" { - methods "${STAGING_LIBDIR}/apt/methods/"; + methods "@STAGING_LIBDIR@/apt/methods/"; gzip "/bin/gzip"; dpkg "dpkg"; dpkg-source "dpkg-source"; diff --git a/meta/recipes-devtools/apt/files/db_linking_hack.patch b/meta/recipes-devtools/apt/apt-1.0.9/db_linking_hack.patch index d2246b3d2b..d619344198 100644 --- a/meta/recipes-devtools/apt/files/db_linking_hack.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/db_linking_hack.patch @@ -1,9 +1,9 @@ -Upstream-Status: Backport +Upstream-Status: Pending -Index: apt-0.7.3/configure.in +Index: apt-0.7.3/configure.ac =================================================================== ---- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000 -+++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000 +--- apt-0.7.3.orig/configure.ac 2007-07-01 10:38:45.000000000 +0000 ++++ apt-0.7.3/configure.ac 2007-08-21 13:39:26.000000000 +0000 @@ -67,8 +67,20 @@ [AC_DEFINE(HAVE_BDB) BDBLIB="-ldb" diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-1.0.9/disable-configure-in-makefile.patch index 7c2f64e3e6..7c2f64e3e6 100644 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/disable-configure-in-makefile.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/disable-configure-in-makefile.patch diff --git a/meta/recipes-devtools/apt/apt-1.0.9/disable-tests-and-drop-dependency-on-gtest.patch b/meta/recipes-devtools/apt/apt-1.0.9/disable-tests-and-drop-dependency-on-gtest.patch new file mode 100644 index 0000000000..3783b5daa6 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-1.0.9/disable-tests-and-drop-dependency-on-gtest.patch @@ -0,0 +1,45 @@ +Upstream-Status: Invalid [configuration] + +From 0f39cc30fcc6b3440d93c213caf348e3784e29d9 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter <obi@opendreambox.org> +Date: Wed, 27 Aug 2014 12:14:43 +0200 +Subject: [PATCH] disable tests and drop dependency on gtest + +Signed-off-by: Andreas Oberritter <obi@opendreambox.org> +--- + Makefile | 1 - + configure.ac | 6 ------ + 2 files changed, 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 6e1edbd..659f110 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,6 @@ all headers library clean veryclean binary program doc manpages docbook test upd + $(MAKE) -C dselect $@ + $(MAKE) -C doc $@ + $(MAKE) -C po $@ +- $(MAKE) -C test $@ + + all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs + +diff --git a/configure.ac b/configure.ac +index e605528..7910cbc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,12 +89,6 @@ AC_CHECK_LIB(curl, curl_easy_init, + AC_MSG_ERROR([failed: I need CURL due https support]), + ) + +-AC_LANG_PUSH([C++]) +-AC_CHECK_HEADER(gtest/gtest.h,, +- AC_MSG_ERROR([failed: I need gtest to build tests]), +-) +-AC_LANG_POP([C++]) +- + + AC_SUBST(BDBLIB) + +-- +1.9.1 + diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch b/meta/recipes-devtools/apt/apt-1.0.9/makerace.patch index 46e3161b67..46e3161b67 100644 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/makerace.patch diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-1.0.9/no-nls-dpkg.patch index a0996d4d44..a0996d4d44 100644 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/no-nls-dpkg.patch diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/truncate-filename.patch b/meta/recipes-devtools/apt/apt-1.0.9/truncate-filename.patch index db1c42b66c..db1c42b66c 100644 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/truncate-filename.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/truncate-filename.patch diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/use-host.patch b/meta/recipes-devtools/apt/apt-1.0.9/use-host.patch index 25caa3b0a5..b30fcff0d6 100644 --- a/meta/recipes-devtools/apt/apt-0.9.9.4/use-host.patch +++ b/meta/recipes-devtools/apt/apt-1.0.9/use-host.patch @@ -1,9 +1,9 @@ Upstream-Status: Pending -Index: apt-0.9.7.7/configure.in +Index: apt-0.9.7.7/configure.ac =================================================================== ---- apt-0.9.7.7.orig/configure.in -+++ apt-0.9.7.7/configure.in +--- apt-0.9.7.7.orig/configure.ac ++++ apt-0.9.7.7/configure.ac @@ -112,7 +112,7 @@ dnl This is often the dpkg architecture dnl First check against the full canonical canoncial-system-type in $target dnl and if that fails, just look for the cpu diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc deleted file mode 100644 index fede8694c4..0000000000 --- a/meta/recipes-devtools/apt/apt-native.inc +++ /dev/null @@ -1,68 +0,0 @@ -require apt.inc -inherit native - -DEPENDS += "dpkg-native gettext-native db-native curl-native" -PACKAGES = "" -USE_NLS = "yes" - -SRC_URI += "file://db_linking_hack.patch" - -python do_install () { - bb.build.exec_func('do_install_base', d) - bb.build.exec_func('do_install_config', d) -} - -python do_install_config () { - indir = os.path.dirname(d.getVar('FILE',1)) - infile = file(oe.path.join(indir, 'files', 'apt.conf'), 'r') - data = infile.read() - infile.close() - - data = d.expand(data) - - outdir = oe.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt') - if not os.path.exists(outdir): - os.makedirs(outdir) - - outpath = oe.path.join(outdir, 'apt.conf.sample') - if not os.path.exists(outpath): - outfile = file(outpath, 'w') - outfile.write(data) - outfile.close() -} - -do_install_base () { - install -d ${D}${bindir} - install -m 0755 bin/apt-cdrom ${D}${bindir}/ - install -m 0755 bin/apt-get ${D}${bindir}/ - install -m 0755 bin/apt-config ${D}${bindir}/ - install -m 0755 bin/apt-cache ${D}${bindir}/ - install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ - install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - install -m 0755 bin/apt-ftparchive ${D}${bindir}/ - - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ - ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so - - install -d ${D}${libdir}/apt/methods - install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ - - install -d ${D}${libdir}/dpkg/methods/apt - install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ - install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ - - install -d ${D}${sysconfdir}/apt - install -d ${D}${sysconfdir}/apt/apt.conf.d - install -d ${D}${sysconfdir}/apt/preferences.d - install -d ${D}${localstatedir}/lib/apt/lists/partial - install -d ${D}${localstatedir}/cache/apt/archives/partial - - install -d ${D}${localstatedir}/log/apt/ -} diff --git a/meta/recipes-devtools/apt/apt-native_0.9.9.4.bb b/meta/recipes-devtools/apt/apt-native_0.9.9.4.bb deleted file mode 100644 index d5934f9942..0000000000 --- a/meta/recipes-devtools/apt/apt-native_0.9.9.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -require apt-native.inc - -SRC_URI += "file://noconfigure.patch \ - file://no-curl.patch" - -SRC_URI[md5sum] = "72b3283acd9b99868da5545f0499b0da" -SRC_URI[sha256sum] = "770cb94d7f4c922c2a1516f2b5ec852d3ad668a8c9c3713ac2528c861b7fa79a" - -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc deleted file mode 100644 index 0897d3a9fc..0000000000 --- a/meta/recipes-devtools/apt/apt-package.inc +++ /dev/null @@ -1,77 +0,0 @@ -apt-manpages="doc/apt-cache.8 \ - doc/apt-cdrom.8 \ - doc/apt-config.8 \ - doc/apt-get.8 \ - doc/apt.8 \ - doc/apt.conf.5 \ - doc/apt_preferences.5 \ - doc/sources.list.5" -apt-utils-manpages="doc/apt-extracttemplates.1 \ - doc/apt-sortpkgs.1" - -def get_files_apt_doc(d, bb, manpages): - import re - manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages) - manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\2/\1.\2', manpages) - return manpages - -def get_commands_apt_doc(d, bb, manpages): - s = list() - __dir_cache__ = list() - for m in manpages.split(): - dest = get_files_apt_doc(d, bb, m) - dir = os.path.dirname(dest) - if not dir in __dir_cache__: - s.append("install -d ${D}/%s" % dir) - __dir_cache__.append(dir) - s.append("install -m 0644 %s ${D}/%s" % (m, dest)) - return "\n".join(s) - -PACKAGES += "${PN}-utils ${PN}-utils-doc" -FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ - ${bindir}/apt-config ${bindir}/apt-cache \ - ${libdir}/apt ${libdir}/libapt*.so.* \ - ${localstatedir} ${sysconfdir} \ - ${libdir}/dpkg" -FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" -FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages', True))} \ - ${docdir}/apt" -FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages', True))}" -FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" - -do_install () { - set -x - install -d ${D}${bindir} - install -m 0755 bin/apt-cdrom ${D}${bindir}/ - install -m 0755 bin/apt-get ${D}${bindir}/ - install -m 0755 bin/apt-config ${D}${bindir}/ - install -m 0755 bin/apt-cache ${D}${bindir}/ - - install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ - install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - - oe_libinstall -so -C bin libapt-pkg ${D}${libdir} - oe_libinstall -so -C bin libapt-inst ${D}${libdir} - - install -d ${D}${libdir}/apt/methods - install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ - - install -d ${D}${libdir}/dpkg/methods/apt - install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ - install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ - - install -d ${D}${sysconfdir}/apt - install -d ${D}${sysconfdir}/apt/apt.conf.d - install -d ${D}${sysconfdir}/apt/sources.list.d - install -d ${D}${sysconfdir}/apt/preferences.d - install -d ${D}${localstatedir}/lib/apt/lists/partial - install -d ${D}${localstatedir}/cache/apt/archives/partial - install -d ${D}${docdir}/apt/examples - install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/ - - install -d ${D}${includedir}/apt-pkg/ - install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ -} diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc deleted file mode 100644 index 83411a968a..0000000000 --- a/meta/recipes-devtools/apt/apt.inc +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Advanced front-end for dpkg." -LICENSE = "GPLv2.0+" -SECTION = "base" - -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ - file://no-ko-translation.patch \ - file://use-host.patch \ - file://makerace.patch \ - file://no-nls-dpkg.patch \ - file://fix-gcc-4.6-null-not-defined.patch \ - file://truncate-filename.patch \ - file://nodoc.patch \ - file://disable-configure-in-makefile.patch \ - " - -inherit autotools gettext - -EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" - -do_configure_prepend() { - rm -rf ${S}/buildlib/config.sub - rm -rf ${S}/buildlib/config.guess -} - -# Apt wants to know the glibc version by running a binary file, which will -# fail, so we have to tell configure which version to use Since I don't know -# the impliations of setting a wrong value I only provide one for angstrom, -# which uses glibc 2.5 (which claims to be 2.4) -# Koen - 20070327 -EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" - -# under Debian it is set to libc6.3 as they use glibc 2.3 -# They also provide glibc 2.5 in 'experimental' and it works with APT built -# for 2.3 so we set it in same way -EXTRA_OECONF_append = " ac_cv_glibc_ver=libc6.3" - -FILES_${PN}-dbg += "${libdir}/apt/methods/.debug/" diff --git a/meta/recipes-devtools/apt/apt_0.9.9.4.bb b/meta/recipes-devtools/apt/apt_0.9.9.4.bb deleted file mode 100644 index ae9ed6cb66..0000000000 --- a/meta/recipes-devtools/apt/apt_0.9.9.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -DEPENDS = "curl db" -RDEPENDS_${PN} = "dpkg" -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" -require apt.inc - -SRC_URI[md5sum] = "72b3283acd9b99868da5545f0499b0da" -SRC_URI[sha256sum] = "770cb94d7f4c922c2a1516f2b5ec852d3ad668a8c9c3713ac2528c861b7fa79a" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -do_install_append() { - #Write the correct apt-architecture to apt.conf - APT_CONF=${D}/etc/apt/apt.conf - echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} -} diff --git a/meta/recipes-devtools/apt/apt_1.0.9.bb b/meta/recipes-devtools/apt/apt_1.0.9.bb new file mode 100644 index 0000000000..340f2899ad --- /dev/null +++ b/meta/recipes-devtools/apt/apt_1.0.9.bb @@ -0,0 +1,117 @@ +SUMMARY = "commandline package manager" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" +DEPENDS = "curl db" + +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.xz \ + file://use-host.patch \ + file://makerace.patch \ + file://no-nls-dpkg.patch \ + file://truncate-filename.patch \ + file://disable-configure-in-makefile.patch \ + file://db_linking_hack.patch \ + file://Fix-regression-for-file-uris-from-CVE-2014-0487.patch \ + file://disable-tests-and-drop-dependency-on-gtest.patch \ + file://apt.conf.in" +SRC_URI[md5sum] = "14d68e7bc6a5f3cef28ca1edf744cdbe" +SRC_URI[sha256sum] = "4e6f25464a38e94961e107ebd1afb72dbb865d096504aa7194f55c755706c071" + +S = "${WORKDIR}/apt-1.0.8" + +inherit autotools gettext + +EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" +EXTRA_OECONF = "--disable-rpath --without-getconf" +CACHED_CONFIGUREVARS = " \ + ac_cv_path_DOT= \ + ac_cv_path_DOXYGEN= \ + ac_cv_path_PO4A= \ + ac_cv_path_W3M= \ + ac_cv_path_XSLTPROC= \ +" +USE_NLS_class-native = "yes" + +do_configure_prepend() { + for f in config.guess config.sub; do + rm -f ${S}/buildlib/$f + done +} + +do_install() { + install -d ${D}${sysconfdir}/apt/apt.conf.d + install -d ${D}${sysconfdir}/apt/preferences.d + install -d ${D}${sysconfdir}/apt/sources.list.d + install -d ${D}${sysconfdir}/apt/trusted.gpg.d + + install -d ${D}${bindir} + for f in apt apt-cache apt-cdrom apt-config apt-extracttemplates apt-ftparchive apt-get apt-key apt-mark apt-sortpkgs; do + install -m 0755 bin/$f ${D}${bindir} + done + + install -d ${D}${includedir}/apt-pkg + install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg + + install -d ${D}${libdir} + for f in inst pkg private; do + oe_libinstall -so -C bin libapt-$f ${D}${libdir} + done + + install -d ${D}${libdir}/apt + install -m 0755 bin/apt-helper ${D}${libdir}/apt + + install -d ${D}${libdir}/apt/methods + install -m 0755 bin/methods/* ${D}${libdir}/apt/methods + + install -d ${D}${libdir}/dpkg/methods/apt + for f in desc.apt names; do + install -m 0644 ${S}/dselect/$f ${D}${libdir}/dpkg/methods/apt + done + for f in install setup update; do + install -m 0755 ${S}/dselect/$f ${D}${libdir}/dpkg/methods/apt + done + + install -d ${D}${docdir}/apt/examples + install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples + + for i in 1 5 8; do + install -d ${D}${mandir}/man${i} + install -m 0644 ${S}/doc/en/*.${i} ${D}${mandir}/man${i} + done + + install -d ${D}${localstatedir}/cache/apt/archives/partial + install -d ${D}${localstatedir}/lib/apt/lists/partial + install -d ${D}${localstatedir}/lib/apt/mirrors/partial + install -d ${D}${localstatedir}/lib/apt/periodic + install -d ${D}${localstatedir}/log/apt +} + +do_install_append_class-native() { + sed -e "s,@STAGING_DIR_NATIVE@,${STAGING_DIR_NATIVE},g" \ + -e "s,@STAGING_BINDIR_NATIVE@,${STAGING_BINDIR_NATIVE},g" \ + -e "s,@STAGING_LIBDIR@,${STAGING_LIBDIR},g" \ + < ${WORKDIR}/apt.conf.in > ${D}${sysconfdir}/apt/apt.conf.sample +} + +do_install_append_class-target() { + # Write the correct apt-architecture to apt.conf + echo 'APT::Architecture "${DPKG_ARCH}";' > ${D}${sysconfdir}/apt/apt.conf +} + +PACKAGES =+ "apt-transport-https apt-utils libapt-inst libapt-pkg" + +RDEPENDS_${PN} = "dpkg" + +RRECOMMENDS_${PN} = "gnupg" +RRECOMMENDS_${PN}_class-native = "" + +FILES_${PN} += "${libdir}/dpkg" +FILES_${PN}-dbg += "${libdir}/apt/methods/.debug" +FILES_apt-transport-https = "${libdir}/apt/methods/https" +FILES_apt-utils = "${bindir}/apt-extracttemplates \ + ${bindir}/apt-ftparchive \ + ${bindir}/apt-sortpkgs" +FILES_libapt-inst = "${libdir}/libapt-inst${SOLIBS}" +FILES_libapt-pkg = "${libdir}/libapt-pkg${SOLIBS}" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/apt/files/environment.patch b/meta/recipes-devtools/apt/files/environment.patch deleted file mode 100644 index 9a0303803e..0000000000 --- a/meta/recipes-devtools/apt/files/environment.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Backport - -Index: apt-0.6.46.2/buildlib/environment.mak.in -=================================================================== ---- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 -+++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 -@@ -62,7 +62,7 @@ - - # Shared library things - HOST_OS = @host_os@ --ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) -+ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) - SONAME_MAGIC=-Wl,-soname -Wl, - LFLAGS_SO= - else diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch deleted file mode 100644 index 9fd3b3ab79..0000000000 --- a/meta/recipes-devtools/apt/files/no-curl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - configure.in | 6 ------ - methods/makefile | 7 ------- - 2 files changed, 13 deletions(-) - ---- a/configure.in -+++ b/configure.in -@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h, - - LIBS="$saveLIBS" - --AC_CHECK_LIB(curl, curl_easy_init, -- [AC_CHECK_HEADER(curl/curl.h, -- curl_ok=yes, -- curl_ok=no)], -- AC_MSG_ERROR([failed: I need CURL due https support]), --) - - AC_SUBST(BDBLIB) - ---- a/methods/makefile -+++ b/methods/makefile -@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile - SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc - include $(PROGRAM_H) - --# The https method --PROGRAM=https --SLIBS = -lapt-pkg -lcurl $(INTLLIBS) --LIB_MAKES = apt-pkg/makefile --SOURCE = https.cc --include $(PROGRAM_H) -- - # The ftp method - PROGRAM=ftp - SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) |