Revision: 7437
http://sourceforge.net/p/ipcop/svn/7437
Author: owes
Date: 2014-04-08 17:31:27 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
Bump version, prepare for next update.
In next commits I will 'restore' the modifications already in SVN that were
dropped for the 2.1.4 update.
Modified Paths:
--------------
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/updates/2.1.5/
ipcop/trunk/updates/2.1.5/ROOTFILES.alpha-2.1.5
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
ipcop/trunk/updates/2.1.5/ROOTFILES.ppc-2.1.5
ipcop/trunk/updates/2.1.5/ROOTFILES.sparc-2.1.5
ipcop/trunk/updates/2.1.5/information.xml
ipcop/trunk/updates/2.1.5/setup
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-04-08 17:01:49 UTC (rev 7436)
+++ ipcop/trunk/make.sh 2014-04-08 17:31:27 UTC (rev 7437)
@@ -50,13 +50,13 @@
SNAME="ipcop"
# This is the IPCop version number for the release.
-VERSION=2.1.4
+VERSION=2.1.5
# VERSIONSTEP is only used when the update is split into 2 versions/packages.
#VERSIONSTEP=2.1.0
# This is the last official IPCop version number. Needed for ./make.sh
newupdate.
-PREVIOUSVERSION=2.1.3
+PREVIOUSVERSION=2.1.4
# This is the SVN revision number for the last IPCop version. Needed for
ChangeLog.
PREVIOUSSVNREV=7392
Added: ipcop/trunk/updates/2.1.5/ROOTFILES.alpha-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.alpha-2.1.5
(rev 0)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.alpha-2.1.5 2014-04-08 17:31:27 UTC
(rev 7437)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Added: ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
(rev 0)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-08 17:31:27 UTC
(rev 7437)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Added: ipcop/trunk/updates/2.1.5/ROOTFILES.ppc-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.ppc-2.1.5
(rev 0)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.ppc-2.1.5 2014-04-08 17:31:27 UTC
(rev 7437)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Added: ipcop/trunk/updates/2.1.5/ROOTFILES.sparc-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.sparc-2.1.5
(rev 0)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.sparc-2.1.5 2014-04-08 17:31:27 UTC
(rev 7437)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Added: ipcop/trunk/updates/2.1.5/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.5/information.xml (rev 0)
+++ ipcop/trunk/updates/2.1.5/information.xml 2014-04-08 17:31:27 UTC (rev
7437)
@@ -0,0 +1,12 @@
+<ipcop>
+ <update>
+ <version>2.1.5</version>
+ <releasedate>2014-mm-dd</releasedate>
+ <size>0</size>
+ <isoimages>no</isoimages>
+ <description>Description (needs modification, shortly before release
at the latest).</description>
+ <previousversion>2.1.4</previousversion>
+ <installdate>INSTALLDATE</installdate>
+ <latest />
+ </update>
+</ipcop>
Added: ipcop/trunk/updates/2.1.5/setup
===================================================================
--- ipcop/trunk/updates/2.1.5/setup (rev 0)
+++ ipcop/trunk/updates/2.1.5/setup 2014-04-08 17:31:27 UTC (rev 7437)
@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# Upgrade IPCop
+#
+
+UPGRADEVERSION=2.1.5
+PREVIOUSVERSION=2.1.4
+
+
+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.
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
