--- rpms/smeserver-gitweb/contribs8/smeserver-gitweb.spec	2015/02/05 13:21:54	1.1
+++ rpms/smeserver-gitweb/contribs8/smeserver-gitweb.spec	2016/06/10 07:19:52	1.2
@@ -10,6 +10,9 @@ License: GNU GPL version 2
 URL: http://www.through-ip.com
 Group: SMEserver/addon
 Source: smeserver-gitweb-%{version}.tar.gz
+Patch1: smeserver-gitweb-1.1.0-remove_unused_linefeed_from_auth_error.patch
+Patch2: smeserver-gitweb-1.1.0-remove_runtime_access_to_networks_db.patch
+patch3: smeserver-gitweb-1.1.0-runtime_search_for_pwauth.patch
 Packager: Marco Hess <marco.hess@through-ip.com>
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -24,6 +27,16 @@ AutoReqProv: no
 HTTP access to https://git.host.com provides a gitweb view of the repositories.
 
 %changelog
+* Thu Feb 18 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-4
+- backport SME9 changes [SME: 9217]
+- Removed chmod 644 /home/e-smith/db/networks from spec file as
+  it is no longer required for gitweb.conf
+- Changed the trypass function in 60ExportAuthHook to dynamically
+  check for the location of pwauth so this becomes universal for
+  SME8 and SME9.
+- Remove runtime access to NetworkDB [SME: 9217]
+- Some trailing whitespace cleanup
+
 * Tue Feb 2 2015 Marco Hess <marco.hess@through-ip.com> 1.0.0-15
 - pwauth is in /usr/lib/httpd/modules/pwauth for this SME.
 
@@ -65,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 echo "Ensuring git database is accessible to GitWeb ..."
 touch /home/e-smith/db/git
 chmod 644 /home/e-smith/db/git
-echo "Ensuring networks database is accessible to GitWeb ..."
-chmod 644 /home/e-smith/db/networks
+#echo "Ensuring networks database is accessible to GitWeb ..."
+#chmod 644 /home/e-smith/db/networks
 echo "Expanding gitweb.conf template ..."
 /sbin/e-smith/expand-template /etc/gitweb.conf
 echo "Expanding GitWeb home page text template ..."