On 2018/02/28 17:32, Jiri B wrote: > OK, new diff and tarball attached. I've cleaned it up a bit. Does it still work for you?
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/burp/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 9 Feb 2018 10:41:45 -0000 1.3 +++ Makefile 2 Mar 2018 20:45:49 -0000 @@ -1,34 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2018/02/09 10:41:45 nigel Exp $ +# $OpenBSD$ -COMMENT = BackUp and Restore Program -DISTNAME = burp-2.0.54 -REVISION = 1 +SUBDIR = +SUBDIR += 2.0 +SUBDIR += 2.1 -CATEGORIES = sysutils -HOMEPAGE = http://burp.grke.org/ - -# AGPLv3 -PERMIT_PACKAGE_CDROM = Yes - -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=burp/} -EXTRACT_SUFX = .tar.bz2 - -CONFIGURE_STYLE = gnu -INSTALL_TARGET = install-all - -# 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 - -SUBST_VARS += TRUEPREFIX -post-patch: - ${SUBST_CMD} ${WRKSRC}/src/client/monitor/status_client_ncurses.c - -post-install: - @rm -Rf ${WRKINST}/${SYSCONFDIR}/burp/autoupgrade - @mv ${WRKINST}/${SYSCONFDIR}/burp ${PREFIX}/share/examples/burp - -.include <bsd.port.mk> +.include <bsd.port.subdir.mk> Index: Makefile.inc =================================================================== RCS file: Makefile.inc diff -N Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile.inc 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,32 @@ +# $OpenBSD$ + +COMMENT = BackUp and Restore Program +DISTNAME = burp-${VERSION} + +CATEGORIES = sysutils +HOMEPAGE = http://burp.grke.org/ + +# AGPLv3 +PERMIT_PACKAGE_CDROM = Yes + +WANTLIB ?= b2 c crypto m curses rsync ssl z + +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=burp/} + +EXTRACT_SUFX = .tar.bz2 + +CONFIGURE_STYLE = gnu +INSTALL_TARGET = install-all + +# check is used for tests but detected at configure time +BUILD_DEPENDS = devel/check \ + devel/uthash +LIB_DEPENDS = net/librsync +RUN_DEPENDS = shells/bash +SYSCONFDIR = ${BASESYSCONFDIR}/burp +CONFIGURE_ENV = runstatedir=${LOCALSTATEDIR}/run/burp + +# configs are subst'ed in fake; use mv, don't override sysconfdir in FAKE_FLAGS +post-install: + rm -Rf ${WRKINST}${SYSCONFDIR}/autoupgrade + mv ${WRKINST}${SYSCONFDIR} ${PREFIX}/share/examples/ Index: distinfo =================================================================== RCS file: distinfo diff -N distinfo --- distinfo 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -SHA256 (burp-2.0.54.tar.bz2) = rhBHBYbx/uRVbqrls8UreM/A6sQQn0uCU8VJ5/8ADYY= -SIZE (burp-2.0.54.tar.bz2) = 754566 Index: 2.0/Makefile =================================================================== RCS file: 2.0/Makefile diff -N 2.0/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/Makefile 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,9 @@ +# $OpenBSD: Makefile,v 1.3 2018/02/09 10:41:45 nigel Exp $ + +VERSION = 2.0.54 +REVISION = 1 + +post-patch: + ${SUBST_CMD} ${WRKSRC}/src/client/monitor/status_client_ncurses.c + +.include <bsd.port.mk> Index: 2.0/distinfo =================================================================== RCS file: 2.0/distinfo diff -N 2.0/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/distinfo 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,2 @@ +SHA256 (burp-2.0.54.tar.bz2) = rhBHBYbx/uRVbqrls8UreM/A6sQQn0uCU8VJ5/8ADYY= +SIZE (burp-2.0.54.tar.bz2) = 754566 Index: 2.0/patches/patch-configs_server_burp_conf_in =================================================================== RCS file: 2.0/patches/patch-configs_server_burp_conf_in diff -N 2.0/patches/patch-configs_server_burp_conf_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/patches/patch-configs_server_burp_conf_in 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,17 @@ +$OpenBSD: patch-configs_server_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ + +Index: configs/server/burp.conf.in +--- configs/server/burp.conf.in.orig ++++ configs/server/burp.conf.in +@@ -68,8 +68,9 @@ keep = 7 + # keep = 6 + + # Run as different user/group. +-# user=graham +-# group=nogroup ++user=_burp ++group=_burp ++dedup_group=_burp + + # CA options. + # If you want your server to be a certificate authority and generate its own Index: 2.0/patches/patch-configs_server_timer_script =================================================================== RCS file: 2.0/patches/patch-configs_server_timer_script diff -N 2.0/patches/patch-configs_server_timer_script --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/patches/patch-configs_server_timer_script 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,42 @@ +$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)" + Index: 2.0/patches/patch-src_client_monitor_status_client_ncurses_c =================================================================== RCS file: 2.0/patches/patch-src_client_monitor_status_client_ncurses_c diff -N 2.0/patches/patch-src_client_monitor_status_client_ncurses_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/patches/patch-src_client_monitor_status_client_ncurses_c 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,23 @@ +$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"; Index: 2.0/pkg/DESCR =================================================================== RCS file: 2.0/pkg/DESCR diff -N 2.0/pkg/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/pkg/DESCR 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,4 @@ +Burp is a network backup and restore program. It attempts to reduce +network traffic and the amount of space that is used by each backup, +and uses VSS (Volume Shadow Copy Service) to make snapshots when +backing up Windows computers. Index: 2.0/pkg/PLIST =================================================================== RCS file: 2.0/pkg/PLIST diff -N 2.0/pkg/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/pkg/PLIST 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,75 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ +@option is-branch +@conflict burp-* +@newgroup _burp:794 +@newuser _burp:794:794:daemon:BackUp and Recovery Daemon:/var/empty:/sbin/nologin +@bin bin/vss_strip +@man man/man8/bedup.8 +@man man/man8/bsigs.8 +@man man/man8/burp.8 +@man man/man8/burp_ca.8 +@man man/man8/vss_strip.8 +sbin/bedup +sbin/bsigs +@bin sbin/burp +sbin/burp_ca +share/burp/ +share/burp/scripts/ +share/burp/scripts/notify_script +share/burp/scripts/ssl_extra_checks_script +share/burp/scripts/summary_script +share/burp/scripts/timer_script +share/doc/burp/ +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/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 +@mode 770 +@owner _burp +@group _burp +share/examples/burp/ +@sample ${LOCALSTATEDIR}/spool/burp/ +@sample ${SYSCONFDIR}/ +share/examples/burp/CA-client/ +@sample ${SYSCONFDIR}/CA-client/ +@mode 660 +share/examples/burp/CA.cnf +@sample ${SYSCONFDIR}/CA.cnf +share/examples/burp/burp-server.conf +@sample ${SYSCONFDIR}/burp-server.conf +share/examples/burp/burp.conf +@sample ${SYSCONFDIR}/burp.conf +@mode 770 +share/examples/burp/clientconfdir/ +@sample ${SYSCONFDIR}/clientconfdir/ +share/examples/burp/clientconfdir/incexc/ +@sample ${SYSCONFDIR}/clientconfdir/incexc/ +@mode 660 +share/examples/burp/clientconfdir/incexc/example +@sample ${SYSCONFDIR}/clientconfdir/incexc/example +share/examples/burp/clientconfdir/testclient +@sample ${SYSCONFDIR}/clientconfdir/testclient +@mode +@owner +@group +@rcscript ${RCDIR}/burp Index: 2.0/pkg/burp.rc =================================================================== RCS file: 2.0/pkg/burp.rc diff -N 2.0/pkg/burp.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.0/pkg/burp.rc 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,15 @@ +#!/bin/ksh +# +# $OpenBSD: burp.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $ + +daemon="${TRUEPREFIX}/sbin/burp" +daemon_flags="-c ${SYSCONFDIR}/burp-server.conf" + +. /etc/rc.d/rc.subr + +rc_pre() { + chown _burp ${SYSCONFDIR}/ssl_cert_ca.pem + install -d -o _burp -g _burp ${LOCALSTATEDIR}/run/burp +} + +rc_cmd $1 Index: 2.1/Makefile =================================================================== RCS file: 2.1/Makefile diff -N 2.1/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/Makefile 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,5 @@ +# $OpenBSD$ + +VERSION = 2.1.28 + +.include <bsd.port.mk> Index: 2.1/distinfo =================================================================== RCS file: 2.1/distinfo diff -N 2.1/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/distinfo 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,2 @@ +SHA256 (burp-2.1.28.tar.bz2) = xiX+2anZEfJQB8sBidlB778WRJzwLoWZ1vUGkBqezX0= +SIZE (burp-2.1.28.tar.bz2) = 781414 Index: 2.1/patches/patch-configs_client_burp_conf_in =================================================================== RCS file: 2.1/patches/patch-configs_client_burp_conf_in diff -N 2.1/patches/patch-configs_client_burp_conf_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/patches/patch-configs_client_burp_conf_in 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: configs/client/burp.conf.in +--- configs/client/burp.conf.in.orig ++++ configs/client/burp.conf.in +@@ -14,6 +14,7 @@ cname = testclient + # protocol2 mode (inline deduplication with variable length blocks). + # protocol = 0 + pidfile = @runstatedir@/@n...@.client.pid ++monitor_exe = @prefix@/sbin/burp + syslog = 0 + stdout = 1 + progress_counter = 1 Index: 2.1/patches/patch-configs_server_burp_conf_in =================================================================== RCS file: 2.1/patches/patch-configs_server_burp_conf_in diff -N 2.1/patches/patch-configs_server_burp_conf_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/patches/patch-configs_server_burp_conf_in 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +Index: configs/server/burp.conf.in +--- configs/server/burp.conf.in.orig ++++ configs/server/burp.conf.in +@@ -23,7 +23,7 @@ max_status_children = 5 + # max_status_children = 6 + + directory = @localstatedir@/spool/@name@ +-dedup_group = global ++dedup_group = _burp + clientconfdir = @sysconfdir@/clientconfdir + # Choose the protocol to use. + # 0 to decide automatically, 1 to force protocol1 mode (file level granularity +@@ -76,8 +76,8 @@ keep = 7 + # keep = 6 + + # Run as different user/group. +-# user=graham +-# group=nogroup ++user=_burp ++group=_burp + + # CA options. + # If you want your server to be a certificate authority and generate its own Index: 2.1/pkg/DESCR =================================================================== RCS file: 2.1/pkg/DESCR diff -N 2.1/pkg/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/pkg/DESCR 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,4 @@ +Burp is a network backup and restore program. It attempts to reduce +network traffic and the amount of space that is used by each backup, +and uses VSS (Volume Shadow Copy Service) to make snapshots when +backing up Windows computers. Index: 2.1/pkg/PLIST =================================================================== RCS file: 2.1/pkg/PLIST diff -N 2.1/pkg/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/pkg/PLIST 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,77 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ +@option is-branch +@conflict burp-* +@newgroup _burp:794 +@newuser _burp:794:794:daemon:BackUp and Recovery Daemon:/var/empty:/sbin/nologin +@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/ +share/burp/scripts/ +share/burp/scripts/notify_script +share/burp/scripts/ssl_extra_checks_script +share/burp/scripts/summary_script +share/burp/scripts/timer_script +share/doc/burp/ +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/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 +@mode 770 +@owner _burp +@group _burp +share/examples/burp/ +@sample ${SYSCONFDIR}/ +@sample ${LOCALSTATEDIR}/spool/burp/ +share/examples/burp/CA-client/ +@sample ${SYSCONFDIR}/CA-client/ +@mode 660 +share/examples/burp/CA.cnf +@sample ${SYSCONFDIR}/CA.cnf +share/examples/burp/burp-server.conf +@sample ${SYSCONFDIR}/burp-server.conf +share/examples/burp/burp.conf +@sample ${SYSCONFDIR}/burp.conf +@mode 770 +share/examples/burp/clientconfdir/ +@sample ${SYSCONFDIR}/clientconfdir/ +share/examples/burp/clientconfdir/incexc/ +@sample ${SYSCONFDIR}/clientconfdir/incexc/ +@mode 660 +share/examples/burp/clientconfdir/incexc/example +@sample ${SYSCONFDIR}/clientconfdir/incexc/example +share/examples/burp/clientconfdir/testclient +@sample ${SYSCONFDIR}/clientconfdir/testclient +@mode +@owner +@group +@rcscript ${RCDIR}/burp Index: 2.1/pkg/burp.rc =================================================================== RCS file: 2.1/pkg/burp.rc diff -N 2.1/pkg/burp.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 2.1/pkg/burp.rc 2 Mar 2018 20:45:49 -0000 @@ -0,0 +1,15 @@ +#!/bin/ksh +# +# $OpenBSD: burp.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $ + +daemon="${TRUEPREFIX}/sbin/burp" +daemon_flags="-c ${SYSCONFDIR}/burp-server.conf" + +. /etc/rc.d/rc.subr + +rc_pre() { + chown _burp ${SYSCONFDIR}/ssl_cert_ca.pem + install -d -o _burp -g _burp ${LOCALSTATEDIR}/run/burp +} + +rc_cmd $1 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$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@ - scriptdir = @scriptdir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @sysconfdir@/burp - target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ Index: patches/patch-configs_client_burp_conf_in =================================================================== RCS file: patches/patch-configs_client_burp_conf_in diff -N patches/patch-configs_client_burp_conf_in --- patches/patch-configs_client_burp_conf_in 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-configs_client_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ - -Index: configs/client/burp.conf.in ---- configs/client/burp.conf.in.orig -+++ configs/client/burp.conf.in -@@ -11,7 +11,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@/burp/client.pid - syslog = 0 - stdout = 1 - progress_counter = 1 Index: patches/patch-configs_server_burp_conf_in =================================================================== RCS file: patches/patch-configs_server_burp_conf_in diff -N patches/patch-configs_server_burp_conf_in --- patches/patch-configs_server_burp_conf_in 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-configs_server_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ - -Index: configs/server/burp.conf.in ---- configs/server/burp.conf.in.orig -+++ configs/server/burp.conf.in -@@ -22,7 +22,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@/burp/server.pid - hardlinked_archive = 0 - working_dir_recovery_method = delete - max_children = 5 -@@ -68,8 +68,9 @@ keep = 7 - # keep = 6 - - # Run as different user/group. --# user=graham --# group=nogroup -+user=_burp -+group=_burp -+dedup_group=_burp - - # CA options. - # If you want your server to be a certificate authority and generate its own Index: patches/patch-configs_server_timer_script =================================================================== RCS file: patches/patch-configs_server_timer_script diff -N patches/patch-configs_server_timer_script --- patches/patch-configs_server_timer_script 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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)" - Index: patches/patch-src_client_monitor_status_client_ncurses_c =================================================================== RCS file: patches/patch-src_client_monitor_status_client_ncurses_c diff -N patches/patch-src_client_monitor_status_client_ncurses_c --- patches/patch-src_client_monitor_status_client_ncurses_c 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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"; Index: pkg/DESCR =================================================================== RCS file: pkg/DESCR diff -N pkg/DESCR --- pkg/DESCR 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -Burp is a network backup and restore program. It attempts to reduce -network traffic and the amount of space that is used by each backup, -and uses VSS (Volume Shadow Copy Service) to make snapshots when -backing up Windows computers. Index: pkg/PLIST =================================================================== RCS file: pkg/PLIST diff -N pkg/PLIST --- pkg/PLIST 3 Nov 2017 11:31:01 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,70 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $ -@newgroup _burp:794 -@newuser _burp:794:794:daemon:BackUp and Recovery Daemon:/var/empty:/sbin/nologin -@bin bin/vss_strip -@man man/man8/bedup.8 -@man man/man8/bsigs.8 -@man man/man8/burp.8 -@man man/man8/burp_ca.8 -@man man/man8/vss_strip.8 -sbin/bedup -sbin/bsigs -@bin sbin/burp -sbin/burp_ca -share/burp/ -share/burp/scripts/ -share/burp/scripts/notify_script -share/burp/scripts/ssl_extra_checks_script -share/burp/scripts/summary_script -share/burp/scripts/timer_script -share/doc/burp/ -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/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 -@mode 770 -@owner _burp -@group _burp -share/examples/burp/ -@sample ${SYSCONFDIR}/burp/ -share/examples/burp/CA-client/ -@sample ${SYSCONFDIR}/burp/CA-client/ -share/examples/burp/CA.cnf -@sample ${SYSCONFDIR}/burp/CA.cnf -share/examples/burp/burp-server.conf -@sample ${SYSCONFDIR}/burp/burp-server.conf -share/examples/burp/burp.conf -@sample ${SYSCONFDIR}/burp/burp.conf -share/examples/burp/clientconfdir/ -@sample ${SYSCONFDIR}/burp/clientconfdir/ -share/examples/burp/clientconfdir/incexc/ -@sample ${SYSCONFDIR}/burp/clientconfdir/incexc/ -share/examples/burp/clientconfdir/incexc/example -@sample ${SYSCONFDIR}/burp/clientconfdir/incexc/example -share/examples/burp/clientconfdir/testclient -@sample ${SYSCONFDIR}/burp/clientconfdir/testclient -@sample /var/spool/burp/ -@mode -@owner -@group -@rcscript ${RCDIR}/burp Index: pkg/burp.rc =================================================================== RCS file: pkg/burp.rc diff -N pkg/burp.rc --- pkg/burp.rc 11 Jan 2018 19:27:10 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -#!/bin/ksh -# -# $OpenBSD: burp.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $ - -daemon="${TRUEPREFIX}/sbin/burp" -daemon_flags="-c ${SYSCONFDIR}/burp/burp-server.conf" - -. /etc/rc.d/rc.subr - -rc_pre() { - chown _burp ${SYSCONFDIR}/burp/ssl_cert_ca.pem - install -d -o _burp -g _burp /var/run/burp -} - -rc_cmd $1
