burp, bump version (#8553)

app-backup/burp/burp-1.4.28.recipe

@@ -1,77 +0,0 @@
-SUMMARY="A tool to make and restore backups over a network"
-DESCRIPTION="Burp aims to be a better Bacula and is a network backup and \
-restore software. It relies on librsync for compression of network \
-communication and of the backups itself. Burp provides both a client and a \
-server and supports Windows's Volume Shadow Copy Services."
-HOMEPAGE="https://burp.grke.org"
-COPYRIGHT="
-	2011-2014 Graham Keeling
-	2005-2010 Troy D. Hanson
-	"
-LICENSE="GNU AGPL v3"
-REVISION="4"
-SOURCE_URI="https://burp.grke.org/downloads/burp-1.4.28/burp-1.4.28.tar.bz2"
-CHECKSUM_SHA256="01c41c07805ebe8c882d7cb9f294e779b6decbe2eb2c81fd65d8fb2b174e18f0"
-SOURCE_DIR="burp"
-PATCHES="burp-1.4.28.patchset"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?ppc"
-
-GLOBAL_WRITABLE_FILES="
-	settings/burp/CA.cnf auto-merge
-	settings/burp/autoupgrade/server/win32/script auto-merge
-	settings/burp/autoupgrade/server/win64/script auto-merge
-	settings/burp/burp-server.conf auto-merge
-	settings/burp/burp.conf auto-merge
-	settings/burp/clientconfdir/incexc/example auto-merge
-	settings/burp/clientconfdir/testclient auto-merge
-	settings/burp/notify_script auto-merge
-	settings/burp/ssl_extra_checks_script auto-merge
-	settings/burp/summary_script auto-merge
-	settings/burp/timer_script auto-merge
-	"
-
-PROVIDES="
-	burp = $portVersion
-	cmd:bedup
-	cmd:burp
-	cmd:burp_ca
-	cmd:vss_strip
-	"
-REQUIRES="
-	haiku
-	lib:libncurses
-	lib:libpopt
-	lib:librsync
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	devel:libpopt
-	devel:librsync
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:gawk
-	cmd:gcc
-	cmd:make
-	cmd:sed
-	"
-
-BUILD()
-{
-	runConfigure  --omit-dirs sysconfdir\
-		./configure --sysconfdir $settingsDir/burp
-	make $jobArgs
-}
-
-escapedSharedStateDir=$(echo $sharedStateDir | sed -e 's/\//\\\//g')
-INSTALL()
-{
-	sed -i "s/\$(DESTDIR)\/var\//$escapedSharedStateDir\//g" Makefile
-	make install
-}

app-backup/burp/burp-3.1.4.recipe

@@ -0,0 +1,87 @@
+SUMMARY="A tool to make and restore backups over a network"
+DESCRIPTION="Burp aims to be a better Bacula and is a network backup and \
+restore software. It relies on librsync for compression of network \
+communication and of the backups itself. Burp provides both a client and a \
+server and supports Windows's Volume Shadow Copy Services."
+HOMEPAGE="https://burp.grke.org"
+COPYRIGHT="	2011-2014 Graham Keeling
+	2005-2010 Troy D. Hanson"
+LICENSE="GNU AGPL v3"
+REVISION="1"
+SOURCE_URI="https://github.com/grke/burp/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="f5ae92d7abc1e89e07013cae2fc48d3a505a59042f4f8a44e94a2442d647f35d"
+SOURCE_FILENAME="burp-$portVersion.tar.gz"
+PATCHES="burp-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+GLOBAL_WRITABLE_FILES="
+	settings/burp/CA.cnf auto-merge
+	settings/burp/burp-server.conf auto-merge
+	settings/burp/burp.conf auto-merge
+	settings/burp/clientconfdir/incexc/example auto-merge
+	settings/burp/clientconfdir/testclient auto-merge
+	"
+
+PROVIDES="
+	burp$secondaryArchSuffix = $portVersion
+	cmd:bedup$commandSuffix
+	cmd:bsigs$commandSuffix
+	cmd:bsparse$commandSuffix
+	cmd:burp$commandSuffix
+	cmd:burp_ca$commandSuffix
+	cmd:vss_strip$commandSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:librsync$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libncurses$secondaryArchSuffix
+	devel:librsync$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:uthash
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoreconf
+	cmd:gawk
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	export LIBS="-lnetwork"
+	autoreconf -fi
+	runConfigure  --omit-dirs "sysconfdir binDir sbinDir" ./configure \
+			--bindir=$commandBinDir \
+			--sbindir=$commandBinDir \
+			--sysconfdir $settingsDir/burp
+	make $jobArgs
+}
+
+escapedSharedStateDir=$(echo $sharedStateDir | sed -e 's/\//\\\//g')
+INSTALL()
+{
+	sed -i "s/\$(DESTDIR)\/var\//$escapedSharedStateDir\//g" Makefile
+	make install
+	make install-configs
+}

app-backup/burp/patches/burp-1.4.28.patchset

@@ -1,55 +0,0 @@
-From f13db3e8ee38ea212dd1d7502d0604726021f44f Mon Sep 17 00:00:00 2001
-From: Markus Himmel <markus@himmel-villmar.de>
-Date: Fri, 26 Dec 2014 00:07:56 +0000
-Subject: [PATCH] Update to the interface of librsync v.1.0.0
-
-Librsync has moved away from MD4 for signatures, but to maintain
-compatibility with non-Haiku versions, we hang on to it.
----
- src/backup_phase2_server.c | 2 +-
- src/backup_phase4_server.c | 2 +-
- src/rs_buf.c               | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/backup_phase2_server.c b/src/backup_phase2_server.c
-index 6e78515..747a369 100644
---- a/src/backup_phase2_server.c
-+++ b/src/backup_phase2_server.c
-@@ -483,7 +483,7 @@ static int process_changed_file(struct sbuf *cb, struct sbuf *p1b, const char *c
- 	free(curpath);
- 
- 	blocklen=get_librsync_block_len(cb->endfile);
--	if(!(p1b->sigjob=rs_sig_begin(blocklen, RS_DEFAULT_STRONG_LEN)))
-+	if(!(p1b->sigjob=rs_sig_begin(blocklen, 8, RS_MD4_SIG_MAGIC)))
- 	{
- 		logp("could not start signature job.\n");
- 		return -1;
-diff --git a/src/backup_phase4_server.c b/src/backup_phase4_server.c
-index ead92b3..f1b5a84 100644
---- a/src/backup_phase4_server.c
-+++ b/src/backup_phase4_server.c
-@@ -38,7 +38,7 @@ static int make_rev_sig(const char *dst, const char *sig, const char *endfile, i
- 	}
- 	result=rs_sig_gzfile(dstfp, dstzp, sigp,
- 		get_librsync_block_len(endfile),
--		RS_DEFAULT_STRONG_LEN, NULL, cntr);
-+		8, NULL, cntr);
- 	gzclose_fp(&dstzp);
- 	close_fp(&dstfp);
- 	if(close_fp(&sigp))
-diff --git a/src/rs_buf.c b/src/rs_buf.c
-index 78f65b2..0a3c33a 100644
---- a/src/rs_buf.c
-+++ b/src/rs_buf.c
-@@ -497,7 +497,7 @@ rs_result rs_sig_gzfile(FILE *old_file, gzFile old_zfile, FILE *sig_file, size_t
-     rs_job_t        *job;
-     rs_result       r;
- 
--    job = rs_sig_begin(new_block_len, strong_len);
-+    job = rs_sig_begin(new_block_len, strong_len, RS_MD4_SIG_MAGIC);
-     r = rs_whole_gzrun(job, old_file, old_zfile, sig_file, NULL, cntr);
- /*
-     if (stats)
--- 
-1.8.3.4
-

app-backup/burp/patches/burp-3.1.4.patchset

@@ -0,0 +1,29 @@
+From 11c045e4cec104b22bf3e2f7c52db02d1a14dc7e Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 10 Apr 2023 14:46:05 +0200
+Subject: Comment out block for IPV6_TCLASS
+
+
+diff --git a/src/asfd.c b/src/asfd.c
+index 02af613..81dc82c 100644
+--- a/src/asfd.c
++++ b/src/asfd.c
+@@ -439,6 +439,7 @@ static int asfd_set_bulk_packets(struct asfd *asfd)
+ 			logp("%s: error: set IPTOS throughput: %s\n",
+ 				asfd->desc, strerror(errno));
+ 			return -1;
++		#ifndef __HAIKU__
+ 		case AF_INET6:
+ 			if(setsockopt(asfd->fd, IPPROTO_IPV6, IPV6_TCLASS,
+ 				(char *)&opt, sizeof(opt))>=0)
+@@ -446,6 +447,7 @@ static int asfd_set_bulk_packets(struct asfd *asfd)
+ 			logp("%s: error: set IPV6_TCLASS throughput: %s\n",
+ 				asfd->desc, strerror(errno));
+ 			return -1;
++		#endif
+ 	}
+ #endif
+ 	return 0;
+-- 
+2.37.3
+