rpms/wireshark/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 wireshark.pam, 1.1, 1.2 wireshark.spec, 1.42, 1.43 wireshark-nfsv41-layout-types.patch, 1.1, NONE wireshark-nfsv41-layout-updates.patch, 1.1, NONE wireshark-nfsv41.patch, 1.1, NONE wireshark-rpc-pdu-size.patch, 1.1, NONE

[Radek Vokál]

Author: rvokal

Update of /cvs/pkgs/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19791

Modified Files:
	.cvsignore sources wireshark.pam wireshark.spec 
Removed Files:
	wireshark-nfsv41-layout-types.patch 
	wireshark-nfsv41-layout-updates.patch wireshark-nfsv41.patch 
	wireshark-rpc-pdu-size.patch 
Log Message:
upgrade to 1.1.1 development release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Sep 2008 06:36:13 -0000	1.21
+++ .cvsignore	13 Nov 2008 13:05:09 -0000	1.22
@@ -1 +1 @@
-wireshark-1.0.3.tar.gz
+wireshark-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Sep 2008 06:36:13 -0000	1.21
+++ sources	13 Nov 2008 13:05:09 -0000	1.22
@@ -1 +1 @@
-a52b0c6c652ce7239bee879cd6ca02f0  wireshark-1.0.3.tar.gz
+5814871a5fe2ba3d238373e5a2bc1efd  wireshark-1.1.1.tar.gz


Index: wireshark.pam
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark.pam	15 Jun 2006 13:27:16 -0000	1.1
+++ wireshark.pam	13 Nov 2008 13:05:09 -0000	1.2
@@ -1,4 +1,8 @@
 #%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
+auth		sufficient	pam_rootok.so
+#auth		sufficient	pam_timestamp.so
+auth		include		system-auth
+account		required	pam_permit.so
+session		required	pam_permit.so
+session		optional	pam_xauth.so
+#session	optional	pam_timestamp.so


Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wireshark.spec	10 Sep 2008 06:36:14 -0000	1.42
+++ wireshark.spec	13 Nov 2008 13:05:09 -0000	1.43
@@ -5,8 +5,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.0.3
-Release: 	1%{?dist}
+Version:	1.1.1
+Release: 	0.pre1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -20,10 +20,6 @@
 Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
-Patch4:		wireshark-nfsv41.patch
-Patch5:		wireshark-nfsv41-layout-types.patch
-Patch6:		wireshark-nfsv41-layout-updates.patch
-Patch7:		wireshark-rpc-pdu-size.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -78,13 +74,9 @@
 %else
 %setup -q -n %{name}-%{version}
 %endif
-%patch1 -p1 -b .pie
+#%patch1 -p1 -b .pie
 %patch2 -p1 
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -97,15 +89,13 @@
 export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export LDFLAGS="$LDFLAGS -lm -lcrypto"
-
+#./autogen.sh
 %configure \
    --bindir=%{_sbindir} \
    --enable-zlib \
    --enable-ipv6 \
    --with-libsmi \
    --with-gnu-ld \
-   --disable-static \
-   --disable-usr-local \
    --enable-gtk2 \
    --with-pic \
 %if %{with_adns}
@@ -210,6 +200,9 @@
 
 
 %changelog
+* Thu Nov 13 2008 Radek Vokál <rvokal at redhat.com> 1.1.1-1
+- upgrade to 1.1.1 development branch
+
 * Wed Sep 10 2008 Radek Vokál <rvokal at redhat.com> 1.0.3-1
 - upgrade to 1.0.3
 - Security-related bugs in the NCP dissector, zlib compression code, and Tektronix .rf5 file parser have been fixed. 


--- wireshark-nfsv41-layout-types.patch DELETED ---


--- wireshark-nfsv41-layout-updates.patch DELETED ---


--- wireshark-nfsv41.patch DELETED ---


--- wireshark-rpc-pdu-size.patch DELETED ---