From 70a26477ce93f0083cab98d1aeeb98ca6ec34343 Mon Sep 17 00:00:00 2001 From: Ionut Radu Date: Thu, 27 Jun 2013 13:07:13 +0300 Subject: apt: Updated from 0.9.8.1 to 0.9.8.2 (From OE-Core rev: 1500b4e7f6adec612efbdebad6a08a1efeeda7b6) Signed-off-by: Ionut Radu [sgw - fixed apt-native checksums] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../apt/apt-0.9.8.1/truncate-filename.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch (limited to 'meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch') 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 deleted file mode 100644 index db1c42b66c..0000000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/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 - -- cgit v1.2.3-54-g00ecf