From: Arne Fitzenreiter Date: Sun, 11 Sep 2011 14:06:52 +0000 (+0200) Subject: core53: next is core53 now. X-Git-Tag: v2.9-core53~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0dcbdeae448d3fc852c9ee9a4e5e6b9ab75fd34;p=people%2Fms%2Fipfire-2.x.git core53: next is core53 now. set version in backupiso and pakfire to 2.11. --- diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude index bb0d8c84ba..ca3adf5c05 100644 --- a/config/rootfiles/core/53/exclude +++ b/config/rootfiles/core/53/exclude @@ -1,2 +1,9 @@ srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets var/updatecache +etc/localtime +var/ipfire/ovpn diff --git a/config/rootfiles/core/next/filelists/compat-wireless b/config/rootfiles/core/53/filelists/compat-wireless similarity index 100% rename from config/rootfiles/core/next/filelists/compat-wireless rename to config/rootfiles/core/53/filelists/compat-wireless diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index 0037af1833..cdd78c2c10 100644 --- a/config/rootfiles/core/53/filelists/files +++ b/config/rootfiles/core/53/filelists/files @@ -1 +1,27 @@ +etc/rc.d/init.d/network +etc/rc.d/init.d/static-routes +etc/sysctl.conf etc/system-release +etc/issue +etc/iproute2/rt_tables +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.down/10-ovpn +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl +var/ipfire/langs/pl.pl +usr/local/bin/ipsecctrl +usr/local/bin/openvpnctrl +usr/local/bin/vpn-watch +usr/local/bin/rebuildroutes +var/ipfire/main/routing +var/ipfire/menu.d/30-network.menu +opt/pakfire/etc/pakfire.conf diff --git a/config/rootfiles/core/next/filelists/gcc b/config/rootfiles/core/53/filelists/gcc similarity index 100% rename from config/rootfiles/core/next/filelists/gcc rename to config/rootfiles/core/53/filelists/gcc diff --git a/config/rootfiles/core/next/filelists/glibc b/config/rootfiles/core/53/filelists/glibc similarity index 100% rename from config/rootfiles/core/next/filelists/glibc rename to config/rootfiles/core/53/filelists/glibc diff --git a/config/rootfiles/core/next/filelists/gmp b/config/rootfiles/core/53/filelists/gmp similarity index 100% rename from config/rootfiles/core/next/filelists/gmp rename to config/rootfiles/core/53/filelists/gmp diff --git a/config/rootfiles/core/next/filelists/openvpn b/config/rootfiles/core/53/filelists/openvpn similarity index 100% rename from config/rootfiles/core/next/filelists/openvpn rename to config/rootfiles/core/53/filelists/openvpn diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/53/filelists/strongswan similarity index 100% rename from config/rootfiles/core/next/filelists/strongswan rename to config/rootfiles/core/53/filelists/strongswan diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch b/config/rootfiles/core/53/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/next/filelists/usb_modeswitch rename to config/rootfiles/core/53/filelists/usb_modeswitch diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch_data b/config/rootfiles/core/53/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/next/filelists/usb_modeswitch_data rename to config/rootfiles/core/53/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh index f13519a6fc..10b45b98e8 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -26,7 +26,7 @@ # # Remove old core updates from pakfire cache to save space... -core=53 +core=52 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -34,26 +34,74 @@ done # #Stop services -/etc/init.d/squid stop -/etc/init.d/apache stop + +/etc/init.d/ipsec stop + +# +# Remove old strongswan libs +rm -rf /usr/lib/libcharon.so +rm -rf /usr/lib/libcharon.so.0 +rm -rf /usr/lib/libcharon.so.0.0.0 +rm -rf /usr/lib/libhydra.so +rm -rf /usr/lib/libhydra.so.0 +rm -rf /usr/lib/libhydra.so.0.0.0 +rm -rf /usr/lib/libstrongswan.so +rm -rf /usr/lib/libstrongswan.so.0 +rm -rf /usr/lib/libstrongswan.so.0.0.0 +rm -rf /usr/libexec/ipsec/plugins + +# Remove old usb_modeswitch_data +rm -rf /etc/usb_modeswitch.d # #Extract files extract_files +# +#Replace now unsupported EU regdomain by a "DE" comment. +sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \ + /etc/modprobe.d/cfg80211 + # #Start services -/etc/init.d/apache start -/etc/init.d/squid start + +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's -#depmod 2.6.32.43-ipfire >/dev/null 2>&1 -#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1 -#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1 +depmod 2.6.32.45-ipfire >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo 'sync && sync && sync' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-53 " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update + +# +chmod +x /tmp/pak_update +/tmp/pak_update & +echo +echo Please wait until pakfire has ended... +echo # #Finish diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude deleted file mode 100644 index e5f6773790..0000000000 --- a/config/rootfiles/core/next/exclude +++ /dev/null @@ -1,8 +0,0 @@ -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files deleted file mode 100644 index d6eaea866e..0000000000 --- a/config/rootfiles/core/next/filelists/files +++ /dev/null @@ -1,26 +0,0 @@ -etc/rc.d/init.d/network -etc/rc.d/init.d/static-routes -etc/sysctl.conf -etc/system-release -etc/issue -etc/iproute2/rt_tables -etc/rc.d/init.d/networking/red.up/50-ovpn -etc/rc.d/init.d/networking/red.down/10-ovpn -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/outgoinggrp.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/pakfire.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl -var/ipfire/langs/pl.pl -usr/local/bin/ipsecctrl -usr/local/bin/openvpnctrl -usr/local/bin/vpn-watch -usr/local/bin/rebuildroutes -var/ipfire/main/routing -var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/core/next/meta b/config/rootfiles/core/next/meta deleted file mode 100644 index d547fa86fa..0000000000 --- a/config/rootfiles/core/next/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh deleted file mode 100644 index ff6409bd65..0000000000 --- a/config/rootfiles/core/next/update.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/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) 2011 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# -# Remove old core updates from pakfire cache to save space... -core=52 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services - -/etc/init.d/ipsec stop - -# -# Remove old strongswan libs -rm -rf /usr/lib/libcharon.so -rm -rf /usr/lib/libcharon.so.0 -rm -rf /usr/lib/libcharon.so.0.0.0 -rm -rf /usr/lib/libhydra.so -rm -rf /usr/lib/libhydra.so.0 -rm -rf /usr/lib/libhydra.so.0.0.0 -rm -rf /usr/lib/libstrongswan.so -rm -rf /usr/lib/libstrongswan.so.0 -rm -rf /usr/lib/libstrongswan.so.0.0.0 -rm -rf /usr/libexec/ipsec/plugins - -# Remove old usb_modeswitch_data -rm -rf /etc/usb_modeswitch.d - -# -#Extract files -extract_files - -# -#Replace now unsupported EU regdomain by a "DE" comment. -sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \ - /etc/modprobe.d/cfg80211 - -# -#Start services - -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -depmod 2.6.32.45-ipfire >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 - -## Change version of Pakfire.conf -## -#OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` -#NEWVERSION="2.9" -#sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf -## -## After pakfire has ended run it again and update the lists and do upgrade -## -#echo '#!/bin/bash' > /tmp/pak_update -#echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -#echo ' sleep 1' >> /tmp/pak_update -#echo 'done' >> /tmp/pak_update -#echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -#echo ' sleep 1' >> /tmp/pak_update -#echo 'done' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Check it before reboot !!!"' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 " *** Please reboot... *** "' >> /tmp/pak_update -#echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -#chmod +x /tmp/pak_update -#/tmp/pak_update & -#echo -#echo Please wait until pakfire has ended... -#echo - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/lfs/xen-image b/lfs/xen-image index caef9725fc..1b123a72da 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -155,10 +155,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|^thermal|#thermal|g" $(MNThdd)/etc/sysconfig/modules sed -i -e "s|^video|#video|g" $(MNThdd)/etc/sysconfig/modules - #Change pakfire trunk - sed -i -e "s|$(VERSION)|$(VERSION)-xen|g" \ - $(MNThdd)/opt/pakfire/etc/pakfire.conf - #Copy initramdisk, kernel and config #cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \ # /install/images/$(SNAME)/boot diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index ae174af984..7e7b8d59bc 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -21,7 +21,7 @@ package Conf; -$version = "2.9"; +$version = "2.11"; $mainserver = "pakfire.ipfire.org"; diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 426c1e45fb..6bea85578b 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,8 +2,8 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release -URL=http://download.ipfire.org/releases/ipfire-2.x/2.9-core$COREVER/ -ISO=ipfire-2.9.i586-full-core$COREVER.iso +URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/ +ISO=ipfire-2.11.i586-full-core$COREVER.iso if [ -z "$1" ]; then echo usage: $0 backup-file