diff -Nru rserpooldemo-3.1.3/CMakeLists.txt rserpooldemo-3.1.4/CMakeLists.txt --- rserpooldemo-3.1.3/CMakeLists.txt 2023-12-06 15:54:43.000000000 +0000 +++ rserpooldemo-3.1.4/CMakeLists.txt 2023-12-19 16:06:49.000000000 +0000 @@ -37,7 +37,7 @@ SET(BUILD_MAJOR "3") SET(BUILD_MINOR "1") -SET(BUILD_PATCH "3") +SET(BUILD_PATCH "4") SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH}) diff -Nru rserpooldemo-3.1.3/ChangeLog rserpooldemo-3.1.4/ChangeLog --- rserpooldemo-3.1.3/ChangeLog 2023-12-06 15:54:44.000000000 +0000 +++ rserpooldemo-3.1.4/ChangeLog 2023-12-19 16:06:50.000000000 +0000 @@ -1,3 +1,45 @@ +commit 90f39e282be37a3560ea8de8912318b3087d3c81 +Author: Thomas Dreibholz +Date: Tue Dec 19 14:00:30 2023 +0100 + + Dependency fix. + +commit b853b5e93d51d588de8ff1621e7a95c69e8fca45 +Author: Thomas Dreibholz +Date: Thu Dec 7 16:15:18 2023 +0100 + + Packaging update. + +commit 165bf9d37c069aba5e30119d5ef6108983177196 +Author: Thomas Dreibholz +Date: Thu Dec 7 13:47:27 2023 +0100 + + Packaging update. + +commit b70cc306372be240676d7a7caa417334ce2723e7 +Author: Thomas Dreibholz +Date: Thu Dec 7 12:32:29 2023 +0100 + + Improved FreeBSD test script. + +commit 5bb5e10c41dc2659ff153255fe85dccd7636608f +Author: Thomas Dreibholz +Date: Thu Dec 7 10:20:29 2023 +0100 + + Updated packaging configuration. + +commit 3d609123c1b0bed12afc8c41ea0fc6a22ecdb40a +Author: Thomas Dreibholz +Date: Wed Dec 6 17:21:43 2023 +0100 + + Updated LSM entry. + +commit 6cf8427247193590e81d3f304c5fd3813a192582 +Author: Thomas Dreibholz +Date: Wed Dec 6 16:54:44 2023 +0100 + + New release rserpooldemo-3.1.3. + commit 8bb45f7fdc2b44b09035a8879888d1734ccc6b11 Author: Thomas Dreibholz Date: Wed Dec 6 15:09:48 2023 +0100 diff -Nru rserpooldemo-3.1.3/debian/changelog rserpooldemo-3.1.4/debian/changelog --- rserpooldemo-3.1.3/debian/changelog 2023-12-06 15:54:43.000000000 +0000 +++ rserpooldemo-3.1.4/debian/changelog 2023-12-19 16:06:49.000000000 +0000 @@ -1,5 +1,5 @@ -rserpooldemo (3.1.3-1ubuntu~lunar1) lunar; urgency=medium +rserpooldemo (3.1.4-1ubuntu~lunar1) lunar; urgency=medium * Closes: #999549 (ITP). - -- Thomas Dreibholz Wed, 06 Dec 2023 16:54:43 +0100 + -- Thomas Dreibholz Tue, 19 Dec 2023 17:06:49 +0100 diff -Nru rserpooldemo-3.1.3/debian/control rserpooldemo-3.1.4/debian/control --- rserpooldemo-3.1.3/debian/control 2023-12-06 15:54:43.000000000 +0000 +++ rserpooldemo-3.1.4/debian/control 2023-12-19 16:06:49.000000000 +0000 @@ -55,7 +55,7 @@ software-properties-common, subnetcalc, tcpdump, - tftp, + tftp | tftp-hpa, traceroute, tree, virt-what, diff -Nru rserpooldemo-3.1.3/freebsd/rserpooldemo/distinfo rserpooldemo-3.1.4/freebsd/rserpooldemo/distinfo --- rserpooldemo-3.1.3/freebsd/rserpooldemo/distinfo 2023-11-15 08:45:02.000000000 +0000 +++ rserpooldemo-3.1.4/freebsd/rserpooldemo/distinfo 2023-12-07 14:37:00.000000000 +0000 @@ -1,3 +1,3 @@ -TIMESTAMP = 1565194937 -SHA256 (rsplib-3.2.4.tar.xz) = 4b73a8d1b9ec50589f85dcda77155009f318c1c1bee12268d01b58c3813b4a79 -SIZE (rsplib-3.2.4.tar.xz) = 951364 +TIMESTAMP = 1701950472 +SHA256 (rserpooldemo-3.1.3.tar.xz) = 863f23b6630c8bd8b1bccdec0035234d558ceacfd12f6a4353892cf0dcb70461 +SIZE (rserpooldemo-3.1.3.tar.xz) = 13611892 diff -Nru rserpooldemo-3.1.3/freebsd/rserpooldemo/pkg-descr rserpooldemo-3.1.4/freebsd/rserpooldemo/pkg-descr --- rserpooldemo-3.1.3/freebsd/rserpooldemo/pkg-descr 2023-11-15 08:45:02.000000000 +0000 +++ rserpooldemo-3.1.4/freebsd/rserpooldemo/pkg-descr 2023-12-18 12:15:46.000000000 +0000 @@ -1,5 +1,2 @@ -This package contains the RSerPool Demo Tool for RSPLIB. -See https://www.nntb.no/~dreibh/rserpool/ for details on -Reliable Server Pooling (RSerPool) and the RSerPoolDemo tool! - -WWW: https://www.nntb.no/~dreibh/rserpool/ +This package contains the RSerPool Demo Tool for RSPLIB, +which is a Reliable Server Pooling (RSerPool) implementation. diff -Nru rserpooldemo-3.1.3/freebsd/rserpooldemo/pkg-plist rserpooldemo-3.1.4/freebsd/rserpooldemo/pkg-plist --- rserpooldemo-3.1.3/freebsd/rserpooldemo/pkg-plist 2023-11-15 08:45:02.000000000 +0000 +++ rserpooldemo-3.1.4/freebsd/rserpooldemo/pkg-plist 2023-12-18 12:15:46.000000000 +0000 @@ -1,13 +1,105 @@ +bin/rserpooldemo +etc/system-info.d/30-rsplib +etc/system-maintenance.d/30-rsplib share/applications/rserpooldemo.desktop share/icons/hicolor/512x512/apps/rserpooldemo.png +share/man/man1/rserpooldemo.1.gz share/mime/packages/rserpooldemo.xml -share/rserpooldemo/background/* -share/rserpooldemo/desktop/* +share/rserpooldemo/background/Background-1024x768-mosaic.png +share/rserpooldemo/background/Background-1024x768-plain.png +share/rserpooldemo/background/Background-1366x768-mosaic.png +share/rserpooldemo/background/Background-1366x768-plain.png +share/rserpooldemo/background/Background-1600x1200-mosaic.png +share/rserpooldemo/background/Background-1600x1200-plain.png +share/rserpooldemo/background/Background-1920x1080-mosaic.png +share/rserpooldemo/background/Background-1920x1080-plain.png +share/rserpooldemo/background/Background-1920x1200-mosaic.png +share/rserpooldemo/background/Background-1920x1200-plain.png +share/rserpooldemo/background/Background-2970x2100-mosaic.png +share/rserpooldemo/background/Background-2970x2100-plain.png +share/rserpooldemo/background/Background-3840x2160-mosaic.png +share/rserpooldemo/background/Background-3840x2160-plain.png +share/rserpooldemo/background/Zollverein-1024x768-mosaic.jpeg +share/rserpooldemo/background/Zollverein-1024x768-plain.jpeg +share/rserpooldemo/background/Zollverein-1366x768-mosaic.jpeg +share/rserpooldemo/background/Zollverein-1366x768-plain.jpeg +share/rserpooldemo/background/Zollverein-1600x1200-mosaic.jpeg +share/rserpooldemo/background/Zollverein-1600x1200-plain.jpeg +share/rserpooldemo/background/Zollverein-1920x1080-mosaic.jpeg +share/rserpooldemo/background/Zollverein-1920x1080-plain.jpeg +share/rserpooldemo/background/Zollverein-1920x1200-mosaic.jpeg +share/rserpooldemo/background/Zollverein-1920x1200-plain.jpeg +share/rserpooldemo/background/Zollverein-2970x2100-mosaic.jpeg +share/rserpooldemo/background/Zollverein-2970x2100-plain.jpeg +share/rserpooldemo/background/Zollverein-3840x2160-mosaic.jpeg +share/rserpooldemo/background/Zollverein-3840x2160-plain.jpeg +share/rserpooldemo/desktop/Background-1024x768-mosaic.png +share/rserpooldemo/desktop/Background-1024x768-plain.png +share/rserpooldemo/desktop/Background-1366x768-mosaic.png +share/rserpooldemo/desktop/Background-1366x768-plain.png +share/rserpooldemo/desktop/Background-1600x1200-mosaic.png +share/rserpooldemo/desktop/Background-1600x1200-plain.png +share/rserpooldemo/desktop/Background-1920x1080-mosaic.png +share/rserpooldemo/desktop/Background-1920x1080-plain.png +share/rserpooldemo/desktop/Background-1920x1200-mosaic.png +share/rserpooldemo/desktop/Background-1920x1200-plain.png +share/rserpooldemo/desktop/Background-2970x2100-mosaic.png +share/rserpooldemo/desktop/Background-2970x2100-plain.png +share/rserpooldemo/desktop/Background-3840x2160-mosaic.png +share/rserpooldemo/desktop/Background-3840x2160-plain.png +share/rserpooldemo/desktop/Zollverein-1024x768-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-1024x768-plain.jpeg +share/rserpooldemo/desktop/Zollverein-1366x768-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-1366x768-plain.jpeg +share/rserpooldemo/desktop/Zollverein-1600x1200-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-1600x1200-plain.jpeg +share/rserpooldemo/desktop/Zollverein-1920x1080-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-1920x1080-plain.jpeg +share/rserpooldemo/desktop/Zollverein-1920x1200-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-1920x1200-plain.jpeg +share/rserpooldemo/desktop/Zollverein-2970x2100-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-2970x2100-plain.jpeg +share/rserpooldemo/desktop/Zollverein-3840x2160-mosaic.jpeg +share/rserpooldemo/desktop/Zollverein-3840x2160-plain.jpeg +share/rserpooldemo/graphics/Background.png +share/rserpooldemo/graphics/Controller.png +share/rserpooldemo/graphics/europa1.png +share/rserpooldemo/graphics/Europe.jpeg +share/rserpooldemo/graphics/Fractal.png +share/rserpooldemo/graphics/PoolElementActive.png +share/rserpooldemo/graphics/PoolElementActive2.png +share/rserpooldemo/graphics/PoolElementActive3.png +share/rserpooldemo/graphics/PoolElementActive4.png +share/rserpooldemo/graphics/PoolElementActive5.png +share/rserpooldemo/graphics/PoolElementActive6.png +share/rserpooldemo/graphics/PoolElementInactive.png +share/rserpooldemo/graphics/PoolElementInactive2.png +share/rserpooldemo/graphics/PoolElementInactive3.png +share/rserpooldemo/graphics/PoolElementInactive4.png +share/rserpooldemo/graphics/PoolElementInactive5.png +share/rserpooldemo/graphics/PoolElementInactive6.png +share/rserpooldemo/graphics/PoolUserActive.png +share/rserpooldemo/graphics/PoolUserActive2.png +share/rserpooldemo/graphics/PoolUserActive3.png +share/rserpooldemo/graphics/PoolUserInactive.png +share/rserpooldemo/graphics/PoolUserInactive2.png +share/rserpooldemo/graphics/PoolUserInactive3.png +share/rserpooldemo/graphics/RegistrarActive.png +share/rserpooldemo/graphics/RegistrarActive2.png +share/rserpooldemo/graphics/RegistrarInactive.png +share/rserpooldemo/graphics/RegistrarInactive2.png +share/rserpooldemo/graphics/World-1856x1200.png +share/rserpooldemo/graphics/World1.png +share/rserpooldemo/graphics/World2.jpeg share/rserpooldemo/grub-defaults -share/rserpooldemo/splash/* +share/rserpooldemo/local-scenario/ComponentControl +share/rserpooldemo/local-scenario/local-setup.xml +share/rserpooldemo/local-scenario/LocalScenario-StartAll +share/rserpooldemo/local-scenario/LocalScenario-StopAll +share/rserpooldemo/local-scenario/LocalScenario.config +share/rserpooldemo/local-scenario/RunProgram +share/rserpooldemo/splash/Background-1024x768.jpeg +share/rserpooldemo/splash/Background-1920x1080.jpeg +share/rserpooldemo/splash/rserpooldemo-version share/rserpooldemo/splash/Zollverein-1024x768.jpeg -share/rserpooldemo/splash/rserpooldemo-version /etc/rserpooldemo -share/rserpooldemo/graphics/* -share/rserpooldemo/local-scenario/* -bin/rserpooldemo -man/man1/rserpooldemo.1.gz +share/rserpooldemo/splash/Zollverein-1920x1080.jpeg diff -Nru rserpooldemo-3.1.3/freebsd/rserpooldemo/test-packaging rserpooldemo-3.1.4/freebsd/rserpooldemo/test-packaging --- rserpooldemo-3.1.3/freebsd/rserpooldemo/test-packaging 2023-11-15 08:45:02.000000000 +0000 +++ rserpooldemo-3.1.4/freebsd/rserpooldemo/test-packaging 2023-12-07 11:32:18.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # Free Packaging Test Script # Copyright (C) 2010-2024 by Thomas Dreibholz @@ -18,22 +18,22 @@ # # Contact: thomas.dreibholz@gmail.com -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"` -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"` +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"` +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"` PACKAGE_VERSION="${UPSTREAM_VERSION}" -if [ "$PORTREVISION" != "" ] ; then +if [ "${PORTREVISION}" != "" ] ; then PACKAGE_VERSION="${UPSTREAM_VERSION}_${PORTREVISION}" fi echo "######################################################################" -echo "PACKAGE: $PACKAGE" -echo "UPSTREAM_VERSION: $UPSTREAM_VERSION" -echo "PACKAGE_VERSION: $PACKAGE_VERSION" -echo "CATEGORY: $CATEGORY" +echo "PACKAGE: ${PACKAGE}" +echo "UPSTREAM_VERSION: ${UPSTREAM_VERSION}" +echo "PACKAGE_VERSION: ${PACKAGE_VERSION}" +echo "CATEGORY: ${CATEGORY}" echo "######################################################################" @@ -53,22 +53,19 @@ echo "4. ###### make deinstall ##############################################" && \ make deinstall && \ echo "5. ###### pkg add #####################################################" && \ -if [ -e work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz ] ; then - mkdir /usr/ports/packages /usr/ports/packages/All - cp work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz /usr/ports/packages/All -else - echo >&2 "ERROR: Cannot find work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz!" +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!" exit 1 -fi -pkg add /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.txz && \ +fi && \ +pkg add /usr/ports/packages/All/${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 *.txz ##############################################" && \ -tar tzvf /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.txz && \ +echo "9. ###### tar tzvf *.pkg ##############################################" && \ +tar tzvf /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg && \ echo "Running portlint ..." && \ portlint && \ echo "====== Successfully completed! ======" diff -Nru rserpooldemo-3.1.3/packaging.conf rserpooldemo-3.1.4/packaging.conf --- rserpooldemo-3.1.3/packaging.conf 2023-11-15 08:45:05.000000000 +0000 +++ rserpooldemo-3.1.4/packaging.conf 2023-12-07 09:15:17.000000000 +0000 @@ -2,7 +2,7 @@ # --------------------------------------------------------- MAKE_DIST="cmake -DCMAKE_INSTALL_PREFIX=/usr . && make dist" -NOT_TARGET_DISTRIBUTIONS="lucid precise trusty" # <<-- Distrubutions which are *not* supported! +NOT_TARGET_DISTRIBUTIONS="lucid precise trusty xenial" # <<-- Distrubutions which are *not* supported! MAINTAINER="Thomas Dreibholz " MAINTAINER_KEY="21412672518D8B2D1862EFEF5CD5D12AA0877B49" DEBIAN_LAST_ENTRY="" diff -Nru rserpooldemo-3.1.3/rpm/rserpooldemo.spec rserpooldemo-3.1.4/rpm/rserpooldemo.spec --- rserpooldemo-3.1.3/rpm/rserpooldemo.spec 2023-12-06 15:54:43.000000000 +0000 +++ rserpooldemo-3.1.4/rpm/rserpooldemo.spec 2023-12-19 16:06:49.000000000 +0000 @@ -1,5 +1,5 @@ Name: rserpooldemo -Version: 3.1.3 +Version: 3.1.4 Release: 1 Summary: RSerPool Demo Tool Group: Applications/Internet @@ -227,6 +227,8 @@ %changelog +* Tue Dec 19 2023 Thomas Dreibholz - 3.1.4 +- New upstream release. * Wed Dec 06 2023 Thomas Dreibholz - 3.1.3 - New upstream release. * Wed Feb 08 2023 Thomas Dreibholz - 3.1.2