Compare commits
No commits in common. "rawhide" and "f27" have entirely different histories.
4 changed files with 32 additions and 158 deletions
|
|
@ -1,38 +0,0 @@
|
|||
Include relevant headers to avoid implicit function declarations.
|
||||
Declare the return type of main to avoid an implicit int.
|
||||
|
||||
Submitted upstream:
|
||||
|
||||
<https://github.com/openargus/argus/pull/5>
|
||||
<https://github.com/openargus/clients/pull/7>
|
||||
|
||||
diff -ur argus-3.0.8.2.orig/acsite.m4 argus-3.0.8.2/acsite.m4
|
||||
--- argus-3.0.8.2.orig/acsite.m4 2015-04-14 16:32:33.000000000 +0200
|
||||
+++ argus-3.0.8.2/acsite.m4 2022-11-25 18:44:48.934763450 +0100
|
||||
@@ -298,8 +298,10 @@
|
||||
# include <sys/types.h>
|
||||
# include <sys/wait.h>
|
||||
# include <stdio.h>
|
||||
+# include <stdlib.h>
|
||||
+# include <unistd.h>
|
||||
unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
|
||||
- main() {
|
||||
+ int main() {
|
||||
unsigned int i;
|
||||
pid_t pid;
|
||||
int status;
|
||||
diff -ur argus-3.0.8.2.orig/configure argus-3.0.8.2/configure
|
||||
--- argus-3.0.8.2.orig/configure 2016-06-01 20:29:33.000000000 +0200
|
||||
+++ argus-3.0.8.2/configure 2022-11-25 18:44:56.248688727 +0100
|
||||
@@ -5789,8 +5789,10 @@
|
||||
# include <sys/types.h>
|
||||
# include <sys/wait.h>
|
||||
# include <stdio.h>
|
||||
+# include <stdlib.h>
|
||||
+# include <unistd.h>
|
||||
unsigned char a[5] = { 1, 2, 3, 4, 5 };
|
||||
- main() {
|
||||
+ int main() {
|
||||
unsigned int i;
|
||||
pid_t pid;
|
||||
int status;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- common/Makefile.in~ 2015-04-14 09:32:33.000000000 -0500
|
||||
+++ common/Makefile.in 2018-03-16 11:32:06.395595496 -0500
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
CC = @CC@
|
||||
CCOPT = @V_CCOPT@
|
||||
-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus
|
||||
+INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus -I/usr/include/tirpc
|
||||
DEFS = @DEFS@
|
||||
|
||||
# Standard CFLAGS
|
||||
130
argus.spec
130
argus.spec
|
|
@ -2,30 +2,35 @@
|
|||
%global clientversion 3.0.8.2
|
||||
Name: argus
|
||||
Version: 3.0.8.2
|
||||
Release: 29%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Network transaction audit tool
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
Group: Applications/Internet
|
||||
Url: http://qosient.com/argus
|
||||
Source0: http://qosient.com/argus/src/%{name}-%{version}.tar.gz
|
||||
Source1: http://qosient.com/argus/src/%{name}-clients-%{clientversion}.tar.gz
|
||||
Source2: argus.service
|
||||
Source3: README.fedora
|
||||
Source4: argus.logrotate
|
||||
Patch0: argus-tirpc.patch
|
||||
Patch1: common.patch
|
||||
Patch2: argus-configure-c99.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
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
Requires: logrotate
|
||||
BuildRequires: gcc autoconf automake
|
||||
BuildRequires: cyrus-sasl-devel perl-generators flex bison ncurses-devel
|
||||
BuildRequires: libpcap-devel zlib-devel libtirpc-devel readline-devel
|
||||
BuildRequires: cyrus-sasl-devel perl-generators tcp_wrappers flex bison ncurses-devel
|
||||
BuildRequires: libpcap-devel zlib-devel
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: make
|
||||
|
||||
%package clients
|
||||
Summary: Client tools for argus network audit
|
||||
Group: Applications/Internet
|
||||
|
||||
%description
|
||||
Argus (Audit Record Generation and Utilization System) is an IP network
|
||||
|
|
@ -38,6 +43,7 @@ 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.
|
||||
|
|
@ -46,20 +52,19 @@ Header files for argus.
|
|||
%prep
|
||||
%setup -a0 -q
|
||||
%setup -a1 -q
|
||||
%patch -P0 -p0
|
||||
%patch -P1 -p0
|
||||
%patch -P2 -p1
|
||||
pushd %{name}-clients-%{clientversion}
|
||||
%patch -P2 -p1
|
||||
popd
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
#pushd %{name}-clients-%{version}.1
|
||||
#%patch3 -p1
|
||||
#%patch4 -p1
|
||||
#%patch5 -p1
|
||||
#popd
|
||||
%{__install} -p -m 0644 %{SOURCE3} .
|
||||
|
||||
%build
|
||||
autoreconf -if
|
||||
export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc -fcommon"
|
||||
export CXXFLAGS="$CXXFLAGS -fcommon"
|
||||
%configure --with-sasl=yes --prefix=%{_prefix}
|
||||
find . -type f -name 'Makefile' | xargs sed -i s/fcf-protection/fcf-protection\ -fcommon/g
|
||||
%{__make} %{?_smp_mflags}
|
||||
pushd %{name}-clients-%{clientversion}
|
||||
%configure --with-sasl=yes --prefix=%{_prefix}
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
|
@ -100,8 +105,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
|||
|
||||
%files
|
||||
%doc support bin/argusbug
|
||||
%doc CREDITS INSTALL README VERSION
|
||||
%license COPYING
|
||||
%doc COPYING CREDITS INSTALL README VERSION
|
||||
%config(noreplace) %{_sysconfdir}/argus.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/argus
|
||||
%{_unitdir}/argus.service
|
||||
|
|
@ -116,7 +120,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
|||
%doc %{name}-clients-%{clientversion}/ChangeLog %{name}-clients-%{clientversion}/COPYING
|
||||
%doc %{name}-clients-%{clientversion}/CREDITS %{name}-clients-%{clientversion}/INSTALL
|
||||
%doc %{name}-clients-%{clientversion}/README %{name}-clients-%{clientversion}/VERSION
|
||||
#%doc %{name}-clients-%{clientversion}/doc/CHANGES %{name}-clients-%{clientversion}/doc/FAQ
|
||||
#%doc %{name}-clients-%{clientversion}/doc/HOW-TO %{name}-clients-%{clientversion}/doc/pdf
|
||||
#%doc %{name}-clients-%{clientversion}/doc/README
|
||||
%doc %{name}-clients-%{clientversion}/support
|
||||
#%doc %{name}-clients-%{clientversion}/ragraph/ragraph.pl
|
||||
# .pm checked for dependencies regardless of permissions
|
||||
#%doc %{name}-clients-%{version}/contrib
|
||||
%doc README.fedora
|
||||
%{_bindir}/ra*
|
||||
%{_sbindir}/ra*
|
||||
|
|
@ -129,82 +139,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
|||
%{_includedir}/argus/
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Mar 07 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.0.8.2-22
|
||||
- migrated to SPDX license
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Nov 25 2022 Florian Weimer <fweimer@redhat.com> - 3.0.8.2-20
|
||||
- Port configure scripts to C99
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.8.2-16
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.0.8.2-13
|
||||
- Fix FTBFS
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.8.2-10
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Mar 16 2018 Gwyn Ciesla <limburgher@gmail.com> - 3.0.8.2-7
|
||||
- Migrate to libtirpc.
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.8.2-6
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
|
@ -334,7 +268,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
|||
- backed out of __perl_requires redefine for .pm files - trouble w. rpmbuild
|
||||
|
||||
* Fri Feb 24 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-2
|
||||
- empty perl_req/prov avoids .pm's in %%doc from being dep-checked at all
|
||||
- empty perl_req/prov avoids .pm's in %doc from being dep-checked at all
|
||||
- misc spec file fixes
|
||||
|
||||
* Fri Feb 24 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-1
|
||||
|
|
|
|||
11
common.patch
11
common.patch
|
|
@ -1,11 +0,0 @@
|
|||
--- argus/ArgusUdt.c~ 2015-06-29 15:17:25.000000000 -0500
|
||||
+++ argus/ArgusUdt.c 2020-02-19 10:45:00.768211138 -0600
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <ArgusModeler.h>
|
||||
|
||||
#include <argus/bootp.h>
|
||||
-struct bootp *bp;
|
||||
+extern struct bootp *bp;
|
||||
|
||||
struct ArgusSystemFlow *
|
||||
ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt)
|
||||
Loading…
Add table
Add a link
Reference in a new issue