Merge branch 'dev-branch' into stable

FOGProject · Aug 8, 2024 · c9a0d07 · c9a0d07
2 parents bd21398 + 9c8b343
commit c9a0d07
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/.githooks/pre-merge-commit b/.githooks/pre-merge-commit
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+# this was taken from the example hook and adapted to run the custom hook
+
+. git-sh-setup
+test -x "$GIT_WORK_TREE/.githooks/pre-commit" &&
+        exec "$GIT_WORK_TREE/.githooks/pre-commit"
+:
diff --git a/lib/common/functions.sh b/lib/common/functions.sh
@@ -1413,7 +1413,7 @@ configureSnapins() {
     dots "Setting up FOG Snapins"
     mkdir -p $snapindir >>$error_log 2>&1
     if [[ -d $snapindir ]]; then
-        chmod -R 777 $snapindir
+        chmod -R 775 $snapindir
         chown -R $username:$apacheuser $snapindir
     fi
     errorStat $?

diff --git a/packages/web/lib/fog/fogpage.class.php b/packages/web/lib/fog/fogpage.class.php
@@ -2673,7 +2673,7 @@ public function kernelfetch()
                     self::$FOGFTP
                         ->delete($orig)
                         ->rename($tmpfile, $orig)
-                        ->chmod(0755, $orig)
+                        ->chmod(0644, $orig)
                         ->close();
                     unlink($tmpfile);
                     die('##OK##');
@@ -2807,7 +2807,7 @@ public function initrdfetch()
                     self::$FOGFTP
                         ->delete($orig)
                         ->rename($tmpfile, $orig)
-                        ->chmod(0755, $orig)
+                        ->chmod(0644, $orig)
                         ->close();
                     unlink($tmpfile);
                     die('##OK##');

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.10.1565');
+        define('FOG_VERSION', '1.5.10.1566');
         define('FOG_SCHEMA', 271);
         define('FOG_BCACHE_VER', 141);
         define('FOG_CLIENT_VERSION', '0.13.0');

diff --git a/packages/web/lib/reg-task/taskqueue.class.php b/packages/web/lib/reg-task/taskqueue.class.php
@@ -401,7 +401,7 @@ private function _moveUpload()
             ->connect()
             ->delete($dest)
             ->rename($src, $dest)
-            ->chmod(0777, $dest)
+            ->chmod(0775, $dest)
             ->close();
         if ($this->Image->get('format') == 1) {
             $this->Image