summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-03-01 17:06:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:54 +0000
commit9199c3391380f9ac56a33409c25194486062d7d4 (patch)
treef9331ca0f403b90bff695433058c3346df888324 /meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch
parent7e2e2cf50855cd3f3546f0ec33d88075156011a0 (diff)
downloadpoky-9199c3391380f9ac56a33409c25194486062d7d4.tar.gz
apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will generate the correct files) allocate-larger-memory.patch: not needed anymore fix-gcc-4.6-null-not-defined.patch: added - include header that defines NULL includes-fix.patch: not needed anymore localefixes.patch: removed - not necessary anymore (no compiling errors) makerace.patch: adapted to the new version no-ko-translation.patch: adapted to the new version no-nls-dpkg.patch: added - fix build without nls noconfigure.patch: adapted to the new version nodoc.patch: adapted to the new version (apply patch on all cases because the doc generation needs docbook-xsl) remove-redeclaration.patch: not needed anymore truncate-filename.patch: moved use-host.patch: adapted to the new version no-curl.patch: adapted to the new version disable-configure-in-makefile.patch: added - do not run configure at do_compile (From OE-Core rev: 97403b14765331c8c48bb570c6b98f2809214a9a) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch')
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch
deleted file mode 100644
index db1c42b66c..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1strutl.cc: the filename can't be longer than 255
2
3The URItoFileName translates the path into the filename, but the
4filename can't be longer than 255 according to
5/usr/include/linux/limits.h.
6
7Truncate it when it is longer than 240 (leave some spaces for
8".Packages" and "._Release" suffix)
9
10Upstream-Status: Pending
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 apt-pkg/contrib/strutl.cc | 7 ++++++-
14 1 file changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
17--- a/apt-pkg/contrib/strutl.cc
18+++ b/apt-pkg/contrib/strutl.cc
19@@ -399,7 +399,12 @@ string URItoFileName(const string &URI)
20 // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
21 string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
22 replace(NewURI.begin(),NewURI.end(),'/','_');
23- return NewURI;
24+
25+ // Truncate from the head when it is longer than 240
26+ if(NewURI.length() > 240)
27+ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1);
28+ else
29+ return NewURI;
30 }
31 /*}}}*/
32 // Base64Encode - Base64 Encoding routine for short strings /*{{{*/
33--
341.7.10.4
35