From b752e188ce5e503a3404d5780125d93704f2a37b Mon Sep 17 00:00:00 2001 From: Ionut Radu Date: Mon, 13 May 2013 17:55:12 +0300 Subject: apt: Updated from 0.9.7.8 to 0.9.8.1 (From OE-Core rev: 76b32bbe16c790ed81fffe37e67d80d1ec754e4e) Signed-off-by: Ionut Radu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../disable-configure-in-makefile.patch | 18 ----------- .../apt-0.9.7.8/fix-gcc-4.6-null-not-defined.patch | 10 ------ .../apt/apt-0.9.7.8/makerace.patch | 23 -------------- .../apt/apt-0.9.7.8/no-ko-translation.patch | 11 ------- .../apt/apt-0.9.7.8/no-nls-dpkg.patch | 24 --------------- .../apt/apt-0.9.7.8/noconfigure.patch | 36 ---------------------- meta/recipes-devtools/apt/apt-0.9.7.8/nodoc.patch | 18 ----------- .../apt/apt-0.9.7.8/truncate-filename.patch | 35 --------------------- .../apt/apt-0.9.7.8/use-host.patch | 13 -------- .../disable-configure-in-makefile.patch | 18 +++++++++++ .../apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch | 10 ++++++ .../apt/apt-0.9.8.1/makerace.patch | 23 ++++++++++++++ .../apt/apt-0.9.8.1/no-ko-translation.patch | 11 +++++++ .../apt/apt-0.9.8.1/no-nls-dpkg.patch | 24 +++++++++++++++ .../apt/apt-0.9.8.1/noconfigure.patch | 36 ++++++++++++++++++++++ meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch | 18 +++++++++++ .../apt/apt-0.9.8.1/truncate-filename.patch | 35 +++++++++++++++++++++ .../apt/apt-0.9.8.1/use-host.patch | 13 ++++++++ meta/recipes-devtools/apt/apt-native_0.9.7.8.bb | 9 ------ meta/recipes-devtools/apt/apt-native_0.9.8.1.bb | 9 ++++++ meta/recipes-devtools/apt/apt_0.9.7.8.bb | 18 ----------- meta/recipes-devtools/apt/apt_0.9.8.1.bb | 18 +++++++++++ 22 files changed, 215 insertions(+), 215 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/disable-configure-in-makefile.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/fix-gcc-4.6-null-not-defined.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/makerace.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/no-ko-translation.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/no-nls-dpkg.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/noconfigure.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/nodoc.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/truncate-filename.patch delete mode 100644 meta/recipes-devtools/apt/apt-0.9.7.8/use-host.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch create mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch delete mode 100644 meta/recipes-devtools/apt/apt-native_0.9.7.8.bb create mode 100644 meta/recipes-devtools/apt/apt-native_0.9.8.1.bb delete mode 100644 meta/recipes-devtools/apt/apt_0.9.7.8.bb create mode 100644 meta/recipes-devtools/apt/apt_0.9.8.1.bb (limited to 'meta/recipes-devtools/apt') diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/disable-configure-in-makefile.patch deleted file mode 100644 index 7c2f64e..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/disable-configure-in-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable configure at compilation stage - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca - -Index: apt-0.9.7.7/Makefile -=================================================================== ---- apt-0.9.7.7.orig/Makefile -+++ apt-0.9.7.7/Makefile -@@ -33,7 +33,7 @@ veryclean: clean - # The startup target builds the necessary configure scripts. It should - # be used after a CVS checkout. - CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile --include buildlib/configure.mak -+#include buildlib/configure.mak - $(BUILDDIR)/include/config.h: buildlib/config.h.in - $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in - $(BUILDDIR)/environment.mak: buildlib/environment.mak.in diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/fix-gcc-4.6-null-not-defined.patch deleted file mode 100644 index 70ecd95..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/fix-gcc-4.6-null-not-defined.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - /** - * Class for objects providing support for weak pointers. diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/makerace.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/makerace.patch deleted file mode 100644 index 403711f..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/makerace.patch +++ /dev/null @@ -1,23 +0,0 @@ -I was seeing various issues with parallel make, mainly due to to what was likely -partially installed headers. If you change into the source directory and -"NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it -doesn't have any dependencies on the headers being installed. This patch -fixes that so things build correctly. - -RP 2012/3/19 - -Upstream-Status: Pending - -Index: apt-0.7.14/buildlib/library.mak -=================================================================== ---- apt-0.7.14.orig/buildlib/library.mak -+++ apt-0.7.14/buildlib/library.mak -@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR - - # Compilation rules - vpath %.cc $(SUBDIRS) --$(OBJ)/%.opic: %.cc -+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS) - echo Compiling $< to $@ - $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< - $(DoDep) diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/no-ko-translation.patch deleted file mode 100644 index 7aa408f..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/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.7.8/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/no-nls-dpkg.patch deleted file mode 100644 index f1dd5fd..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/no-nls-dpkg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/apt-pkg/deb/dpkgpm.cc -+++ b/apt-pkg/deb/dpkgpm.cc -@@ -42,6 +42,12 @@ - #include - /*}}}*/ - -+#ifdef USE_NLS -+#define _dpkg(x) dgettext("dpkg", x) -+#else -+#define _dpkg(x) x -+#endif -+ - using namespace std; - - namespace -@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const - } - - // check if its not a follow up error -- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); -+ const char *needle = _dpkg("dependency problems - leaving unconfigured"); - if(strstr(errormsg, needle) != NULL) { - std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; - return; diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/noconfigure.patch deleted file mode 100644 index 712d5e7..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/noconfigure.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca - -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.7.8/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/nodoc.patch deleted file mode 100644 index 449e42d..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/nodoc.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable documentation - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca - -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-0.9.7.8/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/truncate-filename.patch deleted file mode 100644 index db1c42b..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/truncate-filename.patch +++ /dev/null @@ -1,35 +0,0 @@ -strutl.cc: the filename can't be longer than 255 - -The URItoFileName translates the path into the filename, but the -filename can't be longer than 255 according to -/usr/include/linux/limits.h. - -Truncate it when it is longer than 240 (leave some spaces for -".Packages" and "._Release" suffix) - -Upstream-Status: Pending -Signed-off-by: Robert Yang ---- - apt-pkg/contrib/strutl.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc ---- a/apt-pkg/contrib/strutl.cc -+++ b/apt-pkg/contrib/strutl.cc -@@ -399,7 +399,12 @@ string URItoFileName(const string &URI) - // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; - string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); - replace(NewURI.begin(),NewURI.end(),'/','_'); -- return NewURI; -+ -+ // Truncate from the head when it is longer than 240 -+ if(NewURI.length() > 240) -+ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1); -+ else -+ return NewURI; - } - /*}}}*/ - // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ --- -1.7.10.4 - diff --git a/meta/recipes-devtools/apt/apt-0.9.7.8/use-host.patch b/meta/recipes-devtools/apt/apt-0.9.7.8/use-host.patch deleted file mode 100644 index f7eaaed..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.7.8/use-host.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: apt-0.9.7.7/configure.in -=================================================================== ---- apt-0.9.7.7.orig/configure.in -+++ apt-0.9.7.7/configure.in -@@ -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 - 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 diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch new file mode 100644 index 0000000..7c2f64e --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch @@ -0,0 +1,18 @@ +Disable configure at compilation stage + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Constantin Musca + +Index: apt-0.9.7.7/Makefile +=================================================================== +--- apt-0.9.7.7.orig/Makefile ++++ apt-0.9.7.7/Makefile +@@ -33,7 +33,7 @@ veryclean: clean + # The startup target builds the necessary configure scripts. It should + # be used after a CVS checkout. + CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile +-include buildlib/configure.mak ++#include buildlib/configure.mak + $(BUILDDIR)/include/config.h: buildlib/config.h.in + $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in + $(BUILDDIR)/environment.mak: buildlib/environment.mak.in diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch new file mode 100644 index 0000000..70ecd95 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch @@ -0,0 +1,10 @@ +--- 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 + #include + /** + * Class for objects providing support for weak pointers. diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch new file mode 100644 index 0000000..403711f --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch @@ -0,0 +1,23 @@ +I was seeing various issues with parallel make, mainly due to to what was likely +partially installed headers. If you change into the source directory and +"NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it +doesn't have any dependencies on the headers being installed. This patch +fixes that so things build correctly. + +RP 2012/3/19 + +Upstream-Status: Pending + +Index: apt-0.7.14/buildlib/library.mak +=================================================================== +--- apt-0.7.14.orig/buildlib/library.mak ++++ apt-0.7.14/buildlib/library.mak +@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR + + # Compilation rules + vpath %.cc $(SUBDIRS) +-$(OBJ)/%.opic: %.cc ++$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS) + echo Compiling $< to $@ + $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< + $(DoDep) diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch new file mode 100644 index 0000000..7aa408f --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch @@ -0,0 +1,11 @@ +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.8.1/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch new file mode 100644 index 0000000..f1dd5fd --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch @@ -0,0 +1,24 @@ +--- a/apt-pkg/deb/dpkgpm.cc ++++ b/apt-pkg/deb/dpkgpm.cc +@@ -42,6 +42,12 @@ + #include + /*}}}*/ + ++#ifdef USE_NLS ++#define _dpkg(x) dgettext("dpkg", x) ++#else ++#define _dpkg(x) x ++#endif ++ + using namespace std; + + namespace +@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + } + + // check if its not a follow up error +- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); ++ const char *needle = _dpkg("dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch new file mode 100644 index 0000000..712d5e7 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch @@ -0,0 +1,36 @@ +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Constantin Musca + +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.8.1/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch new file mode 100644 index 0000000..449e42d --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch @@ -0,0 +1,18 @@ +Disable documentation + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Constantin Musca + +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-0.9.8.1/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch new file mode 100644 index 0000000..db1c42b --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch @@ -0,0 +1,35 @@ +strutl.cc: the filename can't be longer than 255 + +The URItoFileName translates the path into the filename, but the +filename can't be longer than 255 according to +/usr/include/linux/limits.h. + +Truncate it when it is longer than 240 (leave some spaces for +".Packages" and "._Release" suffix) + +Upstream-Status: Pending +Signed-off-by: Robert Yang +--- + apt-pkg/contrib/strutl.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc +--- a/apt-pkg/contrib/strutl.cc ++++ b/apt-pkg/contrib/strutl.cc +@@ -399,7 +399,12 @@ string URItoFileName(const string &URI) + // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; + string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); + replace(NewURI.begin(),NewURI.end(),'/','_'); +- return NewURI; ++ ++ // Truncate from the head when it is longer than 240 ++ if(NewURI.length() > 240) ++ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1); ++ else ++ return NewURI; + } + /*}}}*/ + // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ +-- +1.7.10.4 + diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch new file mode 100644 index 0000000..f7eaaed --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch @@ -0,0 +1,13 @@ +Index: apt-0.9.7.7/configure.in +=================================================================== +--- apt-0.9.7.7.orig/configure.in ++++ apt-0.9.7.7/configure.in +@@ -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 + 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 diff --git a/meta/recipes-devtools/apt/apt-native_0.9.7.8.bb b/meta/recipes-devtools/apt/apt-native_0.9.7.8.bb deleted file mode 100644 index 000a18d..0000000 --- a/meta/recipes-devtools/apt/apt-native_0.9.7.8.bb +++ /dev/null @@ -1,9 +0,0 @@ -require apt-native.inc - -SRC_URI += "file://noconfigure.patch \ - file://no-curl.patch" - -SRC_URI[md5sum] = "d44f459d59d8fa7fc5f455f1f982f08c" -SRC_URI[sha256sum] = "9570905992f4a83b0c182f11f9e0a8c20a1209a52996d1a01ddbfa359ae2c819" - -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" diff --git a/meta/recipes-devtools/apt/apt-native_0.9.8.1.bb b/meta/recipes-devtools/apt/apt-native_0.9.8.1.bb new file mode 100644 index 0000000..000a18d --- /dev/null +++ b/meta/recipes-devtools/apt/apt-native_0.9.8.1.bb @@ -0,0 +1,9 @@ +require apt-native.inc + +SRC_URI += "file://noconfigure.patch \ + file://no-curl.patch" + +SRC_URI[md5sum] = "d44f459d59d8fa7fc5f455f1f982f08c" +SRC_URI[sha256sum] = "9570905992f4a83b0c182f11f9e0a8c20a1209a52996d1a01ddbfa359ae2c819" + +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" diff --git a/meta/recipes-devtools/apt/apt_0.9.7.8.bb b/meta/recipes-devtools/apt/apt_0.9.7.8.bb deleted file mode 100644 index 9653ee9..0000000 --- a/meta/recipes-devtools/apt/apt_0.9.7.8.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] = "d44f459d59d8fa7fc5f455f1f982f08c" -SRC_URI[sha256sum] = "9570905992f4a83b0c182f11f9e0a8c20a1209a52996d1a01ddbfa359ae2c819" - -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_0.9.8.1.bb b/meta/recipes-devtools/apt/apt_0.9.8.1.bb new file mode 100644 index 0000000..445d14c --- /dev/null +++ b/meta/recipes-devtools/apt/apt_0.9.8.1.bb @@ -0,0 +1,18 @@ +DEPENDS = "curl db" +RDEPENDS_${PN} = "dpkg" +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" +require apt.inc + +SRC_URI[md5sum] = "85781bb39901d6fb79c37ca307929594" +SRC_URI[sha256sum] = "dcef6fc33948d5e430d337ad6326bf7ac3d06b14d99ede176809461ac12b4c6f" + +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} +} -- cgit v1.1