From d9d969ca863a82e247bd4a2e264591b07a7377f5 Mon Sep 17 00:00:00 2001
From: adridg <adridg@FreeBSD.org>
Date: Fri, 28 Aug 2020 22:16:13 +0000
Subject: [PATCH] Fix sysutils/zbackup in the face of modern C++

The "smart" pointer has had a serious bug for years, but the
method with the bug isn't used :S Fix the bug, throw in some
gratuitous C++ modernizations while we're at it.

Patches submitted upstream.
---
 sysutils/zbackup/Makefile            |  2 +-
 sysutils/zbackup/files/patch-sptr.hh | 47 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/zbackup/files/patch-sptr.hh

diff --git a/sysutils/zbackup/Makefile b/sysutils/zbackup/Makefile
index ea4987360962..4c240da4c47c 100644
--- a/sysutils/zbackup/Makefile
+++ b/sysutils/zbackup/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zbackup
 PORTVERSION=	1.4.4
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/zbackup/files/patch-sptr.hh b/sysutils/zbackup/files/patch-sptr.hh
new file mode 100644
index 000000000000..e9fd8b683ca7
--- /dev/null
+++ b/sysutils/zbackup/files/patch-sptr.hh
@@ -0,0 +1,47 @@
+--- sptr.hh.orig	2015-09-16 07:28:04 UTC
++++ sptr.hh
+@@ -25,9 +25,9 @@ class sptr_base
+ 
+ public:
+ 
+-  sptr_base(): p( 0 ), count( 0 ) {}
++  sptr_base(): p( nullptr ), count( nullptr ) {}
+ 
+-  sptr_base( T * p_ ): p( p_ ), count( p ? new unsigned( 1 ) : 0 )
++  sptr_base( T * p_ ): p( p_ ), count( p ? new unsigned( 1 ) : nullptr )
+   {
+   }
+ 
+@@ -48,27 +48,27 @@ class sptr_base
+       {
+         delete count;
+ 
+-        count = 0;
++        count = nullptr;
+ 
+         if ( p )
+         {
+           T * p_ = p;
+   
+-          p = 0;
++          p = nullptr;
+   
+           delete p_;
+         }
+       }
+       else
+       {
+-        p = 0;
+-        count = 0;
++        p = nullptr;
++        count = nullptr;
+       }
+     }
+   }
+ 
+   unsigned use_count() const
+-  { return count; }
++  { return *count; }
+ 
+   sptr_base & operator = ( sptr_base const & other )
+   { if ( &other != this ) { reset(); p = other.p; count = other.count; increment(); }