Revision: 7225 http://sourceforge.net/p/ipcop/svn/7225 Author: owes Date: 2014-02-13 16:27:03 +0000 (Thu, 13 Feb 2014) Log Message: ----------- Bump version, prepare for next update.
Modified Paths: -------------- ipcop/trunk/make.sh Added Paths: ----------- ipcop/trunk/updates/2.1.2/ ipcop/trunk/updates/2.1.2/ROOTFILES.alpha-2.1.2 ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2 ipcop/trunk/updates/2.1.2/ROOTFILES.ppc-2.1.2 ipcop/trunk/updates/2.1.2/ROOTFILES.sparc-2.1.2 ipcop/trunk/updates/2.1.2/information.xml ipcop/trunk/updates/2.1.2/setup Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2014-02-13 08:37:06 UTC (rev 7224) +++ ipcop/trunk/make.sh 2014-02-13 16:27:03 UTC (rev 7225) @@ -50,15 +50,15 @@ SNAME="ipcop" # This is the IPCop version number for the release. -VERSION=2.1.1 +VERSION=2.1.2 # VERSIONSTEP is only used when the update is split into 2 versions/packages. -VERSIONSTEP=2.1.0 +#VERSIONSTEP=2.1.0 # This is the last official IPCop version number. Needed for ./make.sh newupdate. -PREVIOUSVERSION=2.0.6 +PREVIOUSVERSION=2.1.1 # This is the SVN revision number for the last IPCop version. Needed for ChangeLog. -PREVIOUSSVNREV=6343 +PREVIOUSSVNREV=7224 # Just an arbitrary name for the downloadable, prebuilt toolchain (if you want to save time compiling). TOOLCHAINVERSION=2.1.2 Added: ipcop/trunk/updates/2.1.2/ROOTFILES.alpha-2.1.2 =================================================================== --- ipcop/trunk/updates/2.1.2/ROOTFILES.alpha-2.1.2 (rev 0) +++ ipcop/trunk/updates/2.1.2/ROOTFILES.alpha-2.1.2 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2 =================================================================== --- ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2 (rev 0) +++ ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.1.2/ROOTFILES.ppc-2.1.2 =================================================================== --- ipcop/trunk/updates/2.1.2/ROOTFILES.ppc-2.1.2 (rev 0) +++ ipcop/trunk/updates/2.1.2/ROOTFILES.ppc-2.1.2 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.1.2/ROOTFILES.sparc-2.1.2 =================================================================== --- ipcop/trunk/updates/2.1.2/ROOTFILES.sparc-2.1.2 (rev 0) +++ ipcop/trunk/updates/2.1.2/ROOTFILES.sparc-2.1.2 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1 @@ +## please place IPCop files first, then packages sorted by alphabetical order Added: ipcop/trunk/updates/2.1.2/information.xml =================================================================== --- ipcop/trunk/updates/2.1.2/information.xml (rev 0) +++ ipcop/trunk/updates/2.1.2/information.xml 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1,11 @@ +<ipcop> + <update> + <version>2.1.2</version> + <releasedate>2014-mm-dd</releasedate> + <size>0</size> + <description>Description (needs modification, shortly before release at the latest).</description> + <previousversion>2.1.1</previousversion> + <installdate>INSTALLDATE</installdate> + <latest /> + </update> +</ipcop> Added: ipcop/trunk/updates/2.1.2/setup =================================================================== --- ipcop/trunk/updates/2.1.2/setup (rev 0) +++ ipcop/trunk/updates/2.1.2/setup 2014-02-13 16:27:03 UTC (rev 7225) @@ -0,0 +1,93 @@ +#!/bin/bash +# +# Upgrade IPCop +# + +UPGRADEVERSION=2.1.2 +PREVIOUSVERSION=2.1.1 + + +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. ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn