summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMake/Misc.cmake18
-rw-r--r--CMake/Translations.cmake8
-rw-r--r--apt-pkg/contrib/gpgv.cc3
-rw-r--r--apt-pkg/contrib/strutl.cc2
-rw-r--r--apt-pkg/depcache.cc3
-rw-r--r--apt-private/private-cmndline.cc1
-rw-r--r--apt-private/private-update.cc2
-rw-r--r--cmdline/CMakeLists.txt2
-rw-r--r--cmdline/apt-key.in20
-rwxr-xr-xdebian/apt.postinst2
-rw-r--r--debian/changelog10
-rw-r--r--doc/apt-get.8.xml10
-rw-r--r--doc/apt-key.8.xml32
-rw-r--r--doc/examples/configure-index1
-rw-r--r--methods/CMakeLists.txt6
-rw-r--r--methods/gpgv.cc8
-rw-r--r--test/integration/status-bug-lp1347721-dpkg-ordering14
-rw-r--r--test/integration/status-ubuntu-bug-61499312
-rw-r--r--test/interactive-helper/aptwebserver.cc9
19 files changed, 97 insertions, 66 deletions
diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake
index 6ad0b9479..8cb18b6ac 100644
--- a/CMake/Misc.cmake
+++ b/CMake/Misc.cmake
@@ -51,17 +51,17 @@ function(add_vendor_file)
endfunction()
# Add symbolic links to a file
-function(add_slaves destination master)
- set(slaves "")
- foreach(slave ${ARGN})
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${slave}
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${master} ${CMAKE_CURRENT_BINARY_DIR}/${slave})
- list(APPEND slaves ${CMAKE_CURRENT_BINARY_DIR}/${slave})
+function(add_links directory target)
+ set(link_names "")
+ foreach(link_name ${ARGN})
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${link_name}
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${target} ${CMAKE_CURRENT_BINARY_DIR}/${link_name})
+ list(APPEND link_names ${CMAKE_CURRENT_BINARY_DIR}/${link_name})
endforeach()
- STRING(REPLACE "/" "-" master "${master}")
- add_custom_target(${master}-slaves ALL DEPENDS ${slaves})
- install(FILES ${slaves} DESTINATION ${destination})
+ STRING(REPLACE "/" "-" target "${target}")
+ add_custom_target(${target}-link_names ALL DEPENDS ${link_names})
+ install(FILES ${link_names} DESTINATION ${directory})
endfunction()
# Generates a simple version script versioning everything with current SOVERSION
diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake
index 54a635ab6..24925105c 100644
--- a/CMake/Translations.cmake
+++ b/CMake/Translations.cmake
@@ -136,8 +136,8 @@ function(apt_add_update_po)
list(APPEND potfiles ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot)
endforeach()
- get_filename_component(master_name ${output} NAME_WE)
- add_custom_target(nls-${master_name}
+ get_filename_component(primary_name ${output} NAME_WE)
+ add_custom_target(nls-${primary_name}
COMMAND msgcomm --sort-by-file --add-location=file
--more-than=0 --output=${output}
${potfiles}
@@ -154,11 +154,11 @@ function(apt_add_update_po)
endif()
add_custom_target(update-po-${langcode}
COMMAND msgmerge -q --previous --update --backup=none ${translation} ${output}
- DEPENDS nls-${master_name}
+ DEPENDS nls-${primary_name}
)
add_dependencies(update-po update-po-${langcode})
endforeach()
- add_dependencies(update-po nls-${master_name})
+ add_dependencies(update-po nls-${primary_name})
endfunction()
function(apt_add_po_statistics excluded)
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index d956eaf00..28f3150c3 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -251,6 +251,9 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
setenv("APT_CONFIG", conf.get(), 1);
}
+ // Tell apt-key not to emit warnings
+ setenv("APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE", "1", 1);
+
if (releaseSignature == DETACHED)
{
auto detached = make_unique_FILE(FileGPG, "r");
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 972472986..bd4856526 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1771,7 +1771,7 @@ URI::operator string()
{
// FIXME: Technically userinfo is permitted even less
// characters than these, but this is not conveniently
- // expressed with a blacklist.
+ // expressed with a denylist.
Res << QuoteString(User, ":/?#[]@");
if (Password.empty() == false)
Res << ":" << QuoteString(Password, ":/?#[]@");
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 817d9de3c..c7ef7a400 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1156,6 +1156,7 @@ struct CompareProviders /*{{{*/
/*}}}*/
bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool AutoInst, bool FromUser) /*{{{*/
{
+ bool AlwaysMarkAsAuto = _config->FindB("APT::Get::Mark-Auto", false) == true;
auto &P = (*this)[Pkg];
if (P.Protect() && P.InstallVer == P.CandidateVer)
return true;
@@ -1171,7 +1172,7 @@ bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool
P.Mode = pkgDepCache::ModeInstall;
P.InstallVer = P.CandidateVer;
- if(FromUser)
+ if(FromUser && !AlwaysMarkAsAuto)
{
// Set it to manual if it's a new install or already installed,
// but only if its not marked by the autoremover (aptitude depend on this behavior)
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 478cb95f1..bcafe785b 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -276,6 +276,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
addArg(0,"force-yes","APT::Get::force-yes",0);
addArg(0,"print-uris","APT::Get::Print-URIs",0);
addArg(0,"trivial-only","APT::Get::Trivial-Only",0);
+ addArg(0,"mark-auto","APT::Get::Mark-Auto",0);
addArg(0,"remove","APT::Get::Remove",0);
addArg(0,"only-source","APT::Get::Only-Source",0);
addArg(0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0);
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index 248f1f36e..affae655d 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -110,7 +110,7 @@ bool DoUpdate(CommandLine &CmdL)
if (uri.User.empty() && uri.Password.empty())
continue;
// we can't really predict if a +http method supports everything http does,
- // so we play it safe and use a whitelist here.
+ // so we play it safe and use an allowlist here.
char const *const affected[] = {"http", "https", "tor+http", "tor+https", "ftp"};
if (std::find(std::begin(affected), std::end(affected), uri.Access) != std::end(affected))
// TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index d82239bee..91bf9bb0c 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -53,7 +53,7 @@ install(TARGETS apt-helper RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/)
install(TARGETS apt-dump-solver apt-internal-solver RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/solvers)
install(TARGETS apt-internal-planner RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/planners)
-add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/planners ../solvers/dump planners/dump)
+add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/planners ../solvers/dump planners/dump)
# Install the not-to-be-compiled programs
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apt-key DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index e9187b423..baf3df5c3 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -671,10 +671,10 @@ prepare_gpg_home() {
# well as the script hopefully uses apt-key optionally then like e.g.
# debian-archive-keyring for (upgrade) cleanup did
if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] && [ -z "$APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE" ]; then
- if ! dpkg-query --show --showformat '${Pre-Depends}${Depends}${Recommends}\n' "$DPKG_MAINTSCRIPT_PACKAGE" 2>/dev/null | grep -q gnupg; then
+ if ! dpkg-query --show --showformat '${Pre-Depends}${Depends}${Recommends}\n' "$DPKG_MAINTSCRIPT_PACKAGE" 2>/dev/null | grep -E -q 'gpg|gnupg'; then
cat >&2 <<EOF
Warning: The $DPKG_MAINTSCRIPT_NAME maintainerscript of the package $DPKG_MAINTSCRIPT_PACKAGE
-Warning: seems to use apt-key (provided by apt) without depending on gnupg or gnupg2.
+Warning: seems to use apt-key (provided by apt) without depending on gpg, gnupg, or gnupg2.
Warning: This will BREAK in the future and should be fixed by the package maintainer(s).
Note: Check first if apt-key functionality is needed at all - it probably isn't!
EOF
@@ -740,8 +740,18 @@ warn_on_script_usage() {
# (Maintainer) scripts should not be using apt-key
if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
echo >&2 "Warning: apt-key should not be used in scripts (called from $DPKG_MAINTSCRIPT_NAME maintainerscript of the package ${DPKG_MAINTSCRIPT_PACKAGE})"
- elif [ ! -t 1 ]; then
- echo >&2 "Warning: apt-key output should not be parsed (stdout is not a terminal)"
+ fi
+
+ echo >&2 "Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8))."
+}
+
+warn_outside_maintscript() {
+ # In del, we want to warn in interactive use, but not inside maintainer
+ # scripts, so as to give people a chance to migrate keyrings.
+ #
+ # FIXME: We should always warn starting in 2022.
+ if [ -z "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
+ echo >&2 "Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8))."
fi
}
@@ -760,6 +770,7 @@ case "$command" in
;;
del|rm|remove)
# no script warning here as removing 'add' usage needs 'del' for cleanup
+ warn_outside_maintscript
requires_root
foreach_keyring_do 'remove_key_from_keyring' "$@"
aptkey_echo "OK"
@@ -772,6 +783,7 @@ case "$command" in
merge_back_changes
;;
net-update)
+ warn_on_script_usage
requires_root
setup_merged_keyring
net_update
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 8d1cdb1b3..0c6b5db9c 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -60,7 +60,7 @@ case "$1" in
chmod -f 0640 /var/log/apt/term.log* || true
fi
- # create kernel autoremoval blacklist on update
+ # create kernel autoremoval denylist on update
if dpkg --compare-versions "$2" lt 0.9.9.3; then
/etc/kernel/postinst.d/apt-auto-removal
fi
diff --git a/debian/changelog b/debian/changelog
index c7651c4d6..bf2335543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -994,7 +994,7 @@ apt (1.6~alpha3) unstable; urgency=medium
apt (1.6~alpha2) unstable; urgency=medium
- * seccomp: Conditionalize statx() whitelisting
+ * seccomp: Conditionalize statx() allowlisting
* CMake: methods: Cleanup link libraries, use OBJECT libraries
* methods: Enable additional syscalls (SYSV IPC) in fakeroot (Closes: #879662)
* Don't segfault if receiving a method warning on empty queue
@@ -1363,7 +1363,7 @@ apt (1.4~rc1) unstable; urgency=medium
* make the moo reproducible.
Thanks to Chris Lamb for initial patch and guru meditation (Closes: #848721)
* update release mappings in documentation
- * avoid malloc if option whitelist is disabled (default)
+ * avoid malloc if option allowlist is disabled (default)
[ Julian Andres Klode ]
* basehttp: Only read Content-Range on 416 and 206 responses (LP: #1657567)
@@ -1413,7 +1413,7 @@ apt (1.4~beta3) unstable; urgency=medium
Thanks to Kristian Glass for initial patch! (Closes: #709092)
* separating state variables regarding server/request (Closes: #440057)
* fix minimum pkgs option for dpkg --recursive usage
- * allow warning generation for non-whitelisted options
+ * allow warning generation for non-allowlisted options
[ Oriol Debian ]
* Catalan program translation update (Closes: #846514)
@@ -4310,7 +4310,7 @@ apt (0.9.9.3) unstable; urgency=low
[ Ben Hutchings ]
* debian/apt.auto-removal.sh:
- do not include debug symbol packages for the kernel in the
- blacklist (closes: #717616)
+ denylist (closes: #717616)
[ Michael Vogt ]
* debian/apt.postinst:
@@ -6627,7 +6627,7 @@ apt (0.8.11) unstable; urgency=low
* methods/{gzip,bzip}.cc:
- print a good error message if FileSize() is zero
* apt-pkg/aptconfiguration.cc:
- - remove the inbuilt Translation files whitelist
+ - remove the inbuilt Translation files allowlist
* cmdline/apt-cache.cc:
- remove not implemented 'apt-cache add' command
* doc/apt-cache.8.xml:
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index e603ec5bb..a7b786dfe 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -545,6 +545,16 @@
Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
</varlistentry>
+ <varlistentry><term><option>--mark-auto</option></term>
+ <listitem><para>
+ After successful installation, mark all freshly installed packages as
+ automatically installed, which will cause each of the packages to be
+ removed when no more manually installed packages depend on this package.
+ This is equally to running <command>apt-mark auto</command> for all
+ installed packages.
+ Configuration Item: <literal>APT::Get::Mark-Auto</literal>.</para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>--no-remove</option></term>
<listitem><para>If any packages are to be removed apt-get immediately aborts without
prompting.
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 1ab4d784e..2c8c3f655 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -25,7 +25,7 @@
<!-- Man page title -->
<refnamediv>
<refname>apt-key</refname>
- <refpurpose>APT key management utility</refpurpose>
+ <refpurpose>Deprecated APT key management utility</refpurpose>
</refnamediv>
&synopsis-command-apt-key;
@@ -37,13 +37,15 @@
authenticated using these keys will be considered trusted.
</para>
<para>
- Note that if usage of <command>apt-key</command> is desired the additional
+ Use of <command>apt-key</command> is deprecated, except for the use of
+ <command>apt-key del</command> in maintainer scripts to remove existing
+ keys from the main keyring.
+ If such usage of <command>apt-key</command> is desired the additional
installation of the GNU Privacy Guard suite (packaged in
- <package>gnupg</package>) is required. For this reason alone the programmatic
- usage (especially in package maintainer scripts!) is strongly discouraged.
- Further more the output format of all commands is undefined and can and does
- change whenever the underlying commands change. <command>apt-key</command> will
- try to detect such usage and generates warnings on stderr in these cases.
+ <package>gnupg</package>) is required.
+ </para>
+ <para>
+ apt-key(8) will last be available in Debian 11 and Ubuntu 22.04.
</para>
</refsect1>
@@ -63,7 +65,7 @@
<refsect1><title>Commands</title>
<variablelist>
- <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option></term>
+ <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option> (deprecated)</term>
<listitem>
<para>
Add a new key to the list of trusted keys.
@@ -85,7 +87,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option></term>
+ <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option> (mostly deprecated)</term>
<listitem>
<para>
@@ -96,7 +98,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option></term>
+ <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option> (deprecated)</term>
<listitem>
<para>
@@ -107,7 +109,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>exportall</option></term>
+ <varlistentry><term><option>exportall</option> (deprecated)</term>
<listitem>
<para>
@@ -118,7 +120,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>list</option>, <option>finger</option></term>
+ <varlistentry><term><option>list</option>, <option>finger</option> (deprecated)</term>
<listitem>
<para>
@@ -129,7 +131,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>adv</option></term>
+ <varlistentry><term><option>adv</option> (deprecated)</term>
<listitem>
<para>
Pass advanced options to gpg. With <command>adv --recv-key</command> you
@@ -160,7 +162,7 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>net-update</option></term>
+ <varlistentry><term><option>net-update</option> (deprecated)</term>
<listitem>
<para>
@@ -183,7 +185,7 @@
<refsect1><title>Options</title>
<para>Note that options need to be defined before the commands described in the previous section.</para>
<variablelist>
- <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term>
+ <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option> (deprecated)</term>
<listitem><para>With this option it is possible to specify a particular keyring
file the command should operate on. The default is that a command is executed
on the <filename>trusted.gpg</filename> file as well as on all parts in the
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f04e32502..d9f269344 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -73,6 +73,7 @@ APT
Assume-Yes "<BOOL>"; // not as dangerous, but use with care still
Assume-No "<BOOL>";
Trivial-Only "<BOOL>";
+ Mark-Auto "<BOOL>";
Remove "<BOOL>";
AllowUnauthenticated "<BOOL>"; // skip security
diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt
index 8589484cf..d575382f7 100644
--- a/methods/CMakeLists.txt
+++ b/methods/CMakeLists.txt
@@ -27,8 +27,8 @@ target_link_libraries(ftp ${GNUTLS_LIBRARIES})
install(TARGETS file copy store gpgv cdrom http ftp rred rsh mirror
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods)
-add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy)
-add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh)
+add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy)
+add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh)
-add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https)
+add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https)
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 1ca62557c..5597e7cff 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -307,13 +307,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
}
else if (exactKey == false)
{
- auto const master = SubKeyMapping.find(l);
- if (master == SubKeyMapping.end())
+ auto const primary = SubKeyMapping.find(l);
+ if (primary == SubKeyMapping.end())
continue;
- auto const validsubkeysig = std::find_if(master->second.cbegin(), master->second.cend(), [&](auto const subkey) {
+ auto const validsubkeysig = std::find_if(primary->second.cbegin(), primary->second.cend(), [&](auto const subkey) {
return IsTheSameKey(subkey, good) && std::find(Signers.Valid.cbegin(), Signers.Valid.cend(), subkey) != Signers.Valid.cend();
});
- if (validsubkeysig != master->second.cend())
+ if (validsubkeysig != primary->second.cend())
{
found = true;
Signers.SignedBy.push_back(l);
diff --git a/test/integration/status-bug-lp1347721-dpkg-ordering b/test/integration/status-bug-lp1347721-dpkg-ordering
index 62e545c55..eaea10b2d 100644
--- a/test/integration/status-bug-lp1347721-dpkg-ordering
+++ b/test/integration/status-bug-lp1347721-dpkg-ordering
@@ -684,14 +684,14 @@ Depends: libc6 (>= 2.17), libkmod2, sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16
Breaks: module-init-tools (<< 4)
Conffiles:
/etc/init/kmod.conf 2686532745c8b71d6d3df91c3a53aef3
- /etc/modprobe.d/blacklist-framebuffer.conf 097e2142ae3e4dd2911eda7844ce0c18
- /etc/modprobe.d/blacklist-rare-network.conf 8fb4b96124e461f53adceba9ca91f09a
- /etc/modprobe.d/blacklist.conf bc6754fa320733c6d239a4bb0148ffd7
+ /etc/modprobe.d/denylist-framebuffer.conf 097e2142ae3e4dd2911eda7844ce0c18
+ /etc/modprobe.d/denylist-rare-network.conf 8fb4b96124e461f53adceba9ca91f09a
+ /etc/modprobe.d/denylist.conf bc6754fa320733c6d239a4bb0148ffd7
/etc/modprobe.d/iwlwifi.conf f27bc645e93e20c8e532325d190ac8ee
- /etc/modprobe.d/blacklist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b
+ /etc/modprobe.d/denylist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b
/etc/modprobe.d/mlx4.conf b2a0bedb7461daeb0138270639581bbf
- /etc/modprobe.d/blacklist-firewire.conf 9cc07a17e8e64f9cd35ff59c29debe69
- /etc/modprobe.d/blacklist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1
+ /etc/modprobe.d/denylist-firewire.conf 9cc07a17e8e64f9cd35ff59c29debe69
+ /etc/modprobe.d/denylist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1
/etc/init.d/kmod e6d43abead3714ceb8aca68dd77e1dad
/etc/depmod.d/ubuntu.conf 7c8439ef36b12e5f226b5dbfa20b8c2d
Description: tools for managing Linux kernel modules
@@ -1884,7 +1884,7 @@ Conffiles:
/etc/init/udev-finish.conf 5c953c5b98ccfbb2a02985bfa2f80aed
/etc/init/udev.conf 41c0081f3a830e0902aaff76a53edf98
/etc/init/udevmonitor.conf b541dfb5aa4958e9a5336ecaec00ca15
- /etc/modprobe.d/fbdev-blacklist.conf 01cd03c88ce6821c03baf904f7dfcbd0
+ /etc/modprobe.d/fbdev-denylist.conf 01cd03c88ce6821c03baf904f7dfcbd0
/etc/udev/rules.d/README 3b6de9f3f911176734c66903b4f8735c obsolete
Description: /dev/ and hotplug management daemon
udev is a daemon which dynamically creates and removes device nodes from
diff --git a/test/integration/status-ubuntu-bug-614993 b/test/integration/status-ubuntu-bug-614993
index 99de51d12..1e95b51e6 100644
--- a/test/integration/status-ubuntu-bug-614993
+++ b/test/integration/status-ubuntu-bug-614993
@@ -488,11 +488,11 @@ Depends: libc6 (>= 2.8), upstart-job
Breaks: initramfs-tools (<< 0.92bubuntu23)
Conffiles:
/etc/depmod.d/ubuntu.conf 7c8439ef36b12e5f226b5dbfa20b8c2d
- /etc/modprobe.d/blacklist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b
- /etc/modprobe.d/blacklist-firewire.conf cb8a4c10a5dddd1d67092198b1ae415f
- /etc/modprobe.d/blacklist-framebuffer.conf b46c9509180b5a76145f08be46b1aff5
- /etc/modprobe.d/blacklist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1
- /etc/modprobe.d/blacklist.conf bc6754fa320733c6d239a4bb0148ffd7
+ /etc/modprobe.d/denylist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b
+ /etc/modprobe.d/denylist-firewire.conf cb8a4c10a5dddd1d67092198b1ae415f
+ /etc/modprobe.d/denylist-framebuffer.conf b46c9509180b5a76145f08be46b1aff5
+ /etc/modprobe.d/denylist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1
+ /etc/modprobe.d/denylist.conf bc6754fa320733c6d239a4bb0148ffd7
/etc/init/module-init-tools.conf 48db1b767c3148fd83eba59d12fc9a5e
Description: tools for managing Linux kernel modules
This package contains a set of programs for loading, inserting, and
@@ -4886,7 +4886,7 @@ Version: 2.11.1-0ubuntu7
Replaces: libc0.1, libc0.3, libc6, libc6.1
Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10)
Conffiles:
- /etc/bindresvport.blacklist 154db0e55fa99051ff1bd99e5b2c0584
+ /etc/bindresvport.denylist 154db0e55fa99051ff1bd99e5b2c0584
/etc/ld.so.conf.d/libc.conf d4d833fd095fb7b90e1bb4a547f16de6
/etc/gai.conf 4b3389be7132a6a8805f3df8d0ff00f6
Description: Embedded GNU C Library: Binaries
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 0398a12b6..f074cd148 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -960,7 +960,8 @@ int main(int const argc, const char * argv[])
// create socket, bind and listen to it {{{
// ignore SIGPIPE, this can happen on write() if the socket closes connection
signal(SIGPIPE, SIG_IGN);
- // we don't care for our slaves, so ignore their death
+ // ignore worker processes exiting, as we don't want to cause them to stay
+ // around as zombies because we're busy.
signal(SIGCHLD, SIG_IGN);
int sock = socket(AF_INET6, SOCK_STREAM, 0);
@@ -1051,9 +1052,9 @@ int main(int const argc, const char * argv[])
std::clog << "Serving ANY file on port: " << port << std::endl;
- int const slaves = _config->FindI("aptwebserver::slaves", SOMAXCONN);
- std::cerr << "SLAVES: " << slaves << std::endl;
- listen(sock, slaves);
+ int const workers = _config->FindI("aptwebserver::workers", SOMAXCONN);
+ std::cerr << "WORKERS: " << workers << std::endl;
+ listen(sock, workers);
/*}}}*/
_config->CndSet("aptwebserver::response-header::Server", "APT webserver");
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 18:33:40 +0000