updated: libpcap, tcpdump

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1070 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libp/libpcap/libpcap-vl.spec

@@ -1,13 +1,13 @@
 %define pcap_major 1
-%define pcap_minor 0 
+%define pcap_minor 1 
-%define pcap_subminor 0
+%define pcap_subminor 1
 %define libpcap_ver %{pcap_major}.%{pcap_minor}.%{pcap_subminor}
 
 Summary: A system-independent interface for user-level packet capture.
 Summary(ja): ユーザレベルでパケットをキャプチャするインターフェイス
 Name: libpcap
 Version: %{libpcap_ver}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Epoch: 1
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 License: BSD
@@ -21,6 +21,7 @@ BuildRequires: kernel-headers >= 2.2.0
 BuildRequires: flex >= 2.4
 BuildRequires: bison
 BuildRequires: openssl-devel
+BuildRequires: libnl-devel
 Requires: kernel >= 2.2.0
 
 Vendor: Project Vine
@@ -61,19 +62,15 @@ with %{name}.
 
 %prep
 %setup -q
-%patch50 -p1 -b .shared 
+#patch50 -p1 -b .shared 
 
 %build
-%configure --enable-ipv6
+%configure --enable-ipv6 
 DEFS="-g -D_U_=\"\" -fPIC -DHAVE_CONFIG_H"
 %ifarch alpha sparc sparc64
 DEFS="$DEFS -DHAVE_ETHER_HOSTTON=1 -DLBL_ALIGN=1"
 %endif
-make DEFS="$DEFS" \
+make DEFS="$DEFS"
-     LIBMAJOR="%{pcap_major}" \
-     LIBMINOR="%{pcap_minor}" \
-     LIBSUBMINOR="%{pcap_subminor}"
-			
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,11 +79,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
 make DESTDIR=${RPM_BUILD_ROOT} \
      includedir=%{_includedir}/pcap \
-     LIBMAJOR="%{pcap_major}" \
-     LIBMINOR="%{pcap_minor}" \
-     LIBSUBMINOR="%{pcap_subminor}" \
      install
-#chmod +x ${RPM_BUILD_ROOT}%{_libdir}/libpcap.so.*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -112,6 +105,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man7/*
 
 %changelog
+* Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:1.1.1-1
+- new upstream release
+- dropt Patch50
+- built with new toolchain
+- added BR: libnl-devel
+
 * Fri Apr 24 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:1.0.0-2vl5
 - split devel package
 

t/tcpdump/tcpdump-vl.spec

@@ -1,5 +1,5 @@
-%define	tcpdump_ver	4.0.0
+%define	tcpdump_ver	4.1.1
-%define	libpcap_ver	1.0.0
+%define	libpcap_ver	1.1.1
 
 Summary: A network traffic monitoring tool.
 Summary(ja): ネットワークのトラフィックをモニタするツール
@@ -7,7 +7,7 @@ Name: tcpdump
 Version: %{tcpdump_ver}
 %define	tcpdump_dir	tcpdump-%{tcpdump_ver}
 %define tcpslice_dir	tcpslice
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Epoch: 1
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 License: BSD
@@ -16,7 +16,7 @@ Source0: http://www.tcpdump.org/release/tcpdump-%{tcpdump_ver}.tar.gz
 Source4: tcpslice-CVS.20010207.tar.gz
 
 Patch5: tcpdump-3.6.2-tcpslice-time.patch
-Patch10: tcpdump-3.6.1-portnumbers.patch
+Patch10: tcpdump-4.1.1-portnumbers.patch
 Patch15: tcpdump-3.6.2-ip6opts.patch
 Patch16: tcpdump-3.8.1-sctp.patch
 Patch17: tcpdump-3.7.2-sctpdef.patch
@@ -134,6 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:4.1.1-1
+- new upstream release
+- updated Patch10
+- built with new toolchain
+
 * Sat Apr 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:4.0.0-2
 - spec in UTF-8
 - added BuildRequires: libpcap-devel instead of libpcap