Tor: fix permissions after updating, too

Message ID 699c9e88-49ae-17e2-6610-af83de23b581@ipfire.org
State Accepted
Commit fa7de475fe745004b207eea07ba178b61197fe5e
Headers
Series Tor: fix permissions after updating, too |

Commit Message

Peter Müller June 11, 2019, 5:02 a.m. UTC
  Fixes #12088

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reported-by: Erik Kapfer <ummeegge@ipfire.org>
---
 lfs/tor                 | 2 +-
 src/paks/tor/install.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
  

Comments

Peter Müller June 12, 2019, 11:57 p.m. UTC | #1
Hello,

could somebody please merge this patch _before_ closing Core Update 133?

Thanks, and best regards,
Peter Müller


> Fixes #12088
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> Reported-by: Erik Kapfer <ummeegge@ipfire.org>
> ---
>  lfs/tor                 | 2 +-
>  src/paks/tor/install.sh | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/lfs/tor b/lfs/tor
> index 1e8c3889d..d918910d4 100644
> --- a/lfs/tor
> +++ b/lfs/tor
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = tor
> -PAK_VER    = 39
> +PAK_VER    = 40
>  
>  DEPS       = "libseccomp"
>  
> diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
> index 268bccecd..1659871b6 100644
> --- a/src/paks/tor/install.sh
> +++ b/src/paks/tor/install.sh
> @@ -32,9 +32,10 @@ if ! getent passwd tor; then
>         useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor
>  fi
>  
> +extract_files
> +restore_backup ${NAME}
> +
>  # Adjust some folder permission for new UID/GID
>  chown -R tor:tor /var/lib/tor /var/ipfire/tor
>  
> -extract_files
> -restore_backup ${NAME}
>  start_service --background ${NAME}
>
  
Michael Tremer June 13, 2019, 12:12 a.m. UTC | #2
Hi,

err, the update is closed and should be building right now.

But tor is an add-on. So we can build this separately.

-Michael

> On 12 Jun 2019, at 14:57, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello,
> 
> could somebody please merge this patch _before_ closing Core Update 133?
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>> Fixes #12088
>> 
>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>> Reported-by: Erik Kapfer <ummeegge@ipfire.org>
>> ---
>> lfs/tor                 | 2 +-
>> src/paks/tor/install.sh | 5 +++--
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>> 
>> diff --git a/lfs/tor b/lfs/tor
>> index 1e8c3889d..d918910d4 100644
>> --- a/lfs/tor
>> +++ b/lfs/tor
>> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>> DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> TARGET     = $(DIR_INFO)/$(THISAPP)
>> PROG       = tor
>> -PAK_VER    = 39
>> +PAK_VER    = 40
>> 
>> DEPS       = "libseccomp"
>> 
>> diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
>> index 268bccecd..1659871b6 100644
>> --- a/src/paks/tor/install.sh
>> +++ b/src/paks/tor/install.sh
>> @@ -32,9 +32,10 @@ if ! getent passwd tor; then
>>        useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor
>> fi
>> 
>> +extract_files
>> +restore_backup ${NAME}
>> +
>> # Adjust some folder permission for new UID/GID
>> chown -R tor:tor /var/lib/tor /var/ipfire/tor
>> 
>> -extract_files
>> -restore_backup ${NAME}
>> start_service --background ${NAME}
>> 
> 
> -- 
> The road to Hades is easy to travel.
> 	-- Bion of Borysthenes
  

Patch

diff --git a/lfs/tor b/lfs/tor
index 1e8c3889d..d918910d4 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 39
+PAK_VER    = 40
 
 DEPS       = "libseccomp"
 
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh
index 268bccecd..1659871b6 100644
--- a/src/paks/tor/install.sh
+++ b/src/paks/tor/install.sh
@@ -32,9 +32,10 @@  if ! getent passwd tor; then
        useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor
 fi
 
+extract_files
+restore_backup ${NAME}
+
 # Adjust some folder permission for new UID/GID
 chown -R tor:tor /var/lib/tor /var/ipfire/tor
 
-extract_files
-restore_backup ${NAME}
 start_service --background ${NAME}