February 2019 - crux-commits

ports/contrib (3.5): [notify] python-lxml: 4.2.1 -> 4.2.4 renamed from lxml
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit d97cb94d68915eb4312e54ec9a461b8e487e294e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:45:25 2018 +1000 [notify] python-lxml: 4.2.1 -> 4.2.4 renamed from lxml diff --git a/lxml/.md5sum b/lxml/.md5sum deleted file mode 100644 index 4ef538d9..00000000 --- a/lxml/.md5sum +++ /dev/null @@ -1 +0,0 @@ -c266d9062e23b08f66426979a2b36f51 lxml-4.2.1.tgz diff --git a/lxml/.signature b/lxml/.signature deleted file mode 100644 index cdfced1f..00000000 --- a/lxml/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3ww30zKb4A63TWH9V+p//47h0LdCGRSyPe3BNKpz9sd9qusKO0Io7vpqKH3t/Lzv2n+HOwiMc1+YattkGwLYUAE= -SHA256 (Pkgfile) = 236435d12d54c76b5492758b220e5e280321d17cda885bb635de3e850136c84f -SHA256 (.footprint) = 9ff53a37810f26874042a64b7f94f9261e3cfda66fc2eef9b14cf2f35ac98a0e -SHA256 (lxml-4.2.1.tgz) = e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b diff --git a/lxml/Pkgfile b/lxml/Pkgfile deleted file mode 100644 index b914b12d..00000000 --- a/lxml/Pkgfile +++ /dev/null @@ -1,15 +0,0 @@ -# Description: A pythonic binding for the libxml2 and libxslt libraries. -# URL: http://lxml.de/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: beautifulsoup4 cssselect cython html5lib-python libxslt - -name=lxml -version=4.2.1 -release=1 -source=(http://lxml.de/files/$name-$version.tgz) - -build() { - cd $name-$version - /usr/bin/python setup.py build - /usr/bin/python setup.py install --root $PKG -} diff --git a/lxml/.footprint b/python-lxml/.footprint similarity index 77% rename from lxml/.footprint rename to python-lxml/.footprint index 5569cfe0..8489d549 100644 --- a/lxml/.footprint +++ b/python-lxml/.footprint @@ -2,64 +2,84 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.1-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.2.4-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/ElementInclude.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/ElementInclude.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/ElementInclude.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/__init__.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/_elementpath.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/_elementpath.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/_elementpath.pyo -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/_elementpath.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/builder.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/builder.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/builder.pyo -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/builder.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/cssselect.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/cssselect.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/cssselect.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/doctestcompare.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/doctestcompare.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/doctestcompare.pyo -rw-rw-r-- root/root usr/lib/python2.7/site-packages/lxml/etree.h -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/etree.so -rw-rw-r-- root/root usr/lib/python2.7/site-packages/lxml/etree_api.h drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/html/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/ElementSoup.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/ElementSoup.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/ElementSoup.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/__init__.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_diffcommand.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_diffcommand.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_diffcommand.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_html5builder.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_html5builder.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_html5builder.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_setmixin.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_setmixin.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/_setmixin.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/builder.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/builder.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/builder.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/clean.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/clean.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/clean.pyo -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/html/clean.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/defs.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/defs.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/defs.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/diff.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/diff.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/diff.pyo -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/html/diff.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/formfill.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/formfill.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/formfill.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/html5parser.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/html5parser.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/html5parser.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/soupparser.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/soupparser.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/soupparser.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/usedoctest.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/usedoctest.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/html/usedoctest.pyo drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/includes/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/lxml/includes/__init__.pxd (EMPTY) -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/includes/__init__.py (EMPTY) -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/includes/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/includes/__init__.pyo -rw-rw-r-- root/root usr/lib/python2.7/site-packages/lxml/includes/c14n.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/lxml/includes/config.pxd -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/includes/dtdvalid.pxd @@ -80,6 +100,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/includes/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/isoschematron/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.pyo drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/isoschematron/resources/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/iso-schematron.rng @@ -98,7 +119,10 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/isoschematron/resource -rwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/objectify.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/pyclasslookup.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/pyclasslookup.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/pyclasslookup.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/sax.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/sax.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/sax.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/usedoctest.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/usedoctest.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/usedoctest.pyo diff --git a/python-lxml/.signature b/python-lxml/.signature new file mode 100644 index 00000000..3e9843ac --- /dev/null +++ b/python-lxml/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3wgh8GkXd3Ykd3WYOHNcuy0o7P7nx7MW5d7M+mtaKN1AmXGPQRXn+yh3w19qU7pagU+T9d22KA0GFNErKuRoZAU= +SHA256 (Pkgfile) = 6624fddd93977e0fc1f34f304931d28d32e95a942a5f89ec69e300d6b06f6626 +SHA256 (.footprint) = 1ccc71f398c34d68c87f24ceb3535c8f33f12dcd0ecdb167f1de469115336b0d +SHA256 (lxml-4.2.4.tgz) = e2afbe403090f5893e254958d02875e0732975e73c4c0cdd33c1f009a61963ca diff --git a/python-lxml/Pkgfile b/python-lxml/Pkgfile new file mode 100644 index 00000000..5a13a5d9 --- /dev/null +++ b/python-lxml/Pkgfile @@ -0,0 +1,18 @@ +# Description: A pythonic binding for the libxml2 and libxslt libraries. +# URL: http://lxml.de/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: python-beautifulsoup4 python-cssselect python-cython python-html5lib libxslt + +name=python-lxml +version=4.2.4 +release=1 +source=(https://lxml.de/files/${name#*-}-$version.tgz) + +build() { + cd ${name#*-}-$version + + /usr/bin/python setup.py build + + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 +}

1 0

ports/contrib (3.5): [notify] python-html5lib: 1.0b10 -> 1.0.1 renamed from html5lib-python
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit 7156a33b6a85b3b7f3469dbcd1f19941c14eda47 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:20:30 2018 +1000 [notify] python-html5lib: 1.0b10 -> 1.0.1 renamed from html5lib-python diff --git a/html5lib-python/.md5sum b/html5lib-python/.md5sum deleted file mode 100644 index bb218b97..00000000 --- a/html5lib-python/.md5sum +++ /dev/null @@ -1 +0,0 @@ -4658c3065d7d84dc321410ca1f721502 1.0b10.tar.gz diff --git a/html5lib-python/.signature b/html5lib-python/.signature deleted file mode 100644 index 462c807c..00000000 --- a/html5lib-python/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wtcJ+9AgCM3bFYk6zLFIRzoA3Bt+u5NXKiuY9mB6ht4g5nS04QfQbOyUaUCbOrAloTYXO+at0hf/aFJjAjnagw= -SHA256 (Pkgfile) = e602c463e6a5cc58b3372ff6e6036ecd5451c673033d394c436762678537f9aa -SHA256 (.footprint) = cd7bff022b10ef1e5b7e3b0ebb8ff75b03a8f38b744f50fa80616ddde7854c8e -SHA256 (1.0b10.tar.gz) = 192337c31b8a5112ca2fe2f408a7bac5ec7a351523d59663953e741c96df31c4 diff --git a/html5lib-python/.footprint b/python-html5lib/.footprint similarity index 98% rename from html5lib-python/.footprint rename to python-html5lib/.footprint index 9b018c7b..572b7575 100644 --- a/html5lib-python/.footprint +++ b/python-html5lib/.footprint @@ -2,12 +2,12 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0b10-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib-1.0.1-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/html5lib/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/html5lib/__init__.pyc diff --git a/python-html5lib/.signature b/python-html5lib/.signature new file mode 100644 index 00000000..cdeddca7 --- /dev/null +++ b/python-html5lib/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3yB+0kcDa4WM2BMWq1399C5OvYJMsDXWsHKaOnq2BEXfhMDBj287nO8fslA6uKs4XjFAAcnT6Wu0apUzXpXzcQ0= +SHA256 (Pkgfile) = 21d08899c73aae053914a70a01c634564f9d1e6a563afc851169f00f48fcf50c +SHA256 (.footprint) = f82a0e586649806d1503d439f1b895f443c6172844a9d8ae54626a5bbbfdcc54 +SHA256 (html5lib-python-1.0.1.tar.gz) = fabbebd6a55d07842087f13849076eeed350aa8bb6c9ec840f6a6aba9388db06 diff --git a/html5lib-python/Pkgfile b/python-html5lib/Pkgfile similarity index 64% rename from html5lib-python/Pkgfile rename to python-html5lib/Pkgfile index aed2612b..023fe3b8 100644 --- a/html5lib-python/Pkgfile +++ b/python-html5lib/Pkgfile @@ -3,13 +3,16 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: python-setuptools -name=html5lib-python -version=1.0b10 +name=python-html5lib +version=1.0.1 release=1 -source=(https://github.com/html5lib/html5lib-python/archive/$version.tar.gz) +source=(https://github.com/html5lib/html5lib-python/archive/$version/html5lib-python-$version.tar.gz) build() { - cd $name-$version + cd html5lib-python-$version + /usr/bin/python setup.py build - /usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1 + + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 }

1 0

ports/contrib (3.5): [notify] python-cython: 0.28.3 -> 0.28.4 renamed from cython
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit 5014741afb22aa368dd1aa26d4c6d6a64938fb96 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:16:58 2018 +1000 [notify] python-cython: 0.28.3 -> 0.28.4 renamed from cython diff --git a/cython/.signature b/cython/.signature deleted file mode 100644 index 9d81497c..00000000 --- a/cython/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31qGfSvC6tNIRwQebleDzT8VjFRWJP3gO4qe8128PB+xf/zwtgtWBFlma4McyNl3J347jWGE89GOGqG20suSiQo= -SHA256 (Pkgfile) = b417cf06e7ad2bf2f66c1356bf8ca9b1c5cf637732d78a838ba55702795abbe4 -SHA256 (.footprint) = 2c23adb64d58290dde119222666e7cf837f033f2548b1d3603eaa2bddaf463a4 -SHA256 (Cython-0.28.3.tar.gz) = 1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526 diff --git a/cython/.footprint b/python-cython/.footprint similarity index 99% rename from cython/.footprint rename to python-cython/.footprint index 1c8d5969..9e3fbc81 100644 --- a/cython/.footprint +++ b/python-cython/.footprint @@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.3-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.28.4-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Build/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Build/BuildExecutable.py diff --git a/cython/.md5sum b/python-cython/.md5sum similarity index 100% rename from cython/.md5sum rename to python-cython/.md5sum diff --git a/python-cython/.signature b/python-cython/.signature new file mode 100644 index 00000000..5c897ef7 --- /dev/null +++ b/python-cython/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3wVliVZBgTBOBxPIe0x756/fQxsIy/d9TRtOrC0wIgI9kLzvfSgiXzlpa+ItujcbgRed6zzfwuhILJwfQlkoIgs= +SHA256 (Pkgfile) = 58d64360278ae3c52260752b1be92c88d94fb6abea1b91c23e625bfad5c398eb +SHA256 (.footprint) = 6afbb6bea5e9490def78cf47b8753fec7a2b66b37c760208115e80563e323953 +SHA256 (Cython-0.28.4.tar.gz) = 76ac2b08d3d956d77b574bb43cbf1d37bd58b9d50c04ba281303e695854ebc46 diff --git a/cython/Pkgfile b/python-cython/Pkgfile similarity index 73% rename from cython/Pkgfile rename to python-cython/Pkgfile index ec026cd6..10dae949 100644 --- a/cython/Pkgfile +++ b/python-cython/Pkgfile @@ -3,13 +3,16 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: python-setuptools -name=cython -version=0.28.3 +name=python-cython +version=0.28.4 release=1 source=(https://files.pythonhosted.org/packages/source/C/Cython/Cython-$ver… build() { cd Cython-$version + /usr/bin/python setup.py build - /usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1 + + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 }

1 0

ports/contrib (3.5): python-cssselect: renamed from cssselect
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit eabc2e2588ad96e69eeeb64bd7f98b45ca87ee5b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:14:28 2018 +1000 python-cssselect: renamed from cssselect diff --git a/cssselect/.footprint b/python-cssselect/.footprint similarity index 100% rename from cssselect/.footprint rename to python-cssselect/.footprint diff --git a/cssselect/.md5sum b/python-cssselect/.md5sum similarity index 100% rename from cssselect/.md5sum rename to python-cssselect/.md5sum diff --git a/cssselect/.signature b/python-cssselect/.signature similarity index 56% rename from cssselect/.signature rename to python-cssselect/.signature index 7c0f645c..60edba5f 100644 --- a/cssselect/.signature +++ b/python-cssselect/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39sDb5l720QEafHKpQ7zho/jfUtm/2trLeUiADt2rzZ80kDKZjWH+T4vQxtrOZ2WZf5HPzGdT2GtgcbagsYw8wg= -SHA256 (Pkgfile) = 1499a13fb42b204c0950439ba6a82c3a33a972dc4234774429c23c40b8471fb6 +RWSagIOpLGJF3+nxD/NyjcbSgEfApdPkbSWQtEj9b7ameqv3+tIeoVq1tDnLHTZw3HZnD8H5VxuAtTn4Xa+Va2rrh9XZ342wgwc= +SHA256 (Pkgfile) = 684305105225c7850d25005b105933ff37e47fa73fa01379abbc6436c3a9833b SHA256 (.footprint) = 9b1dc4a4c301bf8482db667bd882a9adf6b1f54368fd215955b154f864b2205a SHA256 (cssselect-1.0.3.tar.gz) = 066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204 diff --git a/cssselect/Pkgfile b/python-cssselect/Pkgfile similarity index 55% rename from cssselect/Pkgfile rename to python-cssselect/Pkgfile index 2c3d10ec..50508601 100644 --- a/cssselect/Pkgfile +++ b/python-cssselect/Pkgfile @@ -3,14 +3,16 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: python-setuptools -name=cssselect +name=python-cssselect version=1.0.3 release=1 -source=( -https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$name-$version.tar.gz) +source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz) build() { - cd $name-$version + cd ${name#*-}-$version + /usr/bin/python setup.py build - /usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1 + + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 }

1 0

ports/contrib (3.5): python3-beautifulsoup4: initial import
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit 3e45ad7f83a0b02a7d83700e4b2df97dad4582e4 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:12:54 2018 +1000 python3-beautifulsoup4: initial import diff --git a/python3-beautifulsoup4/.footprint b/python3-beautifulsoup4/.footprint new file mode 100644 index 00000000..9a5a53c2 --- /dev/null +++ b/python3-beautifulsoup4/.footprint @@ -0,0 +1,67 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/python3.6/ +drwxr-xr-x root/root usr/lib/python3.6/site-packages/ +drwxr-xr-x root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/ +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/PKG-INFO +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/SOURCES.txt +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/dependency_links.txt +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/requires.txt +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/beautifulsoup4-4.6.1-py3.6.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__init__.py +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/__init__.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/__init__.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/dammit.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/dammit.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/diagnose.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/diagnose.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/element.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/element.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/testing.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/__pycache__/testing.cpython-36.pyc +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/builder/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__init__.py +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/__init__.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/__init__.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_html5lib.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_html5lib.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_htmlparser.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_htmlparser.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_lxml.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/__pycache__/_lxml.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/_html5lib.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/_htmlparser.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/builder/_lxml.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/dammit.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/diagnose.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/element.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/testing.py +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/tests/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__init__.py +drwxr-xr-x root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/__init__.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/__init__.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_builder_registry.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_builder_registry.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_docs.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_docs.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_html5lib.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_html5lib.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_htmlparser.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_htmlparser.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_lxml.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_lxml.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_soup.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_soup.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_tree.cpython-36.opt-1.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/__pycache__/test_tree.cpython-36.pyc +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_builder_registry.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_docs.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_html5lib.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_htmlparser.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_lxml.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_soup.py +-rw-r--r-- root/root usr/lib/python3.6/site-packages/bs4/tests/test_tree.py diff --git a/python3-beautifulsoup4/.signature b/python3-beautifulsoup4/.signature new file mode 100644 index 00000000..50ba8f65 --- /dev/null +++ b/python3-beautifulsoup4/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF37Pc2qN62NNbbMOWOO5VG4L2Tn0tkMYsjJbuUNu+ofKf+V04nrVx1iQ/5nawt24+BMs5qYejfH9E0lEKoR5GCwI= +SHA256 (Pkgfile) = e72d6846fae77f994af79aa2680e904bc9b7b4723b616ed5fc837e2ff38041ba +SHA256 (.footprint) = e9ecd335436c09c63a82eeccbba040143679b51e80931b06b3834cf712f7405b +SHA256 (beautifulsoup4-4.6.1.tar.gz) = bd43a3b26d2886acd63070c43da821b60dea603eb6d45bab0294aac6129adbfa diff --git a/python3-beautifulsoup4/Pkgfile b/python3-beautifulsoup4/Pkgfile new file mode 100644 index 00000000..67d9c474 --- /dev/null +++ b/python3-beautifulsoup4/Pkgfile @@ -0,0 +1,18 @@ +# Description: Python HTML/XML Parser. +# URL: http://www.crummy.com/software/BeautifulSoup/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: python3-chardet + +name=python3-beautifulsoup4 +version=4.6.1 +release=1 +source=(http://www.crummy.com/software/BeautifulSoup/bs4/download/${version:0:3}/${name#*-}-$version.tar.gz) + +build() { + cd ${name#*-}-$version + + /usr/bin/python3 setup.py build + + /usr/bin/python3 setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 +}

1 0

ports/contrib (3.5): [notify] python-beautifulsoup4: -> 4.6.1 renamed from beautifulsoup4
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit f00b9a87007ff39ecb82b0de8160ad1634aa2a12 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 8 00:11:19 2018 +1000 [notify] python-beautifulsoup4: -> 4.6.1 renamed from beautifulsoup4 diff --git a/beautifulsoup4/.signature b/beautifulsoup4/.signature deleted file mode 100644 index cb2b79f9..00000000 --- a/beautifulsoup4/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/mdwiYb6nJQEiG9kF1RBkYAH0LBRSwzDW0dud0h47hvGMSDOlFQxjTcRvTTGHfqJGd7QmcPl9cudg42kqLfzAo= -SHA256 (Pkgfile) = 8a32a874159226c2e06c724cd5ed00f9fb3c9925950ef191ed08986efc664571 -SHA256 (.footprint) = 2cb66543e54ab5dc53f63649d9d92eee440238c87c6347fae5f2ee7b51e320ec -SHA256 (beautifulsoup4-4.6.0.tar.gz) = 808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89 diff --git a/beautifulsoup4/.footprint b/python-beautifulsoup4/.footprint similarity index 68% rename from beautifulsoup4/.footprint rename to python-beautifulsoup4/.footprint index c8dae9ac..b10b862a 100644 --- a/beautifulsoup4/.footprint +++ b/python-beautifulsoup4/.footprint @@ -2,46 +2,63 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/ --rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/PKG-INFO --rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/SOURCES.txt --rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/dependency_links.txt --rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/requires.txt --rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.0-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/ +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/PKG-INFO +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/SOURCES.txt +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/dependency_links.txt +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/requires.txt +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/beautifulsoup4-4.6.1-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/bs4/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/__init__.pyo drwxr-xr-x root/root usr/lib/python2.7/site-packages/bs4/builder/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/__init__.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_html5lib.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_html5lib.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_html5lib.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_htmlparser.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_htmlparser.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_htmlparser.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_lxml.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_lxml.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/builder/_lxml.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/dammit.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/dammit.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/dammit.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/diagnose.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/diagnose.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/diagnose.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/element.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/element.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/element.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/testing.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/testing.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/testing.pyo drwxr-xr-x root/root usr/lib/python2.7/site-packages/bs4/tests/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/__init__.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_builder_registry.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_builder_registry.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_builder_registry.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_docs.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_docs.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_docs.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_html5lib.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_html5lib.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_html5lib.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_htmlparser.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_htmlparser.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_htmlparser.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_lxml.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_lxml.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_lxml.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_soup.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_soup.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_soup.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_tree.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_tree.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bs4/tests/test_tree.pyo diff --git a/beautifulsoup4/.md5sum b/python-beautifulsoup4/.md5sum similarity index 100% rename from beautifulsoup4/.md5sum rename to python-beautifulsoup4/.md5sum diff --git a/python-beautifulsoup4/.signature b/python-beautifulsoup4/.signature new file mode 100644 index 00000000..75763d82 --- /dev/null +++ b/python-beautifulsoup4/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF37jMksIUfUuZSm7BRRkFJPmq2JeI/mUBBVF8cjW9RPU6g03gjVYKRddoPLklG44BINtFs9iuGXPSThmJNarS4gc= +SHA256 (Pkgfile) = 382557d2e1e63a42df52f51aa2356dd942c7963fa6b948897beeb888c2fec40f +SHA256 (.footprint) = 5dfc7a7153245ed0bcaacb240d01a9b1038b18978647c3d934e92b85b6a3f138 +SHA256 (beautifulsoup4-4.6.1.tar.gz) = bd43a3b26d2886acd63070c43da821b60dea603eb6d45bab0294aac6129adbfa diff --git a/beautifulsoup4/Pkgfile b/python-beautifulsoup4/Pkgfile similarity index 60% rename from beautifulsoup4/Pkgfile rename to python-beautifulsoup4/Pkgfile index cfbc9748..a57cccac 100644 --- a/beautifulsoup4/Pkgfile +++ b/python-beautifulsoup4/Pkgfile @@ -3,13 +3,16 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: python-chardet -name=beautifulsoup4 -version=4.6.0 +name=python-beautifulsoup4 +version=4.6.1 release=1 -source=(http://www.crummy.com/software/BeautifulSoup/bs4/download/${version:0:3}/$name-$version.tar.gz) +source=(http://www.crummy.com/software/BeautifulSoup/bs4/download/${version:0:3}/${name#*-}-$version.tar.gz) build() { - cd $name-$version + cd ${name#*-}-$version + /usr/bin/python setup.py build - /usr/bin/python setup.py install --root=$PKG + + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 }

1 0

ports/contrib (3.5): gtkglext: ->
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit eabc6e64c783e98c901f471de8706831bbd19d95 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Aug 7 23:46:16 2018 +1000 gtkglext: -> diff --git a/gtkglext/.md5sum b/gtkglext/.md5sum deleted file mode 100644 index 967445a2..00000000 --- a/gtkglext/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -e5a87ec3f2d0e616c6f32f90c3f7237f gtk2.20.patch -5c3240bfc1b21becd33ce35c5abe6f8d gtkglext-1.2.0.tar.gz diff --git a/gtkglext/.signature b/gtkglext/.signature index 72228f4f..14a257dc 100644 --- a/gtkglext/.signature +++ b/gtkglext/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3ws6zXVS4oK/IkESjAMH10feidQJUXZmBFbb/eRW9ZJ+Sg+Zk8+1ORZYsDcX15CIYjzfJWSSCDIrr3ZAD+r1mwM= -SHA256 (Pkgfile) = ec871deb1d545ae713c5251369484bdd558ac7d1f6758ae7054cf44cf404090e +RWSagIOpLGJF34X9pRXxsECDQbYqm7YBI8rhJ+G7UAklzLml5OCMPmKmw0B9NZ/PutFbRgnZfvufZC2F3eK9+ULydzfmkIA9JAc= +SHA256 (Pkgfile) = 709d60d68ccede9b168a0c0306f8fdc38495d3fbe5e58393a6dc11d4a1bcac09 SHA256 (.footprint) = 622c3704b31ae9ab61cdafb37336b39c5b715f034ef67a8ecf16d5bb5fd68aad SHA256 (gtkglext-1.2.0.tar.gz) = e5073f3c6b816e7fa67d359d9745a5bb5de94a628ac85f624c992925a46844f9 SHA256 (gtk2.20.patch) = 864c6963c4a2f4f69f1f028ecee6c821a4f4d5aba142f2e07898aede825ce9ea +SHA256 (gtkglext-gcc8.patch) = 0ec0c22b15054b0684f9a9015ff05920af0c00dae5409e76321f683dcc17cff9 diff --git a/gtkglext/Pkgfile b/gtkglext/Pkgfile index 9a46fb07..6e006ac2 100644 --- a/gtkglext/Pkgfile +++ b/gtkglext/Pkgfile @@ -1,20 +1,23 @@ # Description: OpenGL extension to GTK 2.0. # URL: https://projects.gnome.org/gtkglext/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Jay Dolan, jdolan at jdolan dot dyndns dot org # Depends on: glu gtk pangox-compat xorg-libxmu name=gtkglext version=1.2.0 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz - gtk2.20.patch) +release=3 +source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz + gtk2.20.patch + gtkglext-gcc8.patch) build() { cd $name-$version - patch -Np1 -i $SRC/gtk2.20.patch + patch -p1 -i $SRC/gtk2.20.patch sed '/AC_PATH_XTRA/d' -i configure.in + patch -p1 -i $SRC/gtkglext-gcc8.patch + + autoreconf -vi ./configure \ --prefix=/usr \ diff --git a/gtkglext/gtkglext-gcc8.patch b/gtkglext/gtkglext-gcc8.patch new file mode 100644 index 00000000..266f5fef --- /dev/null +++ b/gtkglext/gtkglext-gcc8.patch @@ -0,0 +1,34 @@ +From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu(a)fedoraproject.org> +Date: Thu, 15 Mar 2018 15:56:20 +0100 +Subject: [PATCH 2/2] GCC-8 fixes. + +--- + gdk/gdkglshapes.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c +index f72abba..9d1197f 100644 +--- a/gdk/gdkglshapes.c ++++ b/gdk/gdkglshapes.c +@@ -544,7 +544,7 @@ static GLfloat idata[12][3] = + {-Z, -X, 0} + }; + +-static int index[20][3] = ++static int iindex[20][3] = + { + {0, 4, 1}, + {0, 9, 4}, +@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType) + int i; + + for (i = 19; i >= 0; i--) { +- drawtriangle(i, idata, index, shadeType); ++ drawtriangle(i, idata, iindex, shadeType); + } + } + +-- +2.14.3 +

1 0

ports/contrib (3.5): ant: 1.10.3 -> 1.10.5
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit 2e432cae1c89cf07b14a20b383a0ccc0c41d1f2b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Aug 6 01:12:40 2018 +1000 ant: 1.10.3 -> 1.10.5 diff --git a/ant/.md5sum b/ant/.md5sum deleted file mode 100644 index 37430ea3..00000000 --- a/ant/.md5sum +++ /dev/null @@ -1 +0,0 @@ -60a3f31f7d6a71d822c9af291694c25d apache-ant-1.10.3-bin.tar.bz2 diff --git a/ant/.signature b/ant/.signature index 6468c765..ef77cba0 100644 --- a/ant/.signature +++ b/ant/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37S1oKiJru1mrGnsfZRfojfkNL2D3g3W+k1ohQAjme2kSwpn3ya9lFf0XpilceDc9PDVp0UAmtCdQ6QSCSDiDQ4= -SHA256 (Pkgfile) = cbc516c3ac5ec324fc0e9f63ecdea3e57ec9992c7ad2728b771e7317cff11a47 +RWSagIOpLGJF32YmtXrpKvW2dRGziz7bsweHNROZd60U44tr/T/BfesPL5+QW1bOuzhYk9ihPzFA/fsc4raeK3kZfV++lXGowgQ= +SHA256 (Pkgfile) = 190f6c685becd79dbe1e8613709238c756869272e4fc2516e478765c660cf0cb SHA256 (.footprint) = 49a369c09e37976648f47c4403ee1f915622f6717e3500db4b9fcf95be61f505 -SHA256 (apache-ant-1.10.3-bin.tar.bz2) = 05694f280e3806cf4237dee263dbccd9eecb80fc6ce9ad6a731ce1f7723962c8 +SHA256 (apache-ant-1.10.5-bin.tar.bz2) = 3f762e16c4b5446e64869d146efe76be865a1d83062eede2d0a8fc11d1e20b2d diff --git a/ant/Pkgfile b/ant/Pkgfile index 4746826e..f7bb548b 100644 --- a/ant/Pkgfile +++ b/ant/Pkgfile @@ -1,11 +1,10 @@ # Description: Ant is a Java-based build tool. # URL: http://ant.apache.org/ -# Packager: Rune Stokka, rune at stokka dot no # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: jdk name=ant -version=1.10.3 +version=1.10.5 release=1 source=(https://www.apache.org/dist/ant/binaries/apache-$name-$version-bin.…

1 0

ports/contrib (3.5): net-snmp: updated to 5.8
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit a554e3c9c1b2a57d07dd3271a6bc9246994c9098 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sat Aug 4 19:47:18 2018 +0200 net-snmp: updated to 5.8 diff --git a/net-snmp/.footprint b/net-snmp/.footprint index 80554bee..3c1ab2b1 100644 --- a/net-snmp/.footprint +++ b/net-snmp/.footprint @@ -6,6 +6,7 @@ drwxr-xr-x root/root etc/snmp/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/agentxtrap +-rwxr-xr-x root/root usr/bin/checkbandwidth -rwxr-xr-x root/root usr/bin/encode_keychange -rwxr-xr-x root/root usr/bin/fixproc -rwxr-xr-x root/root usr/bin/ipf-mod.pl @@ -25,10 +26,14 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/snmpgetnext lrwxrwxrwx root/root usr/bin/snmpinform -> snmptrap -rwxr-xr-x root/root usr/bin/snmpnetstat +-rwxr-xr-x root/root usr/bin/snmppcap +-rwxr-xr-x root/root usr/bin/snmpping +-rwxr-xr-x root/root usr/bin/snmpps -rwxr-xr-x root/root usr/bin/snmpset -rwxr-xr-x root/root usr/bin/snmpstatus -rwxr-xr-x root/root usr/bin/snmptable -rwxr-xr-x root/root usr/bin/snmptest +lrwxrwxrwx root/root usr/bin/snmptop -> snmpps -rwxr-xr-x root/root usr/bin/snmptranslate -rwxr-xr-x root/root usr/bin/snmptrap -rwxr-xr-x root/root usr/bin/snmpusm @@ -62,6 +67,7 @@ drwxr-xr-x root/root usr/include/net-snmp/agent/ -rw-r--r-- root/root usr/include/net-snmp/agent/mode_end_call.h -rw-r--r-- root/root usr/include/net-snmp/agent/multiplexer.h -rw-r--r-- root/root usr/include/net-snmp/agent/net-snmp-agent-includes.h +-rw-r--r-- root/root usr/include/net-snmp/agent/netsnmp_close_fds.h -rw-r--r-- root/root usr/include/net-snmp/agent/null.h -rw-r--r-- root/root usr/include/net-snmp/agent/old_api.h -rw-r--r-- root/root usr/include/net-snmp/agent/read_only.h @@ -117,6 +123,7 @@ drwxr-xr-x root/root usr/include/net-snmp/library/ -rw-r--r-- root/root usr/include/net-snmp/library/md5.h -rw-r--r-- root/root usr/include/net-snmp/library/mib.h -rw-r--r-- root/root usr/include/net-snmp/library/mt_support.h +-rw-r--r-- root/root usr/include/net-snmp/library/netsnmp-attribute-format.h -rw-r--r-- root/root usr/include/net-snmp/library/oid.h -rw-r--r-- root/root usr/include/net-snmp/library/oid_stash.h -rw-r--r-- root/root usr/include/net-snmp/library/parse.h @@ -127,12 +134,15 @@ drwxr-xr-x root/root usr/include/net-snmp/library/ -rw-r--r-- root/root usr/include/net-snmp/library/snmpAliasDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpCallbackDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpIPv4BaseDomain.h +-rw-r--r-- root/root usr/include/net-snmp/library/snmpIPv6BaseDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpSocketBaseDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpTCPBaseDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpTCPDomain.h +-rw-r--r-- root/root usr/include/net-snmp/library/snmpTCPIPv6Domain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpUDPBaseDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpUDPDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h +-rw-r--r-- root/root usr/include/net-snmp/library/snmpUDPIPv6Domain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmpUnixDomain.h -rw-r--r-- root/root usr/include/net-snmp/library/snmp_alarm.h -rw-r--r-- root/root usr/include/net-snmp/library/snmp_api.h @@ -177,6 +187,13 @@ drwxr-xr-x root/root usr/include/net-snmp/system/ -rw-r--r-- root/root usr/include/net-snmp/system/cygwin.h -rw-r--r-- root/root usr/include/net-snmp/system/darwin.h -rw-r--r-- root/root usr/include/net-snmp/system/darwin10.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin11.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin12.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin13.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin14.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin15.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin16.h +-rw-r--r-- root/root usr/include/net-snmp/system/darwin17.h -rw-r--r-- root/root usr/include/net-snmp/system/darwin7.h -rw-r--r-- root/root usr/include/net-snmp/system/darwin8.h -rw-r--r-- root/root usr/include/net-snmp/system/darwin9.h @@ -197,13 +214,17 @@ drwxr-xr-x root/root usr/include/net-snmp/system/ -rw-r--r-- root/root usr/include/net-snmp/system/generic.h -rw-r--r-- root/root usr/include/net-snmp/system/hpux.h -rw-r--r-- root/root usr/include/net-snmp/system/irix.h +-rw-r--r-- root/root usr/include/net-snmp/system/kfreebsd.h -rw-r--r-- root/root usr/include/net-snmp/system/linux.h -rw-r--r-- root/root usr/include/net-snmp/system/mingw32.h +-rw-r--r-- root/root usr/include/net-snmp/system/mingw32msvc.h -rw-r--r-- root/root usr/include/net-snmp/system/mips.h -rw-r--r-- root/root usr/include/net-snmp/system/netbsd.h +-rw-r--r-- root/root usr/include/net-snmp/system/nto-qnx6.h -rw-r--r-- root/root usr/include/net-snmp/system/openbsd.h -rw-r--r-- root/root usr/include/net-snmp/system/openbsd4.h -rw-r--r-- root/root usr/include/net-snmp/system/openbsd5.h +-rw-r--r-- root/root usr/include/net-snmp/system/openbsd6.h -rw-r--r-- root/root usr/include/net-snmp/system/osf5.h -rw-r--r-- root/root usr/include/net-snmp/system/solaris.h -rw-r--r-- root/root usr/include/net-snmp/system/solaris2.3.h @@ -221,29 +242,29 @@ drwxr-xr-x root/root usr/include/net-snmp/system/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libnetsnmp.a -rwxr-xr-x root/root usr/lib/libnetsnmp.la -lrwxrwxrwx root/root usr/lib/libnetsnmp.so -> libnetsnmp.so.30.0.3 -lrwxrwxrwx root/root usr/lib/libnetsnmp.so.30 -> libnetsnmp.so.30.0.3 --rwxr-xr-x root/root usr/lib/libnetsnmp.so.30.0.3 +lrwxrwxrwx root/root usr/lib/libnetsnmp.so -> libnetsnmp.so.35.0.0 +lrwxrwxrwx root/root usr/lib/libnetsnmp.so.35 -> libnetsnmp.so.35.0.0 +-rwxr-xr-x root/root usr/lib/libnetsnmp.so.35.0.0 -rw-r--r-- root/root usr/lib/libnetsnmpagent.a -rwxr-xr-x root/root usr/lib/libnetsnmpagent.la -lrwxrwxrwx root/root usr/lib/libnetsnmpagent.so -> libnetsnmpagent.so.30.0.3 -lrwxrwxrwx root/root usr/lib/libnetsnmpagent.so.30 -> libnetsnmpagent.so.30.0.3 --rwxr-xr-x root/root usr/lib/libnetsnmpagent.so.30.0.3 +lrwxrwxrwx root/root usr/lib/libnetsnmpagent.so -> libnetsnmpagent.so.35.0.0 +lrwxrwxrwx root/root usr/lib/libnetsnmpagent.so.35 -> libnetsnmpagent.so.35.0.0 +-rwxr-xr-x root/root usr/lib/libnetsnmpagent.so.35.0.0 -rw-r--r-- root/root usr/lib/libnetsnmphelpers.a -rwxr-xr-x root/root usr/lib/libnetsnmphelpers.la -lrwxrwxrwx root/root usr/lib/libnetsnmphelpers.so -> libnetsnmphelpers.so.30.0.3 -lrwxrwxrwx root/root usr/lib/libnetsnmphelpers.so.30 -> libnetsnmphelpers.so.30.0.3 --rwxr-xr-x root/root usr/lib/libnetsnmphelpers.so.30.0.3 +lrwxrwxrwx root/root usr/lib/libnetsnmphelpers.so -> libnetsnmphelpers.so.35.0.0 +lrwxrwxrwx root/root usr/lib/libnetsnmphelpers.so.35 -> libnetsnmphelpers.so.35.0.0 +-rwxr-xr-x root/root usr/lib/libnetsnmphelpers.so.35.0.0 -rw-r--r-- root/root usr/lib/libnetsnmpmibs.a -rwxr-xr-x root/root usr/lib/libnetsnmpmibs.la -lrwxrwxrwx root/root usr/lib/libnetsnmpmibs.so -> libnetsnmpmibs.so.30.0.3 -lrwxrwxrwx root/root usr/lib/libnetsnmpmibs.so.30 -> libnetsnmpmibs.so.30.0.3 --rwxr-xr-x root/root usr/lib/libnetsnmpmibs.so.30.0.3 +lrwxrwxrwx root/root usr/lib/libnetsnmpmibs.so -> libnetsnmpmibs.so.35.0.0 +lrwxrwxrwx root/root usr/lib/libnetsnmpmibs.so.35 -> libnetsnmpmibs.so.35.0.0 +-rwxr-xr-x root/root usr/lib/libnetsnmpmibs.so.35.0.0 -rw-r--r-- root/root usr/lib/libnetsnmptrapd.a -rwxr-xr-x root/root usr/lib/libnetsnmptrapd.la -lrwxrwxrwx root/root usr/lib/libnetsnmptrapd.so -> libnetsnmptrapd.so.30.0.3 -lrwxrwxrwx root/root usr/lib/libnetsnmptrapd.so.30 -> libnetsnmptrapd.so.30.0.3 --rwxr-xr-x root/root usr/lib/libnetsnmptrapd.so.30.0.3 +lrwxrwxrwx root/root usr/lib/libnetsnmptrapd.so -> libnetsnmptrapd.so.35.0.0 +lrwxrwxrwx root/root usr/lib/libnetsnmptrapd.so.35 -> libnetsnmptrapd.so.35.0.0 +-rwxr-xr-x root/root usr/lib/libnetsnmptrapd.so.35.0.0 drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/5.26/ drwxr-xr-x root/root usr/lib/perl5/5.26/linux-thread-multi/ @@ -251,7 +272,7 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.26/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/Bundle/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/Bundle/Makefile.subs.pl +-r--r--r-- root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/Bundle/MakefileSubs.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/NetSNMP/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/NetSNMP/ASN.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.26/linux-thread-multi/NetSNMP/OID.pm @@ -308,10 +329,12 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/snmpgetnext.1.gz -rw-r--r-- root/root usr/man/man1/snmpinform.1.gz -rw-r--r-- root/root usr/man/man1/snmpnetstat.1.gz +-rw-r--r-- root/root usr/man/man1/snmpps.1.gz -rw-r--r-- root/root usr/man/man1/snmpset.1.gz -rw-r--r-- root/root usr/man/man1/snmpstatus.1.gz -rw-r--r-- root/root usr/man/man1/snmptable.1.gz -rw-r--r-- root/root usr/man/man1/snmptest.1.gz +-rw-r--r-- root/root usr/man/man1/snmptop.1.gz -rw-r--r-- root/root usr/man/man1/snmptranslate.1.gz -rw-r--r-- root/root usr/man/man1/snmptrap.1.gz -rw-r--r-- root/root usr/man/man1/snmpusm.1.gz @@ -525,6 +548,7 @@ drwxr-xr-x root/root usr/share/snmp/mib2c-data/ -rw-r--r-- root/root usr/share/snmp/mib2c.mfd.conf -rw-r--r-- root/root usr/share/snmp/mib2c.notify.conf -rw-r--r-- root/root usr/share/snmp/mib2c.old-api.conf +-rw-r--r-- root/root usr/share/snmp/mib2c.org-mode.conf -rw-r--r-- root/root usr/share/snmp/mib2c.perl.conf -rw-r--r-- root/root usr/share/snmp/mib2c.raw-table.conf -rw-r--r-- root/root usr/share/snmp/mib2c.scalar.conf @@ -580,6 +604,7 @@ drwxr-xr-x root/root usr/share/snmp/mibs/ -rw-r--r-- root/root usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -rw-r--r-- root/root usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt -rw-r--r-- root/root usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt +-rw-r--r-- root/root usr/share/snmp/mibs/SNMP-USM-HMAC-SHA2-MIB.txt -rw-r--r-- root/root usr/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -rw-r--r-- root/root usr/share/snmp/mibs/SNMPv2-CONF.txt -rw-r--r-- root/root usr/share/snmp/mibs/SNMPv2-MIB.txt diff --git a/net-snmp/.md5sum b/net-snmp/.md5sum deleted file mode 100644 index 7b67e526..00000000 --- a/net-snmp/.md5sum +++ /dev/null @@ -1,6 +0,0 @@ -aea518953798008a1db91951eefd8da8 0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch -ebbb1fa141e14932882f6c747f3fe4b4 0001-Remove-U64-typedef.patch -fcbab0e8e6c5cc76da637d1d71aaec3b CVE-2018-1000116.patch -d4a3459e1577d0efa8d96ca70a885e53 net-snmp-5.7.3.tar.gz -0ac35ebc69c521313cf0c24b9afb3b22 snmpd -e75939cb0b4648856d07b9c04610af5d snmpd.conf diff --git a/net-snmp/.signature b/net-snmp/.signature index 859a3a69..2d431df0 100644 --- a/net-snmp/.signature +++ b/net-snmp/.signature @@ -1,10 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/Rvzv16A46oD8b9aHaV4XK2ytLDBytIkGzud97TjDkYM0ez2z9eR+VdHQkQoQysKMHz6mgP0jfDeZ13Xy7B4QY= -SHA256 (Pkgfile) = 6597db3298de9e37c021ee96851f67e9a349758a8505b536927e6c3beac2644a -SHA256 (.footprint) = afd799aa2193c96e57af5dd80a1005038de627c33541191580a8352f6c1b5a44 -SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 +RWSagIOpLGJF3//Is6YXl13RgJ/Avg9ISP0Y2Gsr29/a2fTX7+s5zzTy5mGmvs7Ywoa1LbVfY+nD6K76tat9KnZzWABaCAHzWQk= +SHA256 (Pkgfile) = c3064a29e53532fe87cdf8dec286f521c4877fd6b4c54c51da956170487ccf47 +SHA256 (.footprint) = 2f1a17e25d5343b033933840155988f8cf34c1d6c8f3a8b3a9191a81140ee905 +SHA256 (net-snmp-5.8.tar.gz) = b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf SHA256 (snmpd) = 2f8945dd66668cccd4ad884bbc1f425dfb5ace1261a5c410182222c928f54a34 SHA256 (snmpd.conf) = fc23c35aa4e275456cb9e7e1a4c2af06a9ec089126932a98aef39093a3c33e3e -SHA256 (0001-Remove-U64-typedef.patch) = 5ba67c44ec792c6509e9f91bc2561b7c74231c7123b67e4f45b997ea6b3fa4ec -SHA256 (0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch) = 77b9bf66b7f4ee6be486c945602fcbcf37d48a7b2514f3c9ba1e49550f4cab96 -SHA256 (CVE-2018-1000116.patch) = 49b1c3509d53b1346c10282c29ac8e2020d40921f7287017ce4f24e06c0a301d diff --git a/net-snmp/0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch b/net-snmp/0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch deleted file mode 100644 index c57b2a46..00000000 --- a/net-snmp/0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 4e793461e96a2b4fd81142ab312d074d5c8841fa Mon Sep 17 00:00:00 2001 -From: Bart Van Assche <bvanassche(a)acm.org> -Date: Sat, 23 Jul 2016 18:41:10 -0700 -Subject: [PATCH] CHANGES: BUG: 2712: Fix Perl module compilation - -Avoid that building the Net-SNMP Perl modules fails as follows: - -ERROR from evaluation of /sources/net-snmp-5.7.3/perl/ASN/Makefile.PL: Bizarre \ copy of HASH in list assignment at /usr/lib/perl5/site_perl/5.24.0/Carp.pm line\ 229. - -See also https://sourceforge.net/p/net-snmp/bugs/2712/. ---- - perl/ASN/Makefile.PL | 4 +--- - perl/Makefile.PL | 4 +--- - perl/OID/Makefile.PL | 5 +---- - perl/SNMP/Makefile.PL | 5 +---- - perl/TrapReceiver/Makefile.PL | 5 +---- - perl/agent/Makefile.PL | 5 +---- - perl/agent/Support/Makefile.PL | 5 +---- - perl/agent/default_store/Makefile.PL | 5 +---- - perl/default_store/Makefile.PL | 6 +----- - 9 files changed, 9 insertions(+), 35 deletions(-) - -diff --git a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL -index f895a41..0e52b3a 100644 ---- a/perl/ASN/Makefile.PL -+++ b/perl/ASN/Makefile.PL -@@ -7,9 +7,7 @@ my $lib_version; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/Makefile.PL b/perl/Makefile.PL -index f70f991..ac36c15 100644 ---- a/perl/Makefile.PL -+++ b/perl/Makefile.PL -@@ -3,9 +3,7 @@ use Config; - use Getopt::Long; - require 5; - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - sub InitMakeParams { - $nsconfig="net-snmp-config"; # in path by default -diff --git a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL -index 5d94338..676c439 100644 ---- a/perl/OID/Makefile.PL -+++ b/perl/OID/Makefile.PL -@@ -6,11 +6,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL -index 928cb67..d7b5a2a 100644 ---- a/perl/SNMP/Makefile.PL -+++ b/perl/SNMP/Makefile.PL -@@ -3,15 +3,12 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - my $opts; - - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL -index 5c9463a..0af6aaf 100644 ---- a/perl/TrapReceiver/Makefile.PL -+++ b/perl/TrapReceiver/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL -index b4b358a..fe105ea 100644 ---- a/perl/agent/Makefile.PL -+++ b/perl/agent/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL -index 3a4f200..0dcb3f6 100644 ---- a/perl/agent/Support/Makefile.PL -+++ b/perl/agent/Support/Makefile.PL -@@ -3,14 +3,11 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL -index 67d5ff0..5c6a5d6 100644 ---- a/perl/agent/default_store/Makefile.PL -+++ b/perl/agent/default_store/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL -index 54996ab..221d4ed 100644 ---- a/perl/default_store/Makefile.PL -+++ b/perl/default_store/Makefile.PL -@@ -3,12 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); -- --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); - -+WriteMakefile(InitMakeParams()); - - sub InitMakeParams { - my $opts; --- -2.10.0 - diff --git a/net-snmp/0001-Remove-U64-typedef.patch b/net-snmp/0001-Remove-U64-typedef.patch deleted file mode 100644 index 8d313bb7..00000000 --- a/net-snmp/0001-Remove-U64-typedef.patch +++ /dev/null @@ -1,2519 +0,0 @@ -From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche <bvanassche(a)acm.org> -Date: Sat, 20 Feb 2016 18:58:18 -0800 -Subject: [PATCH] Remove U64 typedef - -The U64 typedef conflicts with a typedef in a Perl header file. Hence -remove the U64 typedef from the Net-SNMP header files. This patch does -not modify the Net-SNMP ABI. ---- - agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +- - agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +- - .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +- - .../ip-mib/data_access/systemstats_common.c | 2 +- - .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +- - .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +- - .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +- - .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +- - .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++------------------- - .../ipSystemStatsTable_interface.c | 56 +- - include/net-snmp/data_access/ipstats.h | 42 +- - include/net-snmp/library/int64.h | 34 +- - snmplib/int64.c | 38 +- - snmplib/read_config.c | 6 +- - testing/fulltests/unit-tests/T015int64_clib.c | 10 +- - 15 files changed, 274 insertions(+), 1071 deletions(-) - -diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.c b/agent/mibgroup/if-mib/ifXTable/ifXTable.c -index bb3e736..0c952ba 100644 ---- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c -+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.c -@@ -722,7 +722,7 @@ The total number of octets received on the interface, - */ - int - ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInOctets_val_ptr) -+ struct counter64 *ifHCInOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCInOctets_val_ptr); -@@ -779,7 +779,7 @@ The number of packets, delivered by this sub-layer to a - */ - int - ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInUcastPkts_val_ptr) -+ struct counter64 *ifHCInUcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); -@@ -838,7 +838,7 @@ The number of packets, delivered by this sub-layer to a - */ - int - ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInMulticastPkts_val_ptr) -+ struct counter64 *ifHCInMulticastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); -@@ -897,7 +897,7 @@ The number of packets, delivered by this sub-layer to a - */ - int - ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInBroadcastPkts_val_ptr) -+ struct counter64 *ifHCInBroadcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); -@@ -955,7 +955,7 @@ The total number of octets transmitted out of the - */ - int - ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutOctets_val_ptr) -+ struct counter64 *ifHCOutOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCOutOctets_val_ptr); -@@ -1013,7 +1013,7 @@ The total number of packets that higher-level protocols - */ - int - ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutUcastPkts_val_ptr) -+ struct counter64 *ifHCOutUcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); -@@ -1074,7 +1074,7 @@ The total number of packets that higher-level protocols - */ - int - ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutMulticastPkts_val_ptr) -+ struct counter64 *ifHCOutMulticastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); -@@ -1134,7 +1134,7 @@ The total number of packets that higher-level protocols - */ - int - ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutBroadcastPkts_val_ptr) -+ struct counter64 *ifHCOutBroadcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); -diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.h b/agent/mibgroup/if-mib/ifXTable/ifXTable.h -index ba22f97..925af13 100644 ---- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h -+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.h -@@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_data_access) - u_long * - ifOutBroadcastPkts_val_ptr); - int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInOctets_val_ptr); -+ struct counter64 *ifHCInOctets_val_ptr); - int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCInUcastPkts_val_ptr); -+ struct counter64 *ifHCInUcastPkts_val_ptr); - int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ifHCInMulticastPkts_val_ptr); - int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ifHCInBroadcastPkts_val_ptr); - int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutOctets_val_ptr); -+ struct counter64 *ifHCOutOctets_val_ptr); - int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 * ifHCOutUcastPkts_val_ptr); -+ struct counter64 *ifHCOutUcastPkts_val_ptr); - int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ifHCOutMulticastPkts_val_ptr); - int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ifHCOutBroadcastPkts_val_ptr); - int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * - rowreq_ctx, -@@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_data_access) - - int ifHCInOctets_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCInOctets_val); -+ struct counter64 ifHCInOctets_val); - int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 ifHCInOctets_val); -+ struct counter64 ifHCInOctets_val); - int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); - - int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCInUcastPkts_val); -+ struct counter64 ifHCInUcastPkts_val); - int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 ifHCInUcastPkts_val); -+ struct counter64 ifHCInUcastPkts_val); - int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); - - int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 -+ struct counter64 - ifHCInMulticastPkts_val); - int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCInMulticastPkts_val); -+ struct counter64 ifHCInMulticastPkts_val); - int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * - rowreq_ctx); - - int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 -+ struct counter64 - ifHCInBroadcastPkts_val); - int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCInBroadcastPkts_val); -+ struct counter64 ifHCInBroadcastPkts_val); - int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * - rowreq_ctx); - - int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCOutOctets_val); -+ struct counter64 ifHCOutOctets_val); - int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 ifHCOutOctets_val); -+ struct counter64 ifHCOutOctets_val); - int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); - - int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCOutUcastPkts_val); -+ struct counter64 ifHCOutUcastPkts_val); - int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, -- U64 ifHCOutUcastPkts_val); -+ struct counter64 ifHCOutUcastPkts_val); - int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * - rowreq_ctx); - - int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 -+ struct counter64 - ifHCOutMulticastPkts_val); - int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCOutMulticastPkts_val); -+ struct counter64 ifHCOutMulticastPkts_val); - int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * - rowreq_ctx); - - int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 -+ struct counter64 - ifHCOutBroadcastPkts_val); - int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * - rowreq_ctx); - int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * - rowreq_ctx, -- U64 ifHCOutBroadcastPkts_val); -+ struct counter64 ifHCOutBroadcastPkts_val); - int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * - rowreq_ctx); - -diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c -index 23b50d0..e561842 100644 ---- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c -+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c -@@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx * rowreq_ctx, - * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCINOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCINUCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCINMULTICASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCINBROADCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCOUTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCOUTUCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCOUTMULTICASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* - * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IFHCOUTBROADCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* -diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_common.c b/agent/mibgroup/ip-mib/data_access/systemstats_common.c -index 29109bd..7434b3a 100644 ---- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c -+++ b/agent/mibgroup/ip-mib/data_access/systemstats_common.c -@@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_entry * entry) - && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] - && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { - -- U64 tmp, tmp2, tmp3; -+ struct counter64 tmp, tmp2, tmp3; - tmp = entry->stats.HCOutRequests; - u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); - u64Incr(&tmp, &entry->stats.HCOutFragCreates); -diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c -index db673dc..fec36b2 100644 ---- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c -+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c -@@ -270,7 +270,7 @@ The total number of input IP datagrams received, including - */ - int - ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInReceives_val_ptr) -+ struct counter64 *ipIfStatsHCInReceives_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); -@@ -395,7 +395,7 @@ The total number of octets received in input IP datagrams, - */ - int - ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInOctets_val_ptr) -+ struct counter64 *ipIfStatsHCInOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); -@@ -862,7 +862,7 @@ The number of input datagrams for which this entity was not - */ - int - ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInForwDatagrams_val_ptr) -+ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); -@@ -1267,7 +1267,7 @@ The total number of datagrams successfully delivered to IP - */ - int - ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInDelivers_val_ptr) -+ struct counter64 *ipIfStatsHCInDelivers_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); -@@ -1396,7 +1396,7 @@ The total number of IP datagrams that local IP user- - */ - int - ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutRequests_val_ptr) -+ struct counter64 *ipIfStatsHCOutRequests_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); -@@ -1532,7 +1532,7 @@ The number of datagrams for which this entity was not their - */ - int - ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutForwDatagrams_val_ptr) -+ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); -@@ -1999,7 +1999,7 @@ The total number of IP datagrams that this entity supplied - */ - int - ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutTransmits_val_ptr) -+ struct counter64 *ipIfStatsHCOutTransmits_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); -@@ -2123,7 +2123,7 @@ The total number of octets in IP datagrams delivered to the - */ - int - ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutOctets_val_ptr) -+ struct counter64 *ipIfStatsHCOutOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); -@@ -2245,7 +2245,7 @@ The number of IP multicast datagrams received. This object - */ - int - ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInMcastPkts_val_ptr) -+ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); -@@ -2372,7 +2372,7 @@ The total number of octets received in IP multicast - */ - int - ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInMcastOctets_val_ptr) -+ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); -@@ -2497,7 +2497,7 @@ The number of IP multicast datagrams transmitted. This - */ - int - ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutMcastPkts_val_ptr) -+ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); -@@ -2621,7 +2621,7 @@ The total number of octets transmitted in IP multicast - */ - int - ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutMcastOctets_val_ptr) -+ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); -@@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams received. This object - */ - int - ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCInBcastPkts_val_ptr) -+ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); -@@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams transmitted. This - */ - int - ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipIfStatsHCOutBcastPkts_val_ptr) -+ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); -diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h -index 0cc7e47..ad5d8a0 100644 ---- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h -+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h -@@ -50,7 +50,7 @@ extern "C" { - ipIfStatsInReceives_val_ptr); - int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInReceives_val_ptr); - int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -58,7 +58,7 @@ extern "C" { - ipIfStatsInOctets_val_ptr); - int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInOctets_val_ptr); - int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -87,7 +87,7 @@ extern "C" { - int - ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInForwDatagrams_val_ptr); - int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -111,7 +111,7 @@ extern "C" { - ipIfStatsInDelivers_val_ptr); - int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInDelivers_val_ptr); - int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -119,7 +119,7 @@ extern "C" { - ipIfStatsOutRequests_val_ptr); - int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutRequests_val_ptr); - int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx - * rowreq_ctx, -@@ -128,7 +128,7 @@ extern "C" { - int - ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutForwDatagrams_val_ptr); - int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -156,7 +156,7 @@ extern "C" { - ipIfStatsOutTransmits_val_ptr); - int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutTransmits_val_ptr); - int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -164,7 +164,7 @@ extern "C" { - ipIfStatsOutOctets_val_ptr); - int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutOctets_val_ptr); - int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -172,7 +172,7 @@ extern "C" { - ipIfStatsInMcastPkts_val_ptr); - int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInMcastPkts_val_ptr); - int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -180,7 +180,7 @@ extern "C" { - ipIfStatsInMcastOctets_val_ptr); - int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx - * rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInMcastOctets_val_ptr); - int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -188,7 +188,7 @@ extern "C" { - ipIfStatsOutMcastPkts_val_ptr); - int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutMcastPkts_val_ptr); - int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -196,7 +196,7 @@ extern "C" { - ipIfStatsOutMcastOctets_val_ptr); - int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx - * rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutMcastOctets_val_ptr); - int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -204,7 +204,7 @@ extern "C" { - ipIfStatsInBcastPkts_val_ptr); - int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCInBcastPkts_val_ptr); - int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -@@ -212,7 +212,7 @@ extern "C" { - ipIfStatsOutBcastPkts_val_ptr); - int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipIfStatsHCOutBcastPkts_val_ptr); - int - ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * -diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c -index 559d1c1..4955a8b 100644 ---- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c -+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c -@@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINRECEIVES: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInReceives_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* -@@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINDELIVERS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInDelivers_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTREQUESTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutRequests_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTTRANSMITS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; -- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); -+ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); - break; - - /* -@@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINMCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINMCASTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTMCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCINBCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, - * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPIFSTATSHCOUTBCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c -index 10587e2..5a9323f 100644 ---- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c -+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c -@@ -452,7 +452,7 @@ The total number of input IP datagrams received, including - */ - int - ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCInReceives_val_ptr) -+ struct counter64 *ipSystemStatsHCInReceives_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); -@@ -579,7 +579,7 @@ The total number of octets received in input IP datagrams, - */ - int - ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCInOctets_val_ptr) -+ struct counter64 *ipSystemStatsHCInOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); -@@ -1058,7 +1058,7 @@ The number of input datagrams for which this entity was not - int - ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInForwDatagrams_val_ptr) - { - /** we should have a non-NULL pointer */ -@@ -1474,7 +1474,7 @@ The total number of datagrams successfully delivered to IP - */ - int - ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCInDelivers_val_ptr) -+ struct counter64 *ipSystemStatsHCInDelivers_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); -@@ -1602,7 +1602,7 @@ The total number of IP datagrams which local IP user- - */ - int - ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCOutRequests_val_ptr) -+ struct counter64 *ipSystemStatsHCOutRequests_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); -@@ -1809,7 +1809,7 @@ The number of datagrams for which this entity was not their - int - ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutForwDatagrams_val_ptr) - { - /** we should have a non-NULL pointer */ -@@ -2288,7 +2288,7 @@ The total number of IP datagrams that this entity supplied - */ - int - ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCOutTransmits_val_ptr) -+ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); -@@ -2415,7 +2415,7 @@ The total number of octets in IP datagrams delivered to the - */ - int - ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCOutOctets_val_ptr) -+ struct counter64 *ipSystemStatsHCOutOctets_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); -@@ -2539,7 +2539,7 @@ The number of IP multicast datagrams received. This object - */ - int - ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCInMcastPkts_val_ptr) -+ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); -@@ -2665,7 +2665,7 @@ The total number of octets received in IP multicast - int - ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInMcastOctets_val_ptr) - { - /** we should have a non-NULL pointer */ -@@ -2790,7 +2790,7 @@ The number of IP multicast datagrams transmitted. This - */ - int - ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCOutMcastPkts_val_ptr) -+ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); -@@ -2921,7 +2921,7 @@ The total number of octets transmitted in IP multicast - int - ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutMcastOctets_val_ptr) - { - /** we should have a non-NULL pointer */ -@@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams received. This object - */ - int - ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCInBcastPkts_val_ptr) -+ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); -@@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams transmitted. This - */ - int - ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, -- U64 * ipSystemStatsHCOutBcastPkts_val_ptr) -+ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) - { - /** we should have a non-NULL pointer */ - netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); -diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h -index ca1e1f3..5c3823e 100644 ---- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h -+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h -@@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) - ********************************************************************* - * function prototypes - */ -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * -+ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * - user_context); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsTable_post_request(ipSystemStatsTable_registration * -+ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * - user_context, int rc); - -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - void *user_init_ctx); - void -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx - * rowreq_ctx); - - ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); - void ipSystemStatsTable_release_data(ipSystemStatsTable_data - * data); -- -- -- -- -- -- -- -- -- ipSystemStatsTable_rowreq_ctx -+ ipSystemStatsTable_rowreq_ctx - * ipSystemStatsTable_row_find_by_mib_index - (ipSystemStatsTable_mib_index * mib_idx); - -@@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) - * indexes - */ - -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInReceives_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInReceives_val_ptr); - int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx - * rowreq_ctx, - u_long * - ipSystemStatsInOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * ipSystemStatsHCInOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * -+ struct counter64 *ipSystemStatsHCInOctets_val_ptr); -+ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInHdrErrors_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInNoRoutes_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInAddrErrors_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInUnknownProtos_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInTruncatedPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInForwDatagrams_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInForwDatagrams_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsReasmReqds_val_ptr); -@@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) - * rowreq_ctx, - u_long * - ipSystemStatsReasmOKs_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsReasmFails_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInDiscards_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInDelivers_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInDelivers_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutRequests_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutRequests_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutNoRoutes_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutForwDatagrams_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutForwDatagrams_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutDiscards_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutFragReqds_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutFragOKs_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutFragFails_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutFragCreates_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutTransmits_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutTransmits_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInMcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInMcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInMcastOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInMcastOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutMcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutMcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutMcastOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutMcastOctets_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsInBcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCInBcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsOutBcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, -- U64 * -+ struct counter64 * - ipSystemStatsHCOutBcastPkts_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsDiscontinuityTime_val_ptr); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long * - ipSystemStatsRefreshRate_val_ptr); -- -- -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index -+ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index - * tbl_idx, - u_long - ipSystemStatsIPVersion_val); -- int -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * -+ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * - rowreq_ctx, - u_long ipSystemStatsIPVersion_val); - -- -- - /* - ********************************************************************* - * SET function declarations -diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c -index e1ca2cb..09c061f 100644 ---- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c -+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c -@@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINRECEIVES: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInReceives_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINDELIVERS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -@@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, - * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h - */ - case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: -- var->val_len = sizeof(U64); -+ var->val_len = sizeof(struct counter64); - var->type = ASN_COUNTER64; - rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, -- (U64 *) var->val.string); -+ (struct counter64 *) var->val.string); - break; - - /* -diff --git a/include/net-snmp/data_access/ipstats.h b/include/net-snmp/data_access/ipstats.h -index f782459..f0df46b 100644 ---- a/include/net-snmp/data_access/ipstats.h -+++ b/include/net-snmp/data_access/ipstats.h -@@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { - * other columns, when underlying OS does not provide them. - * Always fill at least 32 bits, the table is periodically polled -> 32 bit - * overflow shall be detected and 64 bit value should be computed automatically. */ -- U64 HCInReceives; -- U64 HCInOctets; -+ struct counter64 HCInReceives; -+ struct counter64 HCInOctets; - u_long InHdrErrors; -- U64 HCInNoRoutes; -+ struct counter64 HCInNoRoutes; - u_long InAddrErrors; - u_long InUnknownProtos; - u_long InTruncatedPkts; - - /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ -- U64 HCInForwDatagrams; -+ struct counter64 HCInForwDatagrams; - - u_long ReasmReqds; - u_long ReasmOKs; - u_long ReasmFails; - u_long InDiscards; -- U64 HCInDelivers; -- U64 HCOutRequests; -- U64 HCOutNoRoutes; -- U64 HCOutForwDatagrams; -- U64 HCOutDiscards; -+ struct counter64 HCInDelivers; -+ struct counter64 HCOutRequests; -+ struct counter64 HCOutNoRoutes; -+ struct counter64 HCOutForwDatagrams; -+ struct counter64 HCOutDiscards; - - /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ -- U64 HCOutFragReqds; -- U64 HCOutFragOKs; -- U64 HCOutFragFails; -- U64 HCOutFragCreates; -+ struct counter64 HCOutFragReqds; -+ struct counter64 HCOutFragOKs; -+ struct counter64 HCOutFragFails; -+ struct counter64 HCOutFragCreates; - - /* optional, can be computed from - * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates - * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ -- U64 HCOutTransmits; -+ struct counter64 HCOutTransmits; - -- U64 HCOutOctets; -- U64 HCInMcastPkts; -- U64 HCInMcastOctets; -- U64 HCOutMcastPkts; -- U64 HCOutMcastOctets; -- U64 HCInBcastPkts; -- U64 HCOutBcastPkts; -+ struct counter64 HCOutOctets; -+ struct counter64 HCInMcastPkts; -+ struct counter64 HCInMcastOctets; -+ struct counter64 HCOutMcastPkts; -+ struct counter64 HCOutMcastOctets; -+ struct counter64 HCInBcastPkts; -+ struct counter64 HCOutBcastPkts; - - /* Array of available columns.*/ - int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; -diff --git a/include/net-snmp/library/int64.h b/include/net-snmp/library/int64.h -index 9c7c894..3a85213 100644 ---- a/include/net-snmp/library/int64.h -+++ b/include/net-snmp/library/int64.h -@@ -5,31 +5,29 @@ - extern "C" { - #endif - -- typedef struct counter64 U64; -- - #define I64CHARSZ 21 - -- void divBy10(U64, U64 *, unsigned int *); -- void multBy10(U64, U64 *); -- void incrByU16(U64 *, unsigned int); -- void incrByU32(U64 *, unsigned int); -+ void divBy10(struct counter64, struct counter64 *, unsigned int *); -+ void multBy10(struct counter64, struct counter64 *); -+ void incrByU16(struct counter64 *, unsigned int); -+ void incrByU32(struct counter64 *, unsigned int); - NETSNMP_IMPORT -- void zeroU64(U64 *); -- int isZeroU64(const U64 *); -+ void zeroU64(struct counter64 *); -+ int isZeroU64(const struct counter64 *); - NETSNMP_IMPORT -- void printU64(char *, const U64 *); -+ void printU64(char *, const struct counter64 *); - NETSNMP_IMPORT -- void printI64(char *, const U64 *); -- int read64(U64 *, const char *); -+ void printI64(char *, const struct counter64 *); -+ int read64(struct counter64 *, const char *); - NETSNMP_IMPORT -- void u64Subtract(const U64 * pu64one, const U64 * pu64two, -- U64 * pu64out); -- void u64Incr(U64 * pu64out, const U64 * pu64one); -- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, -- const U64 * pu64two); -- void u64Copy(U64 * pu64one, const U64 * pu64two); -+ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, -+ struct counter64 *pu64out); -+ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); -+ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, -+ const struct counter64 *pu64two); -+ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); - -- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, -+ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, - int adjust); - NETSNMP_IMPORT - int netsnmp_c64_check32_and_update(struct counter64 *prev_val, -diff --git a/snmplib/int64.c b/snmplib/int64.c -index 51f1f32..951f813 100644 ---- a/snmplib/int64.c -+++ b/snmplib/int64.c -@@ -33,7 +33,7 @@ - * @param[out] puR Remainder. - */ - void --divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) -+divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) - { - unsigned long ulT; - unsigned long ulQ; -@@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) - * @param[out] pu64P Product. - */ - void --multBy10(U64 u64, U64 * pu64P) -+multBy10(struct counter64 u64, struct counter64 *pu64P) - { - unsigned long ulT; - unsigned long ulP; -@@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P) - * - */ - void --incrByU16(U64 * pu64, unsigned int u16) -+incrByU16(struct counter64 *pu64, unsigned int u16) - { - incrByU32(pu64, u16); - } -@@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16) - * - */ - void --incrByU32(U64 * pu64, unsigned int u32) -+incrByU32(struct counter64 *pu64, unsigned int u32) - { - uint32_t tmp; - -@@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32) - * @param[out] pu64out pu64one - pu64two. - */ - void --u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) -+u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) - { - int carry; - -@@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) - * @param[in,out] pu64out pu64out += pu64one. - */ - void --u64Incr(U64 * pu64out, const U64 * pu64one) -+u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) - { - pu64out->high = (uint32_t)(pu64out->high + pu64one->high); - incrByU32(pu64out, pu64one->low); -@@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64one) - * @param[out] pu64out pu64out += (pu64one - pu64two) - */ - void --u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) -+u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) - { -- U64 tmp; -+ struct counter64 tmp; - - u64Subtract(pu64one, pu64two, &tmp); - u64Incr(pu64out, &tmp); -@@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnmp_unused) - * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. - */ - void --u64Copy(U64 * pu64one, const U64 * pu64two) -+u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) - { - *pu64one = *pu64two; - } -@@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64two) - * @param[in] pu64 Number to be zeroed. - */ - void --zeroU64(U64 * pu64) -+zeroU64(struct counter64 *pu64) - { - pu64->low = 0; - pu64->high = 0; -@@ -232,7 +232,7 @@ zeroU64(U64 * pu64) - * @param[in] pu64 Number to be checked. - */ - int --isZeroU64(const U64 * pu64) -+isZeroU64(const struct counter64 *pu64) - { - return pu64->low == 0 && pu64->high == 0; - } -@@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct counter64 *prev_val, struct counter64 *new - /** Convert an unsigned 64-bit number to ASCII. */ - void - printU64(char *buf, /* char [I64CHARSZ+1]; */ -- const U64 * pu64) -+ const struct counter64 *pu64) - { -- U64 u64a; -- U64 u64b; -+ struct counter64 u64a; -+ struct counter64 u64b; - - char aRes[I64CHARSZ + 1]; - unsigned int u; -@@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1]; */ - /** Convert a signed 64-bit number to ASCII. */ - void - printI64(char *buf, /* char [I64CHARSZ+1]; */ -- const U64 * pu64) -+ const struct counter64 *pu64) - { -- U64 u64a; -+ struct counter64 u64a; - - if (pu64->high & 0x80000000) { - u64a.high = (uint32_t) ~pu64->high; -@@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1]; */ - } - } - --/** Convert a signed 64-bit integer from ASCII to U64. */ -+/** Convert a signed 64-bit integer from ASCII to struct counter64. */ - int --read64(U64 * i64, const char *str) -+read64(struct counter64 *i64, const char *str) - { -- U64 i64p; -+ struct counter64 i64p; - unsigned int u; - int sign = 0; - int ok = 0; -diff --git a/snmplib/read_config.c b/snmplib/read_config.c -index e159c27..ab5b6a3 100644 ---- a/snmplib/read_config.c -+++ b/snmplib/read_config.c -@@ -2279,10 +2279,10 @@ read_config_read_memory(int type, char *readfrom, - return readfrom; - - case ASN_COUNTER64: -- if (*len < sizeof(U64)) -+ if (*len < sizeof(struct counter64)) - return NULL; -- *len = sizeof(U64); -- read64((U64 *) dataptr, readfrom); -+ *len = sizeof(struct counter64); -+ read64((struct counter64 *) dataptr, readfrom); - readfrom = skip_token(readfrom); - return readfrom; - } -diff --git a/testing/fulltests/unit-tests/T015int64_clib.c b/testing/fulltests/unit-tests/T015int64_clib.c -index 5f5f4b6..66f66b7 100644 ---- a/testing/fulltests/unit-tests/T015int64_clib.c -+++ b/testing/fulltests/unit-tests/T015int64_clib.c -@@ -1,4 +1,4 @@ --/* HEADER Testing 64-bit integer operations (U64). */ -+/* HEADER Testing 64-bit integer operations (struct counter64). */ - - int i, j; - char buf[22]; -@@ -15,7 +15,7 @@ static const int64_t intval[] = { - }; - - for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { -- U64 a, b; -+ struct counter64 a, b; - a.low = (uint32_t)intval[i]; - a.high = (uint32_t)(intval[i] >> 32); - printI64(buf, &a); -@@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { - - for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { - for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { -- U64 a, b; -+ struct counter64 a, b; - uint64_t d; - a.low = (uint32_t)intval[i]; - a.high = (uint32_t)(intval[i] >> 32); -@@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { - - for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { - for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { -- U64 a, b, c; -+ struct counter64 a, b, c; - uint64_t d; - a.low = (uint32_t)intval[i]; - a.high = (uint32_t)(intval[i] >> 32); -@@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { - } - - { -- U64 old_val, new_val; -+ struct counter64 old_val, new_val; - old_val.low = 7; - old_val.high = 0; - new_val = old_val; --- -2.10.0 - diff --git a/net-snmp/CVE-2018-1000116.patch b/net-snmp/CVE-2018-1000116.patch deleted file mode 100644 index f33b075b..00000000 --- a/net-snmp/CVE-2018-1000116.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- a/snmplib/snmp_api.c -+++ b/snmplib/snmp_api.c -@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - u_char type; - u_char msg_type; - u_char *var_val; -- int badtype = 0; - size_t len; - size_t four; -- netsnmp_variable_list *vp = NULL; -+ netsnmp_variable_list *vp = NULL, *vplast = NULL; - oid objid[MAX_OID_LEN]; - u_char *p; - -@@ -4493,38 +4492,24 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - (ASN_SEQUENCE | ASN_CONSTRUCTOR), - "varbinds"); - if (data == NULL) -- return -1; -+ goto fail; - - /* - * get each varBind sequence - */ - while ((int) *length > 0) { -- netsnmp_variable_list *vptemp; -- vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp)); -- if (NULL == vptemp) { -- return -1; -- } -- if (NULL == vp) { -- pdu->variables = vptemp; -- } else { -- vp->next_variable = vptemp; -- } -- vp = vptemp; -+ vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list); -+ if (NULL == vp) -+ goto fail; - -- vp->next_variable = NULL; -- vp->val.string = NULL; - vp->name_length = MAX_OID_LEN; -- vp->name = NULL; -- vp->index = 0; -- vp->data = NULL; -- vp->dataFreeHook = NULL; - DEBUGDUMPSECTION("recv", "VarBind"); - data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type, - &vp->val_len, &var_val, length); - if (data == NULL) -- return -1; -+ goto fail; - if (snmp_set_var_objid(vp, objid, vp->name_length)) -- return -1; -+ goto fail; - - len = MAX_PACKET_LENGTH; - DEBUGDUMPHEADER("recv", "Value"); -@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - vp->val.string = (u_char *) malloc(vp->val_len); - } - if (vp->val.string == NULL) { -- return -1; -+ goto fail; - } - p = asn_parse_string(var_val, &len, &vp->type, vp->val.string, - &vp->val_len); -@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - vp->val_len *= sizeof(oid); - vp->val.objid = (oid *) malloc(vp->val_len); - if (vp->val.objid == NULL) { -- return -1; -+ goto fail; - } - memmove(vp->val.objid, objid, vp->val_len); - break; -@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - case ASN_BIT_STR: - vp->val.bitstring = (u_char *) malloc(vp->val_len); - if (vp->val.bitstring == NULL) { -- return -1; -+ goto fail; - } - p = asn_parse_bitstring(var_val, &len, &vp->type, - vp->val.bitstring, &vp->val_len); -@@ -4640,12 +4625,28 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char - break; - default: - snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type); -- badtype = -1; -+ goto fail; - break; - } - DEBUGINDENTADD(-4); -+ -+ if (NULL == vplast) { -+ pdu->variables = vp; -+ } else { -+ vplast->next_variable = vp; -+ } -+ vplast = vp; -+ vp = NULL; - } -- return badtype; -+ return 0; -+ -+ fail: -+ DEBUGMSGTL(("recv", "error while parsing VarBindList\n")); -+ /** if we were parsing a var, remove it from the pdu and free it */ -+ if (vp) -+ snmp_free_var(vp); -+ -+ return -1; - } - - /* diff --git a/net-snmp/Pkgfile b/net-snmp/Pkgfile index 1f67347a..b60842d5 100644 --- a/net-snmp/Pkgfile +++ b/net-snmp/Pkgfile @@ -4,22 +4,15 @@ # Depends on: lm_sensors name=net-snmp -version=5.7.3 -release=5 +version=5.8 +release=1 source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \ - snmpd snmpd.conf \ - 0001-Remove-U64-typedef.patch \ - 0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \ - CVE-2018-1000116.patch) + snmpd snmpd.conf) build() { cd $name-$version - patch -p1 -i $SRC/0001-Remove-U64-typedef.patch - patch -p1 -i $SRC/0001-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch - patch -p1 -i $SRC/CVE-2018-1000116.patch - - export NETSNMP_DONT_CHECK_VERSION=1 + #export NETSNMP_DONT_CHECK_VERSION=1 ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \

1 0

ports/contrib (3.5): vkquake: Fix Github d/l link
by crux＠crux.nu 03 Feb '19

03 Feb '19

commit 21747a87b1ce3606635820185ca4a70e28022bbd Author: Predrag Ivanović <predivan(a)mts.rs> Date: Wed Aug 1 21:45:51 2018 +0200 vkquake: Fix Github d/l link diff --git a/vkquake/.signature b/vkquake/.signature index a58c0c58..5a18f904 100644 --- a/vkquake/.signature +++ b/vkquake/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36EB0nIyNb0ihcNlWB0zP/2wvwE3ZvygUTOZvY5J9O5sdZz7VCineyc1KOoECUpHvpKtleJUT7Jz6/JhwQV7Rgk= -SHA256 (Pkgfile) = 270c49981189e7218c17ea210b6fe4f5f12b17bd0912d73ca17e28b4ce5d2b80 +RWSagIOpLGJF31Dd6yefgpf8GpFp7P/5Su1A29aK0TukuZqpg0WlQXtutTMv/da0qIg1BLYvwww3fifbMWWrbfvQb70EVtlx1wk= +SHA256 (Pkgfile) = 0c55276f864138e27d526a3aa1f1d53f69fbd90f3e5b16215a03efa6cdffc730 SHA256 (.footprint) = 66462ad5c2b551d455e2e36ea425846f55a363e089452b4421200e0a1579d841 -SHA256 (1.00.0.tar.gz) = b0c5420d6f5c71ed032232729fc73537588267a187bea5f29681dc2d51d8712f +SHA256 (vkQuake-1.00.0.tar.gz) = b0c5420d6f5c71ed032232729fc73537588267a187bea5f29681dc2d51d8712f SHA256 (vkquake.desktop) = 022f8eac6de5dd75dc8c6be403fdfda3eaca44e13941c49cd48eeacb1be57385 SHA256 (vkquake.png) = 571ab4f163b31f1f56de2b5b9103cf1b48a4baf4f0ef9514bb4b2da6ba899755 diff --git a/vkquake/Pkgfile b/vkquake/Pkgfile index 2ee9dfb3..3e7b96f4 100644 --- a/vkquake/Pkgfile +++ b/vkquake/Pkgfile @@ -6,7 +6,7 @@ name=vkquake version=1.00.0 release=1 -source=(https://github.com/Novum/vkQuake/archive/$version.tar.gz +source=(https://github.com/Novum/vkQuake/archive/$version/vkQuake-$version.tar.gz vkquake.desktop vkquake.png)

1 0