From 5a6e700c456176fe2eedc4065caaf9725caae00a Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 14 Dec 2018 20:27:12 -0600
Subject: [PATCH 1/3] rpm packaging - update fcgiwrap socket location

I pushed a new fgciwrap package to Fedora and the socket file in the package is in a different location. See: https://bugzilla.redhat.com/show_bug.cgi?id=1655281
---
 distros/redhat/nginx/zoneminder.nginx.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/nginx/zoneminder.nginx.conf.in b/distros/redhat/nginx/zoneminder.nginx.conf.in
index c2e3edee7..2976a83b2 100644
--- a/distros/redhat/nginx/zoneminder.nginx.conf.in
+++ b/distros/redhat/nginx/zoneminder.nginx.conf.in
@@ -21,7 +21,7 @@ server {
 
         include /etc/nginx/fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
-        fastcgi_pass  unix:/run/fcgiwrap.sock;
+        fastcgi_pass  unix:/run/fcgiwrap/fcgiwrap-nginx.sock;
     }
 
     location /zm/cache {

From c1f46a9cb03bad6efc5ad24e6911b953dfdd9eab Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 15 Dec 2018 16:29:44 -0600
Subject: [PATCH 2/3] Update README.httpd

---
 distros/redhat/readme/README.httpd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/distros/redhat/readme/README.httpd b/distros/redhat/readme/README.httpd
index cb5805b18..5301850df 100644
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@@ -146,13 +146,8 @@ Upgrades
    See step 6 of the installation section if you have not already done this
    during a previous upgrade.
 
-<<<<<<< HEAD
-   If this step is not performed correctly, the web console will appear
-   mostly empty and/or significantly corrupted post-upgrade. 
-=======
    IMPORTANT: Failure to complete this step properly will result in a mostly
    empty or significantly corrupted web console post-upgrade.
->>>>>>> 5b211d250910918782d20bf32b0e33a38a0df4dd
 
 4. Upgrade the database before starting ZoneMinder.
 

From 622c17f628acbe11c58341a5bcf5af5ce2a728f5 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@users.noreply.github.com>
Date: Sun, 16 Dec 2018 11:02:07 -0500
Subject: [PATCH 3/3] make sure auth is regenerated each time we call this API
 (#2347)

---
 web/api/app/Controller/HostController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index d4e19fd77..ce101c73d 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -71,7 +71,8 @@ class HostController extends AppController {
       $zmAuthRelay = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY')))['Config']['Value'];
       if ( $zmAuthRelay == 'hashed' ) {
         $zmAuthHashIps = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_IPS')))['Config']['Value'];
-        $credentials = 'auth='.generateAuthHash($zmAuthHashIps);
+        // make sure auth is regenerated each time we call this API
+        $credentials = 'auth='.generateAuthHash($zmAuthHashIps,true);
       } else {
         // user will need to append the store password here
         $credentials = 'user='.$this->Session->read('user.Username').'&pass=';