Revision: 6342 http://ipcop.svn.sourceforge.net/ipcop/?rev=6342&view=rev Author: owes Date: 2012-02-16 15:52:19 +0000 (Thu, 16 Feb 2012) Log Message: ----------- Insert 2.0.4 version in trunk to fix missing libz.so issue.
Modified Paths: -------------- ipcop/trunk/make.sh Added Paths: ----------- ipcop/trunk/updates/2.0.4/ ipcop/trunk/updates/2.0.4/ROOTFILES.alpha-2.0.4 ipcop/trunk/updates/2.0.4/ROOTFILES.i486-2.0.4 ipcop/trunk/updates/2.0.4/ROOTFILES.ppc-2.0.4 ipcop/trunk/updates/2.0.4/ROOTFILES.sparc-2.0.4 ipcop/trunk/updates/2.0.4/information.xml ipcop/trunk/updates/2.0.4/setup Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2012-02-14 15:08:07 UTC (rev 6341) +++ ipcop/trunk/make.sh 2012-02-16 15:52:19 UTC (rev 6342) @@ -50,7 +50,7 @@ SNAME="ipcop" # This is the IPCop version number for the release. -VERSION=2.1.0 +VERSION=2.0.4 # VERSIONSTEP is only used when the update is split into 2 versions/packages. #VERSIONSTEP=1.9.18 Added: ipcop/trunk/updates/2.0.4/ROOTFILES.alpha-2.0.4 =================================================================== --- ipcop/trunk/updates/2.0.4/ROOTFILES.alpha-2.0.4 (rev 0) +++ ipcop/trunk/updates/2.0.4/ROOTFILES.alpha-2.0.4 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.0.4/ROOTFILES.i486-2.0.4 =================================================================== --- ipcop/trunk/updates/2.0.4/ROOTFILES.i486-2.0.4 (rev 0) +++ ipcop/trunk/updates/2.0.4/ROOTFILES.i486-2.0.4 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1,4 @@ +## please place IPCop files first, then packages sorted by alphabetical order +## +## Readd libz.so symlink +/usr/lib/libz.so Added: ipcop/trunk/updates/2.0.4/ROOTFILES.ppc-2.0.4 =================================================================== --- ipcop/trunk/updates/2.0.4/ROOTFILES.ppc-2.0.4 (rev 0) +++ ipcop/trunk/updates/2.0.4/ROOTFILES.ppc-2.0.4 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.0.4/ROOTFILES.sparc-2.0.4 =================================================================== --- ipcop/trunk/updates/2.0.4/ROOTFILES.sparc-2.0.4 (rev 0) +++ ipcop/trunk/updates/2.0.4/ROOTFILES.sparc-2.0.4 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.0.4/information.xml =================================================================== --- ipcop/trunk/updates/2.0.4/information.xml (rev 0) +++ ipcop/trunk/updates/2.0.4/information.xml 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1,11 @@ +<ipcop> + <update> + <version>2.0.4</version> + <releasedate>2012-02-16</releasedate> + <size>2</size> + <description>Fix for some not working dynamic DNS updaters after the 2.0.3 update.</description> + <previousversion>2.0.3</previousversion> + <installdate>INSTALLDATE</installdate> + <latest /> + </update> +</ipcop> Added: ipcop/trunk/updates/2.0.4/setup =================================================================== --- ipcop/trunk/updates/2.0.4/setup (rev 0) +++ ipcop/trunk/updates/2.0.4/setup 2012-02-16 15:52:19 UTC (rev 6342) @@ -0,0 +1,93 @@ +#!/bin/bash +# +# Upgrade IPCop +# + +UPGRADEVERSION=2.0.4 +PREVIOUSVERSION=2.0.3 + + +msg() { + /usr/bin/logger -t installpackage "$*" + /bin/echo "$*" +} + + +# Verify architecture +MACHINE=`/usr/bin/perl -e "require '/usr/lib/ipcop/general-functions.pl';print \\$General::machine;"` +if [ "$MACHINE" != `/bin/cat ./ARCH` ]; then + msg "Update for wrong architecture: `/bin/cat ./ARCH`! We are: $MACHINE. Aborting installation." + exit 1 +fi + +# Verify version, note we also accept replaying an upgrade +CURRENTVERSION=`/usr/bin/perl -e "require '/usr/lib/ipcop/general-functions.pl';print \\$General::version;"` +if [ "$CURRENTVERSION" != "$PREVIOUSVERSION" -a "$CURRENTVERSION" != "$UPGRADEVERSION" ]; then + msg "IPCop v$PREVIOUSVERSION or v$UPGRADEVERSION not running. Aborting installation." + exit 1 +fi + +##### +# +# Add version specific handling *before* unpacking the patch here. +# For example stopping dnsmasq(required before update), squid, etc... +# +##### + + + +##### +# +# End of version specific handling. Continue with universal stuff. +# +##### + +FAILURE=0 +/bin/tar -zxpf patch.tar.gz -C / +FAILURE=$? +if [ $FAILURE -ne 0 ]; then + msg "Error extracting patch.tar.gz $1, need more free space on disk. Aborting." + exit 4 # ERRORTAR +fi + +# Modify or remove line below, depending on update +# Update bootloader config +# /usr/local/sbin/updatekernel.pl --add 2.6.32-2 --keep 2.6.32-1 --remove 2.6.32-0 + +# Modify or remove line below, depending on update +# Create the new initramfs +# /sbin/mkinitramfs --with-kernel=2.6.32-2 --with-firmware --many-modules --with-list=/etc/modules.initramfs + +# Adjust the changed config files +# /usr/local/bin/upgrade.sh + +# Remove old libraries (version specific) +# /bin/rm -f ..... + +# For new shared libs. May not always be required, but makes sure we do not forget +/sbin/ldconfig + +##### +# +# Add version specific handling *after* unpacking the patch here. +# For example restarting apache, squid, etc... +# +##### + + + +##### +# +# End of version specific handling. Continue with universal stuff. +# +##### + +# Patch general-functions.pl +/bin/sed -i -e "s+^\(\$General::version\s*=\s*\).*+\1'$UPGRADEVERSION';+" /usr/lib/ipcop/general-functions.pl +# Patch /etc/issue +/bin/sed -i -e "s+$PREVIOUSVERSION+$UPGRADEVERSION+" /etc/issue + +# Update menu +/usr/local/bin/updatemenu.pl + +msg "$UPGRADEVERSION update installed." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn