Revision: 7048
http://ipcop.svn.sourceforge.net/ipcop/?rev=7048&view=rev
Author: dotzball
Date: 2013-05-27 08:07:09 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Merge 2.0.5 and 2.0.6 update files back to trunk.
I have checked every revision in the "special" 2.0.5/2.0.6 branch, every thing
is now in trunk.
Added Paths:
-----------
ipcop/trunk/updates/2.0.5/
ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5
ipcop/trunk/updates/2.0.5/information.xml
ipcop/trunk/updates/2.0.5/setup
ipcop/trunk/updates/2.0.6/
ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6
ipcop/trunk/updates/2.0.6/information.xml
ipcop/trunk/updates/2.0.6/setup
Removed Paths:
-------------
ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5
ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5
ipcop/trunk/updates/2.0.5/information.xml
ipcop/trunk/updates/2.0.5/setup
ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6
ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6
ipcop/trunk/updates/2.0.6/information.xml
ipcop/trunk/updates/2.0.6/setup
Property Changed:
----------------
ipcop/trunk/
Property changes on: ipcop/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /ipcop/tags/release-2.0.3:6791-6796,6799-6804
Deleted: ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.alpha-2.0.5
2012-10-25 16:25:33 UTC (rev 6791)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5 (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.alpha-2.0.5)
===================================================================
--- ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5
(rev 0)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.alpha-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.i486-2.0.5 2012-10-25
16:25:33 UTC (rev 6791)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5 (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.i486-2.0.5)
===================================================================
--- ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5
(rev 0)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.i486-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1,89 @@
+## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/updates.cgi
+/usr/lib/ipcop/general-functions.pl
+/usr/local/bin/updatelists.pl
+/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
+/usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
+/usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
+/usr/share/locale/cs_CZ/LC_MESSAGES/ipcop.mo
+/usr/share/locale/da_DK/LC_MESSAGES/ipcop.mo
+/usr/share/locale/de_DE/LC_MESSAGES/ipcop.mo
+/usr/share/locale/el_GR/LC_MESSAGES/ipcop.mo
+/usr/share/locale/en_GB/LC_MESSAGES/ipcop.mo
+/usr/share/locale/en_US/LC_MESSAGES/ipcop.mo
+/usr/share/locale/es_ES/LC_MESSAGES/ipcop.mo
+/usr/share/locale/es_UY/LC_MESSAGES/ipcop.mo
+/usr/share/locale/fa_IR/LC_MESSAGES/ipcop.mo
+/usr/share/locale/fi_FI/LC_MESSAGES/ipcop.mo
+/usr/share/locale/fr_FR/LC_MESSAGES/ipcop.mo
+/usr/share/locale/gu_IN/LC_MESSAGES/ipcop.mo
+/usr/share/locale/hu_HU/LC_MESSAGES/ipcop.mo
+/usr/share/locale/it_IT/LC_MESSAGES/ipcop.mo
+/usr/share/locale/ja_JP/LC_MESSAGES/ipcop.mo
+/usr/share/locale/lt_LT/LC_MESSAGES/ipcop.mo
+/usr/share/locale/nb_NO/LC_MESSAGES/ipcop.mo
+/usr/share/locale/nl_NL/LC_MESSAGES/ipcop.mo
+/usr/share/locale/pl_PL/LC_MESSAGES/ipcop.mo
+/usr/share/locale/pt_BR/LC_MESSAGES/ipcop.mo
+/usr/share/locale/pt_PT/LC_MESSAGES/ipcop.mo
+/usr/share/locale/ro_RO/LC_MESSAGES/ipcop.mo
+/usr/share/locale/ru_RU/LC_MESSAGES/ipcop.mo
+/usr/share/locale/sk_SK/LC_MESSAGES/ipcop.mo
+/usr/share/locale/sl_SI/LC_MESSAGES/ipcop.mo
+/usr/share/locale/so_SO/LC_MESSAGES/ipcop.mo
+/usr/share/locale/sv_SE/LC_MESSAGES/ipcop.mo
+/usr/share/locale/th_TH/LC_MESSAGES/ipcop.mo
+/usr/share/locale/tr_TR/LC_MESSAGES/install.mo
+/usr/share/locale/tr_TR/LC_MESSAGES/ipcop.mo
+/usr/share/locale/ur_PK/LC_MESSAGES/ipcop.mo
+/usr/share/locale/vi_VN/LC_MESSAGES/ipcop.mo
+/usr/share/locale/zh_CN/LC_MESSAGES/ipcop.mo
+/usr/share/locale/zh_TW/LC_MESSAGES/ipcop.mo
+/var/log/updates
+## tzdata-2012g
+/usr/share/zoneinfo/posix/Africa/Casablanca
+/usr/share/zoneinfo/posix/America/Atikokan
+/usr/share/zoneinfo/posix/America/Blanc-Sablon
+/usr/share/zoneinfo/posix/America/Coral_Harbour
+/usr/share/zoneinfo/posix/America/Creston
+/usr/share/zoneinfo/posix/America/Dawson_Creek
+/usr/share/zoneinfo/posix/America/Edmonton
+/usr/share/zoneinfo/posix/America/Glace_Bay
+/usr/share/zoneinfo/posix/America/Goose_Bay
+/usr/share/zoneinfo/posix/America/Halifax
+/usr/share/zoneinfo/posix/America/Havana
+/usr/share/zoneinfo/posix/America/Moncton
+/usr/share/zoneinfo/posix/America/Montreal
+/usr/share/zoneinfo/posix/America/Nipigon
+/usr/share/zoneinfo/posix/America/Port-au-Prince
+/usr/share/zoneinfo/posix/America/Rainy_River
+/usr/share/zoneinfo/posix/America/Regina
+/usr/share/zoneinfo/posix/America/Santiago
+/usr/share/zoneinfo/posix/America/St_Johns
+/usr/share/zoneinfo/posix/America/Swift_Current
+/usr/share/zoneinfo/posix/America/Toronto
+/usr/share/zoneinfo/posix/America/Vancouver
+/usr/share/zoneinfo/posix/America/Winnipeg
+/usr/share/zoneinfo/posix/Antarctica/Casey
+/usr/share/zoneinfo/posix/Antarctica/Davis
+/usr/share/zoneinfo/posix/Antarctica/Palmer
+/usr/share/zoneinfo/posix/Asia/Damascus
+/usr/share/zoneinfo/posix/Asia/Gaza
+/usr/share/zoneinfo/posix/Asia/Hebron
+/usr/share/zoneinfo/posix/Asia/Yerevan
+/usr/share/zoneinfo/posix/Atlantic/Stanley
+/usr/share/zoneinfo/posix/Canada/Atlantic
+/usr/share/zoneinfo/posix/Canada/Central
+/usr/share/zoneinfo/posix/Canada/East-Saskatchewan
+/usr/share/zoneinfo/posix/Canada/Eastern
+/usr/share/zoneinfo/posix/Canada/Mountain
+/usr/share/zoneinfo/posix/Canada/Newfoundland
+/usr/share/zoneinfo/posix/Canada/Pacific
+/usr/share/zoneinfo/posix/Canada/Saskatchewan
+/usr/share/zoneinfo/posix/Chile/Continental
+/usr/share/zoneinfo/posix/Chile/EasterIsland
+/usr/share/zoneinfo/posix/Cuba
+/usr/share/zoneinfo/posix/Pacific/Apia
+/usr/share/zoneinfo/posix/Pacific/Easter
+/usr/share/zoneinfo/posix/Pacific/Fakaofo
+/usr/share/zoneinfo/posix/Pacific/Fiji
Deleted: ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.ppc-2.0.5 2012-10-25
16:25:33 UTC (rev 6791)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5 (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.ppc-2.0.5)
===================================================================
--- ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5
(rev 0)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.ppc-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.sparc-2.0.5
2012-10-25 16:25:33 UTC (rev 6791)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5 (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/ROOTFILES.sparc-2.0.5)
===================================================================
--- ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5
(rev 0)
+++ ipcop/trunk/updates/2.0.5/ROOTFILES.sparc-2.0.5 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.5/information.xml
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/information.xml 2012-10-25
16:25:33 UTC (rev 6791)
+++ ipcop/trunk/updates/2.0.5/information.xml 2013-05-27 08:07:09 UTC (rev
7048)
@@ -1,11 +0,0 @@
-<ipcop>
- <update>
- <version>2.0.5</version>
- <releasedate>2011-mm-dd</releasedate>
- <size>0</size>
- <description>Description (needs modification, shortly before release
at the latest).</description>
- <previousversion>2.0.4</previousversion>
- <installdate>INSTALLDATE</installdate>
- <latest />
- </update>
-</ipcop>
Copied: ipcop/trunk/updates/2.0.5/information.xml (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/information.xml)
===================================================================
--- ipcop/trunk/updates/2.0.5/information.xml (rev 0)
+++ ipcop/trunk/updates/2.0.5/information.xml 2013-05-27 08:07:09 UTC (rev
7048)
@@ -0,0 +1,13 @@
+<ipcop>
+ <update>
+ <version>2.0.5</version>
+ <releasedate>2012-10-27</releasedate>
+ <size>1373</size>
+ <description>Fix the 'update is old' information message.<br />
+ Language updates. Upgrade tzdata to 2012g.
+ </description>
+ <previousversion>2.0.4</previousversion>
+ <installdate>INSTALLDATE</installdate>
+ <latest />
+ </update>
+</ipcop>
Deleted: ipcop/trunk/updates/2.0.5/setup
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.5/setup 2012-10-25 16:25:33 UTC
(rev 6791)
+++ ipcop/trunk/updates/2.0.5/setup 2013-05-27 08:07:09 UTC (rev 7048)
@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# Upgrade IPCop
-#
-
-UPGRADEVERSION=2.0.5
-PREVIOUSVERSION=2.0.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."
Copied: ipcop/trunk/updates/2.0.5/setup (from rev 6791,
ipcop/tags/release-2.0.3/updates/2.0.5/setup)
===================================================================
--- ipcop/trunk/updates/2.0.5/setup (rev 0)
+++ ipcop/trunk/updates/2.0.5/setup 2013-05-27 08:07:09 UTC (rev 7048)
@@ -0,0 +1,79 @@
+#!/bin/bash
+#
+# Upgrade IPCop
+#
+
+UPGRADEVERSION=2.0.5
+PREVIOUSVERSION=2.0.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
+
+# 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."
Deleted: ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6
2012-10-28 08:01:45 UTC (rev 6799)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6 (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.alpha-2.0.6)
===================================================================
--- ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6
(rev 0)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.alpha-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6 2012-10-28
08:01:45 UTC (rev 6799)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6 (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.i486-2.0.6)
===================================================================
--- ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6
(rev 0)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.i486-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1,2 @@
+## please place IPCop files first, then packages sorted by alphabetical order
+/etc/rc.d/rc.flash.up
Deleted: ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6 2012-10-28
08:01:45 UTC (rev 6799)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6 (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.ppc-2.0.6)
===================================================================
--- ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6
(rev 0)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.ppc-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6
2012-10-28 08:01:45 UTC (rev 6799)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -1 +0,0 @@
-## please place IPCop files first, then packages sorted by alphabetical order
Copied: ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6 (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/ROOTFILES.sparc-2.0.6)
===================================================================
--- ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6
(rev 0)
+++ ipcop/trunk/updates/2.0.6/ROOTFILES.sparc-2.0.6 2013-05-27 08:07:09 UTC
(rev 7048)
@@ -0,0 +1 @@
+## please place IPCop files first, then packages sorted by alphabetical order
Deleted: ipcop/trunk/updates/2.0.6/information.xml
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/information.xml 2012-10-28
08:01:45 UTC (rev 6799)
+++ ipcop/trunk/updates/2.0.6/information.xml 2013-05-27 08:07:09 UTC (rev
7048)
@@ -1,11 +0,0 @@
-<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>
Copied: ipcop/trunk/updates/2.0.6/information.xml (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/information.xml)
===================================================================
--- ipcop/trunk/updates/2.0.6/information.xml (rev 0)
+++ ipcop/trunk/updates/2.0.6/information.xml 2013-05-27 08:07:09 UTC (rev
7048)
@@ -0,0 +1,11 @@
+<ipcop>
+ <update>
+ <version>2.0.6</version>
+ <releasedate>2012-10-28</releasedate>
+ <size>3</size>
+ <description>Fix /var/log symlink for flash
installations.</description>
+ <previousversion>2.0.5</previousversion>
+ <installdate>INSTALLDATE</installdate>
+ <latest />
+ </update>
+</ipcop>
Deleted: ipcop/trunk/updates/2.0.6/setup
===================================================================
--- ipcop/tags/release-2.0.3/updates/2.0.6/setup 2012-10-28 08:01:45 UTC
(rev 6799)
+++ ipcop/trunk/updates/2.0.6/setup 2013-05-27 08:07:09 UTC (rev 7048)
@@ -1,79 +0,0 @@
-#!/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."
Copied: ipcop/trunk/updates/2.0.6/setup (from rev 6799,
ipcop/tags/release-2.0.3/updates/2.0.6/setup)
===================================================================
--- ipcop/trunk/updates/2.0.6/setup (rev 0)
+++ ipcop/trunk/updates/2.0.6/setup 2013-05-27 08:07:09 UTC (rev 7048)
@@ -0,0 +1,85 @@
+#!/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...
+#
+#####
+
+if [ -e /etc/FLASH ]; then
+ if [ ! -L /var/log ]; then
+ msg "Repairing /var/log symlink."
+ rm -rf /var/log
+ ln -s /ram/var/log /var/log
+ fi
+fi
+
+#####
+#
+# 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.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
