karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

* updated etcnet (0.8.5 -> 0.9.2) 

* removed obsolete tap support patch (included by now)
	* rediffed Makefile patch
	* Note: This version also introduce openvpn support!


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21046 10447126-35f2-4685-b0cf-6dd780d3921f
early
Christian Wiese 18 years ago
parent
1186e05e37
commit
469ad4a919
3 changed files with 10 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      network/etcnet/Makefile-ln.patch
  2. 89
      network/etcnet/etcnet-0.8.5-tap-support.patch
  3. 4
      network/etcnet/etcnet.desc

12
network/etcnet/etcnet-0.8.5-Makefile-ln.patch → network/etcnet/Makefile-ln.patch
Unescape View File

@ -1,7 +1,7 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../etcnet/etcnet-0.8.5-Makefile-ln.patch
# Filename: package/.../etcnet/Makefile-ln.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
@ -14,14 +14,18 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- etcnet-0.8.5/contrib/Makefile.orig 2007-03-01 21:00:33.000000000 +0200
+++ etcnet-0.8.5/contrib/Makefile 2007-03-01 21:02:02.000000000 +0200
@@ -45,6 +45,6 @@
--- etcnet-0.9.2/contrib/Makefile.orig 2007-05-08 17:01:02.000000000 +0200
+++ etcnet-0.9.2/contrib/Makefile 2007-05-08 17:02:50.000000000 +0200
@@ -57,8 +57,8 @@
# 3. Create /sbin links.
@install -d $(sbindir)
- @ln -s ../etc/net/scripts/ifup $(sbindir)/ifup
- @ln -s ../etc/net/scripts/ifdown $(sbindir)/ifdown
- @ln -s ../etc/net/scripts/contrib/efw $(sbindir)/efw
- @ln -s ../etc/net/scripts/contrib/eqos $(sbindir)/eqos
+ @ln -sf ../etc/net/scripts/ifup $(sbindir)/ifup
+ @ln -sf ../etc/net/scripts/ifdown $(sbindir)/ifdown
+ @ln -sf ../etc/net/scripts/contrib/efw $(sbindir)/efw
+ @ln -sf ../etc/net/scripts/contrib/eqos $(sbindir)/eqos
@echo Done!

89
network/etcnet/etcnet-0.8.5-tap-support.patch
Unescape View File

@ -1,89 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../etcnet/etcnet-0.8.5-tap-support.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- SDE-COPYRIGHT-NOTE-END ---
Submitted By: Christian Wiese <morfoh at opensde dot org>
Date: 2007-03-01
Initial Package Version: 0.8.5
Upstream Status: submitted
Origin: Christian Wiese <morfoh at opensde dot org>
http://trac.opensde.org/browser/package/trunk/network/etcnet/
Description: This patch adds tap interface support to etcnet using the tunctl
command.
diff -ruN etcnet-0.8.5/etc/net/options.d/00-default etcnet-0.8.5-tap/etc/net/options.d/00-default
--- etcnet-0.8.5/etc/net/options.d/00-default 2006-09-23 20:45:27.000000000 +0300
+++ etcnet-0.8.5-tap/etc/net/options.d/00-default 2007-03-01 21:54:10.000000000 +0200
@@ -61,7 +61,7 @@
# 'broadcast +' to each IPv4 address line (see iproute2 manual).
AUTO_BROADCAST=off
-IFGROUP[0]='lo dummy'
+IFGROUP[0]='lo dummy tap'
IFGROUP[1]='eth plip usb dvb bnep'
IFGROUP[2]='vlan bond bri teql'
IFGROUP[3]='iptun ipsectun'
diff -ruN etcnet-0.8.5/etc/net/scripts/create-tap etcnet-0.8.5-tap/etc/net/scripts/create-tap
--- etcnet-0.8.5/etc/net/scripts/create-tap 1970-01-01 02:00:00.000000000 +0200
+++ etcnet-0.8.5-tap/etc/net/scripts/create-tap 2007-03-01 17:57:52.000000000 +0200
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+pickup_defaults
+pickup_options
+
+$MODPROBE tun || {
+ print_error "tun kernel module not found"
+ exit 2
+}
+
+[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] || {
+ print_error "$TUNCTL does not exist or is not executable. Try installing tunctctl package on your system."
+ exit 1
+}
+
+$TUNCTL -t $NAME
diff -ruN etcnet-0.8.5/etc/net/scripts/destroy-tap etcnet-0.8.5-tap/etc/net/scripts/destroy-tap
--- etcnet-0.8.5/etc/net/scripts/destroy-tap 1970-01-01 02:00:00.000000000 +0200
+++ etcnet-0.8.5-tap/etc/net/scripts/destroy-tap 2007-03-01 17:57:52.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+pickup_defaults
+pickup_options
+
+[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] || {
+ print_error "$TUNCTL does not exist or is not executable. Try installing the tunctl package on your system."
+ exit 1
+}
+
+$TUNCTL -d $NAME
+try_rmmod tun
diff -ruN etcnet-0.8.5/etc/net/scripts/functions etcnet-0.8.5-tap/etc/net/scripts/functions
--- etcnet-0.8.5/etc/net/scripts/functions 2007-01-28 14:27:19.000000000 +0200
+++ etcnet-0.8.5-tap/etc/net/scripts/functions 2007-03-01 17:59:48.000000000 +0200
@@ -41,6 +41,7 @@
DEFAULT_SZAP_ARGS='-n 1 -x'
DEFAULT_DVBNET=/usr/bin/dvbnet
DEFAULT_PAND=/usr/bin/pand
+DEFAULT_TUNCTL=/usr/sbin/tunctl
trim()
{
@@ -487,3 +488,4 @@
declare -rx DEFAULT_PPPINITCHAT DEFAULT_PPPCONNECTCHAT DEFAULT_PPPDISCONNECTCHAT
declare -rx DEFAULT_CHATOPTIONS DEFAULT_PPPOE DEFAULT_PPPOEOPTIONS DEFAULT_PPTP
declare -rx DEFAULT_SZAP DEFAULT_SZAP_ARGS DEFAULT_DVBNET DEFAULT_PAND
+declare -rx DEFAULT_TUNCTL

4
network/etcnet/etcnet.desc
Unescape View File

@ -35,7 +35,7 @@
[L] GPL
[S] Stable
[V] 0.8.5
[V] 0.9.2
[P] O -----5---9 203.000
[D] 3791500590 etcnet-0.8.5.tar.bz2 http://etcnet.org/files/
[D] 1270881134 etcnet-0.9.2.tar.gz http://etcnet.org/files/

Write Preview
Loading…
Cancel
Save