Fix database and logs path

3 files changed, 11 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2d8e7fca846..1b0cd8c815c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = responder
 	pkgdesc = A LLMNR, NBT-NS and MDNS poisoner, with built-in HTTP/SMB/MSSQL/FTP/LDAP rogue authentication server supporting NTLMv1/NTLMv2/LMv2, Extended Security NTLMSSP and Basic HTTP authentication
 	pkgver = 3.1.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/lgandx/responder/
 	arch = any
 	license = GPL3
@@ -12,6 +12,6 @@ pkgbase = responder
 	source = responder.patch
 	sha256sums = 2e769bc1277749a352dcba193ee1b46d47c45e1385f7de9d34da428cc6966141
 	sha256sums = 3feef53e8c408439bc518474264b91919f9a43593f3bbf656958b9a8a216bc4b
-	sha256sums = 8cb4ecdbe6b43ee8c5b5fccd71ac1762c55675e2d569c5fbbf002b9cf7d98f9f
+	sha256sums = 609160b1f0bb45803a1fb2cc18dd2262d1956352b6adb9b2e839de232ac4183f
 
 pkgname = responder
diff --git a/PKGBUILD b/PKGBUILD
index 1501828f0d49..3122e010ad1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=Responder
 pkgname=responder
 pkgver=3.1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A LLMNR, NBT-NS and MDNS poisoner, with built-in HTTP/SMB/MSSQL/FTP/LDAP rogue authentication server supporting NTLMv1/NTLMv2/LMv2, Extended Security NTLMSSP and Basic HTTP authentication'
 arch=('any')
 depends=('python')
@@ -16,7 +16,7 @@ source=("https://github.com/lgandx/Responder/archive/refs/tags/v${pkgver}.tar.gz
         'responder.patch')
 sha256sums=('2e769bc1277749a352dcba193ee1b46d47c45e1385f7de9d34da428cc6966141'
             '3feef53e8c408439bc518474264b91919f9a43593f3bbf656958b9a8a216bc4b'
-            '8cb4ecdbe6b43ee8c5b5fccd71ac1762c55675e2d569c5fbbf002b9cf7d98f9f')
+            '609160b1f0bb45803a1fb2cc18dd2262d1956352b6adb9b2e839de232ac4183f')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/responder.patch b/responder.patch
index d933edc5fd35..b86733229a7b 100644
--- a/responder.patch
+++ b/responder.patch
@@ -1,43 +1,31 @@
 diff --git a/Responder.conf b/Responder.conf
-index 5c1b94e..9493f30 100755
+index 5c1b94e..9590db3 100755
 --- a/Responder.conf
 +++ b/Responder.conf
-@@ -24,6 +24,11 @@ Challenge = Random
+@@ -24,6 +24,9 @@ Challenge = Random
  ; Delete this file to re-capture previously captured hashes
--Database = Responder.db
-+Database = /var/lib/responder/Responder.db
+ Database = Responder.db
  
-+
 +; Path to log folder
 +LogPath = /var/log/responder
 +
-+
  ; Default log file
  SessionLog = Responder-Session.log
  
 diff --git a/settings.py b/settings.py
-index 095f5b5..3b7d9c9 100755
+index 095f5b5..6ec5341 100755
 --- a/settings.py
 +++ b/settings.py
-@@ -83,6 +83,8 @@ class Settings:
- 		# Config parsing
- 		config = ConfigParser.ConfigParser()
- 		config.read(os.path.join(self.ResponderPATH, 'Responder.conf'))
-+
-+		self.LogPath = config.get('Responder Core', 'LogPath')
- 		
- 		# Servers
- 		self.HTTP_On_Off     = self.toBool(config.get('Responder Core', 'HTTP'))
-@@ -101,10 +103,10 @@ class Settings:
+@@ -101,10 +101,10 @@ class Settings:
  		self.Krb_On_Off      = self.toBool(config.get('Responder Core', 'Kerberos'))
  
  		# Db File
 -		self.DatabaseFile    = os.path.join(self.ResponderPATH, config.get('Responder Core', 'Database'))
-+		self.DatabaseFile    = os.path.join(self.LogPath, config.get('Responder Core', 'Database'))
++		self.DatabaseFile    = os.path.join("/var/lib/responder", config.get('Responder Core', 'Database'))
  
  		# Log Files
 -		self.LogDir = os.path.join(self.ResponderPATH, 'logs')
-+		self.LogDir = os.path.join(self.LogPath, 'logs')
++		self.LogDir = config.get('Responder Core', 'LogPath')
  
  		if not os.path.exists(self.LogDir):
  			os.mkdir(self.LogDir)