From ee7b0227a29796db8c2d5986db7fcf7073ce8dfd Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Fri, 25 Jan 2019 12:52:25 +0100
Subject: Release 1.6.8

---
 CMakeLists.txt          | 2 +-
 debian/changelog        | 6 ++++++
 doc/apt-verbatim.ent    | 2 +-
 doc/apt_auth.conf.5.xml | 2 +-
 doc/po/apt-doc.pot      | 4 ++--
 po/apt-all.pot          | 4 ++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbba3cd1b..2c76ff2ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ endif()
 # Configure some variables like package, version and architecture.
 set(PACKAGE ${PROJECT_NAME})
 set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "1.6.7")
+set(PACKAGE_VERSION "1.6.8")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 80e97d9c7..789bc6bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (1.6.8) bionic; urgency=medium
+
+  * merge security update: content injection in http method (CVE-2019-3462)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 25 Jan 2019 12:51:00 +0100
+
 apt (1.6.7) bionic; urgency=medium
 
   [ Milo Casagrande ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c00a19aeb..f61c02353 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -262,7 +262,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.6.7">
+<!ENTITY apt-product-version "1.6.8">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index e7961ef81..bb0e5aa90 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2018-12-03T00:00:00Z</date>
+   <date>2019-01-14T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 18bdfbe94..dd9bfa58e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.6.6\n"
+"Project-Id-Version: apt-doc 1.6.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-01-14 14:35+0100\n"
+"POT-Creation-Date: 2019-01-25 12:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index cb487ab16..f6490d6cd 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.6.6\n"
+"Project-Id-Version: apt 1.6.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-01-14 14:35+0100\n"
+"POT-Creation-Date: 2019-01-25 12:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3