Updated sysutils/burp to 3.2.0

sysutils/burp/Makefile

@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.9 2023/10/24 22:11:04 wiz Exp $
 
-DISTNAME=	burp-1.4.40
-PKGREVISION=	5
+DISTNAME=	burp-3.2.0
 CATEGORIES=	sysutils archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=burp/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=grke/}
+GITHUB_PROJECT=	burp
+GITHUB_TAG=	3.2.0
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://burp.grke.net/
@@ -19,20 +19,28 @@ PKG_SYSCONFSUBDIR=	burp
 SUBST_CLASSES+=		dirs
 SUBST_STAGE.dirs=	pre-install
 SUBST_MESSAGE.dirs=	Fixing directories
-SUBST_FILES.dirs=	configs/server/burp.conf \
-			configs/server/summary_script \
-			configs/client/burp.conf \
-			configs/certs/CA/CA.cnf \
-			configs/certs/CA/burp_ca \
-			manpages/*.8
+SUBST_FILES.dirs=	configs/server/burp.conf.in \
+			configs/server/summary_script.in \
+			configs/client/burp.conf.in \
+			configs/certs/CA/CA.cnf.in \
+			configs/certs/CA/burp_ca.in \
+			manpages/*.8.in
 SUBST_SED.dirs=		-e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,' \
 			-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' \
 			-e 's,@SBINDIR@,${PREFIX}/sbin,'
 
-REPLACE_SH+=	configs/certs/CA/burp_ca \
+REPLACE_SH+=	configs/certs/CA/burp_ca.in \
 		configs/server/notify_script \
 		configs/server/timer_script
 
+USE_TOOLS+=	autoreconf autoconf automake pkg-config
+USE_LIBTOOL=	yes
+
+pre-configure:
+	set -e; cd ${WRKSRC} && autoreconf -vif
+
+INSTALL_TARGET=		install-all
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--mandir=${PREFIX}/${PKGMANDIR} \
 			--sbindir=${PREFIX}/sbin
@@ -41,6 +49,7 @@ INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/burp \
 			libexecdir=${PREFIX}/libexec/burp
 
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/uthash/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/librsync/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

sysutils/burp/PLIST

@@ -1,19 +1,45 @@
 @comment $NetBSD: PLIST,v 1.2 2016/07/24 23:40:10 rillig Exp $
-libexec/burp/notify_script
-libexec/burp/ssl_extra_checks_script
-libexec/burp/summary_script
-libexec/burp/timer_script
+share/burp/scripts/backup_tool_script
+share/burp/scripts/notify_script
+share/burp/scripts/ssl_extra_checks_script
+share/burp/scripts/summary_script
+share/burp/scripts/timer_script
 man/man8/bedup.8
 man/man8/burp.8
 man/man8/burp_ca.8
 man/man8/vss_strip.8
+bin/vss_strip
 sbin/bedup
 sbin/burp
 sbin/burp_ca
-sbin/vss_strip
+sbin/bsigs
+sbin/bsparse
+share/doc/burp/CHANGELOG
+share/doc/burp/CONTRIBUTORS
+share/doc/burp/DONATIONS
+share/doc/burp/LICENSE
+share/doc/burp/README
+share/doc/burp/UPGRADING
+share/doc/burp/add-remove.txt
+share/doc/burp/autoupgrade.txt
+share/doc/burp/backup_phases.txt
+share/doc/burp/backup_tool_script.txt
+share/doc/burp/baremetal-windows2008.txt
+share/doc/burp/baremetal-windows7-hirens.txt
+share/doc/burp/baremetal-windows7.txt
+share/doc/burp/baremetal-windows7and8.txt
+share/doc/burp/burp_ca.txt
+share/doc/burp/debug.txt
+share/doc/burp/readwrite.txt
+share/doc/burp/retention.txt
+share/doc/burp/security-models.txt
+share/doc/burp/server-basics.txt
+share/doc/burp/shuffling.txt
+share/doc/burp/status-monitor.txt
+share/doc/burp/tests.txt
+share/doc/burp/timer_script.txt
+share/doc/burp/working_dir.txt
 share/examples/burp/CA.cnf
-share/examples/burp/autoupgrade/server/win32/script
-share/examples/burp/autoupgrade/server/win64/script
 share/examples/burp/burp-server.conf
 share/examples/burp/burp.conf
 share/examples/burp/clientconfdir/incexc/example

sysutils/burp/distinfo

@@ -1,19 +1,15 @@
 $NetBSD: distinfo,v 1.7 2021/10/26 11:19:23 nia Exp $
 
-BLAKE2s (burp-1.4.40.tar.bz2) = d7a7a6f413fc36d9b7d6ec32d0203ba5ebaca8c14995017648115b0174804033
-SHA512 (burp-1.4.40.tar.bz2) = b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c
-Size (burp-1.4.40.tar.bz2) = 712937 bytes
-SHA1 (patch-Makefile.in) = 3df0458b1fc50cc03d8f69a864830ab52e9d0f8d
-SHA1 (patch-configs_certs_CA_CA.cnf) = e58da075d16ecd16454b8b08dd6070101fa24475
-SHA1 (patch-configs_certs_CA_burp__ca) = cdcb697e0a40c612ef3881a0abdcbce89aa78980
-SHA1 (patch-configs_client_burp.conf) = b61837e0a4c358a12060ebb6b4a42e26a9667d0d
-SHA1 (patch-configs_server_burp.conf) = bf5a41c09117519b3b198ca1a13951a552a100c1
-SHA1 (patch-configs_server_summary__script) = 068cec66b0634f0746f94891e1390097ec0ef96c
-SHA1 (patch-manpages_Makefile.in) = 710bf51bd43c0ecbe8987a843b27fd0e460342f5
-SHA1 (patch-manpages_bedup.8) = 5e1a2e3c42118d98c9b66a0bc5cafb2eb9c09f11
-SHA1 (patch-manpages_burp.8) = 81879e11cf917c36467513aeb440d0ab2dbad142
-SHA1 (patch-manpages_burp__ca.8) = f9ac9ffe1f67df040c939bb1afcf614869695034
-SHA1 (patch-src-xattr.c) = 105aa2c67fde7007b525d6ff93e0d9ce67ee2f4f
-SHA1 (patch-src_handy.c) = 6d3fe34734c6392a28a59ed1491688d2f12e0a66
-SHA1 (patch-src_msg.c) = 2a8f542f801f2d4ace5d9335d3abb7490cba82d7
-SHA1 (patch-src_server.c) = 3dc518b24bd866d0ff7cc9c834d4fde810cacb74
+BLAKE2s (burp-3.2.0.tar.gz) = 1f79d602e34f4d03b2052fbd5853b054ad571afd0b59c7a802f65bbdd9f55766
+SHA512 (burp-3.2.0.tar.gz) = 13affe243f1bb50460ae6bcece580a18718acb01695e2ef804ce519335a733f02c6a89d5c3263963794ff3714a0c693dd8a2f69ae43774088c3b2c63570162df
+Size (burp-3.2.0.tar.gz) = 550673 bytes
+SHA1 (patch-Makefile.am) = 7ba740c6e77d38684bbe984dd14838feec55755c
+SHA1 (patch-configs_certs_CA_CA.cnf.in) = f0945a96f18d2ebab70affdfd70f3c66a876cd50
+SHA1 (patch-configs_certs_CA_burp__ca.in) = e6043ca0b28fd6755b6c69824aa6466719d94ffd
+SHA1 (patch-configs_client_burp.conf.in) = a75e642ec2ee9aeecbe042b19e674acac7761273
+SHA1 (patch-configs_server_burp.conf.in) = 8b37b26262b3bdb748f1bfc0e746138dc00ba7ff
+SHA1 (patch-configs_server_summary__script.in) = 4c825ff342421f92f04926664dce6ab4e362b526
+SHA1 (patch-manpages_bedup.8.in) = 93c12f03cec4a3dff8621472b021fe3ff223de6c
+SHA1 (patch-manpages_burp.8.in) = fd8d3440e16a1a53d66298f58f17d213af8ce13e
+SHA1 (patch-manpages_burp__ca.8.in) = 75590d44c979c6abbe95504d4cb87901cfaf7a68
+

sysutils/burp/patches/patch-Makefile.am

@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.am.orig	2026-07-20 14:50:45.132486980 +0000
++++ Makefile.am
+@@ -388,7 +388,7 @@ clean-local-check:
+ $(configs): Makefile
+
+ $(PACKAGE_TARNAME): main
+-	$(AM_V_at)mv -fv main $(PACKAGE_TARNAME)
++	$(AM_V_at)mv -f main $(PACKAGE_TARNAME)
+
+ $(PACKAGE_TARNAME).conf:
+ 	$(AM_V_at)rm -f $@

sysutils/burp/patches/patch-configs_certs_CA_CA.cnf.in

@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- configs/certs/CA/CA.cnf.in.orig	2026-07-21 12:36:40.240762309 +0000
++++ configs/certs/CA/CA.cnf.in
+@@ -1,6 +1,6 @@
+ # simple config for burp_ca
+
+-CA_DIR                  = @sysconfdir@/CA
++CA_DIR                  = @PKG_SYSCONFDIR@/CA
+
+
+ [ ca ]

sysutils/burp/patches/patch-configs_certs_CA_burp__ca.in

@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configs/certs/CA/burp_ca.in.orig	2026-07-21 12:44:39.659616295 +0000
++++ configs/certs/CA/burp_ca.in
+@@ -66,7 +66,7 @@ esac
+ # Try NetBSD style.
+ [ -n "$name" ] || name="$(hostname)"
+
+-etc="@sysconfdir@"
++etc="@PKG_SYSCONFDIR@"
+ dir="$etc"/CA
+ conf="$etc"/CA.cnf
+ days=

sysutils/burp/patches/patch-configs_client_burp.conf → sysutils/burp/patches/patch-configs_client_burp.conf.in

@@ -1,35 +1,33 @@
-$NetBSD: patch-configs_client_burp.conf,v 1.1 2015/09/12 22:55:18 joerg Exp $
+$NetBSD$
 
---- configs/client/burp.conf.orig	2015-07-01 11:45:08.000000000 +0000
-+++ configs/client/burp.conf
-@@ -15,7 +15,7 @@ progress_counter = 1
+--- configs/client/burp.conf.in.orig	2026-07-21 12:46:43.560539930 +0000
++++ configs/client/burp.conf.in
+@@ -17,7 +17,7 @@ progress_counter = 1
  # network_timeout = 7200
  # The directory to which autoupgrade files will be downloaded.
  # To never autoupgrade, leave it commented out.
--# autoupgrade_dir=/etc/burp/autoupgrade/client
+-# autoupgrade_dir=@sysconfdir@/autoupgrade/client
 +# autoupgrade_dir=@PKG_SYSCONFDIR@/autoupgrade/client
  # OS path component for the autoupgrade directory on the server.
  # autoupgrade_os=test_os
-
-@@ -41,17 +41,17 @@ cross_all_filesystems=0
-
+ # Wait a random number of seconds between 0 and the given number before
+@@ -61,16 +61,16 @@ cross_all_filesystems=0
  # Uncomment the following lines to automatically generate a certificate signing
  # request and send it to the server.
--ca_burp_ca = /usr/sbin/burp_ca
--ca_csr_dir = /etc/burp/CA-client
-+ca_burp_ca = /opt/pkgsrc/sbin/burp_ca
+ ca_@name@_ca = @sbindir@/@name@_ca
+-ca_csr_dir = @sysconfdir@/CA-client
 +ca_csr_dir = @PKG_SYSCONFDIR@/CA-client
 
  # SSL certificate authority - same file on both server and client
--ssl_cert_ca = /etc/burp/ssl_cert_ca.pem
+-ssl_cert_ca = @sysconfdir@/ssl_cert_ca.pem
 +ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem
 
  # Client SSL certificate
--ssl_cert = /etc/burp/ssl_cert-client.pem
+-ssl_cert = @sysconfdir@/ssl_cert-client.pem
 +ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-client.pem
 
  # Client SSL key
--ssl_key = /etc/burp/ssl_cert-client.key
+-ssl_key = @sysconfdir@/ssl_cert-client.key
 +ssl_key = @PKG_SYSCONFDIR@/ssl_cert-client.key
 
  # Client SSL ciphers