Merging upstream version 2.7.14.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

27 files changed, 501 insertions, 358 deletions

diff --git a/CMake/config.h.in b/CMake/config.h.in
index 65f983f..607f9d5 100644
--- a/CMake/config.h.in
+++ b/CMake/config.h.in
@@ -5,6 +5,9 @@
 /* Define if we have the timegm() function */
 #cmakedefine HAVE_TIMEGM
 
+/* Define if we have the gnutls library for TLS */
+#cmakedefine HAVE_GNUTLS
+
 /* Define if we have the zlib library for gzip */
 #cmakedefine HAVE_ZLIB
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9036b3d..3a2677f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ if (BERKELEY_FOUND)
   set(HAVE_BDB 1)
 endif()
 
-find_package(GnuTLS REQUIRED)
+find_package(GnuTLS)
 if (GNUTLS_FOUND)
   set(HAVE_GNUTLS 1)
 endif()
@@ -206,7 +206,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 "2.7.13")
+set(PACKAGE_VERSION "2.7.14")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 81e6fec..08428e7 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2708,32 +2708,28 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {
    if (d == nullptr || Failed())
       return false;
-   ssize_t Res = 1;
-   errno = 0;
    if (Actual != 0)
       *Actual = 0;
    *((char *)To) = '\0';
-   while (Res > 0 && Size > 0)
+   while (Size > 0)
    {
-      Res = d->InternalRead(To, Size);
+      errno = 0;
+      ssize_t Res = d->InternalRead(To, Size);
 
       if (Res < 0)
       {
 	 if (errno == EINTR)
-	 {
-	    // trick the while-loop into running again
-	    Res = 1;
-	    errno = 0;
 	    continue;
-	 }
 	 return d->InternalReadError();
       }
-      
-      To = (char *)To + Res;
+      if (Res == 0)
+	 break;
+
+      To = static_cast<char *>(To) + Res;
       Size -= Res;
-      if (d != NULL)
+      if (d != nullptr)
 	 d->set_seekpos(d->get_seekpos() + Res);
-      if (Actual != 0)
+      if (Actual != nullptr)
 	 *Actual += Res;
    }
    
@@ -2751,24 +2747,22 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 }
 bool FileFd::Read(int const Fd, void *To, unsigned long long Size, unsigned long long * const Actual)
 {
-   ssize_t Res = 1;
-   errno = 0;
    if (Actual != nullptr)
       *Actual = 0;
    *static_cast<char *>(To) = '\0';
-   while (Res > 0 && Size > 0)
+   while (Size > 0)
    {
-      Res = read(Fd, To, Size);
+      errno = 0;
+      ssize_t const Res = read(Fd, To, Size);
       if (Res < 0)
       {
 	 if (errno == EINTR)
-	 {
-	    Res = 1;
-	    errno = 0;
 	    continue;
-	 }
 	 return _error->Errno("read", _("Read error"));
       }
+      if (Res == 0)
+	 break;
+
       To = static_cast<char *>(To) + Res;
       Size -= Res;
       if (Actual != 0)
@@ -2829,27 +2823,23 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 {
    if (d == nullptr || Failed())
       return false;
-   ssize_t Res = 1;
-   errno = 0;
-   while (Res > 0 && Size > 0)
+   while (Size > 0)
    {
-      Res = d->InternalWrite(From, Size);
+      errno = 0;
+      ssize_t const Res = d->InternalWrite(From, Size);
 
       if (Res < 0)
       {
 	 if (errno == EINTR)
-	 {
-	    // trick the while-loop into running again
-	    Res = 1;
-	    errno = 0;
 	    continue;
-	 }
 	 return d->InternalWriteError();
       }
+      if (Res == 0)
+	 break;
 
-      From = (char const *)From + Res;
+      From = static_cast<char const *>(From) + Res;
       Size -= Res;
-      if (d != NULL)
+      if (d != nullptr)
 	 d->set_seekpos(d->get_seekpos() + Res);
    }
 
@@ -2860,17 +2850,20 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 }
 bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 {
-   ssize_t Res = 1;
-   errno = 0;
-   while (Res > 0 && Size > 0)
+   while (Size > 0)
    {
-      Res = write(Fd,From,Size);
-      if (Res < 0 && errno == EINTR)
-	 continue;
+      errno = 0;
+      ssize_t const Res = write(Fd, From, Size);
       if (Res < 0)
+      {
+	 if (errno == EINTR)
+	    continue;
 	 return _error->Errno("write",_("Write error"));
+      }
+      if (Res == 0)
+	 break;
 
-      From = (char const *)From + Res;
+      From = static_cast<char const *>(From) + Res;
       Size -= Res;
    }
 
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 8099b36..46c3629 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -522,7 +522,17 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
       Op = pkgCache::Dep::Equals;
       I++;
       break;
-      
+
+      // != is unsupported packaging
+      case '!':
+      if (*(I + 1) == '=')
+      {
+	 I = I + 2;
+	 Op = pkgCache::Dep::NotEquals;
+	 break;
+      }
+      [[fallthrough]];
+
       // HACK around bad package definitions
       default:
       Op = pkgCache::Dep::Equals;
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 8f323bb..95ae4a4 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -431,6 +431,11 @@ bool pkgTagFile::Fill()
    that is there */
 bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
 {
+   // Head back to the start of the buffer, in case we get called for the same section
+   // again (d->Start will point to next section already)
+   d->iOffset -= d->Start - d->Buffer;
+   d->Start = d->Buffer;
+
    if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) == 0 &&
    // We are within a buffer space of the next hit..
 	 Offset >= d->iOffset && d->iOffset + (d->End - d->Start) > Offset)
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 531500c..7fdd4df 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -745,7 +745,7 @@ static bool XVcg(CommandLine &CmdL)
 // ---------------------------------------------------------------------
 /* Dotty is the graphvis program for generating graphs. It is a fairly
    simple queuing algorithm that just writes dependencies and nodes. 
-   http://www.research.att.com/sw/tools/graphviz/ */
+   https://graphviz.org/ */
 static bool Dotty(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 1e84b44..d42b502 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2023-07-20T00:00:00Z</date>
+   <date>2024-03-14T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -210,7 +210,7 @@ Reverse Provides:
      <varlistentry><term><option>dotty</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>dotty</literal> takes a list of packages on the command line and
      generates output suitable for use by dotty from the 
-     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+     <ulink url="https://graphviz.org/">GraphViz</ulink>
      package. The result will be a set of nodes and edges representing the 
      relationships between the packages. By default the given packages will 
      trace out all dependent packages; this can produce a very large graph. 
@@ -227,7 +227,7 @@ Reverse Provides:
      
      <varlistentry><term><option>xvcg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
 	 <listitem><para>The same as <literal>dotty</literal>, only for xvcg from the
-	 <ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>.
+	 <ulink url="https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1.html">VCG tool</ulink>.
 	 </para></listitem></varlistentry>
 
 	 <varlistentry><term><option>policy</option> <optional><replaceable>&synopsis-pkg;</replaceable>…</optional></term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 8d6bd8e..da1e919 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>2023-12-15T00:00:00Z</date>
+   <date>2024-03-12T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -62,8 +62,10 @@
      retrieved and installed. New versions of currently installed packages that 
      cannot be upgraded without changing the install status of another package 
      will be left at their current version. An <literal>update</literal> must be 
-     performed first so that <command>apt-get</command> knows that new versions of packages are 
-     available.</para></listitem>
+     performed first so that <command>apt-get</command> knows that new versions
+     of packages are available.</para><para>When a package is supplied as an
+     argument, the package will be installed prior to the upgrade
+     action.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>dist-upgrade</option></term>
@@ -76,7 +78,9 @@
      The <filename>/etc/apt/sources.list</filename> file contains a list of locations 
      from which to retrieve desired package files.
      See also &apt-preferences; for a mechanism for
-     overriding the general settings for individual packages.</para></listitem>
+     overriding the general settings for individual packages.</para><para>When
+     a package is supplied as an argument, the package will be installed prior
+     to the upgrade action.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>dselect-upgrade</option></term>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 1dabbe7..8bf2321 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.7.13">
+<!ENTITY apt-product-version "2.7.14">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index b897369..7af915e 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2023-12-28T00:00:00Z</date>
+   <date>2024-03-12T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -59,14 +59,18 @@
 	   packages will never be removed. If an upgrade for a package requires
 	   the removal of an installed package the upgrade for this package
 	   isn't performed.
-     </para></listitem>
+     </para>
+     <para>When a package is supplied as an argument, the package will be
+     installed prior to the upgrade action.</para>
+     </listitem>
      </varlistentry>
 
      <varlistentry><term><option>full-upgrade</option> (&apt-get;)</term>
      <listitem><para><literal>full-upgrade</literal> performs the function of
 	   upgrade but will remove currently installed packages if this is
 	   needed to upgrade the system as a whole.
-     </para></listitem>
+     </para><para>When a package is supplied as an argument, the package will
+     be installed prior to the upgrade action.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>install</option>, <option>reinstall</option>, <option>remove</option>, <option>purge</option> (&apt-get;)</term>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 5f7e243..2ae569e 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>2024-02-20T00:00:00Z</date>
+   <date>2024-02-21T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -1073,16 +1073,6 @@ APT::Compressor::rev {
      </varlistentry>
 
      <varlistentry>
-       <term><option>Debug::BuildDeps</option></term>
-       <listitem>
-	 <para>
-	   Describes the process of resolving build-dependencies in
-	   &apt-get;.
-	 </para>
-       </listitem>
-     </varlistentry>
-
-     <varlistentry>
        <term><option>Debug::Hashes</option></term>
        <listitem>
 	 <para>
diff --git a/doc/apt.ent b/doc/apt.ent
index db4cb6f..a6abb0e 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -14,7 +14,7 @@
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>
-   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.
+   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.
    If you wish to report a bug in APT, please see
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the
    &reportbug; command.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 68bb766..2c1c9b3 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 2.7.13\n"
+"Project-Id-Version: apt-doc 2.7.14\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-28 18:50+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\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"
@@ -46,7 +46,8 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug "
+"page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -575,6 +576,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -1892,11 +1900,11 @@ msgstr ""
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
-"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> "
-"package. The result will be a set of nodes and edges representing the "
-"relationships between the packages. By default the given packages will trace "
-"out all dependent packages; this can produce a very large graph.  To limit "
-"the output to only the packages listed on the command line, set the "
+"url=\"https://graphviz.org/\">GraphViz</ulink> package. The result will be a "
+"set of nodes and edges representing the relationships between the "
+"packages. By default the given packages will trace out all dependent "
+"packages; this can produce a very large graph.  To limit the output to only "
+"the packages listed on the command line, set the "
 "<literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 
@@ -1918,7 +1926,7 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1.html\">VCG "
 "tool</ulink>."
 msgstr ""
 
@@ -4338,11 +4346,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
diff --git a/doc/po/de.po b/doc/po/de.po
index e5ae516..9e04d5f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2020-04-04 08:45+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -68,7 +68,7 @@ msgstr ""
 "<!-- Vorformatierter Textblock Fehlerbericht-Abschnitt -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Fehler</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT-Fehlerseite</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT-Fehlerseite</ulink>. \n"
 "   Wenn Sie einen Fehler in APT berichten möchten, lesen Sie bitte\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> oder den\n"
 "   &reportbug;-Befehl. Verfassen Sie Fehlerberichte bitte auf Englisch.\n"
@@ -721,6 +721,13 @@ msgstr ""
 "installiertes Paket entfernt wird, wird dieses Upgrade nicht durchgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2651,25 +2658,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> nimmt eine Paketliste auf der Befehlszeile entgegen "
 "und generiert eine Ausgabe, die für die Benutzung durch dotty aus dem Paket "
-"<ulink url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</"
-"ulink> geeignet ist. Das Ergebnis ist eine Zusammenstellung von Knoten und "
-"Kanten, die die Beziehung zwischen Paketen darstellen. Standardmäßig werden "
-"alle abhängigen Pakete ausfindig gemacht. Dies kann zu einem sehr großen "
-"Schaubild führen. Um die Ausgabe auf die Pakete zu beschränken, die auf der "
-"Befehlszeile eingegeben wurden, setzen Sie die Option <literal>APT::Cache::"
-"GivenOnly</literal>."
+"<ulink url=\"https://graphviz.org/\">GraphViz</ulink> geeignet ist. Das "
+"Ergebnis ist eine Zusammenstellung von Knoten und Kanten, die die Beziehung "
+"zwischen Paketen darstellen. Standardmäßig werden alle abhängigen Pakete "
+"ausfindig gemacht. Dies kann zu einem sehr großen Schaubild führen. Um die "
+"Ausgabe auf die Pakete zu beschränken, die auf der Befehlszeile eingegeben "
+"wurden, setzen Sie die Option <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2696,12 +2711,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Das gleiche wie <literal>dotty</literal>, nur für xvcg vom <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG-Werkzeug</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG-Werkzeug</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6261,12 +6276,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -14165,6 +14174,10 @@ msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
+
 #~ msgid "Selects packages that are currently installed."
 #~ msgstr "wählt Pakete aus, die derzeit installiert sind."
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 8ff4b4f..449a411 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -90,7 +90,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -101,7 +101,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Página de errores de APT</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>Página de errores de APT</ulink>. \n"
 "   Si quiere informar de un error en APT, consulte\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o use la orden\n"
 "   &reportbug;.\n"
@@ -784,6 +784,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2674,24 +2681,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> toma una lista de paquetes de la línea de ordenes y "
 "genera una salida apropiada para su uso con dotty, del paquete <ulink "
-"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. El "
-"resultado será un conjunto de nodos y uniones representando las relaciones "
-"entre los paquetes. De forma predeterminada, los paquetes proporcionados "
-"mostrarán todas sus dependencias, lo que puede producir un grafo muy grande. "
-"Para limitar la salida sólo a los paquetes listados en la línea de órdenes, "
-"active la opción <literal>APT::Cache::GivenOnly</literal>."
+"url=\"https://graphviz.org/\">GraphViz</ulink>. El resultado será un "
+"conjunto de nodos y uniones representando las relaciones entre los paquetes. "
+"De forma predeterminada, los paquetes proporcionados mostrarán todas sus "
+"dependencias, lo que puede producir un grafo muy grande. Para limitar la "
+"salida sólo a los paquetes listados en la línea de órdenes, active la opción "
+"<literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2717,12 +2733,12 @@ msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Lo mismo que <literal>dotty</literal>, sólo para xvcg de la <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">herramienta "
-"VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">herramienta VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6108,13 +6124,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Describe el proceso de resolución de dependencias de compilación en &apt-"
-"get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -13416,6 +13425,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Describe el proceso de resolución de dependencias de compilación en &apt-"
+#~ "get;."
+
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "Expresiones regulares y sintaxis &glob;"
 
@@ -14000,12 +14014,12 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ msgstr "Esta página de manual ni siquiera está iniciada."
 
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
-#~ "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe "
-#~ "de error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-"
+#~ "Consulte E<lt>https://bugs.debian.org/aptE<gt>. Si desea enviar un "
+#~ "informe de error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-"
 #~ "reporting.txt> o use la orden B<reportbug>(1)."
 
 #~ msgid "AUTHOR"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 48218a5..f5dd8cb 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -64,7 +64,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -75,7 +75,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bogues</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
 "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
 "   la commande &reportbug;.\n"
@@ -719,6 +719,13 @@ msgstr ""
 "réalisée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2625,15 +2632,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "La commande <literal>dotty</literal> prend une liste de paquets sur la ligne "
 "de commande et affiche une sortie appropriée à une utilisation par la "
@@ -2671,12 +2687,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6239,13 +6255,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Décrit le processus de résolution des dépendances pour la construction de "
-"paquets source ( « build-dependencies » ) par &apt-get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -14000,6 +14009,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Décrit le processus de résolution des dépendances pour la construction de "
+#~ "paquets source ( « build-dependencies » ) par &apt-get;."
+
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "Expressions régulières et syntaxe &glob;"
 
@@ -14665,11 +14679,11 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgstr "Cette page de manuel n'a même pas commencé à être rédigée."
 
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
-#~ "Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
+#~ "Voir E<lt>https://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
 #~ "bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting."
 #~ "txt> ou utiliser la commande B<reportbug>(1)."
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 8b3550e..33edd6a 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -62,7 +62,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -73,7 +73,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bug</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bug di APT</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>Pagina dei bug di APT</ulink>.\n"
 "   Se si desidera segnalare un bug in APT, vedere\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o il\n"
 "   comando &reportbug;.\n"
@@ -769,6 +769,13 @@ msgstr ""
 "pacchetto non viene effettuato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2653,25 +2660,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> accetta un elenco di pacchetti dalla riga di "
 "comando e genera un output adatto all'uso da parte di dotty del pacchetto "
-"<ulink url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</"
-"ulink>. Il risultato sarà un insieme di nodi e linee che rappresentano le "
-"relazioni fra i pacchetti. In modo predefinito dai pacchetti dati si "
-"risalirà a tutti i pacchetti delle dipendenze; ciò può produrre un grafo "
-"molto grande. Per limitare il risultato ai soli pacchetti elencati sulla "
-"riga di comando, impostare l'opzione <literal>APT::Cache::GivenOnly</"
-"literal>."
+"<ulink url=\"https://graphviz.org/\">GraphViz</ulink>. Il risultato sarà un "
+"insieme di nodi e linee che rappresentano le relazioni fra i pacchetti. In "
+"modo predefinito dai pacchetti dati si risalirà a tutti i pacchetti delle "
+"dipendenze; ciò può produrre un grafo molto grande. Per limitare il "
+"risultato ai soli pacchetti elencati sulla riga di comando, impostare "
+"l'opzione <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2698,12 +2713,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">strumento VCG</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">strumento VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6224,13 +6239,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
-"get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -13781,6 +13789,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Descrive il processo di risoluzione delle dipendenze di compilazione in "
+#~ "&apt-get;."
+
 # &glob; è rimpiazzato da "glob(7)"
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "Sintassi per le espressioni regolari e &glob;"
@@ -14478,11 +14491,11 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgstr "Questa pagina di manuale non è neanche stata iniziata."
 
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
-#~ "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in "
+#~ "Vedere E<lt>https://bugs.debian.org/aptE<gt>. Per segnalare un bug in "
 #~ "B<apt>, vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
 #~ "B<reportbug>(1)."
 
@@ -14940,7 +14953,7 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "<!-- Boiler plate Bug reporting section -->\n"
 #~ "<!ENTITY manbugs \"\n"
 #~ " <refsect1><title>Bugs</title>\n"
-#~ "   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</"
+#~ "   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</"
 #~ "ulink>. \n"
 #~ "   If you wish to report a bug in APT, please see\n"
 #~ "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
@@ -14952,7 +14965,7 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "<!-- Sezione standard segnalazione bachi -->\n"
 #~ "<!ENTITY manbugs \"\n"
 #~ " <refsect1><title>Bachi</title>\n"
-#~ "   <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bachi di "
+#~ "   <para><ulink url='https://bugs.debian.org/src:apt'>Pagina dei bachi di "
 #~ "APT</ulink>. \n"
 #~ "   Per segnalare un baco in APT, vedere\n"
 #~ "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o il\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index f1f96b0..de42613 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -61,7 +61,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -72,7 +72,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>バグ</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT バグページ</ulink> をご覧ください。 \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT バグページ</ulink> をご覧ください。 \n"
 "   APT のバグを報告する場合は、\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> や\n"
 "   &reportbug; コマンドをご覧ください。\n"
@@ -765,6 +765,13 @@ msgstr ""
 "合、そのパッケージのアップグレードは行われません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2568,23 +2575,32 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> は、コマンドライン上のパッケージ名から、<ulink "
-"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> パッ"
-"ケージの dotty コマンドで利用するのに便利な出力を生成します。結果はパッケージ"
-"の関係を表わす、ノード・エッジのセットで表現されます。デフォルトでは、すべて"
-"の依存パッケージをトレースするので、非常に大きい図が得られます。コマンドライ"
-"ンに列挙したパッケージだけを出力するように制限するには、<literal>APT::Cache::"
-"GivenOnly</literal> をセットしてください。"
+"url=\"https://graphviz.org/\">GraphViz</ulink> パッケージの dotty コマンドで"
+"利用するのに便利な出力を生成します。結果はパッケージの関係を表わす、ノード・"
+"エッジのセットで表現されます。デフォルトでは、すべての依存パッケージをトレー"
+"スするので、非常に大きい図が得られます。コマンドラインに列挙したパッケージだ"
+"けを出力するように制限するには、<literal>APT::Cache::GivenOnly</literal> を"
+"セットしてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2608,8 +2624,8 @@ msgstr "注意) dotty は、パッケージのより大きなセットのグラ�
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "<literal>dotty</literal> と同様ですが、<ulink url=\"http://rw4.cs.uni-sb.de/"
 "users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
@@ -5979,11 +5995,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -13228,6 +13239,9 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
+
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "正規表現と &glob; 構文"
 
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 1ebd319..fd40beb 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -1,13 +1,13 @@
 # Translation of apt-doc to Dutch
 # This file is distributed under the same license as the apt-doc package.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015-2023.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015-2024.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.7.3\n"
+"Project-Id-Version: apt-doc 2.7.12\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
-"PO-Revision-Date: 2023-08-29 23:39+0200\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
+"PO-Revision-Date: 2024-02-26 22:00+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -58,7 +58,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -69,7 +69,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bugpagina</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bugpagina</ulink>.\n"
 "   Indien u een bug in APT wilt rapporteren, raadpleeg dan\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> of het\n"
 "   &reportbug; commando.\n"
@@ -771,6 +771,15 @@ msgstr ""
 "wordt, zal de opwaardering voor dat pakket niet uitgevoerd worden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+"Wanneer een pakket wordt opgegeven als argument, zal het pakket "
+"geïnstalleerd worden voordat de opwaardering plaats vindt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -962,17 +971,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-#, fuzzy
-#| msgid "(&apt-cache;)"
 msgid "(summarised in &apt-cache;)"
-msgstr "(&apt-cache;)"
+msgstr "(samengevat in &apt-cache;)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-#, fuzzy
-#| msgid "(&apt-get;)"
 msgid "(summarised in &apt-get;)"
-msgstr "(&apt-get;)"
+msgstr "(samengevat in &apt-get;)"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
@@ -1540,7 +1545,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml
 msgid "alias)"
-msgstr ""
+msgstr "alias)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1550,6 +1555,11 @@ msgid ""
 "for example, when finalizing images distributed to users.  The release files "
 "are kept for security reasons, to prevent various types of attacks."
 msgstr ""
+"<literal>distclean</literal> verwijdert alle bestanden onder "
+"<filename>&statedir;/lists</filename> behalve Release, Release.gpg en "
+"InRelease. Het kan bijvoorbeeld gebruikt worden bij het afwerken van images "
+"die verspreid worden onder gebruikers. De bestanden release worden bewaard "
+"om veiligheidsredenen, om verschillende soorten aanvallen te voorkomen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2724,25 +2734,34 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> pikt op de commandoregel een lijst pakketten op en "
 "genereert uitvoer die geschikt is om gebruikt te worden door dotty uit het "
-"pakket <ulink url=\"http://www.research.att.com/sw/tools/graphviz/"
-"\">GraphViz</ulink>. Het resultaat is een geheel van knooppunten en gebogen "
-"lijnen die de relaties tussen pakketten voorstellen. Standaard trekken de "
-"als argument opgegeven pakketten al hun vereisten na, hetgeen een zeer "
-"uitgebreide grafiek kan opleveren. Om de uitvoer te beperken tot die "
-"pakketten die expliciet opgegeven werden aan de commandoregel, stelt men de "
-"optie <literal>APT::Cache::GivenOnly</literal> in."
+"pakket <ulink url=\"https://graphviz.org/\">GraphViz</ulink>. Het resultaat "
+"is een geheel van knooppunten en gebogen lijnen die de relaties tussen "
+"pakketten voorstellen. Standaard trekken de als argument opgegeven pakketten "
+"al hun vereisten na, hetgeen een zeer uitgebreide grafiek kan opleveren. Om "
+"de uitvoer te beperken tot die pakketten die expliciet opgegeven werden aan "
+"de commandoregel, stelt men de optie <literal>APT::Cache::GivenOnly</"
+"literal> in."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2770,12 +2789,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Hetzelfde als <literal>dotty</literal>, maar dan voor xvcg uit het <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
-"gereedschap</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG gereedschap</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -4959,13 +4978,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "Selects packages where the name matches the given regular expression."
 msgid "Never autoremove packages that match the regular expression(s)."
 msgstr ""
-"Selecteert pakketten waarvan de naam overeenkomst met de opgegeven reguliere "
-"expressie."
+"Pakketten waarvan de naam overeenkomt met de opgegeven reguliere "
+"expressie(s) nooit automatisch verwijderen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4974,6 +4990,9 @@ msgid ""
 "true. In case kernels are not protected they are treated as any other "
 "package."
 msgstr ""
+"Deze optie vertelt apt autoremove dat kernels beschermd zijn en staat "
+"standaard op true. In het geval dat kernels niet beschermd zijn, worden ze "
+"behandeld als elk ander pakket."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4982,6 +5001,9 @@ msgid ""
 "these expressions a rule set is injected into apt similar to APT::"
 "NeverAutoRemove regular expressions."
 msgstr ""
+"De reguliere expressie(s) definiëren voor kernelpakketten met versiebeheer. "
+"Op basis van deze expressies wordt een regelset in apt geïnjecteerd, "
+"vergelijkbaar met de reguliere expressies van APT::NeverAutoRemove."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4993,6 +5015,13 @@ msgid ""
 "ignored. If you want only the latest kernel, you should set APT::Protect-"
 "Kernels to false."
 msgstr ""
+"Een aangepast aantal kernels behouden bij het automatisch verwijderen en is "
+"standaard ingesteld op 2, wat betekent dat er twee kernels behouden blijven. "
+"Apt zal altijd de actieve kernel en de laatste kernel behouden. Als de "
+"laatste kernel hetzelfde is als de actieve kernel, wordt de op één na "
+"laatste kernel behouden. Daarom wordt elke waarde lager dan 2 genegeerd. Als "
+"u alleen de laatste kernel wilt, moet u APT::Protect-Kernels op false "
+"instellen."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -6367,12 +6396,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Beschrijft het proces van het oplossen van bouwvereisten door &apt-get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -11398,7 +11421,7 @@ msgstr ""
 "wordt de naam van de spiegelserver standaard getoetst aan de identiteit die "
 "in het certificaat gevonden wordt. Dit standaardgedrag is veilig en moet "
 "niet gewijzigd worden, maar indien u weet dat de server die u gebruikt, een "
-"DNS-naam heeft die niet overeenkomst met de identiteit in diens certificaat, "
+"DNS-naam heeft die niet overeenkomt met de identiteit uit diens certificaat, "
 "kunt u de optie instellen op \"<literal>false</literal>\", hetgeen zal "
 "voorkomen dat de vergelijking uitgevoerd wordt."
 
@@ -12182,7 +12205,7 @@ msgstr "<code>~nREGEX</code>"
 #: apt-patterns.7.xml
 msgid "Selects packages where the name matches the given regular expression."
 msgstr ""
-"Selecteert pakketten waarvan de naam overeenkomst met de opgegeven reguliere "
+"Selecteert pakketten waarvan de naam overeenkomt met de opgegeven reguliere "
 "expressie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -12203,18 +12226,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?false</code>"
 msgid "<code>?phasing</code>"
-msgstr "<code>?false</code>"
+msgstr "<code>?phasing</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "Selects packages that no longer exist in repositories."
 msgid "Selects packages that will be kept back in upgrades due to phasing."
 msgstr ""
-"Selecteert pakketten die niet langer aanwezig zijn in de pakketbronnen."
+"Selecteert pakketten die bij upgrades vastgehouden worden vanwege fasering."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -12424,20 +12443,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?false</code>"
 msgid "<code>?security</code>"
-msgstr "<code>?false</code>"
+msgstr "<code>?security</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "Selects packages that can be upgraded (have a newer candidate)."
 msgid ""
 "Selects packages that are a security update or succeed a security update."
 msgstr ""
-"Selecteert pakketten die opgewaardeerd kunnen worden (een nieuwere kandidaat "
-"hebben)."
+"Selecteert pakketten die een beveiligingsupdate zijn of een opvolger zijn "
+"van een beveiligingsupdate."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
@@ -14358,3 +14373,7 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
+
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Beschrijft het proces van het oplossen van bouwvereisten door &apt-get;."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 6a92b38..d56d842 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -65,7 +65,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -76,7 +76,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Strona błędów APT</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>Strona błędów APT</ulink>. \n"
 " Aby zgłosić błąd w APT, proszę przeczytać\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> lub opis polecenia\n"
 "   &reportbug;.\n"
@@ -744,6 +744,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2704,15 +2711,24 @@ msgstr ""
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> bierze jako argument listę pakietów i generuje "
 "wyjście odpowiednie dla programu dotty z pakietu <ulink url=\"http://www."
@@ -2747,12 +2763,12 @@ msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Robi to samo, co <literal>dotty</literal>, tylko dla xvcg z <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">narzędzia VCG</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">narzędzia VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -5603,11 +5619,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -12922,11 +12933,11 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgstr "Ta strona podręcznika nie jest nawet zaczęta."
 
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
-#~ "Patrz E<lt>http://bugs.debian.org/aptE<gt>.  Aby wysłać zgłoszenie o "
+#~ "Patrz E<lt>https://bugs.debian.org/aptE<gt>.  Aby wysłać zgłoszenie o "
 #~ "błędzie w programie B<apt>, przeczytaj I</usr/share/doc/debian/bug-"
 #~ "reporting.txt> lub użyj polecenia B<reportbug>(1)."
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 653762c..15abf13 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2023-09-11 20:47+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -59,7 +59,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -70,7 +70,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>página de bugs do APT</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>página de bugs do APT</ulink>. \n"
 "   Se deseja reportar um bug no APT, por favor veja\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou o\n"
 "   comando &reportbug;.\n"
@@ -762,6 +762,13 @@ msgstr ""
 "instalado, a actualização deste pacote não será executada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2661,24 +2668,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "<literal>dotty</literal> recebe uma lista de pacotes na linha de comandos e "
 "gera resultados apropriados para uso pelo dotty do pacote <ulink "
-"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. O "
-"resultado será um conjunto de nós e orlas que representam os relacionamentos "
-"entre os pacotes. Por predefinição, os pacotes fornecidos irão seguir todos "
-"os pacotes dependentes; isto pode produzir um gráfico muito grande. Para "
-"limitar os resultados apenas aos pacotes listados na linha de comandos, "
-"defina a opção <literal>APT::Cache::GivenOnly</literal>."
+"url=\"https://graphviz.org/\">GraphViz</ulink>. O resultado será um conjunto "
+"de nós e orlas que representam os relacionamentos entre os pacotes. Por "
+"predefinição, os pacotes fornecidos irão seguir todos os pacotes "
+"dependentes; isto pode produzir um gráfico muito grande. Para limitar os "
+"resultados apenas aos pacotes listados na linha de comandos, defina a opção "
+"<literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2705,12 +2721,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "O mesmo que <literal>dotty</literal>, apenas para xvcg a partir de <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">Ferramenta "
-"VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">Ferramenta VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6184,12 +6200,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Descreve os processos de resolver dependências de compilação no &apt-get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -13962,6 +13972,10 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Descreve os processos de resolver dependências de compilação no &apt-get;."
+
 #~ msgid "Selects packages that are currently installed."
 #~ msgstr "Seleciona pacotes que estão presentemente instalados."
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 8606b1d..a38a147 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 " <RefSect1><Title>Bugs</>\n"
 "   <para>\n"
-"   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do APT</>.\n"
+"   Consulte a <ulink url='https://bugs.debian.org/apt'>página de bugs do APT</>.\n"
 "   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando &reportbug;.\n"
 " </RefSect1>\n"
@@ -557,6 +557,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -1862,13 +1869,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1889,8 +1895,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4286,11 +4292,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -10384,14 +10385,14 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
 #~ "\n"
 #~ " <RefSect1><Title>Bugs</>\n"
 #~ "   <para>\n"
-#~ "   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do "
+#~ "   Consulte a <ulink url='https://bugs.debian.org/apt'>página de bugs do "
 #~ "APT</>.\n"
 #~ "   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
 #~ "   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando "
diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt
index a5a3602..a94cb41 100644
--- a/methods/CMakeLists.txt
+++ b/methods/CMakeLists.txt
@@ -15,13 +15,15 @@ add_executable(ftp ftp.cc $<TARGET_OBJECTS:connectlib>)
 add_executable(rred rred.cc)
 add_executable(rsh rsh.cc)
 
-target_compile_definitions(connectlib PRIVATE ${GNUTLS_DEFINITIONS})
-target_include_directories(connectlib PRIVATE ${GNUTLS_INCLUDE_DIR})
+if (HAVE_GNUTLS)
+  target_compile_definitions(connectlib PRIVATE ${GNUTLS_DEFINITIONS})
+  target_include_directories(connectlib PRIVATE ${GNUTLS_INCLUDE_DIR})
+endif()
 target_include_directories(http PRIVATE $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_INCLUDE_DIRS}>)
 
 # Additional libraries to link against for networked stuff
-target_link_libraries(http ${GNUTLS_LIBRARIES} $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_LIBRARIES}>)
-target_link_libraries(ftp ${GNUTLS_LIBRARIES})
+target_link_libraries(http $<$<BOOL:${GNUTLS_FOUND}>:${GNUTLS_LIBRARIES}> $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_LIBRARIES}>)
+target_link_libraries(ftp $<$<BOOL:${GNUTLS_FOUND}>:${GNUTLS_LIBRARIES}>)
 
 target_link_libraries(rred apt-private)
 
diff --git a/methods/connect.cc b/methods/connect.cc
index 110f2fc..f3e199d 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -19,8 +19,10 @@
 #include <apt-pkg/srvrec.h>
 #include <apt-pkg/strutl.h>
 
+#ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
+#endif
 
 #include <cerrno>
 #include <cstdio>
@@ -798,7 +800,8 @@ ResultState UnwrapSocks(std::string Host, int Port, URI Proxy, std::unique_ptr<M
 
    return ResultState::SUCCESSFUL;
 }
-									/*}}}*/
+
+#ifdef HAVE_GNUTLS									/*}}}*/
 // UnwrapTLS - Handle TLS connections 					/*{{{*/
 // ---------------------------------------------------------------------
 /* Performs a TLS handshake on the socket */
@@ -1050,4 +1053,4 @@ ResultState UnwrapTLS(std::string const &Host, std::unique_ptr<MethodFd> &Fd,
 
    return ResultState::SUCCESSFUL;
 }
-									/*}}}*/
+#endif									/*}}}*/
diff --git a/methods/http.cc b/methods/http.cc
index 9b45506..0c4d822 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -429,7 +429,9 @@ ResultState HttpServerState::Open()
    Out.Reset();
    Persistent = true;
 
+#ifdef HAVE_GNUTLS
    bool tls = (ServerName.Access == "https" || APT::String::Endswith(ServerName.Access, "+https"));
+#endif
 
    // Determine the proxy setting
    // Used to run AutoDetectProxy(ServerName) here, but we now send a Proxy
@@ -454,6 +456,7 @@ ResultState HttpServerState::Open()
 	   {
 	      char *result = getenv("http_proxy");
 	      Proxy = result ? result : "";
+#ifdef HAVE_GNUTLS
 	      if (tls == true)
 	      {
 		 char *result = getenv("https_proxy");
@@ -462,6 +465,7 @@ ResultState HttpServerState::Open()
 		    Proxy = result;
 		 }
 	      }
+#endif
 	   }
    }
    
@@ -475,8 +479,13 @@ ResultState HttpServerState::Open()
    if (Proxy.empty() == false)
       Owner->AddProxyAuth(Proxy, ServerName);
 
+#ifdef HAVE_GNUTLS
    auto const DefaultService = tls ? "https" : "http";
    auto const DefaultPort = tls ? 443 : 80;
+#else
+   auto const DefaultService = "http";
+   auto const DefaultPort = 80;
+#endif
    if (Proxy.Access == "socks5h")
    {
       auto result = Connect(Proxy.Host, Proxy.Port, "socks", 1080, ServerFd, TimeOut, Owner);
@@ -510,12 +519,15 @@ ResultState HttpServerState::Open()
 	    Port = Proxy.Port;
 	 Host = Proxy.Host;
 
+#ifdef HAVE_GNUTLS
 	 if (Proxy.Access == "https" && Port == 0)
 	    Port = 443;
+#endif
       }
       auto result = Connect(Host, Port, DefaultService, DefaultPort, ServerFd, TimeOut, Owner);
       if (result != ResultState::SUCCESSFUL)
 	 return result;
+#ifdef HAVE_GNUTLS
       if (Host == Proxy.Host && Proxy.Access == "https")
       {
 	 aptConfigWrapperForMethods ProxyConf{std::vector<std::string>{"http", "https"}};
@@ -530,10 +542,13 @@ ResultState HttpServerState::Open()
 	 if (result != ResultState::SUCCESSFUL)
 	    return result;
       }
+#endif
    }
 
+#ifdef HAVE_GNUTLS
    if (tls)
       return UnwrapTLS(ServerName.Host, ServerFd, TimeOut, Owner, Owner);
+#endif
 
    return ResultState::SUCCESSFUL;
 }
diff --git a/po/apt-all.pot b/po/apt-all.pot
index cb86b76..ab03ee3 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.7.13\n"
+"Project-Id-Version: apt 2.7.14\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-28 18:50+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+0000\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/nl.po b/po/nl.po
index ec1b702..792185b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,14 +9,14 @@
 # Wannes Soenen <wannes@wannes.cjb.net>, 2002.
 # Frans Pop <elendil@planet.nl>, 2010.
 # Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014-2023.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014-2024.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.7.6\n"
+"Project-Id-Version: apt 2.7.12\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-28 18:50+0000\n"
-"PO-Revision-Date: 2023-10-13 11:36+0200\n"
+"POT-Creation-Date: 2024-03-07 16:30+0100\n"
+"PO-Revision-Date: 2024-02-26 20:56+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -2277,10 +2277,8 @@ msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "The following packages have been kept back:"
 msgid "The following upgrades have been deferred due to phasing:"
-msgstr "De volgende pakketten zijn achtergehouden:"
+msgstr "De volgende opwaarderingen zijn uitgesteld vanwege fasering:"
 
 #: apt-private/private-output.cc
 msgid "The following packages have been kept back:"