[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[6814] ipcop/trunk/updates
From:       owes () users ! sourceforge ! net
Date:       2012-10-31 10:48:29
Message-ID: E1TTVqX-00010G-Eh () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6814
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6814&view=rev
Author:   owes
Date:     2012-10-31 10:48:29 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Also move squid and squidGuard to 2.1.1 upgrade package.

Modified Paths:
--------------
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml
    ipcop/trunk/updates/2.1.0/setup
    ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1
    ipcop/trunk/updates/2.1.1/information.xml
    ipcop/trunk/updates/2.1.1/setup

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2012-10-31 10:48:29 UTC (rev 6814)
@@ -717,17 +717,6 @@
 /usr/lib/libsqlite3.so.0
 /usr/lib/libsqlite3.so.0.8.6
 ##
-## squid-3.1.20
-/usr/lib/squid/negotiate_kerb_auth
-/usr/lib/squid/negotiate_kerb_auth_test
-/usr/lib/squid/ntlm_smb_lm_auth
-/usr/lib/squid/squid_kerb_auth
-/usr/lib/squid/squid_kerb_auth_test
-/usr/sbin/squid
-##
-## squidGuard modified
-/usr/bin/squidGuard
-##
 ## tcpdump-4.3.0
 /usr/sbin/tcpdump
 ##

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.0/information.xml	2012-10-31 10:48:29 UTC (rev 6814)
@@ -5,7 +5,7 @@
         <size>0</size>
         <description>iputils, gettext, setserial, pcmciautils, ppp, openvpn \
                radiusplugin patched&lt;br /&gt;
             cairo recompiled with -O3, isdn4k-utils with -Os \
                -fno-strict-aliasing&lt;br /&gt;
-            Add URL filter, xz-5.0.4&lt;br /&gt;
+            Add xz-5.0.4&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.37, bind to \
                9.8.3-P2, CnxADSL to ..PIM-2.6-2.7
             conntrack-tools to 1.2.2, coreutils to 8.19, dhcpcd to 5.5.6, dnsmasq to \
2.63, @@ -17,7 +17,7 @@
             libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2 to \
                2.8.0, logrotate to 3.8.1, lsof to 4.86,
             mdadm to 3.2.5, net-tools to 1.60-p20120127084908, openldap to 2.4.32, \
                openssh to 6.0, openssl to 1.0.1c, openswan to 2.6.38,
             pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, \
                psmisc to 22.19,
-            rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13, squid to 3.1.20,
+            rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13,
             tcpdump to 4.3.0, traceroute to 2.0.18,
             usb-modeswitch to 1.2.4, usb-modeswitch-data to 20120815, usbutils to \
006, util-linux to 2.21.2,  wanpipe to 3.5.25, zlib to 1.2.7, several Perl CPAN \
modules.

Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.0/setup	2012-10-31 10:48:29 UTC (rev 6814)
@@ -98,14 +98,6 @@
     exit 4 # ERRORTAR
 fi
 
-# Modify or remove line below, depending on update
-# Update bootloader config
-/usr/local/sbin/updatekernel.pl --add 3.0-1 --keep 2.6.32-6 --remove 2.6.32-5
-
-# Modify or remove line below, depending on update
-# Create the new initramfs
-/sbin/mkinitramfs --with-kernel=3.0-1 --with-firmware --many-modules \
                --with-list=/etc/modules.initramfs
-
 # Remove old libraries (version specific)
 # /bin/rm -f .....
 /bin/rm -f /lib/iptables/libipt_addrtype.so
@@ -219,9 +211,6 @@
 # Restart dnsmasq
 /etc/rc.d/rc.dnsmasq --start
 
-# restart squid (helper checks whether squid is enabled)
-/usr/local/bin/restartsquid
-
 # Restart OpenVPN server
 if [ -e /var/run/openvpn.pid ]; then
     /usr/local/bin/openvpnctrl --restart

Modified: ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1
===================================================================
--- ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1	2012-10-31 10:48:29 UTC (rev 6814)
@@ -10,6 +10,17 @@
 /lib/modules/3.0-1/extra/solos-pci.ko.gz
 /lib/modules/3.0-1/kernel
 ##
+## squid-3.1.20
+/usr/lib/squid/negotiate_kerb_auth
+/usr/lib/squid/negotiate_kerb_auth_test
+/usr/lib/squid/ntlm_smb_lm_auth
+/usr/lib/squid/squid_kerb_auth
+/usr/lib/squid/squid_kerb_auth_test
+/usr/sbin/squid
+##
+## squidGuard modified
+/usr/bin/squidGuard
+##
 ## squid-langpack-20120616
 /usr/lib/squid/errors
 /usr/lib/squid/errors.ipcop

Modified: ipcop/trunk/updates/2.1.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.1/information.xml	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.1/information.xml	2012-10-31 10:48:29 UTC (rev 6814)
@@ -3,7 +3,8 @@
         <version>2.1.1</version>
         <releasedate>2012-11-dd</releasedate>
         <size>0</size>
-        <description>Upgrade kernel to 3.0.41, squid-langpack to 20120616.
+        <description>Add URL filter.&lt;br /&gt;
+            Upgrade kernel to 3.0.41, squid to 3.1.20, squid-langpack to 20120616.
             &lt;br /&gt;
             &lt;b&gt;Mandatory reboot after upgrade.&lt;/b&gt;
         </description>

Modified: ipcop/trunk/updates/2.1.1/setup
===================================================================
--- ipcop/trunk/updates/2.1.1/setup	2012-10-31 09:18:13 UTC (rev 6813)
+++ ipcop/trunk/updates/2.1.1/setup	2012-10-31 10:48:29 UTC (rev 6814)
@@ -74,8 +74,9 @@
 #
 #####
 
+# restart squid (helper checks whether squid is enabled)
+/usr/local/bin/restartsquid
 
-
 #####
 #
 # End of version specific handling. Continue with universal stuff.

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic