diff options
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.7.14')
10 files changed, 0 insertions, 442 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch b/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch deleted file mode 100644 index 36e1499005..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | Method file has died unexpectedly | ||
2 | |||
3 | "Method file has died unexpectedly!", this is because the "char S[1024]" | ||
4 | is not enough for the long the URI, "char S[2048]" would be enough. | ||
5 | |||
6 | It would be boring if we use malloc here since we can't know how much | ||
7 | memory is needed except strelen() every component of it. So similarly | ||
8 | use "char S[2048]" as it did before. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | --- | ||
13 | apt-pkg/acquire-method.cc | 12 ++++++------ | ||
14 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
15 | |||
16 | diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc | ||
17 | --- a/apt-pkg/acquire-method.cc | ||
18 | +++ b/apt-pkg/acquire-method.cc | ||
19 | @@ -95,7 +95,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient) | ||
20 | *I = ' '; | ||
21 | } | ||
22 | |||
23 | - char S[1024]; | ||
24 | + char S[2048]; | ||
25 | if (Queue != 0) | ||
26 | { | ||
27 | snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n" | ||
28 | @@ -132,7 +132,7 @@ void pkgAcqMethod::URIStart(FetchResult &Res) | ||
29 | if (Queue == 0) | ||
30 | abort(); | ||
31 | |||
32 | - char S[1024] = ""; | ||
33 | + char S[2048] = ""; | ||
34 | char *End = S; | ||
35 | |||
36 | End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str()); | ||
37 | @@ -160,7 +160,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) | ||
38 | if (Queue == 0) | ||
39 | abort(); | ||
40 | |||
41 | - char S[1024] = ""; | ||
42 | + char S[2048] = ""; | ||
43 | char *End = S; | ||
44 | |||
45 | End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",Queue->Uri.c_str()); | ||
46 | @@ -242,7 +242,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) | ||
47 | to be ackd */ | ||
48 | bool pkgAcqMethod::MediaFail(string Required,string Drive) | ||
49 | { | ||
50 | - char S[1024]; | ||
51 | + char S[2048]; | ||
52 | snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n", | ||
53 | Required.c_str(),Drive.c_str()); | ||
54 | |||
55 | @@ -411,7 +411,7 @@ void pkgAcqMethod::Log(const char *Format,...) | ||
56 | va_start(args,Format); | ||
57 | |||
58 | // sprintf the description | ||
59 | - char S[1024]; | ||
60 | + char S[2048]; | ||
61 | unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n" | ||
62 | "Message: ",CurrentURI.c_str()); | ||
63 | |||
64 | @@ -435,7 +435,7 @@ void pkgAcqMethod::Status(const char *Format,...) | ||
65 | va_start(args,Format); | ||
66 | |||
67 | // sprintf the description | ||
68 | - char S[1024]; | ||
69 | + char S[2048]; | ||
70 | unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n" | ||
71 | "Message: ",CurrentURI.c_str()); | ||
72 | |||
73 | -- | ||
74 | 1.7.10.4 | ||
75 | |||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch deleted file mode 100644 index c85c3881aa..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Add missing includes required when building with modern toolchain, based on | ||
4 | patch from Debian bugzilla: | ||
5 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505954 | ||
6 | |||
7 | Should no longer be required once upgraded to 0.7.22 or later. | ||
8 | |||
9 | Index: apt-0.7.14/apt-pkg/acquire.cc | ||
10 | =================================================================== | ||
11 | --- apt-0.7.14.orig/apt-pkg/acquire.cc 2008-05-28 14:22:13.000000000 +0100 | ||
12 | +++ apt-0.7.14/apt-pkg/acquire.cc 2010-07-23 17:30:11.494883936 +0100 | ||
13 | @@ -22,6 +22,7 @@ | ||
14 | |||
15 | #include <apti18n.h> | ||
16 | |||
17 | +#include <cstdio> | ||
18 | #include <iostream> | ||
19 | #include <sstream> | ||
20 | |||
21 | Index: apt-0.7.14/apt-pkg/contrib/sha256.h | ||
22 | =================================================================== | ||
23 | --- apt-0.7.14.orig/apt-pkg/contrib/sha256.h 2008-05-28 14:22:14.000000000 +0100 | ||
24 | +++ apt-0.7.14/apt-pkg/contrib/sha256.h 2010-07-23 17:30:11.494883936 +0100 | ||
25 | @@ -14,6 +14,7 @@ | ||
26 | #ifndef APTPKG_SHA256_H | ||
27 | #define APTPKG_SHA256_H | ||
28 | |||
29 | +#include <stdint.h> | ||
30 | #include <string> | ||
31 | #include <cstring> | ||
32 | #include <algorithm> | ||
33 | Index: apt-0.7.14/apt-pkg/deb/dpkgpm.cc | ||
34 | =================================================================== | ||
35 | --- apt-0.7.14.orig/apt-pkg/deb/dpkgpm.cc 2008-05-28 14:22:14.000000000 +0100 | ||
36 | +++ apt-0.7.14/apt-pkg/deb/dpkgpm.cc 2010-07-23 17:30:36.960856870 +0100 | ||
37 | @@ -20,6 +20,7 @@ | ||
38 | #include <stdlib.h> | ||
39 | #include <fcntl.h> | ||
40 | #include <sys/select.h> | ||
41 | +#include <sys/stat.h> | ||
42 | #include <sys/types.h> | ||
43 | #include <sys/wait.h> | ||
44 | #include <signal.h> | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch b/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch deleted file mode 100644 index 80252732e2..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | Add in missing header includes to resolve compile failures with recent | ||
2 | compiler/glibc combinations. | ||
3 | |||
4 | Upstream-Status: Inappropriate [Resolved upstream] | ||
5 | |||
6 | RP 2011/11/23 | ||
7 | |||
8 | Index: apt-0.7.14/apt-pkg/init.cc | ||
9 | =================================================================== | ||
10 | --- apt-0.7.14.orig/apt-pkg/init.cc 2011-11-23 22:48:53.544637868 +0000 | ||
11 | +++ apt-0.7.14/apt-pkg/init.cc 2011-11-23 22:48:59.456638260 +0000 | ||
12 | @@ -16,6 +16,7 @@ | ||
13 | #include <config.h> | ||
14 | #include <cstdlib> | ||
15 | #include <sys/stat.h> | ||
16 | +#include <locale> | ||
17 | /*}}}*/ | ||
18 | |||
19 | #define Stringfy_(x) # x | ||
20 | Index: apt-0.7.14/cmdline/apt-cache.cc | ||
21 | =================================================================== | ||
22 | --- apt-0.7.14.orig/cmdline/apt-cache.cc 2011-11-23 22:53:29.048631067 +0000 | ||
23 | +++ apt-0.7.14/cmdline/apt-cache.cc 2011-11-23 22:54:15.784616212 +0000 | ||
24 | @@ -32,6 +32,7 @@ | ||
25 | #include <apti18n.h> | ||
26 | |||
27 | #include <locale.h> | ||
28 | +#include <locale> | ||
29 | #include <iostream> | ||
30 | #include <unistd.h> | ||
31 | #include <errno.h> | ||
32 | Index: apt-0.7.14/cmdline/apt-cdrom.cc | ||
33 | =================================================================== | ||
34 | --- apt-0.7.14.orig/cmdline/apt-cdrom.cc 2011-11-23 22:53:29.064631096 +0000 | ||
35 | +++ apt-0.7.14/cmdline/apt-cdrom.cc 2011-11-23 22:53:57.616630261 +0000 | ||
36 | @@ -27,6 +27,7 @@ | ||
37 | //#include "indexcopy.h" | ||
38 | |||
39 | #include <locale.h> | ||
40 | +#include <locale> | ||
41 | #include <iostream> | ||
42 | #include <fstream> | ||
43 | #include <vector> | ||
44 | Index: apt-0.7.14/cmdline/apt-config.cc | ||
45 | =================================================================== | ||
46 | --- apt-0.7.14.orig/cmdline/apt-config.cc 2011-11-23 22:50:16.796635352 +0000 | ||
47 | +++ apt-0.7.14/cmdline/apt-config.cc 2011-11-23 22:50:25.640633906 +0000 | ||
48 | @@ -27,6 +27,7 @@ | ||
49 | #include <locale.h> | ||
50 | #include <iostream> | ||
51 | #include <string> | ||
52 | +#include <locale> | ||
53 | /*}}}*/ | ||
54 | using namespace std; | ||
55 | |||
56 | Index: apt-0.7.14/cmdline/apt-extracttemplates.cc | ||
57 | =================================================================== | ||
58 | --- apt-0.7.14.orig/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:29.080631084 +0000 | ||
59 | +++ apt-0.7.14/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:38.304630439 +0000 | ||
60 | @@ -39,6 +39,7 @@ | ||
61 | #include <config.h> | ||
62 | #include <apti18n.h> | ||
63 | #include "apt-extracttemplates.h" | ||
64 | +#include <locale> | ||
65 | /*}}}*/ | ||
66 | |||
67 | using namespace std; | ||
68 | Index: apt-0.7.14/cmdline/apt-get.cc | ||
69 | =================================================================== | ||
70 | --- apt-0.7.14.orig/cmdline/apt-get.cc 2011-11-23 22:53:29.096631090 +0000 | ||
71 | +++ apt-0.7.14/cmdline/apt-get.cc 2011-11-23 22:53:49.368629452 +0000 | ||
72 | @@ -48,6 +48,7 @@ | ||
73 | |||
74 | #include <set> | ||
75 | #include <locale.h> | ||
76 | +#include <locale> | ||
77 | #include <langinfo.h> | ||
78 | #include <fstream> | ||
79 | #include <termios.h> | ||
80 | Index: apt-0.7.14/cmdline/apt-sortpkgs.cc | ||
81 | =================================================================== | ||
82 | --- apt-0.7.14.orig/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:03.872640247 +0000 | ||
83 | +++ apt-0.7.14/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:10.880638611 +0000 | ||
84 | @@ -27,6 +27,7 @@ | ||
85 | |||
86 | #include <locale.h> | ||
87 | #include <unistd.h> | ||
88 | +#include <locale> | ||
89 | /*}}}*/ | ||
90 | |||
91 | using namespace std; | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch b/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch deleted file mode 100644 index 403711f013..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | I was seeing various issues with parallel make, mainly due to to what was likely | ||
2 | partially installed headers. If you change into the source directory and | ||
3 | "NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it | ||
4 | doesn't have any dependencies on the headers being installed. This patch | ||
5 | fixes that so things build correctly. | ||
6 | |||
7 | RP 2012/3/19 | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Index: apt-0.7.14/buildlib/library.mak | ||
12 | =================================================================== | ||
13 | --- apt-0.7.14.orig/buildlib/library.mak | ||
14 | +++ apt-0.7.14/buildlib/library.mak | ||
15 | @@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR | ||
16 | |||
17 | # Compilation rules | ||
18 | vpath %.cc $(SUBDIRS) | ||
19 | -$(OBJ)/%.opic: %.cc | ||
20 | +$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS) | ||
21 | echo Compiling $< to $@ | ||
22 | $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< | ||
23 | $(DoDep) | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch deleted file mode 100644 index 7fd1db8b25..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- | ||
4 | po/LINGUAS | 2 +- | ||
5 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
6 | |||
7 | --- apt-0.7.14.orig/po/LINGUAS | ||
8 | +++ apt-0.7.14/po/LINGUAS | ||
9 | @@ -1 +1 @@ | ||
10 | -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 | ||
11 | +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/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch deleted file mode 100644 index 04e721d659..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- | ||
4 | apt-pkg/packagemanager.cc | 4 ++++ | ||
5 | 1 file changed, 4 insertions(+) | ||
6 | |||
7 | --- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc | ||
8 | +++ apt-0.6.45exp2/apt-pkg/packagemanager.cc | ||
9 | @@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI | ||
10 | |||
11 | List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); | ||
12 | |||
13 | +#if 0 | ||
14 | // Perform immedate configuration of the package. | ||
15 | if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) | ||
16 | if (SmartConfigure(Pkg) == false) | ||
17 | return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); | ||
18 | +#endif | ||
19 | |||
20 | return true; | ||
21 | } | ||
22 | @@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
23 | DoneSomething = true; | ||
24 | } | ||
25 | |||
26 | +#if 0 | ||
27 | // Final run through the configure phase | ||
28 | if (ConfigureAll() == false) | ||
29 | return Failed; | ||
30 | @@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
31 | return Failed; | ||
32 | } | ||
33 | } | ||
34 | +#endif | ||
35 | |||
36 | return Completed; | ||
37 | } | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch deleted file mode 100644 index 216c091819..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- | ||
4 | Makefile | 2 +- | ||
5 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
6 | |||
7 | --- apt-0.7.14.orig/Makefile | ||
8 | +++ apt-0.7.14/Makefile | ||
9 | @@ -15,11 +15,11 @@ all headers library clean veryclean bina | ||
10 | $(MAKE) -C apt-inst $@ | ||
11 | $(MAKE) -C methods $@ | ||
12 | $(MAKE) -C cmdline $@ | ||
13 | $(MAKE) -C ftparchive $@ | ||
14 | $(MAKE) -C dselect $@ | ||
15 | - $(MAKE) -C doc $@ | ||
16 | +# $(MAKE) -C doc $@ | ||
17 | $(MAKE) -C po $@ | ||
18 | |||
19 | # Some very common aliases | ||
20 | .PHONY: maintainer-clean dist-clean distclean pristine sanity | ||
21 | maintainer-clean dist-clean distclean pristine sanity: veryclean | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch b/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch deleted file mode 100644 index 8d7c891545..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Fix build errors on gcc 4.7: | ||
2 | |||
3 | deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()': | ||
4 | deb/deblistparser.cc:212:13: error: redeclaration of 'char* I' | ||
5 | deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
9 | --- | ||
10 | apt-pkg/deb/deblistparser.cc | 10 +++++----- | ||
11 | cmdline/apt-get.cc | 8 ++++---- | ||
12 | 2 files changed, 9 insertions(+), 9 deletions(-) | ||
13 | |||
14 | diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc | ||
15 | --- a/apt-pkg/deb/deblistparser.cc | ||
16 | +++ b/apt-pkg/deb/deblistparser.cc | ||
17 | @@ -209,18 +209,18 @@ unsigned short debListParser::VersionHash() | ||
18 | /* Strip out any spaces from the text, this undoes dpkgs reformatting | ||
19 | of certain fields. dpkg also has the rather interesting notion of | ||
20 | reformatting depends operators < -> <= */ | ||
21 | - char *I = S; | ||
22 | + char *J = S; | ||
23 | for (; Start != End; Start++) | ||
24 | { | ||
25 | if (isspace(*Start) == 0) | ||
26 | - *I++ = tolower(*Start); | ||
27 | + *J++ = tolower(*Start); | ||
28 | if (*Start == '<' && Start[1] != '<' && Start[1] != '=') | ||
29 | - *I++ = '='; | ||
30 | + *J++ = '='; | ||
31 | if (*Start == '>' && Start[1] != '>' && Start[1] != '=') | ||
32 | - *I++ = '='; | ||
33 | + *J++ = '='; | ||
34 | } | ||
35 | |||
36 | - Result = AddCRC16(Result,S,I - S); | ||
37 | + Result = AddCRC16(Result,S,J - S); | ||
38 | } | ||
39 | |||
40 | return Result; | ||
41 | diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc | ||
42 | --- a/cmdline/apt-get.cc | ||
43 | +++ b/cmdline/apt-get.cc | ||
44 | @@ -1752,12 +1752,12 @@ bool DoInstall(CommandLine &CmdL) | ||
45 | if ((*Cache)[I].Install() == false) | ||
46 | continue; | ||
47 | |||
48 | - const char **J; | ||
49 | - for (J = CmdL.FileList + 1; *J != 0; J++) | ||
50 | - if (strcmp(*J,I.Name()) == 0) | ||
51 | + const char **K; | ||
52 | + for (K = CmdL.FileList + 1; *K != 0; K++) | ||
53 | + if (strcmp(*K,I.Name()) == 0) | ||
54 | break; | ||
55 | |||
56 | - if (*J == 0) { | ||
57 | + if (*K == 0) { | ||
58 | List += string(I.Name()) + " "; | ||
59 | VersionsList += string(Cache[I].CandVersion) + "\n"; | ||
60 | } | ||
61 | -- | ||
62 | 1.7.1 | ||
63 | |||
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 @@ | |||
1 | strutl.cc: the filename can't be longer than 255 | ||
2 | |||
3 | The URItoFileName translates the path into the filename, but the | ||
4 | filename can't be longer than 255 according to | ||
5 | /usr/include/linux/limits.h. | ||
6 | |||
7 | Truncate it when it is longer than 240 (leave some spaces for | ||
8 | ".Packages" and "._Release" suffix) | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-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 | |||
16 | diff --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 | -- | ||
34 | 1.7.10.4 | ||
35 | |||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch b/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch deleted file mode 100644 index 485ad7ba37..0000000000 --- a/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- | ||
4 | buildlib/sizetable | 4 +++- | ||
5 | configure.in | 2 +- | ||
6 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
7 | |||
8 | Index: apt-0.7.14/buildlib/sizetable | ||
9 | =================================================================== | ||
10 | --- apt-0.7.14.orig/buildlib/sizetable | ||
11 | +++ apt-0.7.14/buildlib/sizetable | ||
12 | @@ -11,6 +11,9 @@ | ||
13 | # The format is:- | ||
14 | # CPU endian sizeof: char, int, short, long | ||
15 | i386 little 1 4 2 4 | ||
16 | +i486 little 1 4 2 4 | ||
17 | +i586 little 1 4 2 4 | ||
18 | +i686 little 1 4 2 4 | ||
19 | armeb big 1 4 2 4 | ||
20 | arm little 1 4 2 4 | ||
21 | alpha little 1 4 2 8 | ||
22 | @@ -21,4 +24,5 @@ m68k big 1 4 2 4 | ||
23 | powerpc big 1 4 2 4 | ||
24 | mips big 1 4 2 4 | ||
25 | hppa big 1 4 2 4 | ||
26 | -m32r big 1 4 2 4 | ||
27 | \ No newline at end of file | ||
28 | +m32r big 1 4 2 4 | ||
29 | +x86_64 little 1 4 2 8 | ||
30 | Index: apt-0.7.14/configure.in | ||
31 | =================================================================== | ||
32 | --- apt-0.7.14.orig/configure.in | ||
33 | +++ apt-0.7.14/configure.in | ||
34 | @@ -88,7 +88,7 @@ dnl This is often the dpkg architecture | ||
35 | dnl First check against the full canonical canoncial-system-type in $target | ||
36 | dnl and if that fails, just look for the cpu | ||
37 | AC_MSG_CHECKING(debian architecture) | ||
38 | -archset="`dpkg-architecture -qDEB_HOST_ARCH`" | ||
39 | +archset="`echo $host_alias|cut -d'-' -f1`" | ||
40 | if test "x$archset" = "x"; then | ||
41 | AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) | ||
42 | fi | ||