summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--apt-pkg/acquire-item.cc5
-rw-r--r--debian/changelog8
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt-transport-http.1.xml2
-rw-r--r--doc/apt-transport-https.1.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/po/apt-doc.pot38
-rw-r--r--po/apt-all.pot4
10 files changed, 37 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c14b64ee6..3288a6a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,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.7.0~alpha1")
+set(PACKAGE_VERSION "1.7.0~alpha2")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 0126b0f63..b40c67ec1 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -33,6 +33,7 @@
#include <algorithm>
#include <ctime>
+#include <chrono>
#include <iostream>
#include <memory>
#include <numeric>
@@ -1526,8 +1527,8 @@ void pkgAcqMetaClearSig::QueueIndexes(bool const verify) /*{{{*/
can be as we shouldn't be telling the mirrors (and everyone else watching)
which is native/foreign arch, specific order of preference of translations, … */
auto range_start = IndexTargets.begin();
- std::random_device rd;
- std::default_random_engine g(rd());
+ auto seed = (std::chrono::high_resolution_clock::now().time_since_epoch() / std::chrono::nanoseconds(1)) ^ getpid();
+ std::default_random_engine g(seed);
do {
auto const type = range_start->Option(IndexTarget::CREATED_BY);
auto const range_end = std::find_if_not(range_start, IndexTargets.end(),
diff --git a/debian/changelog b/debian/changelog
index fb6dd6ce9..8d4734637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (1.7.0~alpha2) experimental; urgency=medium
+
+ * Handle JSON hooks that just close the file/exit and fix some other errors
+ (LP: #1776218)
+ * Use cheaper entropy source for randomizing items to fetch
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 09 Jul 2018 16:02:45 +0200
+
apt (1.7.0~alpha1) experimental; urgency=medium
[ Julian Andres Klode ]
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index f7363bcd7..c1db915b3 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-04-18T00:00:00Z</date>
+ <date>2018-06-25T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-transport-http.1.xml b/doc/apt-transport-http.1.xml
index f239da554..03e77246d 100644
--- a/doc/apt-transport-http.1.xml
+++ b/doc/apt-transport-http.1.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-05-11T00:00:00Z</date>
+ <date>2018-06-25T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index e00dd7c62..353c0a564 100644
--- a/doc/apt-transport-https.1.xml
+++ b/doc/apt-transport-https.1.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-05-11T00:00:00Z</date>
+ <date>2018-06-25T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 4386e0aa4..85a634233 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -268,7 +268,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.7.0~alpha1">
+<!ENTITY apt-product-version "1.7.0~alpha2">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 288d1aec0..aa374ead8 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-04-18T00:00:00Z</date>
+ <date>2018-06-25T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 3de6e347c..0920aff3e 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.7.0~alpha1\n"
+"Project-Id-Version: apt-doc 1.7.0~alpha2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-06-25 17:12+0200\n"
+"POT-Creation-Date: 2018-07-09 16:03+0200\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"
@@ -545,7 +545,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml apt.8.xml apt.8.xml apt.8.xml
+#: apt.8.xml
msgid "(&apt-get;)"
msgstr ""
@@ -578,7 +578,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml apt-key.8.xml sources.list.5.xml
+#: apt.8.xml apt-key.8.xml sources.list.5.xml
msgid ","
msgstr ""
@@ -635,7 +635,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml
+#: apt.8.xml
msgid "(&apt-cache;)"
msgstr ""
@@ -659,7 +659,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml
+#: apt.8.xml
msgid "(work-in-progress)"
msgstr ""
@@ -983,12 +983,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml apt-get.8.xml
+#: apt-get.8.xml
msgid "(and the"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml apt-get.8.xml
+#: apt-get.8.xml
msgid "alias since 1.1)"
msgstr ""
@@ -1506,8 +1506,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
-#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
+#: apt-cache.8.xml
msgid "&synopsis-pkg;"
msgstr ""
@@ -2093,9 +2092,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-mark.8.xml apt-cdrom.8.xml
-#: apt-transport-http.1.xml apt-transport-https.1.xml
-#: apt-transport-mirror.1.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
msgid "Options"
msgstr ""
@@ -4843,7 +4841,7 @@ msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml apt_preferences.5.xml
+#: apt_preferences.5.xml
msgid "the <literal>Version:</literal> line"
msgstr ""
@@ -5052,7 +5050,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml apt_preferences.5.xml apt_preferences.5.xml
+#: apt_preferences.5.xml
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6179,7 +6177,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
@@ -6393,7 +6391,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
msgid ""
"Specifies whether long descriptions should be included in the "
"<filename>Packages</filename> file or split out into a master "
@@ -6599,12 +6597,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
msgid "Sets the source extra override file."
msgstr ""
@@ -8464,7 +8462,7 @@ msgid "Introduction"
msgstr ""
#. type: Content of: <book><chapter><section><title>
-#: offline.dbk offline.dbk offline.dbk
+#: offline.dbk
msgid "Overview"
msgstr ""
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 81dabafeb..3d1f855d1 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.7.0~alpha1\n"
+"Project-Id-Version: apt 1.7.0~alpha2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-06-25 17:12+0200\n"
+"POT-Creation-Date: 2018-07-09 16:03+0200\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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 14:38:15 +0000