Created
December 4, 2019 13:48
-
-
Save crondaemon/cac1b92de06e1027232f6e42f385b8d1 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dario@hardcore:~/projects/wireshark/build-ninja (oss-fuzz)$ git diff | |
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh | |
index c57662ba26..28d7fb2723 100755 | |
--- a/tools/debian-setup.sh | |
+++ b/tools/debian-setup.sh | |
@@ -172,6 +172,7 @@ ACTUAL_LIST=$BASIC_LIST | |
# Now arrange for optional support libraries | |
if [ $ADDITIONAL ] | |
then | |
+ echo "Adding additional" | |
ACTUAL_LIST="$ACTUAL_LIST $ADDITIONAL_LIST" | |
fi | |
dario@hardcore:~/projects/wireshark/build-ninja (oss-fuzz)$ sudo ../tools/debian-setup.sh | |
Hit:1 http://apt.llvm.org/bionic llvm-toolchain-bionic-7 InRelease | |
Hit:2 http://it.archive.ubuntu.com/ubuntu bionic InRelease | |
Hit:3 https://artifacts.elastic.co/packages/6.x/apt stable InRelease | |
Hit:4 http://security.ubuntu.com/ubuntu bionic-security InRelease | |
Hit:5 http://ppa.launchpad.net/wireshark-dev/stable/ubuntu bionic InRelease | |
Hit:6 http://archive.canonical.com/ubuntu bionic InRelease | |
Hit:7 http://it.archive.ubuntu.com/ubuntu bionic-updates InRelease | |
Hit:8 http://it.archive.ubuntu.com/ubuntu bionic-backports InRelease | |
Hit:9 http://ppa.launchpad.net/yubico/stable/ubuntu bionic InRelease | |
Hit:10 https://download.sublimetext.com apt/stable/ InRelease | |
Hit:11 https://packages.gitlab.com/runner/gitlab-runner/ubuntu bionic InRelease | |
Reading package lists... Done | |
Adding additional | |
Reading package lists... Done | |
Building dependency tree | |
Reading state information... Done | |
Note, selecting 'libgcrypt20-dev' instead of 'libgcrypt-dev' | |
bison is already the newest version (2:3.0.4.dfsg-1build1). | |
dh-python is already the newest version (3.20180325ubuntu2). | |
doxygen is already the newest version (1.8.13-10). | |
flex is already the newest version (2.6.4-6). | |
libc-ares-dev is already the newest version (1.14.0-1). | |
libcap-dev is already the newest version (1:2.25-1.2). | |
liblua5.2-dev is already the newest version (5.2.4-1.1build1). | |
liblz4-dev is already the newest version (0.0~r131-2ubuntu3). | |
libnghttp2-dev is already the newest version (1.30.0-1ubuntu1). | |
libnl-3-dev is already the newest version (3.2.29-0ubuntu3). | |
libnl-cli-3-dev is already the newest version (3.2.29-0ubuntu3). | |
libparse-yapp-perl is already the newest version (1.21-1). | |
libpcap-dev is already the newest version (1.8.1-6ubuntu1). | |
libqt5svg5-dev is already the newest version (5.9.5-0ubuntu1). | |
libsbc-dev is already the newest version (1.3-2). | |
libsmi2-dev is already the newest version (0.4.8+dfsg2-15). | |
libsnappy-dev is already the newest version (1.1.7-1). | |
libspeexdsp-dev is already the newest version (1.2~rc1.2-1ubuntu2). | |
lsb-release is already the newest version (9.20170808ubuntu1). | |
make is already the newest version (4.1-9.1ubuntu1). | |
po-debconf is already the newest version (1.0.20). | |
python3-ply is already the newest version (3.11-1). | |
asciidoctor is already the newest version (1.5.5-1). | |
docbook-xml is already the newest version (4.5-8). | |
docbook-xsl is already the newest version (1.79.1+dfsg-2). | |
libmaxminddb-dev is already the newest version (1.3.1-1). | |
libminizip-dev is already the newest version (1.1-8build1). | |
libspandsp-dev is already the newest version (0.0.6+dfsg-0.1). | |
ninja-build is already the newest version (1.8.2-1). | |
qtmultimedia5-dev is already the newest version (5.9.5-0ubuntu1). | |
qttools5-dev is already the newest version (5.9.5-0ubuntu1). | |
qttools5-dev-tools is already the newest version (5.9.5-0ubuntu1). | |
quilt is already the newest version (0.63-8.2). | |
softhsm2 is already the newest version (2.2.0-3.1build1). | |
cmake is already the newest version (3.10.2-1ubuntu2.18.04.1). | |
debhelper is already the newest version (11.1.6ubuntu2). | |
git is already the newest version (1:2.17.1-1ubuntu0.4). | |
libbrotli-dev is already the newest version (1.0.3-1ubuntu1.2). | |
libgcrypt20-dev is already the newest version (1.8.1-4ubuntu1.1). | |
libglib2.0-dev is already the newest version (2.56.4-0ubuntu0.18.04.4). | |
libgnutls28-dev is already the newest version (3.5.18-1ubuntu1.1). | |
libkrb5-dev is already the newest version (1.16-2ubuntu0.1). | |
libssh-gcrypt-dev is already the newest version (0.8.0~20170825.94fa1e38-1ubuntu0.2). | |
libsystemd-dev is already the newest version (237-3ubuntu10.33). | |
libxml2-dev is already the newest version (2.9.4+dfsg1-6.1ubuntu1.2). | |
libxml2-utils is already the newest version (2.9.4+dfsg1-6.1ubuntu1.2). | |
libzstd-dev is already the newest version (1.3.3+dfsg-2ubuntu1.1). | |
perl is already the newest version (5.26.1-6ubuntu0.3). | |
python3 is already the newest version (3.6.7-1~18.04). | |
xsltproc is already the newest version (1.1.29-5ubuntu0.2). | |
gnutls-bin is already the newest version (3.5.18-1ubuntu1.1). | |
qt5-default is already the newest version (5.9.5+dfsg-0ubuntu2.4). | |
The following packages were automatically installed and are no longer required: | |
linux-headers-4.15.0-66 linux-headers-4.15.0-66-generic linux-image-4.15.0-66-generic linux-modules-4.15.0-66-generic linux-modules-extra-4.15.0-66-generic linux-tools-4.15.0-66 | |
linux-tools-4.15.0-66-generic | |
Use 'sudo apt autoremove' to remove them. | |
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded. | |
*** Optional packages not installed. Rerun with --install-optional to have them. | |
*** Debian packages build deps not installed. Rerun with --install-deb-deps to have them. | |
*** Test deps not installed. Rerun with --install-test-deps to have them. | |
dario@hardcore:~/projects/wireshark/build-ninja (oss-fuzz)$ sudo ../tools/debian-setup.sh --install-optional | |
Hit:1 http://apt.llvm.org/bionic llvm-toolchain-bionic-7 InRelease | |
Hit:2 http://it.archive.ubuntu.com/ubuntu bionic InRelease | |
Hit:3 https://artifacts.elastic.co/packages/6.x/apt stable InRelease | |
Hit:4 http://security.ubuntu.com/ubuntu bionic-security InRelease | |
Hit:5 http://archive.canonical.com/ubuntu bionic InRelease | |
Hit:6 http://ppa.launchpad.net/wireshark-dev/stable/ubuntu bionic InRelease | |
Hit:7 http://it.archive.ubuntu.com/ubuntu bionic-updates InRelease | |
Hit:8 http://it.archive.ubuntu.com/ubuntu bionic-backports InRelease | |
Hit:9 http://ppa.launchpad.net/yubico/stable/ubuntu bionic InRelease | |
Hit:10 https://download.sublimetext.com apt/stable/ InRelease | |
Hit:11 https://packages.gitlab.com/runner/gitlab-runner/ubuntu bionic InRelease | |
Reading package lists... Done | |
Adding additional | |
Reading package lists... Done | |
Building dependency tree | |
Reading state information... Done | |
Note, selecting 'libgcrypt20-dev' instead of 'libgcrypt-dev' | |
bison is already the newest version (2:3.0.4.dfsg-1build1). | |
dh-python is already the newest version (3.20180325ubuntu2). | |
doxygen is already the newest version (1.8.13-10). | |
flex is already the newest version (2.6.4-6). | |
libc-ares-dev is already the newest version (1.14.0-1). | |
libcap-dev is already the newest version (1:2.25-1.2). | |
liblua5.2-dev is already the newest version (5.2.4-1.1build1). | |
liblz4-dev is already the newest version (0.0~r131-2ubuntu3). | |
libnghttp2-dev is already the newest version (1.30.0-1ubuntu1). | |
libnl-3-dev is already the newest version (3.2.29-0ubuntu3). | |
libnl-cli-3-dev is already the newest version (3.2.29-0ubuntu3). | |
libparse-yapp-perl is already the newest version (1.21-1). | |
libpcap-dev is already the newest version (1.8.1-6ubuntu1). | |
libqt5svg5-dev is already the newest version (5.9.5-0ubuntu1). | |
libsbc-dev is already the newest version (1.3-2). | |
libsmi2-dev is already the newest version (0.4.8+dfsg2-15). | |
libsnappy-dev is already the newest version (1.1.7-1). | |
libspeexdsp-dev is already the newest version (1.2~rc1.2-1ubuntu2). | |
lsb-release is already the newest version (9.20170808ubuntu1). | |
make is already the newest version (4.1-9.1ubuntu1). | |
po-debconf is already the newest version (1.0.20). | |
python3-ply is already the newest version (3.11-1). | |
asciidoctor is already the newest version (1.5.5-1). | |
docbook-xml is already the newest version (4.5-8). | |
docbook-xsl is already the newest version (1.79.1+dfsg-2). | |
libmaxminddb-dev is already the newest version (1.3.1-1). | |
libminizip-dev is already the newest version (1.1-8build1). | |
libspandsp-dev is already the newest version (0.0.6+dfsg-0.1). | |
ninja-build is already the newest version (1.8.2-1). | |
qtmultimedia5-dev is already the newest version (5.9.5-0ubuntu1). | |
qttools5-dev is already the newest version (5.9.5-0ubuntu1). | |
qttools5-dev-tools is already the newest version (5.9.5-0ubuntu1). | |
quilt is already the newest version (0.63-8.2). | |
softhsm2 is already the newest version (2.2.0-3.1build1). | |
cmake is already the newest version (3.10.2-1ubuntu2.18.04.1). | |
debhelper is already the newest version (11.1.6ubuntu2). | |
git is already the newest version (1:2.17.1-1ubuntu0.4). | |
libbrotli-dev is already the newest version (1.0.3-1ubuntu1.2). | |
libgcrypt20-dev is already the newest version (1.8.1-4ubuntu1.1). | |
libglib2.0-dev is already the newest version (2.56.4-0ubuntu0.18.04.4). | |
libgnutls28-dev is already the newest version (3.5.18-1ubuntu1.1). | |
libkrb5-dev is already the newest version (1.16-2ubuntu0.1). | |
libssh-gcrypt-dev is already the newest version (0.8.0~20170825.94fa1e38-1ubuntu0.2). | |
libsystemd-dev is already the newest version (237-3ubuntu10.33). | |
libxml2-dev is already the newest version (2.9.4+dfsg1-6.1ubuntu1.2). | |
libxml2-utils is already the newest version (2.9.4+dfsg1-6.1ubuntu1.2). | |
libzstd-dev is already the newest version (1.3.3+dfsg-2ubuntu1.1). | |
perl is already the newest version (5.26.1-6ubuntu0.3). | |
python3 is already the newest version (3.6.7-1~18.04). | |
xsltproc is already the newest version (1.1.29-5ubuntu0.2). | |
gnutls-bin is already the newest version (3.5.18-1ubuntu1.1). | |
qt5-default is already the newest version (5.9.5+dfsg-0ubuntu2.4). | |
The following packages were automatically installed and are no longer required: | |
linux-headers-4.15.0-66 linux-headers-4.15.0-66-generic linux-image-4.15.0-66-generic linux-modules-4.15.0-66-generic linux-modules-extra-4.15.0-66-generic linux-tools-4.15.0-66 | |
linux-tools-4.15.0-66-generic | |
Use 'sudo apt autoremove' to remove them. | |
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded. | |
*** Debian packages build deps not installed. Rerun with --install-deb-deps to have them. | |
*** Test deps not installed. Rerun with --install-test-deps to have them. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment