--- rpms/smeserver-gitweb/contribs9/smeserver-gitweb.spec	2016/02/11 02:54:17	1.2
+++ rpms/smeserver-gitweb/contribs9/smeserver-gitweb.spec	2016/06/11 19:06:31	1.8
@@ -1,6 +1,6 @@
 %define name smeserver-gitweb
 %define version 1.1.0
-%define release 1
+%define release 6
 Summary: GitWeb is a web based Git repository viewer on SME Server
 Name: %{name}
 Version: %{version}
@@ -20,11 +20,34 @@ Requires: gitweb
 Requires: highlight
 AutoReqProv: no
 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
+Patch4: smeserver-gitweb-1.1.0-defineURI.patch
+Patch5: smeserver-gitweb-1.1.0-fix_remote_auth.patch
 
 %description
 HTTP access to https://git.host.com provides a gitweb view of the repositories.
 
 %changelog
+* Sat Jun 11 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-6.sme
+- fix auth from remote IP [SME: 9202]
+
+* Fri Jun 10 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-5.sme
+- fix short url to repo not working  [SME: 9202]
+
+* Thu Feb 18 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-4
+- Removed chmod 644 /home/e-smith/db/networks from spec file as 
+  it is no longer required for gitweb.conf
+
+* Wed Feb 17 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-3
+- Changed the trypass function in 60ExportAuthHook to dynamically
+  check for the location of pwauth so this becomes universal for
+  SME8 and SME9.
+
+* Wed Feb 17 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-2
+- Remove runtime access to NetworkDB [SME: 9217]
+- Some trailing whitespace cleanup
+
 * Thu Feb 11 2016 Marco Hess <marco.hess@through-ip.com> 1.1.0-1
 - Remove unused line feeds from auth_error messages [SME: 9217]
 
@@ -49,6 +72,11 @@ HTTP access to https://git.host.com prov
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
 %build
 
 %install
@@ -64,8 +92,6 @@ 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 "Expanding gitweb.conf template ..."
 /sbin/e-smith/expand-template /etc/gitweb.conf
 echo "Expanding GitWeb home page text template ..."