Update to new upstream release 4.3.0
This commit is contained in:
parent
aca9b7aa9d
commit
dcdffd252e
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ tcpdump-4.1.1.tar.gz
|
||||
/tcpdump-4.2.0.tar.gz
|
||||
/ppi.h
|
||||
/tcpdump-4.2.1.tar.gz
|
||||
/tcpdump-4.3.0.tar.gz
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
c202878c6db054767b52651041b9e60e tcpdump-4.2.1.tar.gz
|
||||
a3fe4d30ac85ff5467c889ff46b7e1e8 tcpdump-4.3.0.tar.gz
|
||||
e329cbeb7e589f132d92c3447c477190 tcpslice-1.2a3.tar.gz
|
||||
|
@ -1,46 +0,0 @@
|
||||
--- tcpdump-3.9.7/tcpdump.c.droproot 2006-09-19 21:07:57.000000000 +0200
|
||||
+++ tcpdump-3.9.7/tcpdump.c 2007-07-24 16:15:54.000000000 +0200
|
||||
@@ -958,6 +958,11 @@ main(int argc, char **argv)
|
||||
(void)setsignal(SIGHUP, oldhandler);
|
||||
#endif /* WIN32 */
|
||||
|
||||
+ if (Cflag != 0 && (getuid() == 0 || geteuid() == 0)) {
|
||||
+ if (username || chroot_dir)
|
||||
+ droproot(username, chroot_dir);
|
||||
+ }
|
||||
+
|
||||
if (pcap_setfilter(pd, &fcode) < 0)
|
||||
error("%s", pcap_geterr(pd));
|
||||
if (WFileName) {
|
||||
@@ -999,7 +1004,7 @@ main(int argc, char **argv)
|
||||
* We cannot do this earlier, because we want to be able to open
|
||||
* the file (if done) for writing before giving up permissions.
|
||||
*/
|
||||
- if (getuid() == 0 || geteuid() == 0) {
|
||||
+ if (Cflag == 0 && (getuid() == 0 || geteuid() == 0)) {
|
||||
if (username || chroot_dir)
|
||||
droproot(username, chroot_dir);
|
||||
}
|
||||
--- tcpdump-3.9.7/tcpdump.1.in.droproot 2007-07-24 16:15:54.000000000 +0200
|
||||
+++ tcpdump-3.9.7/tcpdump.1.in 2007-07-24 16:15:54.000000000 +0200
|
||||
@@ -264,6 +264,9 @@ have the name specified with the
|
||||
flag, with a number after it, starting at 1 and continuing upward.
|
||||
The units of \fIfile_size\fP are millions of bytes (1,000,000 bytes,
|
||||
not 1,048,576 bytes).
|
||||
+
|
||||
+Note that when used with \fB\-Z\fR option (enabled by default), privileges
|
||||
+are dropped before opening first savefile.
|
||||
.TP
|
||||
.B \-d
|
||||
Dump the compiled packet-matching code in a human readable form to
|
||||
@@ -592,7 +595,9 @@ Drops privileges (if root) and changes u
|
||||
and the group ID to the primary group of
|
||||
.IR user .
|
||||
.IP
|
||||
-This behavior can also be enabled by default at compile time.
|
||||
+This behavior is enabled by default (\fB\-Z tcpdump\fR), and can
|
||||
+be disabled by \fB\-Z root\fR.
|
||||
+
|
||||
.IP "\fI expression\fP"
|
||||
.RS
|
||||
selects which packets will be dumped.
|
@ -1,8 +1,8 @@
|
||||
Summary: A network traffic monitoring tool
|
||||
Name: tcpdump
|
||||
Epoch: 14
|
||||
Version: 4.2.1
|
||||
Release: 3%{?dist}
|
||||
Version: 4.3.0
|
||||
Release: 1%{?dist}
|
||||
License: BSD with advertising
|
||||
URL: http://www.tcpdump.org
|
||||
Group: Applications/Internet
|
||||
@ -95,6 +95,9 @@ exit 0
|
||||
%{_mandir}/man8/tcpdump.8*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 13 2012 Michal Sekletar <msekleta@redhat.com> - 14:4.3.0-1
|
||||
- Update to 4.3.0
|
||||
|
||||
* Wed May 16 2012 Michal Sekletar <msekleta@redhat.com>
|
||||
- Resolves: #809638
|
||||
- created savefile has proper owner
|
||||
|
Loading…
Reference in New Issue
Block a user