Revision: 6799 http://ipcop.svn.sourceforge.net/ipcop/?rev=6799&view=rev Author: owes Date: 2012-10-28 08:01:45 +0000 (Sun, 28 Oct 2012) Log Message: ----------- Modify tagged 2.0.3 version to be able to build 2.0.6 patch
Modified Paths: -------------- ipcop/tags/release-2.0.3/make.sh Added Paths: ----------- ipcop/tags/release-2.0.3/updates/2.0.6/ ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6 ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6 ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6 ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6 ipcop/tags/release-2.0.3/updates/2.0.6/information.xml ipcop/tags/release-2.0.3/updates/2.0.6/setup Modified: ipcop/tags/release-2.0.3/make.sh =================================================================== --- ipcop/tags/release-2.0.3/make.sh 2012-10-28 07:48:09 UTC (rev 6798) +++ ipcop/tags/release-2.0.3/make.sh 2012-10-28 08:01:45 UTC (rev 6799) @@ -50,7 +50,7 @@ SNAME="ipcop" # This is the IPCop version number for the release. -VERSION=2.0.5 +VERSION=2.0.6 # VERSIONSTEP is only used when the update is split into 2 versions/packages. #VERSIONSTEP=1.9.18 Added: ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6 =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6 (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6 =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6 (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6 =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6 (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6 =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6 (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/tags/release-2.0.3/updates/2.0.6/information.xml =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/information.xml (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/information.xml 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1,11 @@ +<ipcop> + <update> + <version>2.0.6</version> + <releasedate>2012-10-28</releasedate> + <size>0</size> + <description>Fix /var/log symlink for flash installations.</description> + <previousversion>2.0.5</previousversion> + <installdate>INSTALLDATE</installdate> + <latest /> + </update> +</ipcop> Added: ipcop/tags/release-2.0.3/updates/2.0.6/setup =================================================================== --- ipcop/tags/release-2.0.3/updates/2.0.6/setup (rev 0) +++ ipcop/tags/release-2.0.3/updates/2.0.6/setup 2012-10-28 08:01:45 UTC (rev 6799) @@ -0,0 +1,79 @@ +#!/bin/bash +# +# Upgrade IPCop +# + +UPGRADEVERSION=2.0.6 +PREVIOUSVERSION=2.0.5 + + +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 + +# 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. ------------------------------------------------------------------------------ WINDOWS 8 is here. Millions of people. Your app in 30 days. Visit The Windows 8 Center at Sourceforge for all your go to resources. http://windows8center.sourceforge.net/ join-generation-app-and-make-money-coding-fast/ _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn