update packaging for 0.13 prerelease

4 files changed, 18 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index 97f3d6b9..4c220711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-boxbackup (0.12~gitcf52058f-4~1.gbp8cbb14) UNRELEASED; urgency=medium
+boxbackup (0.13~~git20180102.g6d7e9562-1) unstable; urgency=medium
 
-  ** SNAPSHOT build @8cbb14e04a4ef429bdea5a23f4968b98e4d6c26c **
+  * QA upload
+  * New upstream pre-release (requested by upstream)
+  * Migrate to libssl 1.1 (Closes: #870775)
 
-  * Build-depend on libssl (Closes: #870775)
-
- -- Reinhard Tartler <siretart@tauware.de>  Sun, 26 Nov 2017 22:16:09 -0500
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 13 Jan 2018 20:58:21 -0500
 
 boxbackup (0.12~gitcf52058f-3) unstable; urgency=medium
 
diff --git a/debian/patches/06-fixup-bbstored-certs.diff b/debian/patches/06-fixup-bbstored-certs.diff
index f752bd2c..ff131305 100644
--- a/debian/patches/06-fixup-bbstored-certs.diff
+++ b/debian/patches/06-fixup-bbstored-certs.diff
@@ -24,12 +24,3 @@ useful to me.
  	print <<__E;
  
  This certificate is for backup account
-@@ -288,7 +282,7 @@ sub get_csr_common_name
- 	my $subject;
- 	while(<CSRTEXT>)
- 	{
--		$subject = $1 if m/Subject:.+?CN=([-\.\w]+)/
-+		$subject = $1 if m/Subject:.+?CN\s?=\s?([-\.\w]+)/
- 	}	
- 	close CSRTEXT;
- 
diff --git a/debian/patches/series b/debian/patches/series
index a03c1985..f52e7b08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 03-adjust-syslog-facility.diff
 05-dont_use_net_for_docs.diff
-06-fixup-bbstored-certs.diff
-07-fix-ftbfs-signed-char.diff
diff --git a/debian/testing-notes.org b/debian/testing-notes.org
index 0a6293e4..b948c100 100644
--- a/debian/testing-notes.org
+++ b/debian/testing-notes.org
@@ -7,17 +7,17 @@
 
 These are my personal notes on how I've tested the boxbackup
 packages. Surely there are many other ways (and even better ones) how
-test the packages, but this is a way that works for me. Feel free to fix
-typos and makes suggestions.
+test the packages, but this is a way that works for me. Please do
+provide me with your thoughts and suggestions.
 
 I'm using vagrant in KVM mode, which is included in debian/stretch. I've
-tested this on a relatively modern Intel I5 CPU with an debian amd64
-installation. Other architectures and non-virtualized environments
+tested this on a relatively modern Intel I5-7260U CPU with a Debian
+amd64 installation. Other architectures and non-virtualized environments
 should work exactly the same.  The basic testing idea is to install the
 CA signature server, the boxbackup server and the boxbackup client on
-the same machine, and backup to localhost for simplicity. Production
-installations will place them all on different host, but that would make
-testing unnecessarily hard.
+the same (virtual) machine, and backup to localhost for
+simplicity. Production installations will place them all on different
+host, but that would make testing unnecessarily hard.
 
 Let's first start with installing vagrant:
 
@@ -43,10 +43,10 @@ First install the debian packages. This assumes that the Vagrant file is
 in the same directory that contains the =*.deb= packages to test.
 
 #+BEGIN_SRC bash
-sudo apt install /vagrant/boxbackup*0.12*.deb
+sudo apt install /vagrant/boxbackup*0.13*.deb
 #+END_SRC
 
-First, we need to create a certificat authority.
+First, we need to create a certificate authority.
 
 #+BEGIN_SRC bash
 cd /root
@@ -291,7 +291,9 @@ Which we can now sign:
 
 
 #+BEGIN_EXAMPLE
-# bbstored-certs ca sign /etc/boxbackup/bbackupd/boxbackup-client-cert-req.pem
+# cd /root
+# cp -v /etc/boxbackup/bbackupd/boxbackup-client-cert-req.pem ca/clients/1-csr.pem
+# bbstored-certs ca sign ca/clients/1-csr.pem
 
 This certificate is for backup account
 
@@ -375,7 +377,7 @@ INFO:    Sync finished.
 Let's check the size of the backup store, and the number of files in backup:
 
 #+BEGIN_EXAMPLE
-root@stretch:/tmp# bbackupquery 'list -r'  exit | wc -l
+root@stretch:/tmp# bbackupquery 'list -R'  exit | wc -l
 1184
 root@stretch:/tmp# du -sh /boxbackup
 5.1M	/boxbackup