From 86fd65b7c1ac86143c183aa0e848de5b82a8a570 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Mar 20 2012 19:06:38 +0000
Subject: 3.0.4.


---

diff --git a/.gitignore b/.gitignore
index 95783a2..f683819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 argus-2.0.6.fixes.1.tar.gz
 argus-clients-2.0.6.fixes.1.tar.gz
+/argus-3.0.4.tar.gz
+/argus-clients-3.0.4.1.tar.gz
diff --git a/argus.service b/argus.service
index 43e4ee6..c097432 100644
--- a/argus.service
+++ b/argus.service
@@ -3,7 +3,6 @@ Description=Argus generates network transaction audit records
 After=syslog.target network.target
 
 [Service]
-Type=forking
 PIDFile=/var/run/argus.pid
 ExecStart=/usr/sbin/argus -d 
 
diff --git a/argus.spec b/argus.spec
index 454b52f..bfeb1bc 100644
--- a/argus.spec
+++ b/argus.spec
@@ -1,28 +1,28 @@
 Name: argus
-Version: 2.0.6.fixes.1
-Release: 23%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
 Summary: Network transaction audit tool
 License: GPLv2+
 Group: Applications/Internet
 Url: http://qosient.com/argus
-Source0: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-clients-%{version}.tar.gz
+Source0: http://qosient.com/argus/src/%{name}-%{version}.tar.gz
+Source1: http://qosient.com/argus/src/%{name}-clients-%{version}.1.tar.gz
 Source2: argus.service
 Source3: README.fedora
-Patch0: argus-2.0.6.fixes.1-makefile.patch
-Patch1: argus-2.0.6.fixes.1-build.patch
+#Patch0: argus-2.0.6.fixes.1-makefile.patch
+#Patch1: argus-2.0.6.fixes.1-build.patch
 # bpf_dump conflicts with a function with slightly different prototype (added
 # const) in libpcap 1.0
-Patch2: argus-2.0.6.fixes.1-libpcap10.patch
-Patch3: argus-clients-2.0.6.fixes.1-makefile.patch
-Patch4: argus-clients-2.0.6.fixes.1-build.patch
-Patch5: argus-clients-2.0.6.fixes.1-print.patch
+#Patch2: argus-2.0.6.fixes.1-libpcap10.patch
+#Patch3: argus-clients-2.0.6.fixes.1-makefile.patch
+#Patch4: argus-clients-2.0.6.fixes.1-build.patch
+#Patch5: argus-clients-2.0.6.fixes.1-print.patch
 Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 BuildRequires: cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel
-BuildRequires: libpcap-devel
+BuildRequires: libpcap-devel zlib-devel
 BuildRequires: systemd-units
 
 %package clients
@@ -38,33 +38,41 @@ management.
 %description clients
 Clients to the argus probe which process and display information.
 
+%package devel
+Summary: Header files for argus network audit
+Group: Applications/Internet
+
+%description devel
+Header files for argus.
+
+
 %prep
-%setup -a0
-%setup -a1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-pushd %{name}-clients-%{version}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-popd
+%setup -a0 -q
+%setup -a1 -q
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+#pushd %{name}-clients-%{version}.1
+#%patch3 -p1
+#%patch4 -p1
+#%patch5 -p1
+#popd
 %{__install} -p -m 0644 %{SOURCE3} .
 
 %build
-%configure --with-sasl=yes
+%configure --with-sasl=yes --prefix=%{_prefix}
 %{__make} %{?_smp_mflags}
-pushd %{name}-clients-%{version}
-%configure --with-sasl=yes
+pushd %{name}-clients-%{version}.1
+%configure --with-sasl=yes --prefix=%{_prefix}
 %{__make} %{?_smp_mflags}
 popd
 
 %install
 %{__make} DESTDIR=%{buildroot} install
-pushd %{name}-clients-%{version}
+pushd %{name}-clients-%{version}.1
 %{__make} DESTDIR=%{buildroot} install
 # avoid unwanted dependencies when using these as docs (clients package):
-find doc contrib support ragraph -type f -exec chmod a-x '{}' \;
+find doc support ragraph -type f -exec chmod a-x '{}' \;
 popd
 %{__rm} -rf %{buildroot}/%{_libdir}
 %{__rm} -rf %{buildroot}/%{_bindir}/ragraph
@@ -78,6 +86,9 @@ popd
 # avoid unwanted dependencies when using these as docs (main package):
 find support -type f -exec chmod a-x '{}' \;
 
+rm -rf %{buildroot}/usr/share/doc/argus-clients-3.0/
+mv %{buildroot}/usr/argus %{buildroot}%{_datadir}/argus
+
 %post
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
@@ -109,32 +120,43 @@ fi
 /bin/systemctl try-restart argus.service >/dev/null 2>&1 || :
 
 %files
-%doc support doc/CHANGES doc/FAQ doc/HOW-TO doc/html bin/argusbug
+%doc support bin/argusbug
 %doc COPYING CREDITS INSTALL README VERSION
 %config(noreplace) %{_sysconfdir}/argus.conf
 %{_unitdir}/argus.service
-%{_sbindir}/argus*
+%{_bindir}/argus*
+%{_sbindir}/argus
 %{_mandir}/man5/argus*
 %{_mandir}/man8/argus*
 %dir %{_localstatedir}/lib/argus
 %dir %{_localstatedir}/lib/argus/archive
 
 %files clients
-%doc %{name}-clients-%{version}/ChangeLog %{name}-clients-%{version}/COPYING
-%doc %{name}-clients-%{version}/CREDITS %{name}-clients-%{version}/INSTALL
-%doc %{name}-clients-%{version}/README %{name}-clients-%{version}/VERSION
-%doc %{name}-clients-%{version}/doc/CHANGES %{name}-clients-%{version}/doc/FAQ
-%doc %{name}-clients-%{version}/doc/HOW-TO %{name}-clients-%{version}/doc/html
-%doc %{name}-clients-%{version}/support
-%doc %{name}-clients-%{version}/ragraph/ragraph.pl
+%doc %{name}-clients-%{version}.1/ChangeLog %{name}-clients-%{version}.1/COPYING
+%doc %{name}-clients-%{version}.1/CREDITS %{name}-clients-%{version}.1/INSTALL
+%doc %{name}-clients-%{version}.1/README %{name}-clients-%{version}.1/VERSION
+%doc %{name}-clients-%{version}.1/doc/CHANGES %{name}-clients-%{version}.1/doc/FAQ
+%doc %{name}-clients-%{version}.1/doc/HOW-TO %{name}-clients-%{version}.1/doc/pdf
+%doc %{name}-clients-%{version}.1/doc/README
+%doc %{name}-clients-%{version}.1/support
+%doc %{name}-clients-%{version}.1/ragraph/ragraph.pl
 # .pm checked for dependencies regardless of permissions
 #%doc %{name}-clients-%{version}/contrib
 %doc README.fedora
 %{_bindir}/ra*
+%{_sbindir}/ra*
 %{_mandir}/man1/ra*
 %{_mandir}/man5/ra*
+%{_mandir}/man8/ra*
+%{_datadir}/argus/
+
+%files devel
+%{_includedir}/argus/
 
 %changelog
+* Mon Mar 19 2012 Jon Ciesla <limburgher@gmail.com> - 3.0.4-1
+- Latest upstream, BZ 575984.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.6.fixes.1-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e0d5eb..1268c90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b90b8ea951fd0e2193b9a6bab565a139  argus-2.0.6.fixes.1.tar.gz
-59f65159070f849211685513384fa90f  argus-clients-2.0.6.fixes.1.tar.gz
+9465e91cebefc35f5e4bc935c3fe5ff8  argus-3.0.4.tar.gz
+e79a9f97fa9baf2fe4cd7b5c1bc5dbbc  argus-clients-3.0.4.1.tar.gz