Re: Core 151 testing feedback

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

Hi,

[unneeded stuff deleted]

On 11.10.2020 13:57, ummeegge wrote:

> ...
>> The only thing: I'm not quite sure how to integrate a fix deleting
>> the old directory and file(s) under consideration of the respective client
>> architecture.
> May i am terribly unright but shouldn´t a wildcard solve this 
> /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS
> 

*Sigh* You're right. I'm in the need of holidays...

Wrote patch. Tested. Works. Please confirm.

=> https://bugzilla.ipfire.org/show_bug.cgi?id=12491#c9

I also added it here. Please find attached an updated 'update.sh' plus a
proposed patch for Core 151 for .../config/rootfiles/core/151'.

I didn't want to push this to the 'master' branch and something like
https://git.ipfire.org/?p=ipfire-2.x.git;a=shortlog;h=refs/heads/core151
doesn't exist yet.

Best,
Matthias





[-- Attachment #2: update.sh --]
[-- Type: text/plain, Size: 2812 bytes --]

#!/bin/bash
############################################################################
#                                                                          #
# This file is part of the IPFire Firewall.                                #
#                                                                          #
# IPFire is free software; you can redistribute it and/or modify           #
# it under the terms of the GNU General Public License as published by     #
# the Free Software Foundation; either version 3 of the License, or        #
# (at your option) any later version.                                      #
#                                                                          #
# IPFire is distributed in the hope that it will be useful,                #
# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
# GNU General Public License for more details.                             #
#                                                                          #
# You should have received a copy of the GNU General Public License        #
# along with IPFire; if not, write to the Free Software                    #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
#                                                                          #
# Copyright (C) 2020 IPFire-Team <info@ipfire.org>.                        #
#                                                                          #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1

core=151

# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done

# Remove files
rm -rfv \
	/usr/lib/perl5/site_perl/5.30.0/Locale
rm -rfv \
	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS
rm -fv \
	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm

# Stop services
/etc/init.d/ipsec stop

# Extract files
extract_files

# update linker config
ldconfig

# Update Language cache
/usr/local/bin/update-lang-cache

# Filesytem cleanup
/usr/local/bin/filesystem-cleanup

# Apply local configuration to sshd_config
/usr/local/bin/sshctrl

# Start services
/etc/init.d/sshd restart
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
	/etc/init.d/ipsec start
fi
/etc/init.d/collectd restart

# Reload sysctl.conf
sysctl -p

# This update needs a reboot...
#touch /var/run/need_reboot

# Finish
/etc/init.d/fireinfo start
sendprofile

# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
	grub-mkconfig -o /boot/grub/grub.cfg
fi

sync

# Don't report the exitcode last command
exit 0

[-- Attachment #3: core151_fix_for_net-dns_problem.patch --]
[-- Type: text/plain, Size: 452 bytes --]

diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index 699528274..fa7e3a3bf 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -34,6 +34,10 @@ done
 # Remove files
 rm -rfv \
 	/usr/lib/perl5/site_perl/5.30.0/Locale
+rm -rfv \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS
+rm -fv \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
 
 # Stop services
 /etc/init.d/ipsec stop