Signed-off-by: Adrian Bunk
---
.../recipes-devtools/apt/apt-native_1.2.31.bb | 4 +-
...nging-the-global-LC_TIME-for-Release.patch | 80 ---
...caled-std-put_time-instead-rolling-o.patch | 46 ---
...ntrib-strutl.cc-Include-array-header.patch | 33
4 files changed, 1 insertion(+), 162 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
delete mode 100644
meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
delete mode 100644
meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
diff --git a/meta/recipes-devtools/apt/apt-native_1.2.31.bb
b/meta/recipes-devtools/apt/apt-native_1.2.31.bb
index 5b16b503d5..2952c21017 100644
--- a/meta/recipes-devtools/apt/apt-native_1.2.31.bb
+++ b/meta/recipes-devtools/apt/apt-native_1.2.31.bb
@@ -2,6 +2,4 @@ require apt-native.inc
SRC_URI += "file://noconfigure.patch \
file://no-curl.patch \
-
file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \
-
file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \
-
file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch"
+"
diff --git
a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
deleted file mode 100644
index 438de209a2..00
---
a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7ef2b2dba0e0bee450da3c8450ea782a3e7d6429 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?=
-Date: Tue, 22 Aug 2017 11:49:01 -0500
-Subject: [PATCH 3/3] Revert "avoid changing the global LC_TIME for Release
- writing"
-
-This reverts commit 78e7b683c645e907db12658405a4b201a6243ea8.
-
-After we drop debian8 and centos7 that has gcc < 5 (std::put_time not
available)
-versions this patch can be remove.
-
-Signed-off-by: Anibal Limon
-
-Upstream-Status: Inappropriate [embedded specific]
- ftparchive/writer.cc | 29 +
- 1 file changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
-index 2596382..e43a643 100644
a/ftparchive/writer.cc
-+++ b/ftparchive/writer.cc
-@@ -37,7 +37,6 @@
- #include
- #include
- #include
--#include
- #include
- #include
- #include
-@@ -984,29 +983,35 @@ ReleaseWriter::ReleaseWriter(FileFd * const GivenOutput,
string const &/*DB*/) :
-AddPatterns(_config->FindVector("APT::FTPArchive::Release::Patterns"));
-
-time_t const now = time(NULL);
-- auto const posix = std::locale("C.UTF-8");
-
-- // FIXME: use TimeRFC1123 here? But that uses GMT to satisfy HTTP/1.1
-- std::ostringstream datestr;
-- datestr.imbue(posix);
-- datestr << std::put_time(gmtime(), "%a, %d %b %Y %H:%M:%S UTC");
-+ setlocale(LC_TIME, "C");
-+
-+ char datestr[128];
-+ if (strftime(datestr, sizeof(datestr), "%a, %d %b %Y %H:%M:%S UTC",
-+gmtime()) == 0)
-+ {
-+ datestr[0] = '\0';
-+ }
-
-time_t const validuntil = now +
_config->FindI("APT::FTPArchive::Release::ValidTime", 0);
-- std::ostringstream validstr;
-- if (validuntil != now)
-+ char validstr[128];
-+ if (now == validuntil ||
-+ strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC",
-+gmtime()) == 0)
-{
-- datestr.imbue(posix);
-- validstr << std::put_time(gmtime(), "%a, %d %b %Y %H:%M:%S
UTC");
-+ validstr[0] = '\0';
-}
-
-+ setlocale(LC_TIME, "");
-+
-map Fields;
-Fields["Origin"] = "";
-Fields["Label"] = "";
-Fields["Suite"] = "";
-Fields["Version"] = "";
-Fields["Codename"] = "";
-- Fields["Date"] = datestr.str();
-- Fields["Valid-Until"] = validstr.str();
-+ Fields["Date"] = datestr;
-+ Fields["Valid-Until"] = validstr;
-Fields["Architectures"] = "";
-Fields["Components"] = "";
-Fields["Description"] = "";
---
-2.1.4
-
diff --git
a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
deleted file mode 100644
index 088a66a3c8..00
---
a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c72ef9b6ae83a0a2fbbefd5c050335f65f0d2bc9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?=
-Date: Tue, 22 Aug 2017 11:48:46 -0500
-Subject: [PATCH 2/3] Revert "use de-localed std::put_time instead rolling our
- own"
-
-This reverts commit 4ed2a17ab4334f019c00512aa54a162f0bf083c4.
-
-After we drop debian8 and centos7 that has gcc < 5 (std::put_time not
