On Wed, Feb 28, 2018 at 10:05:57PM +0000, Stuart Henderson wrote:
> > I hope I finally was successful to make diff for burp.
>
> Diff only has one of the two versions. Can you just send a tar?
OK, new diff and tarball attached.
> > - moving current port version into '2.0' subdir
> > - adding 'stable' subdir for 2.1.28
>
> 2.0 and 'stable' doesn't seem very natural. I think this would
> be better named 2.0 and 2.1.
>
> > - I would love to know how to build -static flavor so I could use burp
> > for disaster recovery from ramdisk env.
>
> You're into custom ramdisks then really, which is beyond the scope of
> ports. It would probably need to be non-PIE as well as static. I think
> you'd have less trouble with a USB stick or netboot installation
> rather than ramdisk for DR.
I was using install and restore over it in the past - although on RHEL -
and I was not very happy about it, too much fragile IMO.
Thank you for help.
Jiri
diff --git sysutils/burp/2.0/Makefile sysutils/burp/2.0/Makefile
new file mode 100644
index 00000000000..ceb51612cbf
--- /dev/null
+++ sysutils/burp/2.0/Makefile
@@ -0,0 +1,13 @@
+# $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
+
+post-install:
+ @rm -Rf ${WRKINST}/${SYSCONFDIR}/burp/autoupgrade
+ @mv ${WRKINST}/${SYSCONFDIR}/burp ${PREFIX}/share/examples/burp
+
+.include <bsd.port.mk>
diff --git sysutils/burp/distinfo sysutils/burp/2.0/distinfo
similarity index 100%
rename from sysutils/burp/distinfo
rename to sysutils/burp/2.0/distinfo
diff --git sysutils/burp/patches/patch-Makefile_in sysutils/burp/2.0/patches/patch-Makefile_in
similarity index 100%
rename from sysutils/burp/patches/patch-Makefile_in
rename to sysutils/burp/2.0/patches/patch-Makefile_in
diff --git sysutils/burp/patches/patch-configs_client_burp_conf_in sysutils/burp/2.0/patches/patch-configs_client_burp_conf_in
similarity index 100%
rename from sysutils/burp/patches/patch-configs_client_burp_conf_in
rename to sysutils/burp/2.0/patches/patch-configs_client_burp_conf_in
diff --git sysutils/burp/patches/patch-configs_server_burp_conf_in sysutils/burp/2.0/patches/patch-configs_server_burp_conf_in
similarity index 100%
rename from sysutils/burp/patches/patch-configs_server_burp_conf_in
rename to sysutils/burp/2.0/patches/patch-configs_server_burp_conf_in
diff --git sysutils/burp/patches/patch-configs_server_timer_script sysutils/burp/2.0/patches/patch-configs_server_timer_script
similarity index 100%
rename from sysutils/burp/patches/patch-configs_server_timer_script
rename to sysutils/burp/2.0/patches/patch-configs_server_timer_script
diff --git sysutils/burp/patches/patch-src_client_monitor_status_client_ncurses_c sysutils/burp/2.0/patches/patch-src_client_monitor_status_client_ncurses_c
similarity index 100%
rename from sysutils/burp/patches/patch-src_client_monitor_status_client_ncurses_c
rename to sysutils/burp/2.0/patches/patch-src_client_monitor_status_client_ncurses_c
diff --git sysutils/burp/pkg/DESCR sysutils/burp/2.0/pkg/DESCR
similarity index 100%
rename from sysutils/burp/pkg/DESCR
rename to sysutils/burp/2.0/pkg/DESCR
diff --git sysutils/burp/pkg/PLIST sysutils/burp/2.0/pkg/PLIST
similarity index 98%
rename from sysutils/burp/pkg/PLIST
rename to sysutils/burp/2.0/pkg/PLIST
index 767d2faa6e1..71f076924f1 100644
--- sysutils/burp/pkg/PLIST
+++ sysutils/burp/2.0/pkg/PLIST
@@ -1,4 +1,6 @@
@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
diff --git sysutils/burp/pkg/burp.rc sysutils/burp/2.0/pkg/burp.rc
similarity index 100%
rename from sysutils/burp/pkg/burp.rc
rename to sysutils/burp/2.0/pkg/burp.rc
diff --git sysutils/burp/Makefile sysutils/burp/Makefile
index c7292cb155d..abe55ff38ee 100644
--- sysutils/burp/Makefile
+++ sysutils/burp/Makefile
@@ -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 += stable
-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>
diff --git sysutils/burp/Makefile.inc sysutils/burp/Makefile.inc
new file mode 100644
index 00000000000..4031ddc310b
--- /dev/null
+++ sysutils/burp/Makefile.inc
@@ -0,0 +1,28 @@
+# $OpenBSD$
+
+COMMENT = BackUp and Restore Program
+DISTNAME = burp-${VERSION}
+
+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
+
+pre-install:
+ ${INSTALL_DATA_DIR} ${DESTDIR}${SYSCONFDIR}/burp
diff --git sysutils/burp/stable/Makefile sysutils/burp/stable/Makefile
new file mode 100644
index 00000000000..5b20ecdc694
--- /dev/null
+++ sysutils/burp/stable/Makefile
@@ -0,0 +1,14 @@
+# $OpenBSD$
+
+VERSION = 2.1.28
+
+post-install:
+ @rm -Rf ${WRKINST}/${SYSCONFDIR}/burp/autoupgrade
+ @mv ${WRKINST}/${SYSCONFDIR}/burp ${PREFIX}/share/examples/burp
+ @perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' \
+ ${PREFIX}/share/examples/burp/burp.conf
+
+.include <bsd.port.mk>
+CONFIGURE_ARGS = --sysconfdir="${SYSCONFDIR}/burp" \
+ --mandir="${PREFIX}/man" \
+ --localstatedir="${LOCALSTATEDIR}"
diff --git sysutils/burp/stable/distinfo sysutils/burp/stable/distinfo
new file mode 100644
index 00000000000..b1d87766a7f
--- /dev/null
+++ sysutils/burp/stable/distinfo
@@ -0,0 +1,2 @@
+SHA256 (burp-2.1.28.tar.bz2) = xiX+2anZEfJQB8sBidlB778WRJzwLoWZ1vUGkBqezX0=
+SIZE (burp-2.1.28.tar.bz2) = 781414
diff --git sysutils/burp/stable/patches/patch-configs_client_burp_conf_in sysutils/burp/stable/patches/patch-configs_client_burp_conf_in
new file mode 100644
index 00000000000..9bf29f50442
--- /dev/null
+++ sysutils/burp/stable/patches/patch-configs_client_burp_conf_in
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: configs/client/burp.conf.in
+--- configs/client/burp.conf.in.orig
++++ configs/client/burp.conf.in
+@@ -13,7 +13,8 @@ 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@/@name@.client.pid
++pidfile = @runstatedir@/burp/@name@.client.pid
++monitor_exe = %%LOCALBASE%%/sbin/burp
+ syslog = 0
+ stdout = 1
+ progress_counter = 1
diff --git sysutils/burp/stable/patches/patch-configs_server_burp_conf_in sysutils/burp/stable/patches/patch-configs_server_burp_conf_in
new file mode 100644
index 00000000000..e9c7fc439a1
--- /dev/null
+++ sysutils/burp/stable/patches/patch-configs_server_burp_conf_in
@@ -0,0 +1,34 @@
+$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
+@@ -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@/@name@.server.pid
++pidfile = @runstatedir@/burp/@name@.server.pid
+ hardlinked_archive = 0
+ working_dir_recovery_method = delete
+ umask = 0022
+@@ -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
diff --git sysutils/burp/stable/pkg/DESCR sysutils/burp/stable/pkg/DESCR
new file mode 100644
index 00000000000..01a51148382
--- /dev/null
+++ sysutils/burp/stable/pkg/DESCR
@@ -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.
diff --git sysutils/burp/stable/pkg/PLIST sysutils/burp/stable/pkg/PLIST
new file mode 100644
index 00000000000..37ad14e4c53
--- /dev/null
+++ sysutils/burp/stable/pkg/PLIST
@@ -0,0 +1,74 @@
+@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}/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
diff --git sysutils/burp/stable/pkg/burp.rc sysutils/burp/stable/pkg/burp.rc
new file mode 100644
index 00000000000..98d0505c4ac
--- /dev/null
+++ sysutils/burp/stable/pkg/burp.rc
@@ -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/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
No comments:
Post a Comment