On Fri 09/02/2018 17:11, Stuart Henderson wrote: > On 2018/02/09 13:44, Landry Breuil wrote: > > On Fri, Feb 09, 2018 at 01:29:36PM +0100, Bjorn Ketelaars wrote: > > > Included a diff for bringing sysutils/burp to the latest version. > > > Changelog can be found at http://burp.grke.org/changelog.html > > > > > > I removed 2 patches as the issues have been solved upstream. > > > > > > Output 'make test': > > > > > > 100%: Checks: 348, Failures: 0, Errors: 0 > > > > > > I only did some very, very light testing. Only thing that I'm sure about > > > is that it doesn't blow up. > > > > I didnt port 2.1 branch on purpose as at that time, upstream considered > > it "development" - but it see now that it's been promoted to stable, > > good. > > Yes, but only last week. Good to send the diff out for testing but unless > someone has been running 2.1.x regularly on OpenBSD during dev, it would > probably be better to hold off a little before actually updating.
What sthen@ writes makes sense, especially as I'm not a burp user. In the meantime I did test the internalised timer functionality. It seems to work. I also tested the ncurses monitor client (burp -a s). It works after 'monitor_exe=path_to_burp' has been set in burp.conf. For details see https://github.com/grke/burp/commit/2f8caac60da0cb713054276440656b5581878b4f I think it makes sense to set the latter in OpenBSD's port. As such, a new diff. In this diff I also removed bash as RDEP. There is no need for bash in a plain vanilla setup (there are no scripts defined). diff --git Makefile Makefile index c7292cb155d..f54c8d07060 100644 --- Makefile +++ Makefile @@ -1,27 +1,30 @@ -# $OpenBSD: Makefile,v 1.3 2018/02/09 10:41:45 nigel Exp $ +# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:10 rpe Exp $ COMMENT = BackUp and Restore Program -DISTNAME = burp-2.0.54 -REVISION = 1 + +DISTNAME = burp-2.1.28 CATEGORIES = sysutils + HOMEPAGE = http://burp.grke.org/ # AGPLv3 PERMIT_PACKAGE_CDROM = Yes +WANTLIB = b2 c crypto curses m rsync ssl z + MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=burp/} -EXTRACT_SUFX = .tar.bz2 -CONFIGURE_STYLE = gnu -INSTALL_TARGET = install-all +EXTRACT_SUFX = .tar.bz2 # check is used for tests but detected at configure time BUILD_DEPENDS = devel/uthash \ devel/check LIB_DEPENDS = net/librsync -RUN_DEPENDS = shells/bash -WANTLIB += b2 c crypto m curses rsync ssl z + +CONFIGURE_STYLE = gnu + +INSTALL_TARGET = install-all SUBST_VARS += TRUEPREFIX post-patch: diff --git distinfo distinfo index 8261a2d01ba..b1d87766a7f 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (burp-2.0.54.tar.bz2) = rhBHBYbx/uRVbqrls8UreM/A6sQQn0uCU8VJ5/8ADYY= -SIZE (burp-2.0.54.tar.bz2) = 754566 +SHA256 (burp-2.1.28.tar.bz2) = xiX+2anZEfJQB8sBidlB778WRJzwLoWZ1vUGkBqezX0= +SIZE (burp-2.1.28.tar.bz2) = 781414 diff --git patches/patch-Makefile_in patches/patch-Makefile_in index 045e0419c45..28b2ca2754b 100644 --- patches/patch-Makefile_in +++ patches/patch-Makefile_in @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -625,7 +625,7 @@ sbindir = @sbindir@ +@@ -639,7 +639,7 @@ sbindir = @sbindir@ scriptdir = @scriptdir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git patches/patch-configs_client_burp_conf_in patches/patch-configs_client_burp_conf_in index 4b0fe24292f..9282eb8a823 100644 --- patches/patch-configs_client_burp_conf_in +++ patches/patch-configs_client_burp_conf_in @@ -3,12 +3,19 @@ $OpenBSD: patch-configs_client_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 landry Index: configs/client/burp.conf.in --- configs/client/burp.conf.in.orig +++ configs/client/burp.conf.in -@@ -11,7 +11,7 @@ cname = testclient +@@ -13,7 +13,7 @@ cname = testclient # with a pseudo mirrored storage on the server and optional rsync). 2 forces # protocol2 mode (inline deduplication with variable length blocks). # protocol = 0 --pidfile = @runstatedir@/burp.client.pid +-pidfile = @runstatedir@/@n...@.client.pid +pidfile = @runstatedir@/burp/client.pid syslog = 0 stdout = 1 progress_counter = 1 +@@ -127,3 +127,6 @@ exclude_comp=gz + # When enabled, this causes problems in the phase1 scan (such as an 'include' + # being missing) to be treated as fatal errors. The default is 0. + #scan_problem_raises_error=1 ++ ++# Where to look to find the burp binary to use when forking a monitor client. ++monitor_exe=@sbindir@/burp diff --git patches/patch-configs_server_burp_conf_in patches/patch-configs_server_burp_conf_in index e40588384a1..ce2e8694375 100644 --- patches/patch-configs_server_burp_conf_in +++ patches/patch-configs_server_burp_conf_in @@ -3,16 +3,16 @@ $OpenBSD: patch-configs_server_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 landry Index: configs/server/burp.conf.in --- configs/server/burp.conf.in.orig +++ configs/server/burp.conf.in -@@ -22,7 +22,7 @@ clientconfdir = @sysconfdir@/clientconfdir +@@ -32,7 +32,7 @@ clientconfdir = @sysconfdir@/clientconfdir # Like many other settings, this can be set per client in the clientconfdir # files. # protocol = 0 --pidfile = @runstatedir@/burp.server.pid +-pidfile = @runstatedir@/@n...@.server.pid +pidfile = @runstatedir@/burp/server.pid hardlinked_archive = 0 working_dir_recovery_method = delete - max_children = 5 -@@ -68,8 +68,9 @@ keep = 7 + umask = 0022 +@@ -76,8 +76,9 @@ keep = 7 # keep = 6 # Run as different user/group. diff --git patches/patch-configs_server_timer_script patches/patch-configs_server_timer_script deleted file mode 100644 index 1b1d569ea9f..00000000000 --- patches/patch-configs_server_timer_script +++ /dev/null @@ -1,42 +0,0 @@ -$OpenBSD: patch-configs_server_timer_script,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ - -https://github.com/grke/burp/issues/627 - -Index: configs/server/timer_script ---- configs/server/timer_script.orig -+++ configs/server/timer_script -@@ -77,29 +77,12 @@ get_intervals() - - read junk ts < "$timestamp" - -- if ! secs=$(LANG=C LC_TIME=C date +%s -d "$ts") \ -- || ! now=$(LANG=C LC_TIME=C date +"%Y-%m-%d %H:%M:%S") \ -- || ! nowsecs=$(LANG=C LC_TIME=C date +%s -d "$now") -- then -- echo "$0: Date command returned error for $client." -- return 0 -- fi -- -+ mts=$(echo $ts | sed -e 's/-//g; s/ //; s/://; s/:/./') -+ secs=$(LANG=C LC_TIME=C date -j "$mts" +%s) -+ now=$(LANG=C LC_TIME=C date +"%Y-%m-%d %H:%M:%S") -+ nowsecs=$(LANG=C LC_TIME=C date +%s) - min_timesecs=$((secs+intervalsecs)) -- -- # GNU coreutils 'date' command should accept the following (even -- # slightly old versions). -- if ! min_time=$(LANG=C LC_TIME=C date -d "Jan 1, 1970 00:00:00 +0000 + $min_timesecs seconds" +"%Y-%m-%d %H:%M:%S") -- then -- # FreeBSD 'date' will return an error with the above, so try -- # a version that FreeBSD 'date' should be happy with. -- if ! min_time=$(LANG=C LC_TIME=C date -r $min_timesecs +"%Y-%m-%d %H:%M:%S") -- then -- echo "$0: Date command returned error for $client." -- return 0 -- fi -- fi -- -+ min_time=$(LANG=C LC_TIME=C date -r $min_timesecs +"%Y-%m-%d %H:%M:%S") - echo "Last backup: $ts" - echo "Next after : $min_time (interval $interval)" - diff --git patches/patch-src_client_monitor_status_client_ncurses_c patches/patch-src_client_monitor_status_client_ncurses_c deleted file mode 100644 index d23ac878275..00000000000 --- patches/patch-src_client_monitor_status_client_ncurses_c +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_client_monitor_status_client_ncurses_c,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ - -https://github.com/grke/burp/issues/626 - -Index: src/client/monitor/status_client_ncurses.c ---- src/client/monitor/status_client_ncurses.c.orig -+++ src/client/monitor/status_client_ncurses.c -@@ -1453,14 +1453,7 @@ static pid_t fork_monitor(int *csin, int *csout, struc - char procpath[32]; - char buf[PATH_MAX]; - -- snprintf(procpath, sizeof(procpath), "/proc/%d/exe", getpid()); -- if(!readlink_w(procpath, buf, sizeof(buf))) -- args[a++]=(char *)buf; -- else if(is_reg_lstat(prog_long)>0) -- args[a++]=(char *)prog_long; -- else -- args[a++]=(char *)"/usr/sbin/burp"; -- -+ args[a++]=(char *)"${TRUEPREFIX}/sbin/burp"; - args[a++]=(char *)"-c"; - args[a++]=get_string(confs[OPT_CONFFILE]); - args[a++]=(char *)"-a"; diff --git pkg/PLIST pkg/PLIST index 767d2faa6e1..31fedd9eb09 100644 --- pkg/PLIST +++ pkg/PLIST @@ -4,11 +4,13 @@ @bin bin/vss_strip @man man/man8/bedup.8 @man man/man8/bsigs.8 +@man man/man8/bsparse.8 @man man/man8/burp.8 @man man/man8/burp_ca.8 @man man/man8/vss_strip.8 sbin/bedup sbin/bsigs +sbin/bsparse @bin sbin/burp sbin/burp_ca share/burp/
