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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7239] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2014-02-16 20:33:37
Message-ID: E1WF8PE-0005Ts-V5 () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7239
          http://sourceforge.net/p/ipcop/svn/7239
Author:   owes
Date:     2014-02-16 20:33:37 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
Fix transparent proxy setting for squid.conf

Modified Paths:
--------------
    ipcop/trunk/src/scripts/makesquidconf.pl
    ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2
    ipcop/trunk/updates/2.1.2/information.xml
    ipcop/trunk/updates/2.1.2/setup

Modified: ipcop/trunk/src/scripts/makesquidconf.pl
===================================================================
--- ipcop/trunk/src/scripts/makesquidconf.pl	2014-02-15 13:07:46 UTC (rev 7238)
+++ ipcop/trunk/src/scripts/makesquidconf.pl	2014-02-16 20:33:37 UTC (rev 7239)
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with IPCop.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2009-2013, the IPCop team.
+# Copyright (C) 2009-2014, the IPCop team.
 #
 # $Id$
 #
@@ -329,20 +329,20 @@
 
     if ($proxysettings{'ENABLED_GREEN_1'} eq 'on') {
         print FILE "http_port \
                $netsettings{'GREEN_1_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
-        if ($proxysettings{'TRANSPARENT_GREEN_1'} eq 'on') { print FILE " \
transparent" } +        if ($proxysettings{'TRANSPARENT_GREEN_1'} eq 'on') { print \
                FILE " intercept" }
         if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " \
no-connection-auth" }  print FILE "\n";
     }
     if (($netsettings{'BLUE_COUNT'} >= 1) && ($proxysettings{'ENABLED_BLUE_1'} eq \
                'on')) {
         print FILE "http_port \
                $netsettings{'BLUE_1_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
-        if ($proxysettings{'TRANSPARENT_BLUE_1'} eq 'on') { print FILE " \
transparent" } +        if ($proxysettings{'TRANSPARENT_BLUE_1'} eq 'on') { print \
                FILE " intercept" }
         if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " \
no-connection-auth" }  print FILE "\n";
     }
     if ($proxysettings{'ENABLED_OVPN'} eq 'on') {
         my $serverip = \
NetAddr::IP->new($ovpnsettings{'DOVPN_SUBNET'})->first()->addr();  print FILE \
                "http_port $serverip:$proxysettings{'PROXY_PORT'}";
-        if ($proxysettings{'TRANSPARENT_OVPN'} eq 'on') { print FILE " transparent" \
} +        if ($proxysettings{'TRANSPARENT_OVPN'} eq 'on') { print FILE " intercept" \
                }
         if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " \
no-connection-auth" }  print FILE "\n";
     }

Modified: ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2
===================================================================
--- ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2	2014-02-15 13:07:46 UTC (rev 7238)
+++ ipcop/trunk/updates/2.1.2/ROOTFILES.i486-2.1.2	2014-02-16 20:33:37 UTC (rev 7239)
@@ -1,5 +1,6 @@
 ## please place IPCop files first, then packages sorted by alphabetical order
 /home/httpd/cgi-bin/openvpn.cgi
+/usr/local/bin/makesquidconf.pl
 ##
 ## dhcpcd-6.2.1
 /usr/sbin/dhcpcd

Modified: ipcop/trunk/updates/2.1.2/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.2/information.xml	2014-02-15 13:07:46 UTC (rev 7238)
+++ ipcop/trunk/updates/2.1.2/information.xml	2014-02-16 20:33:37 UTC (rev 7239)
@@ -4,7 +4,8 @@
         <releasedate>2014-mm-dd</releasedate>
         <size>0</size>
         <isoimages>no</isoimages>
-        <description>Upgrade dhcpcd to 6.2.1, grep to 2.16, libcap to 2.24, libpcap \
to 1.5.3, +        <description>Fix transparent web proxy.<br />
+            Upgrade dhcpcd to 6.2.1, grep to 2.16, libcap to 2.24, libpcap to 1.5.3,
             tar to 1.27.1, tcpdump to 4.5.1, tzdata to 2013i, vim to 7.4, 
             wget to 1.5, xz to 5.0.5.</description>
         <previousversion>2.1.1</previousversion>

Modified: ipcop/trunk/updates/2.1.2/setup
===================================================================
--- ipcop/trunk/updates/2.1.2/setup	2014-02-15 13:07:46 UTC (rev 7238)
+++ ipcop/trunk/updates/2.1.2/setup	2014-02-16 20:33:37 UTC (rev 7239)
@@ -59,7 +59,7 @@
 # /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
+/usr/local/bin/upgrade.sh
 
 # Remove old libraries (version specific)
 # /bin/rm -f .....

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


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