Refresh patches for 8.1

Author: thijskh

debian/patches/010_debianise_dj_make_chroot.patch

@@ -2,8 +2,8 @@ Author: Thijs Kinkhorst <[email protected]>
 Description: Update config and scripts to replace choices with Debian values.
 Forwarded: not-needed
 
---- a/misc-tools/dj_make_chroot.in
-+++ b/misc-tools/dj_make_chroot.in
+--- a/misc-tools/dj_make_chroot.in	2022-06-01 16:58:10.000000000 +0000
++++ b/misc-tools/dj_make_chroot.in	2022-06-09 19:19:24.954518891 +0000
 @@ -24,7 +24,7 @@
  trap cleanup EXIT
 
@@ -13,15 +13,15 @@ Forwarded: not-needed
 
  # Fallback Debian and release (codename) to bootstrap (note: overridden right below):
  DISTRO="Debian"
-@@ -205,6 +205,7 @@
- 	rm -rf "$CHROOTDIR"
+@@ -240,6 +240,7 @@
+     rm -rf "$CHROOTDIR"
  fi
 
 +rm -rf "$CHROOTDIR"
  mkdir -p "$CHROOTDIR"
  cd "$CHROOTDIR"
  CHROOTDIR="$PWD"
-@@ -383,5 +384,10 @@
+@@ -415,5 +416,10 @@
  umount "$CHROOTDIR/sys"
  umount "$CHROOTDIR/proc"
 
@@ -32,3 +32,4 @@ Forwarded: not-needed
 +
  echo "Done building chroot in $CHROOTDIR"
  exit 0
+Only in domjudge-8.1.0/misc-tools: dj_make_chroot.in.orig

debian/patches/disable_fix_permissions

@@ -4,14 +4,14 @@ Author: Thijs Kinkhorst <[email protected]>
 Forwarded: not-needed
 Last-Update: 2020-04-28
 
---- domjudge-7.3.0.orig/Makefile
-+++ domjudge-7.3.0/Makefile
-@@ -124,7 +124,7 @@ install-domserver-l:
+--- domjudge-8.1.0.orig/Makefile	2022-06-01 16:58:10.000000000 +0000
++++ domjudge-8.1.0/Makefile	2022-06-09 19:24:54.089879892 +0000
+@@ -113,7 +113,7 @@
  		$(INSTALL_WEBSITE) -m 0775 -d $(DESTDIR)$(domserver_webappdir)/var/$$d ; \
  	done
  # Make sure that domjudge user and webserver group can write to var/{cache,log}:
--	DESTDIR=$(DESTDIR) $(domserver_bindir)/fix_permissions
-+#	DESTDIR=$(DESTDIR) $(domserver_bindir)/fix_permissions
+-	-DESTDIR=$(DESTDIR) $(DESTDIR)$(domserver_bindir)/fix_permissions
++#	-DESTDIR=$(DESTDIR) $(DESTDIR)$(domserver_bindir)/fix_permissions
  # Special case create tmpdir here, only when FHS not enabled:
  ifneq "$(FHS_ENABLED)" "yes"
  	-$(INSTALL_WEBSITE) -m 0770 -d $(DESTDIR)$(domserver_tmpdir)