Revision: 7642
http://sourceforge.net/p/ipcop/svn/7642
Author: owes
Date: 2014-08-26 05:45:55 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Drop vconfig. Very old, deprecated for ages and can no longer be downloaded.
Modified Paths:
--------------
ipcop/trunk/make.sh
ipcop/trunk/src/rc.d/rc.red
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/setup
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/vlan
ipcop/trunk/lfs/vlan
Deleted: ipcop/trunk/config/rootfiles/common/vlan
===================================================================
--- ipcop/trunk/config/rootfiles/common/vlan 2014-08-26 05:32:21 UTC (rev
7641)
+++ ipcop/trunk/config/rootfiles/common/vlan 2014-08-26 05:45:55 UTC (rev
7642)
@@ -1,3 +0,0 @@
-## vlan-1.9
-##
-sbin/vconfig
Deleted: ipcop/trunk/lfs/vlan
===================================================================
--- ipcop/trunk/lfs/vlan 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/lfs/vlan 2014-08-26 05:45:55 UTC (rev 7642)
@@ -1,89 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <[email protected]>
#
-# #
-# Modifications by: #
-# 2005-jul Gilles Espinasse #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = vlan
-VER = 1.9
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = vlan.$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://www.candelatech.com/~greear/vlan
-DIR_APP = $(DIR_SRC)/vlan
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 5f0c6060b33956fb16e11a15467dd394
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && make clean
- cd $(DIR_APP) && make
- cd $(DIR_APP) && install -p -m 0755 vconfig /sbin
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/make.sh 2014-08-26 05:45:55 UTC (rev 7642)
@@ -1954,7 +1954,6 @@
chroot_make ulogd
chroot_make usb-modeswitch
chroot_make usb-modeswitch-data
- chroot_make vlan
chroot_make vnstat
chroot_make wget
chroot_make wireless_tools
Modified: ipcop/trunk/src/rc.d/rc.red
===================================================================
--- ipcop/trunk/src/rc.d/rc.red 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/src/rc.d/rc.red 2014-08-26 05:45:55 UTC (rev 7642)
@@ -16,7 +16,7 @@
# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# (c) The SmoothWall Team
-# Copyright (c) 2001-2011 The IPCop Team
+# Copyright (c) 2001-2014 The IPCop Team
#
# $Id$
@@ -182,8 +182,8 @@
if (! -d '/sys/module/8021q') {
system('/sbin/modprobe 8021q');
}
-
- system("/sbin/vconfig add $netsettings{'RED_1_DEV'}
$pppsettings{'VDSL_TAG'}");
+
+ system("/sbin/ip link add link $netsettings{'RED_1_DEV'}
name $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} type vlan id
$pppsettings{'VDSL_TAG'}");
system("/sbin/ip link set
$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} up");
}
}
@@ -302,7 +302,7 @@
# VLAN tag can be set in profile even when not using PPPoE, so check for
dev exists to avoid error messages
if ($pppsettings{'VDSL_TAG'} && -e
"/sys/class/net/$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}") {
system("/sbin/ip link set
$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} down");
- system("/sbin/vconfig rem
$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}");
+ system("/sbin/ip link delete $netsettings{'RED_1_DEV'} name
$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}");
}
if (-e "/var/run/dhcpcd-$iface.pid") {
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 05:32:21 UTC
(rev 7641)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 05:45:55 UTC
(rev 7642)
@@ -2,6 +2,7 @@
/etc/logrotate.d/squid
/etc/logrotate.d/squidGuard
/etc/rc.d/rc.net
+/etc/rc.d/rc.red
/etc/rc.d/rc.sysinit
/etc/ssl/openssl.cnf
/etc/ssl/openvpn.cnf
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-26 05:45:55 UTC (rev 7642)
@@ -102,6 +102,9 @@
/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh88
/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh89
+# vlan
+/bin/rm -f /sbin/vconfig
+
# renamed
/bin/rm -f /usr/local/sbin/installflash.sh
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
