pool/pmacct
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 817535 from home:mnhauke:security

Browse Source 
- Update to versino 1.7.5
  * See /usr/share/doc/packages/pmacct/ChangeLog for all changes
- Drop patch (addressed by upstream in 686495dd):
  * pmacct-fix-overflow.patch

OBS-URL: https://build.opensuse.org/request/show/817535
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/pmacct?expand=0&rev=101
This commit is contained in:
Dirk Stoecker 2020-06-30 07:16:48 +00:00 committed by Git OBS Bridge
parent dfa9fb8ae4
commit 6ba55ba9b4
5 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmacct-1.7.4p1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a35fdde01a2e34faf7c0d68cb3010bca56667638a6227b02384d015ee9c1335
size 1581347

3
pmacct-1.7.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e778bd3cdd968c4b9f22e28008b9b72f229980201d2cc2ee04cb02f6b0bdcd5
size 1626770

29
pmacct-fix-overflow.patch
View File

@ -1,29 +0,0 @@
Index: pmacct-1.7.4/src/sfacctd.c
===================================================================
--- pmacct-1.7.4.orig/src/sfacctd.c
+++ pmacct-1.7.4/src/sfacctd.c
@@ -2045,7 +2045,7 @@ void finalizeSample(SFSample *sample, st
int SF_find_id(struct id_table *t, struct packet_ptrs *pptrs, pm_id_t *tag, pm_id_t *tag2)
{
- struct sockaddr sa_local;
+ struct sockaddr_storage sa_local;
struct sockaddr_in *sa4 = (struct sockaddr_in *) &sa_local;
struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &sa_local;
SFSample *sample = (SFSample *)pptrs->f_data;
@@ -2086,13 +2086,13 @@ int SF_find_id(struct id_table *t, struc
if (sample->agent_addr.type == SFLADDRESSTYPE_IP_V4) {
begin = 0;
end = t->ipv4_num;
- sa_local.sa_family = AF_INET;
+ sa_local.ss_family = AF_INET;
sa4->sin_addr.s_addr = sample->agent_addr.address.ip_v4.s_addr;
}
else if (sample->agent_addr.type == SFLADDRESSTYPE_IP_V6) {
begin = t->num-t->ipv6_num;
end = t->num;
- sa_local.sa_family = AF_INET6;
+ sa_local.ss_family = AF_INET6;
memcpy(sa6->sin6_addr.s6_addr, sample->agent_addr.address.ip_v6.s6_addr, 16);
}

8
pmacct.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Jun 28 15:16:43 UTC 2020 - Martin Hauke <mardnh@gmx.de>
- Update to versino 1.7.5
* See /usr/share/doc/packages/pmacct/ChangeLog for all changes
- Drop patch (addressed by upstream in 686495dd):
* pmacct-fix-overflow.patch
-------------------------------------------------------------------
Sun Jun 7 20:37:36 UTC 2020 - Martin Hauke <mardnh@gmx.de>

6
pmacct.spec
View File

@ -24,7 +24,7 @@
%bcond_with ndpi
Name: pmacct
Version: 1.7.4p1
Version: 1.7.5
Release: 0
Summary: Accounting and aggregation toolsuite for IPv4 and IPv6
License: GPL-2.0-only
@ -41,7 +41,6 @@ Source10: nfacctd.conf
Source11: pmacctd.conf
Source12: sfacctd.conf
Source20: pmacct.1
Patch0: pmacct-fix-overflow.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libmysqlclient-devel
@ -73,8 +72,7 @@ supported, both unicast and multicast. A client program can export
export data to tools like RRDtool, GNUPlot, Net-SNMP, MRTG, and Cacti.
%prep
%setup -q -n %{name}-1.7.4
%patch0 -p1
%setup -q -n %{name}-%{version}
# fix permissions
chmod -x sql/pmacct-*