File 003_pi-hole_move_to_bindir.patch of Package pi-hole

Overview Repositories Revisions Requests Users Attributes Meta

File 003_pi-hole_move_to_bindir.patch of Package pi-hole (Revision f2f2b66751f9d53d4efeaa819fbe3091)

Currently displaying revision f2f2b66751f9d53d4efeaa819fbe3091 , Show latest

diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/piholeDebug.sh pi-hole-5.16.1/advanced/Scripts/piholeDebug.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/piholeDebug.sh	2023-03-24 10:04:04.060244384 +0100
+++ pi-hole-5.16.1/advanced/Scripts/piholeDebug.sh	2023-03-24 10:04:36.396757985 +0100
@@ -61,7 +61,7 @@
 DNSMASQ_D_DIRECTORY="/etc/dnsmasq.d"
 PIHOLE_DIRECTORY="/etc/pihole"
 PIHOLE_SCRIPTS_DIRECTORY="/usr/share/pi-hole"
-BIN_DIRECTORY="/usr/local/bin"
+BIN_DIRECTORY="/usr/bin"
 RUN_DIRECTORY="/run"
 LOG_DIRECTORY="/var/log/pihole"
 WEB_SERVER_LOG_DIRECTORY="/var/log/lighttpd"
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/pihole-reenable.sh pi-hole-5.16.1/advanced/Scripts/pihole-reenable.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/pihole-reenable.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/pihole-reenable.sh	2023-03-24 10:04:36.395757969 +0100
@@ -17,7 +17,7 @@
 # This ensures that pihole ends up in the correct state after a sequence of
 # commands suchs as: `pihole disable 30s; pihole enable; pihole disable`
 
-readonly PI_HOLE_BIN_DIR="/usr/local/bin"
+readonly PI_HOLE_BIN_DIR="/usr/bin"
 
 sleep "${1}"
 "${PI_HOLE_BIN_DIR}"/pihole enable
diff -uNr pi-hole-5.16.1.orig/advanced/Templates/pihole.cron pi-hole-5.16.1/advanced/Templates/pihole.cron
--- pi-hole-5.16.1.orig/advanced/Templates/pihole.cron	2023-03-24 10:01:08.359453789 +0100
+++ pi-hole-5.16.1/advanced/Templates/pihole.cron	2023-03-24 10:04:36.397758001 +0100
@@ -18,16 +18,16 @@
 #          early morning. Download any updates from the adlists
 #          Squash output to log, then splat the log to stdout on error to allow for
 #          standard crontab job error handling.
-59 1    * * 7   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log
+59 1    * * 7   root    PATH="$PATH:/usr/sbin:/usr/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log
 
 # Pi-hole: Flush the log daily at 00:00
 #          The flush script will use logrotate if available
 #          parameter "once": logrotate only once (default is twice)
 #          parameter "quiet": don't print messages
-00 00   * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet
+00 00   * * *   root    PATH="$PATH:/usr/sbin:/usr/bin/" pihole flush once quiet
 
 @reboot root /usr/sbin/logrotate --state /var/lib/logrotate/pihole /etc/pihole/logrotate
 
 # Pi-hole: Grab remote and local version every 24 hours
-59 17  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker
-@reboot root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker reboot
+59 17  * * *   root    PATH="$PATH:/usr/sbin:/usr/bin/" pihole updatechecker
+@reboot root    PATH="$PATH:/usr/sbin:/usr/bin/" pihole updatechecker reboot
diff -uNr "pi-hole-5.16.1.orig/automated install/basic-install.sh" "pi-hole-5.16.1/automated install/basic-install.sh"
--- "pi-hole-5.16.1.orig/automated install/basic-install.sh"	2023-03-24 10:04:04.062244416 +0100
+++ "pi-hole-5.16.1/automated install/basic-install.sh"	2023-03-24 10:04:36.398758017 +0100
@@ -23,7 +23,7 @@
 
 # Append common folders to the PATH to ensure that all basic commands are available.
 # When using "su" an incomplete PATH could be passed: https://github.com/pi-hole/pi-hole/issues/3209
-export PATH+=':/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+export PATH+=':/usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin'
 
 ######## VARIABLES #########
 # For better maintainability, we store as much information that can change in variables
@@ -81,7 +81,7 @@
 # This directory is where the Pi-hole scripts will be installed
 PI_HOLE_INSTALL_DIR="/usr/share/pi-hole"
 PI_HOLE_CONFIG_DIR="/etc/pihole"
-PI_HOLE_BIN_DIR="/usr/local/bin"
+PI_HOLE_BIN_DIR="/usr/bin"
 FTL_CONFIG_FILE="${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf"
 if [ -z "$useUpdateVars" ]; then
     useUpdateVars=false
@@ -1474,7 +1474,7 @@
 
 install_manpage() {
     # Copy Pi-hole man pages and call mandb to update man page database
-    # Default location for man files for /usr/local/bin is /usr/local/share/man
+    # Default location for man files for /usr/bin is /usr/local/share/man
     # on lightweight systems may not be present, so check before copying.
     printf "  %b Testing man page installation" "${INFO}"
     if ! is_command mandb ; then
@@ -1732,7 +1732,7 @@
     # If the Web server user is lighttpd,
     if [[ "$LIGHTTPD_USER" == "lighttpd" ]]; then
         # Allow executing pihole via sudo with Fedora
-        # Usually /usr/local/bin ${PI_HOLE_BIN_DIR} is not permitted as directory for sudoable programs
+        # Usually /usr/bin ${PI_HOLE_BIN_DIR} is not permitted as directory for sudoable programs
         echo "Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin:${PI_HOLE_BIN_DIR}" >> /etc/sudoers.d/pihole
     fi
     # Set the strict permissions on the file
diff -uNr "pi-hole-5.16.1.orig/automated install/uninstall.sh" "pi-hole-5.16.1/automated install/uninstall.sh"
--- "pi-hole-5.16.1.orig/automated install/uninstall.sh"	2023-03-24 10:04:04.062244416 +0100
+++ "pi-hole-5.16.1/automated install/uninstall.sh"	2023-03-24 10:04:36.398758017 +0100
@@ -174,7 +174,7 @@
     ${SUDO} rm -rf /etc/pihole/ &> /dev/null
     ${SUDO} rm -rf /etc/.pihole/ &> /dev/null
     ${SUDO} rm -rf /usr/share/pi-hole/ &> /dev/null
-    ${SUDO} rm -f /usr/local/bin/pihole &> /dev/null
+    ${SUDO} rm -f /usr/bin/pihole &> /dev/null
     ${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
     ${SUDO} rm -f /etc/sudoers.d/pihole &> /dev/null
     echo -e "  ${TICK} Removed config files"
diff -uNr pi-hole-5.16.1.orig/gravity.sh pi-hole-5.16.1/gravity.sh
--- pi-hole-5.16.1.orig/gravity.sh	2023-03-24 10:04:04.062244416 +0100
+++ pi-hole-5.16.1/gravity.sh	2023-03-24 10:04:36.398758017 +0100
@@ -19,7 +19,7 @@
 source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
 
 basename="pihole"
-PIHOLE_COMMAND="/usr/local/bin/${basename}"
+PIHOLE_COMMAND="/usr/bin/${basename}"
 
 piholeDir="/etc/${basename}"
 
diff -uNr pi-hole-5.16.1.orig/pihole pi-hole-5.16.1/pihole
--- pi-hole-5.16.1.orig/pihole	2023-03-24 10:04:04.062244416 +0100
+++ pi-hole-5.16.1/pihole	2023-03-24 10:04:36.399758033 +0100
@@ -15,7 +15,7 @@
 # they might get set again when the installer is sourced. This causes an
 # error due to modifying a readonly variable.
 setupVars="/etc/pihole/setupVars.conf"
-PI_HOLE_BIN_DIR="/usr/local/bin"
+PI_HOLE_BIN_DIR="/usr/bin"
 
 readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
 source "${colfile}"
diff -uNr pi-hole-5.16.1.orig/test/_centos_8.Dockerfile pi-hole-5.16.1/test/_centos_8.Dockerfile
--- pi-hole-5.16.1.orig/test/_centos_8.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_centos_8.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -7,7 +7,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/_centos_9.Dockerfile pi-hole-5.16.1/test/_centos_9.Dockerfile
--- pi-hole-5.16.1.orig/test/_centos_9.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_centos_9.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -7,7 +7,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/conftest.py pi-hole-5.16.1/test/conftest.py
--- pi-hole-5.16.1.orig/test/conftest.py	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/conftest.py	2023-03-24 10:04:36.399758033 +0100
@@ -58,7 +58,7 @@
     Allows for setup of commands we don't really want to have to run for real
     in unit tests
     """
-    full_script_path = "/usr/local/bin/{}".format(script)
+    full_script_path = "/usr/bin/{}".format(script)
     mock_script = dedent(
         r"""\
     #!/bin/bash -e
@@ -101,7 +101,7 @@
     Example use-case: mocking `git pull` but still allowing `git clone` to work as intended
     """
     orig_script_path = container.check_output("command -v {}".format(script))
-    full_script_path = "/usr/local/bin/{}".format(script)
+    full_script_path = "/usr/bin/{}".format(script)
     mock_script = dedent(
         r"""\
     #!/bin/bash -e
@@ -148,7 +148,7 @@
     Allows for setup of commands we don't really want to have to run for real
     in unit tests
     """
-    full_script_path = "/usr/local/bin/{}".format(script)
+    full_script_path = "/usr/bin/{}".format(script)
     mock_script = dedent(
         r"""\
     #!/bin/bash -e
@@ -187,7 +187,7 @@
     Allows for setup of commands we don't really want to have to run for real
     in unit tests
     """
-    full_script_path = "/usr/local/bin/{}".format(script)
+    full_script_path = "/usr/bin/{}".format(script)
     mock_script = dedent(
         r"""\
     #!/bin/bash -e
diff -uNr pi-hole-5.16.1.orig/test/_debian_10.Dockerfile pi-hole-5.16.1/test/_debian_10.Dockerfile
--- pi-hole-5.16.1.orig/test/_debian_10.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_debian_10.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -6,7 +6,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/_debian_11.Dockerfile pi-hole-5.16.1/test/_debian_11.Dockerfile
--- pi-hole-5.16.1.orig/test/_debian_11.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_debian_11.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -6,7 +6,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/_fedora_36.Dockerfile pi-hole-5.16.1/test/_fedora_36.Dockerfile
--- pi-hole-5.16.1.orig/test/_fedora_36.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_fedora_36.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -7,7 +7,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/_fedora_37.Dockerfile pi-hole-5.16.1/test/_fedora_37.Dockerfile
--- pi-hole-5.16.1.orig/test/_fedora_37.Dockerfile	2023-03-24 10:02:23.437646234 +0100
+++ pi-hole-5.16.1/test/_fedora_37.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -7,7 +7,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
diff -uNr pi-hole-5.16.1.orig/test/_ubuntu_20.Dockerfile pi-hole-5.16.1/test/_ubuntu_20.Dockerfile
--- pi-hole-5.16.1.orig/test/_ubuntu_20.Dockerfile	2023-03-24 10:02:23.438646250 +0100
+++ pi-hole-5.16.1/test/_ubuntu_20.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -6,7 +6,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN true && \
diff -uNr pi-hole-5.16.1.orig/test/_ubuntu_22.Dockerfile pi-hole-5.16.1/test/_ubuntu_22.Dockerfile
--- pi-hole-5.16.1.orig/test/_ubuntu_22.Dockerfile	2023-03-24 10:02:23.438646250 +0100
+++ pi-hole-5.16.1/test/_ubuntu_22.Dockerfile	2023-03-24 10:04:36.399758033 +0100
@@ -6,7 +6,7 @@
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+ENV PATH /usr/local/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN true && \

Places

File 003_pi-hole_move_to_bindir.patch of Package pi-hole (Revision f2f2b66751f9d53d4efeaa819fbe3091)

Places