--- rpms/smeserver-gitweb/contribs8/smeserver-gitweb.spec	2016/06/11 15:26:57	1.6
+++ rpms/smeserver-gitweb/contribs8/smeserver-gitweb.spec	2016/06/22 18:02:09	1.7
@@ -1,6 +1,6 @@
 %define name smeserver-gitweb
 %define version 1.0.0
-%define release 19
+%define release 20
 Summary: GitWeb is a web based Git repository viewer on SME Server
 Name: %{name}
 Version: %{version}
@@ -15,6 +15,8 @@ Patch2: smeserver-gitweb-1.1.0-remove_ru
 Patch3: smeserver-gitweb-1.1.0-runtime_search_for_pwauth.patch
 Patch4: smeserver-gitweb-1.0.0-defineURI.patch
 Patch5: smeserver-gitweb-1.0.0-fix_remote_auth.patch
+Patch6: smeserver-gitweb-1.0.0-checktrusted_networks.patch
+Patch7: smeserver-gitweb-1.0.0-fix_group_check.patch
 Packager: Marco Hess <marco.hess@through-ip.com>
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -29,6 +31,12 @@ AutoReqProv: no
 HTTP access to https://git.host.com provides a gitweb view of the repositories.
 
 %changelog
+* Wed Jun 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-20.sme
+- port to SME8 SME9 fixes
+- fix 500 error after auth on remote access  [SME: 9614]
+- check all trusted networks [SME: 9578]
+- fix git db readable by everybody [SME: 9615]
+
 * Sat Jun 11 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-19.sme
 - fix auth from remote IP [SME: 9202]
 - revert and improved URI patch for SME8 path
@@ -80,6 +88,8 @@ HTTP access to https://git.host.com prov
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -93,11 +103,6 @@ rm -f %{name}-%{version}-filelist
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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 ..."