Merge branch 'upstream' into tizen

Change-Id: Ica75171d1fca20658d00ddbf78a5c1d6239c619c
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>

diff --cc packaging/tcpdump.spec
index f101de0,0000000..58aac60
mode 100644,000000..100644
--- 1/packaging/tcpdump.spec
--- /dev/null
+++ b/packaging/tcpdump.spec
@@@ -1,40 -1,0 +1,40 @@@
- Version:        4.3.0
 +Name:           tcpdump
++Version:        4.9.2
 +Release:        1
 +License:        BSD-3-Clause
 +Summary:        A Packet Sniffer
 +Url:            http://www.tcpdump.org/
 +Group:          Productivity/Networking/Diagnostic
 +Source:         http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 +Source1001:   tcpdump.manifest
 +BuildRequires:  libpcap-devel
 +#BuildRequires:  libsmi-devel
 +BuildRequires:  openssl-devel
 +
 +%description
 +This program can "read" all or only certain packets going over the
 +ethernet. It can be used to debug specific network problems.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +export CFLAGS="%{optflags} -Wall -DGUESS_TSO -fstack-protector -fno-strict-aliasing -fPIE"
 +export LDFLAGS="-pie"
 +
 +%configure \
 +  --enable-ipv6
 +make
 +
 +%install
 +%make_install
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,network_fw,network_fw)
 +%doc LICENSE README *.awk
 +%doc %{_mandir}/man?/*
 +%{_sbindir}/*
 +
 +%changelog

diff --cc setsignal.c
Simple merge