Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dreibh/hipercontracer
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreibh
dreibh committed Dec 20, 2024
2 parents ee6729d + b989dc6 commit 86fbde2
Show file tree
Hide file tree
Showing 6 changed files with 193 additions and 38 deletions.
3 changes: 1 addition & 2 deletions freebsd/hipercontracer/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PORTNAME= hipercontracer
DISTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= benchmarks
MASTER_SITES= https://www.nntb.no/~dreibh/hipercontracer/download/

Expand Down Expand Up @@ -74,7 +73,7 @@ IMPPGSQL_MAKE_BOOL= ENABLE_BACKEND_POSTGRESQL
IMPPGSQL_LIB_DEPENDS= libpqxx.so:databases/postgresql-libpqxx

IMPMONGO_CMAKE_BOOL= ENABLE_BACKEND_MONGODB
IMPMONGO_LIB_DEPENDS= libmongo-c-driver.so:devel/mongo-c-driver
IMPMONGO_LIB_DEPENDS= libmongoc-1.0.so:devel/mongo-c-driver

ICONS_CMAKE_BOOL= WITH_ICONS
ICONS_BUILD_DEPENDS= gm:graphics/GraphicsMagick \
Expand Down
6 changes: 3 additions & 3 deletions freebsd/hipercontracer/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1701949463
SHA256 (hipercontracer-1.6.10.tar.xz) = 5af4497a1fe78b93050673a5a519be1d98e1e2c59532407193717b863b94f564
SIZE (hipercontracer-1.6.10.tar.xz) = 181536
TIMESTAMP = 1734703258
SHA256 (hipercontracer-2.0.0.tar.xz) = 7fc98242048e5e8b2a05548c5bf7e5feea7107c219cb699cdfc3edd371e7d4a0
SIZE (hipercontracer-2.0.0.tar.xz) = 2509480
1 change: 1 addition & 0 deletions freebsd/hipercontracer/files/pkg-deinstall.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ case $2 in
# Remove administrative user
pw user del hipercontracer >/dev/null 2>&1 || true
pw group del hipercontracer >/dev/null 2>&1 || true
pw group del hpct-nodes >/dev/null 2>&1 || true

# Remove data directory (if empty)
rmdir /var/hipercontracer/data /var/hipercontracer/good /var/hipercontracer/bad || true
Expand Down
4 changes: 4 additions & 0 deletions freebsd/hipercontracer/files/pkg-install.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ case $2 in
if ! getent passwd hipercontracer >/dev/null 2>&1; then
pw user add -n hipercontracer -u 299 -g hipercontracer -d /var/hipercontracer -s /usr/sbin/nologin -c "HiPerConTracer User"
fi
if ! getent group hpct-nodes >/dev/null 2>&1; then
pw group add hpct-nodes -g 298
fi
pw group mod hpct-nodes -m hipercontracer

# Make HiPerConTracer directory
mkdir -p /var/hipercontracer
Expand Down
201 changes: 175 additions & 26 deletions freebsd/hipercontracer/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,187 @@
bin/addressinfogenerator
bin/dbshell
bin/decrypt-dbeaver-configuration
bin/encrypt-dbeaver-configuration
bin/get-default-ips
bin/hipercontracer
bin/hpcttrigger
bin/tracedataimporter
bin/hpct-importer
bin/hpct-node-removal
bin/hpct-node-setup
bin/hpct-nodes-list
bin/hpct-query
bin/hpct-results
bin/hpct-rtunnel
bin/hpct-ssh
bin/hpct-sync
bin/hpct-trigger
bin/hpct-viewer
bin/make-dbeaver-configuration
bin/pipe-checksum
bin/udp-echo-server
include/hipercontracer/check.h
include/hipercontracer/destinationinfo.h
include/hipercontracer/iomodule-base.h
include/hipercontracer/iomodule-icmp.h
include/hipercontracer/iomodule-udp.h
include/hipercontracer/logger.h
include/hipercontracer/ping.h
include/hipercontracer/resultentry.h
include/hipercontracer/resultswriter.h
include/hipercontracer/service.h
include/hipercontracer/tools.h
include/hipercontracer/traceroute.h
lib/libhipercontracer.a
include/universalimporter/database-configuration.h
include/universalimporter/database-statement.h
include/universalimporter/databaseclient-base.h
include/universalimporter/databaseclient-debug.h
include/universalimporter/databaseclient-mariadb.h
include/universalimporter/databaseclient-mongodb.h
include/universalimporter/databaseclient-postgresql.h
include/universalimporter/importer-configuration.h
include/universalimporter/logger.h
include/universalimporter/reader-base.h
include/universalimporter/results-exception.h
include/universalimporter/tools.h
include/universalimporter/universal-importer.h
include/universalimporter/worker.h
lib/libhipercontracer.so
lib/libhipercontracer.so.1
lib/libhipercontracer.so.2
lib/libhipercontracer.so.%%DISTVERSION%%
man/man1/addressinfogenerator.1.gz
man/man1/get-default-ips.1.gz
man/man1/hipercontracer.1.gz
man/man1/hpcttrigger.1.gz
man/man1/tracedataimporter.1.gz
%%DOCSDIR%%/examples/NoSQL/R-query-example.R
%%DOCSDIR%%/examples/NoSQL/README
%%DOCSDIR%%/examples/NoSQL/admin.ms
%%DOCSDIR%%/examples/NoSQL/database.ms
%%DOCSDIR%%/examples/NoSQL/install-database-and-users
%%DOCSDIR%%/examples/NoSQL/schema.ms
%%DOCSDIR%%/examples/NoSQL/users.ms
%%DOCSDIR%%/examples/SQL/README
%%DOCSDIR%%/examples/SQL/database.sql
%%DOCSDIR%%/examples/SQL/install-database-and-users
%%DOCSDIR%%/examples/SQL/login-as-importer
%%DOCSDIR%%/examples/SQL/login-as-researcher
%%DOCSDIR%%/examples/SQL/procedures.sql
%%DOCSDIR%%/examples/SQL/schema.sql
%%DOCSDIR%%/examples/SQL/users.sql
%%DOCSDIR%%/examples/hipercontracer-database-configuration
lib/libuniversalimporter.so
lib/libuniversalimporter.so.2
lib/libuniversalimporter.so.%%DISTVERSION%%
share/applications/hpct-viewer.desktop
share/bash-completion/completions/dbshell
share/bash-completion/completions/hipercontracer
share/bash-completion/completions/hpct-importer
share/bash-completion/completions/hpct-query
share/bash-completion/completions/hpct-results
share/bash-completion/completions/hpct-rtunnel
share/bash-completion/completions/hpct-ssh
share/bash-completion/completions/hpct-sync
share/bash-completion/completions/hpct-trigger
share/bash-completion/completions/hpct-viewer
share/bash-completion/completions/pipe-checksum
share/bash-completion/completions/udp-echo-server
%%DATADIR%%/NoSQL/R-query-example.R
%%DATADIR%%/NoSQL/README-MongoDB.md
%%DATADIR%%/NoSQL/mongodb-database.ms
%%DATADIR%%/NoSQL/mongodb-schema.ms
%%DATADIR%%/NoSQL/mongodb-test.ms
%%DATADIR%%/NoSQL/mongodb-users.ms
%%DATADIR%%/NoSQL/nornet-tools.R
%%DATADIR%%/SQL/README-MySQL+MariaDB.md
%%DATADIR%%/SQL/README-PostgreSQL.md
%%DATADIR%%/SQL/mariadb-database.sql
%%DATADIR%%/SQL/mariadb-delete-all-rows.sql
%%DATADIR%%/SQL/mariadb-schema.sql
%%DATADIR%%/SQL/mariadb-test.sql
%%DATADIR%%/SQL/mariadb-users.sql
%%DATADIR%%/SQL/postgresql-database.sql
%%DATADIR%%/SQL/postgresql-delete-all-rows.sql
%%DATADIR%%/SQL/postgresql-schema.sql
%%DATADIR%%/SQL/postgresql-test.sql
%%DATADIR%%/SQL/postgresql-users.sql
%%DATADIR%%/TestDB/0-make-configurations
%%DATADIR%%/TestDB/1-install-database
%%DATADIR%%/TestDB/2-initialise-database
%%DATADIR%%/TestDB/3-test-database
%%DATADIR%%/TestDB/4-clean-database
%%DATADIR%%/TestDB/5-perform-hpct-importer-test
%%DATADIR%%/TestDB/6-perform-hpct-query-test
%%DATADIR%%/TestDB/9-uninstall-database
%%DATADIR%%/TestDB/CertificateHelper.py
%%DATADIR%%/TestDB/README.md
%%DATADIR%%/TestDB/generate-test-certificates
%%DATADIR%%/TestDB/hpct-users.conf.example
%%DATADIR%%/TestDB/name-in-etc-hosts
%%DATADIR%%/TestDB/run-full-test
%%DATADIR%%/TestDB/test-tls-connection
%%DATADIR%%/hipercontracer-database.conf
%%DATADIR%%/hipercontracer-importer.conf
%%DATADIR%%/hipercontracer.bib
%%DATADIR%%/hipercontracer.pdf
%%DATADIR%%/hipercontracer.png
%%DATADIR%%/results-examples/HiPerConTracer.R
%%DATADIR%%/results-examples/Jitter-ICMP-#12345678-0.0.0.0-20231201T095247.519807-000000008.results.xz
%%DATADIR%%/results-examples/Jitter-ICMP-#12345678-::-20231201T095248.178124-000000007.results.xz
%%DATADIR%%/results-examples/Ping-ICMP-#1000001-0.0.0.0-20241219T090830.364329-000000001.hpct
%%DATADIR%%/results-examples/Ping-ICMP-#1000001-::-20241219T090830.364464-000000001.hpct
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-0.0.0.0-202%%PYTHON_SUFFIX%%08T134228.249420-000000001.results.gz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-0.0.0.0-202%%PYTHON_SUFFIX%%13T114601.843675-000000001.results.xz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-0.0.0.0-20241018T071423.125696-000000001.hpct.xz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-0.0.0.0-20241018T071423.125696-000000002.hpct.xz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-::-202%%PYTHON_SUFFIX%%08T134229.127910-000000001.results.gz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-::-202%%PYTHON_SUFFIX%%13T114602.100641-000000001.results.xz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-::-20241018T071423.126352-000000001.hpct.xz
%%DATADIR%%/results-examples/Ping-ICMP-#12345678-::-20241018T071423.126352-000000002.hpct.xz
%%DATADIR%%/results-examples/Ping-ICMP-#88888888-10.193.4.168-20231018T102656.809336-000000001.results.xz
%%DATADIR%%/results-examples/Ping-ICMP-#88888888-fdb6:6d27:be73:4::50-20231018T102656.817258-000000001.results.xz
%%DATADIR%%/results-examples/Ping-P13735-158.39.4.2-20221012T142120.681066-000003330.results.bz2
%%DATADIR%%/results-examples/Ping-P13735-2001:700:4100:4::2-20221012T142120.713761-000003330.results.bz2
%%DATADIR%%/results-examples/Ping-P256751-0.0.0.0-20211212T125352.632431-000000001.results.bz2
%%DATADIR%%/results-examples/Ping-P79025-0.0.0.0-20221115T161345.273650-000000001.results.bz2
%%DATADIR%%/results-examples/Ping-UDP-#88888888-10.193.4.168-20231018T102656.812007-000000001.results.xz
%%DATADIR%%/results-examples/Ping-UDP-#88888888-fdb6:6d27:be73:4::50-20231018T102656.819372-000000001.results.xz
%%DATADIR%%/results-examples/README.md
%%DATADIR%%/results-examples/Traceroute-ICMP-#1000001-0.0.0.0-20241219T090830.364422-000000001.hpct
%%DATADIR%%/results-examples/Traceroute-ICMP-#1000001-::-20241219T090830.364515-000000001.hpct
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-0.0.0.0-202%%PYTHON_SUFFIX%%08T134228.409798-000000001.results.gz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-0.0.0.0-202%%PYTHON_SUFFIX%%13T114601.920490-000000001.results.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-0.0.0.0-20241018T071423.126183-000000001.hpct.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-0.0.0.0-20241018T071423.126183-000000002.hpct.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-::-202%%PYTHON_SUFFIX%%08T134229.533947-000000001.results.gz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-::-202%%PYTHON_SUFFIX%%13T114602.350837-000000001.results.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-::-20241018T071423.126474-000000001.hpct.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#12345678-::-20241018T071423.126474-000000002.hpct.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#88888888-10.193.4.168-20231018T102656.810953-000000001.results.xz
%%DATADIR%%/results-examples/Traceroute-ICMP-#88888888-fdb6:6d27:be73:4::50-20231018T102656.818346-000000001.results.xz
%%DATADIR%%/results-examples/Traceroute-P13735-158.39.4.2-20221012T142120.713464-000002601.results.bz2
%%DATADIR%%/results-examples/Traceroute-P13735-2001:700:4100:4::2-20221012T142120.713994-000002722.results.bz2
%%DATADIR%%/results-examples/Traceroute-P258235-0.0.0.0-20211212T132253.414640-000000001.results.bz2
%%DATADIR%%/results-examples/Traceroute-P79025-0.0.0.0-20221115T161345.274003-000000001.results.bz2
%%DATADIR%%/results-examples/Traceroute-UDP-#88888888-10.193.4.168-20231018T102656.814657-000000001.results.xz
%%DATADIR%%/results-examples/Traceroute-UDP-#88888888-fdb6:6d27:be73:4::50-20231018T102656.821891-000000001.results.xz
%%DATADIR%%/results-examples/r-install-dependencies
%%DATADIR%%/results-examples/r-ping-example
%%DATADIR%%/results-examples/r-traceroute-example
share/icons/hicolor/128x128/apps/hipercontracer.png
share/icons/hicolor/150x150/apps/hipercontracer.png
share/icons/hicolor/16x16/apps/hipercontracer.png
share/icons/hicolor/192x192/apps/hipercontracer.png
share/icons/hicolor/20x20/apps/hipercontracer.png
share/icons/hicolor/22x22/apps/hipercontracer.png
share/icons/hicolor/24x24/apps/hipercontracer.png
share/icons/hicolor/256x256/apps/hipercontracer.png
share/icons/hicolor/310x310/apps/hipercontracer.png
share/icons/hicolor/32x32/apps/hipercontracer.png
share/icons/hicolor/36x36/apps/hipercontracer.png
share/icons/hicolor/40x40/apps/hipercontracer.png
share/icons/hicolor/42x42/apps/hipercontracer.png
share/icons/hicolor/44x44/apps/hipercontracer.png
share/icons/hicolor/48x48/apps/hipercontracer.png
share/icons/hicolor/512x512/apps/hipercontracer.png
share/icons/hicolor/64x64/apps/hipercontracer.png
share/icons/hicolor/72x72/apps/hipercontracer.png
share/icons/hicolor/8x8/apps/hipercontracer.png
share/icons/hicolor/96x96/apps/hipercontracer.png
share/icons/hicolor/scalable/apps/hipercontracer.svg
share/man/man1/dbshell.1.gz
share/man/man1/decrypt-dbeaver-configuration.1.gz
share/man/man1/encrypt-dbeaver-configuration.1.gz
share/man/man1/get-default-ips.1.gz
share/man/man1/hipercontracer.1.gz
share/man/man1/hpct-importer.1.gz
share/man/man1/hpct-node-removal.1.gz
share/man/man1/hpct-node-setup.1.gz
share/man/man1/hpct-nodes-list.1.gz
share/man/man1/hpct-query.1.gz
share/man/man1/hpct-results.1.gz
share/man/man1/hpct-rtunnel.1.gz
share/man/man1/hpct-ssh.1.gz
share/man/man1/hpct-sync.1.gz
share/man/man1/hpct-trigger.1.gz
share/man/man1/hpct-viewer.1.gz
share/man/man1/make-dbeaver-configuration.1.gz
share/man/man1/pipe-checksum.1.gz
share/man/man1/udp-echo-server.1.gz
share/mime/packages/hipercontracer.xml
16 changes: 9 additions & 7 deletions freebsd/hipercontracer/test-packaging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Contact: [email protected]
# Contact: [email protected]

PACKAGE=`cat Makefile | grep "^PORTNAME=" | sed -e "s/^PORTNAME=//g" | tr -d " \t"`
UPSTREAM_VERSION=`cat Makefile | grep "^PORTVERSION=" | sed -e "s/^PORTVERSION=//g" | tr -d " \t"`
UPSTREAM_VERSION=`cat Makefile | grep "^DISTVERSION=" | sed -e "s/^DISTVERSION=//g" | tr -d " \t"`
PORTREVISION=`cat Makefile | grep "^PORTREVISION=" | sed -e "s/^PORTREVISION=//g" | tr -d " \t"`
CATEGORY=`cat Makefile | grep "^CATEGORIES=" | sed -e "s/^CATEGORIES=//g" | tr -d " \t"`

Expand All @@ -41,7 +41,9 @@ if [ -e work ] ; then
rm -rf work
fi
rm -f ${PACKAGE}-${PACKAGE_VERSION}.txz
find /usr/ports/packages -name "${PACKAGE}*.txz" | xargs rm -f
if [ -d work/pkg ] ; then
find work/pkg -name "${PACKAGE}*.txz" | xargs rm -f
fi


echo "1. ###### make deinstall ##############################################" && \
Expand All @@ -53,19 +55,19 @@ make package && \
echo "4. ###### make deinstall ##############################################" && \
make deinstall && \
echo "5. ###### pkg add #####################################################" && \
if [ ! -e "/usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg" ] ; then
echo >&2 "ERROR: Package /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg not found!"
if [ ! -e "work/pkg/${PACKAGE}-${PACKAGE_VERSION}.pkg" ] ; then
echo >&2 "ERROR: Package work/pkg/${PACKAGE}-${PACKAGE_VERSION}.pkg not found!"
exit 1
fi && \
pkg add /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg && \
pkg add work/pkg/${PACKAGE}-${PACKAGE_VERSION}.pkg && \
echo "6. ###### make deinstall ##############################################" && \
make deinstall && \
echo "7. ###### make reinstall ##############################################" && \
make reinstall && \
echo "8. ###### make package ################################################" && \
make package && \
echo "9. ###### tar tzvf *.pkg ##############################################" && \
tar tzvf /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg && \
tar tzvf work/pkg/${PACKAGE}-${PACKAGE_VERSION}.pkg && \
echo "Running portlint ..." && \
portlint && \
echo "====== Successfully completed! ======"

0 comments on commit 86fbde2

Please sign in to comment.