From fe69dc6173e8a3e45ff7996597e9e50f09033279 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@riseup.net>
Date: Fri, 28 Jun 2019 07:09:35 +0000
Subject: [PATCH] bumped changelog version

---
 changelog.upstream | 106 +++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog   |   6 +++
 2 files changed, 112 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index 168c078..d20a654 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,97 @@
+commit 6a6afc347ad80bd133438a27e2dc64a1b54c784a
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Fri Jun 28 03:02:49 2019 -0400
+
+    update files list
+
+commit ccb89cfd5574ed5a7b3802edc3bf188250edfddd
+Merge: 0a0be1a ab31223
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Fri Jun 28 03:00:21 2019 -0400
+
+    Merge remote-tracking branch 'origin/master'
+
+commit ab312235ba89d62b7b83c26f8e9b8a8ff0ec985b
+Merge: 5e02100 3801a53
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Fri Jun 28 06:59:16 2019 +0000
+
+    Merge pull request #14 from madaidan/patch-10
+    
+    Add some hardening for other distributions
+
+commit 5e02100e34776bf410ba05d7a3f7ee7f696ca0fc
+Merge: 7e12e16 b809185
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Fri Jun 28 06:58:32 2019 +0000
+
+    Merge pull request #13 from madaidan/patch-9
+    
+    Remove System.map and restrict the SysRq key.
+
+commit 7e12e16dc0513f0a6936e576e3c8fa8ee44509d2
+Merge: 0a0be1a 641407c
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Fri Jun 28 06:57:42 2019 +0000
+
+    Merge pull request #11 from madaidan/patch-7
+    
+    Protect against DMA attacks
+
+commit 3801a53a9e01aafa3783276059a7907f5b20b96e
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Thu Jun 27 18:17:58 2019 +0000
+
+    Update tcp_hardening.conf
+
+commit c54125270b44140b9ecfe0420205ac685b2a3505
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Thu Jun 27 18:15:57 2019 +0000
+
+    Create dmesg_restrict.conf
+
+commit b8091850082fe1b956d6cff11fc7aa17786e693e
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Thu Jun 27 16:09:52 2019 +0000
+
+    Update remove-system-map.service
+
+commit 9392c8deb2657d3ff2c3734fb8bf1863d4e2a2d7
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Wed Jun 26 15:03:54 2019 +0000
+
+    Update remove-system.map
+
+commit 8ef0db17e6a9c066b50a021292aab80a7523cbb6
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Wed Jun 26 12:59:45 2019 +0000
+
+    Use a for loop to detect if System.map exists
+
+commit 3116a56f1353681fbb97d4e7f92ee069f2577b33
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Tue Jun 25 19:25:32 2019 +0000
+
+    Create remove-system-map.service
+
+commit 382e336f69097f3baa7693da6aaf8833b05cf322
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Tue Jun 25 19:20:27 2019 +0000
+
+    Create remove-system.map
+
+commit 01c839c815b7f8c16c231bbd72da1673ad88fdb7
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Tue Jun 25 19:16:43 2019 +0000
+
+    Restrict what the SysRq key can do
+
+commit 0a0be1ad2889182b15d5851740ff43fb75773571
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Sun Jun 23 19:57:42 2019 +0000
+
+    bumped changelog version
+
 commit 7806af14193f195e825678471ba65c64e07d7d0a
 Author: Patrick Schleizer <adrelanos@riseup.net>
 Date:   Sun Jun 23 19:51:53 2019 +0000
@@ -58,6 +152,18 @@ Date:   Sun Jun 23 18:45:24 2019 +0000
     
     Enable more kernel hardening parameters
 
+commit 641407c8e9c728429ec86e7c89e431896d88e116
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Sun Jun 23 18:38:50 2019 +0000
+
+    Enable IOMMU
+
+commit 07c6362f1aff2e151c51aa681a79c3ef650baa6d
+Author: madaidan <50278627+madaidan@users.noreply.github.com>
+Date:   Sun Jun 23 18:34:45 2019 +0000
+
+    Blacklist thunderbolt and firewire
+
 commit 2178fb37a85808df0c455f7dd76fc72516d6ff28
 Author: madaidan <50278627+madaidan@users.noreply.github.com>
 Date:   Sun Jun 23 17:54:34 2019 +0000
diff --git a/debian/changelog b/debian/changelog
index afcdf9a..4d7847e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:3.6-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@riseup.net>  Fri, 28 Jun 2019 07:09:35 +0000
+
 security-misc (3:3.5-1) unstable; urgency=medium
 
   * New upstream version (local package).