diff mbox series

core177: remove rngd if the addon was not installed via pakfire

Message ID 20230728161916.9839-1-arne_f@ipfire.org
State Accepted
Commit 8ffe9b67de2fad230ea28200cd5c5b79d586c793
Headers
Series core177: remove rngd if the addon was not installed via pakfire |

Commit Message

Arne Fitzenreiter July 28, 2023, 4:19 p.m. UTC 
  the old version is linked against the old openssl and will fail.

fixes: #13197

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/core/177/update.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Adolf Belka July 28, 2023, 4:52 p.m. UTC | #1 
Hi Arne,

See my feedback below.


On 28/07/2023 18:19, Arne Fitzenreiter wrote:
> the old version is linked against the old openssl and will fail.
>
> fixes: #13197
>
> Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
> ---
>   config/rootfiles/core/177/update.sh | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh
> index 818079940..2347afbdb 100644
> --- a/config/rootfiles/core/177/update.sh
> +++ b/config/rootfiles/core/177/update.sh
> @@ -97,6 +97,15 @@ rm -f \
>   	/opt/pakfire/db/meta/meta-squidclamav \
>   	/opt/pakfire/db/rootfiles/squidclamav
>   
> +# remove old rngd if the addon is not installed
> +if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
> +	rm -rf	/usr/bin/randstat \
> +		/usr/bin/rngtest \
> +		/usr/sbin/rngd \
> +		/etc/rc.d/init.d/rngd \
> +		/etc/rc.d/rc?.d/*rmgd
I think this is a typo. should be *rngd

Regards,
Adolf.
> +fi
> +
>   # Extract files
>   extract_files
>   
> @@ -168,3 +177,4 @@ sync
>   
>   # Don't report the exitcode last command
>   exit 0
> +
Michael Tremer July 28, 2023, 5:20 p.m. UTC | #2 
Thank you. Already caught it:

https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=d4781c29aeb8f5ae2323c445142e48b303fd09e5

-Michael

> On 28 Jul 2023, at 17:52, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Hi Arne,
> 
> See my feedback below.
> 
> 
> On 28/07/2023 18:19, Arne Fitzenreiter wrote:
>> the old version is linked against the old openssl and will fail.
>> 
>> fixes: #13197
>> 
>> Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
>> ---
>>  config/rootfiles/core/177/update.sh | 10 ++++++++++
>>  1 file changed, 10 insertions(+)
>> 
>> diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh
>> index 818079940..2347afbdb 100644
>> --- a/config/rootfiles/core/177/update.sh
>> +++ b/config/rootfiles/core/177/update.sh
>> @@ -97,6 +97,15 @@ rm -f \
>>   /opt/pakfire/db/meta/meta-squidclamav \
>>   /opt/pakfire/db/rootfiles/squidclamav
>>  +# remove old rngd if the addon is not installed
>> +if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
>> + rm -rf /usr/bin/randstat \
>> + /usr/bin/rngtest \
>> + /usr/sbin/rngd \
>> + /etc/rc.d/init.d/rngd \
>> + /etc/rc.d/rc?.d/*rmgd
> I think this is a typo. should be *rngd
> 
> Regards,
> Adolf.
>> +fi
>> +
>>  # Extract files
>>  extract_files
>>  @@ -168,3 +177,4 @@ sync
>>    # Don't report the exitcode last command
>>  exit 0
>> +
> 
> -- 
> Sent from my laptop
diff mbox series

Patch

diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh
index 818079940..2347afbdb 100644
--- a/config/rootfiles/core/177/update.sh
+++ b/config/rootfiles/core/177/update.sh
@@ -97,6 +97,15 @@  rm -f \
 	/opt/pakfire/db/meta/meta-squidclamav \
 	/opt/pakfire/db/rootfiles/squidclamav
 
+# remove old rngd if the addon is not installed
+if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
+	rm -rf	/usr/bin/randstat \
+		/usr/bin/rngtest \
+		/usr/sbin/rngd \
+		/etc/rc.d/init.d/rngd \
+		/etc/rc.d/rc?.d/*rmgd
+fi
+
 # Extract files
 extract_files
 
@@ -168,3 +177,4 @@  sync
 
 # Don't report the exitcode last command
 exit 0
+