From 27b2a5ba929927eef670a3fe303f3d7a71d73e2d Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Tue, 2 Mar 2021 18:01:48 -0800 Subject: [PATCH] Remove ntopng (#689) * Remove ntopng * Also remove ntopng map and cgman --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 4 +- SPECS/ntopng/ntopng.signatures.json | 6 -- SPECS/ntopng/ntopng.spec | 65 ---------------------- cgmanifest.json | 20 ------- 4 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 SPECS/ntopng/ntopng.signatures.json delete mode 100644 SPECS/ntopng/ntopng.spec diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 2840ce921ac..e51868a9aba 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -3,8 +3,8 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | Origin | License | SPECS | |-----------|-----------------------------------|------------| | Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | at
attr
autoconf213
babeltrace2
brotli
calamares
catch
conntrack-tools
cpprest
cryptsetup
dnf
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore-3.3.0
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libxcrypt
mokutil
mozjs60
open-vm-tools
openssl
p11-kit
perl-JSON
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
squashfs-tools
uuid
websocketpp
words
yaml-cpp
zipper
| -| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
bpftrace
blobfuse
bmon
bond
ccache
clamav
cloud-hypervisor
coredns
dtc
flannel
fluent-bit
freefont
gflags
go-md2man
GSL
ivykis
jsonbuilder
kubernetes
libacvp
libconfini
libconfuse
libiothsm-std
libmaxminddb
libuv
libxml++
lttng-consume
mariner-release
mariner-repos
mariner-rpm-macros
mm-common
msgpack
ncat
nlohmann-json
ntopng
omi
pcre2
perl-Test-Warnings
pigz
rocksdb
rubygem-addressable
rubygem-async
rubygem-async-http
rubygem-async-io
rubygem-async-pool
rubygem-aws-eventstream
rubygem-aws-partitions
rubygem-aws-sdk-core
rubygem-aws-sdk-kms
rubygem-aws-sdk-s3
rubygem-aws-sdk-sqs
rubygem-aws-sigv4
rubygem-concurrent-ruby
rubygem-console
rubygem-cool.io
rubygem-digest-crc
rubygem-elasticsearch
rubygem-elasticsearch-api
rubygem-elasticsearch-transport
rubygem-excon
rubygem-faraday
rubygem-ffi
rubygem-fiber-local
rubygem-fluent-config-regexp-type
rubygem-fluent-logger
rubygem-fluent-plugin-elasticsearch
rubygem-fluent-plugin-kafka
rubygem-fluent-plugin-prometheus
rubygem-fluent-plugin-prometheus_pushgateway
rubygem-fluent-plugin-record-modifier
rubygem-fluent-plugin-rewrite-tag-filter
rubygem-fluent-plugin-s3
rubygem-fluent-plugin-systemd
rubygem-fluent-plugin-td
rubygem-fluent-plugin-webhdfs
rubygem-fluentd
rubygem-hirb
rubygem-http_parser.rb
rubygem-httpclient
rubygem-jmespath
rubygem-ltsv
rubygem-mini_portile2
rubygem-msgpack
rubygem-multi_json
rubygem-multipart-post
rubygem-nio4r
rubygem-nokogiri
rubygem-oj
rubygem-parallel
rubygem-prometheus-client
rubygem-protocol-hpack
rubygem-protocol-http
rubygem-protocol-http1
rubygem-protocol-http2
rubygem-public_suffix
rubygem-quantile
rubygem-rake
rubygem-rdkafka
rubygem-ruby-kafka
rubygem-ruby-progressbar
rubygem-ruby2_keywords
rubygem-rubyzip
rubygem-serverengine
rubygem-sigdump
rubygem-strptime
rubygem-systemd-journal
rubygem-td
rubygem-td-client
rubygem-td-logger
rubygem-timers
rubygem-tzinfo
rubygem-tzinfo-data
rubygem-webhdfs
rubygem-yajl-ruby
rubygem-zip-zip
shim-unsigned-x64
span-lite
swupdate
tinyxml2
toml11
tracelogging
vala
verity-read-only-root
vnstat
zstd | +| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
bpftrace
blobfuse
bmon
bond
ccache
clamav
cloud-hypervisor
coredns
dtc
flannel
fluent-bit
freefont
gflags
go-md2man
GSL
ivykis
jsonbuilder
kubernetes
libacvp
libconfini
libconfuse
libiothsm-std
libmaxminddb
libuv
libxml++
lttng-consume
mariner-release
mariner-repos
mariner-rpm-macros
mm-common
msgpack
ncat
nlohmann-json
omi
pcre2
perl-Test-Warnings
pigz
rocksdb
rubygem-addressable
rubygem-async
rubygem-async-http
rubygem-async-io
rubygem-async-pool
rubygem-aws-eventstream
rubygem-aws-partitions
rubygem-aws-sdk-core
rubygem-aws-sdk-kms
rubygem-aws-sdk-s3
rubygem-aws-sdk-sqs
rubygem-aws-sigv4
rubygem-concurrent-ruby
rubygem-console
rubygem-cool.io
rubygem-digest-crc
rubygem-elasticsearch
rubygem-elasticsearch-api
rubygem-elasticsearch-transport
rubygem-excon
rubygem-faraday
rubygem-ffi
rubygem-fiber-local
rubygem-fluent-config-regexp-type
rubygem-fluent-logger
rubygem-fluent-plugin-elasticsearch
rubygem-fluent-plugin-kafka
rubygem-fluent-plugin-prometheus
rubygem-fluent-plugin-prometheus_pushgateway
rubygem-fluent-plugin-record-modifier
rubygem-fluent-plugin-rewrite-tag-filter
rubygem-fluent-plugin-s3
rubygem-fluent-plugin-systemd
rubygem-fluent-plugin-td
rubygem-fluent-plugin-webhdfs
rubygem-fluentd
rubygem-hirb
rubygem-http_parser.rb
rubygem-httpclient
rubygem-jmespath
rubygem-ltsv
rubygem-mini_portile2
rubygem-msgpack
rubygem-multi_json
rubygem-multipart-post
rubygem-nio4r
rubygem-nokogiri
rubygem-oj
rubygem-parallel
rubygem-prometheus-client
rubygem-protocol-hpack
rubygem-protocol-http
rubygem-protocol-http1
rubygem-protocol-http2
rubygem-public_suffix
rubygem-quantile
rubygem-rake
rubygem-rdkafka
rubygem-ruby-kafka
rubygem-ruby-progressbar
rubygem-ruby2_keywords
rubygem-rubyzip
rubygem-serverengine
rubygem-sigdump
rubygem-strptime
rubygem-systemd-journal
rubygem-td
rubygem-td-client
rubygem-td-logger
rubygem-timers
rubygem-tzinfo
rubygem-tzinfo-data
rubygem-webhdfs
rubygem-yajl-ruby
rubygem-zip-zip
shim-unsigned-x64
span-lite
swupdate
tinyxml2
toml11
tracelogging
vala
verity-read-only-root
vnstat
zstd | | Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
ant
ant-contrib
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
ca-certificates
cairo
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
ctags
curl
cyrus-sasl
cython
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
glib
glib-networking
glibc
glibmm24
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
grub2-efi-binary-signed-aarch64
grub2-efi-binary-signed-x64
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
ipmitool
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jna
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-headers
kernel-hyperv
kernel-signed-aarch64
kernel-signed-x64
kexec-tools
keyutils
kmod
krb5
lapack
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libev
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++20
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lua
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
numpy
nvme-cli
oniguruma
openipmi
openjdk8
openjdk8
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
pixman
pkg-config
polkit
popt
postgresql
powershell
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pygobject3
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-backports-ssl_match_hostname
python-bcrypt
python-boto3
python-botocore
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-enum34
python-futures
python-gevent
python-greenlet
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-ipaddress
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-pip
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-Pygments
python-PyNaCl
python-pyvmomi
python-requests
python-setuptools
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx
python-sphinx-theme-alabaster
python-sqlalchemy
python-Twisted
python-typing
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python2
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rubygem-bundler
runc
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemtap
tar
tboot
tcl
tcpdump
tcp_wrappers
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xerces-c
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh
| | OpenMamba | [Openmamba GPLv2 License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt) | bash-completion
| | TreasureData | [TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | td-agent
| -| Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka
| \ No newline at end of file +| Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka
| diff --git a/SPECS/ntopng/ntopng.signatures.json b/SPECS/ntopng/ntopng.signatures.json deleted file mode 100644 index 041160ac943..00000000000 --- a/SPECS/ntopng/ntopng.signatures.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Signatures": { - "nDPI-3.4.tar.gz": "dc9b291c7fde94edb45fb0f222e0d93c93f8d6d37f4efba20ebd9c655bfcedf9", - "ntopng-4.2.tar.gz": "c7ce8d0c7b4251aef276038ec3324530312fe232d38d7ad99de21575dc888e8b" - } -} \ No newline at end of file diff --git a/SPECS/ntopng/ntopng.spec b/SPECS/ntopng/ntopng.spec deleted file mode 100644 index 7e461b442de..00000000000 --- a/SPECS/ntopng/ntopng.spec +++ /dev/null @@ -1,65 +0,0 @@ -%global nDPIver 3.4 -Summary: Web-based Network Traffic Monitoring Application -Name: ntopng -Version: 4.2 -Release: 1%{?dist} -License: GPLv3 -Vendor: Microsoft Corporation -Distribution: Mariner -Group: Applications/System -URL: https://www.ntop.org/ -Source0: https://github.com/ntop/ntopng/archive/%{name}-%{version}.tar.gz -Source1: https://github.com/ntop/nDPI/archive/nDPI-%{nDPIver}.tar.gz -BuildRequires: curl-devel -BuildRequires: gcc -BuildRequires: glib-devel -BuildRequires: groff -BuildRequires: json-c-devel -BuildRequires: libmaxminddb-devel -BuildRequires: libpcap-devel -BuildRequires: libxml2-devel -BuildRequires: make -BuildRequires: mysql-devel -BuildRequires: readline-devel -BuildRequires: sqlite-devel -BuildRequires: zeromq-devel -Requires: curl -Requires: glib -Requires: json-c -Requires: libmaxminddb -Requires: libpcap -Requires: libxml2 -Requires: mysql -Requires: sqlite -Requires: zeromq - -%description -ntopng® is a web-based network traffic monitoring application released -under GPLv3. It is the new incarnation of the original ntop written in -1998, and now revamped in terms of performance, usability, and features. - -%prep -tar -xf %{SOURCE1} -mv nDPI-%{nDPIver} nDPI -%autosetup -p1 -b 0 - -%build -./autogen.sh -%configure -%make_build - -%install -%make_install - -%files -%license LICENSE COPYING -%doc README.md -%{_bindir}/ntopng -%{_prefix}/man/man8/* -%{_datadir}/ntopng/* - -%changelog -* Fri Feb 05 2021 Henry Beberman 4.2-1 -- Add ntopng spec -- License verified -- Original version for CBL-Mariner diff --git a/cgmanifest.json b/cgmanifest.json index fc6b59b1199..95ac8749e83 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3540,16 +3540,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "nDPI", - "version": "3.4", - "downloadUrl": "https://github.com/ntop/nDPI/archive/3.4.tar.gz" - } - } - }, { "component": { "type": "other", @@ -3710,16 +3700,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "ntopng", - "version": "4.2", - "downloadUrl": "https://github.com/ntop/ntopng/archive/4.2.tar.gz" - } - } - }, { "component": { "type": "other",