OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Nov-2004 12:30:19
Branch: HEAD Handle: 2004111011301800
Modified files:
openpkg-src/ucarp ucarp.spec vip-down.sh vip-up.sh
Log:
it appears that GCC is not a requirement, more precisely relocate
preprocessor definition flag to $CPPFLAGS variable, and improve
default virtual interface logic in the suggestive script files
Summary:
Revision Changes Path
1.9 +4 -4 openpkg-src/ucarp/ucarp.spec
1.5 +11 -7 openpkg-src/ucarp/vip-down.sh
1.5 +12 -8 openpkg-src/ucarp/vip-up.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ucarp/ucarp.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 ucarp.spec
--- openpkg-src/ucarp/ucarp.spec 5 Nov 2004 17:34:03 -0000 1.8
+++ openpkg-src/ucarp/ucarp.spec 10 Nov 2004 11:30:18 -0000 1.9
@@ -34,7 +34,7 @@
Group: Network
License: Specific
Version: 1.1
-Release: 20041105
+Release: 20041110
# package options
%option with_fsl yes
@@ -50,7 +50,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, libpcap, libiconv, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, libpcap, libiconv
PreReq: OpenPKG, openpkg >= 20040130, libpcap, libiconv
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.3.0
@@ -110,8 +110,8 @@
# configure program
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} $DEFFLAGS" \
- CPPFLAGS="%{l_cppflags}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags} $DEFFLAGS" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs} -lpcap $LIBFLAGS" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ucarp/vip-down.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 vip-down.sh
--- openpkg-src/ucarp/vip-down.sh 5 Nov 2004 17:34:03 -0000 1.4
+++ openpkg-src/ucarp/vip-down.sh 10 Nov 2004 11:30:18 -0000 1.5
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# SVR4 virtual network interface manipulation
#/sbin/ifconfig $1:48 >/dev/null 2>&1 && \
@@ -9,14 +9,18 @@
#/usr/sbin/route delete 127.0.0.2 127.0.0.1
# BSD virtual network interface manipulation
-#/sbin/ifconfig $1 >/dev/null 2>&1 && \
-# /sbin/ifconfig $1 -alias 127.0.0.2
+#/sbin/ifconfig $1:48 >/dev/null 2>&1 && \
+# /sbin/ifconfig $1:48 -alias 127.0.0.2 down
# BSD IP routing
-#/sbin/route delete 127.0.0.2 127.0.0.1 $1
+#/sbin/route delete 127.0.0.2 127.0.0.1 $1:48
+
+# Debian Linux virtual network interface manipulation
+#/sbin/ifconfig $1:48 >/dev/null 2>&1 && \
+# /sbin/ifconfig $1:48 down
-# Linux virtual network interface manipulation
-#/sbin/ip addr del 127.0.0.2/24 dev $1
+# Other Linux virtual network interface manipulation
+#/sbin/ip addr del 127.0.0.2/24 dev $1:48
# Linux IP routing
-#/sbin/route delete 127.0.0.2 127.0.0.1 $1
+#/sbin/route delete -host 127.0.0.2 $1:48
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ucarp/vip-up.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 vip-up.sh
--- openpkg-src/ucarp/vip-up.sh 5 Nov 2004 17:34:03 -0000 1.4
+++ openpkg-src/ucarp/vip-up.sh 10 Nov 2004 11:30:18 -0000 1.5
@@ -1,22 +1,26 @@
-#!/bin/sh
+#! /bin/sh
# SVR4 virtual network interface manipulation
#/sbin/ifconfig $1:48 >/dev/null 2>&1 || \
# /usr/sbin/ifconfig $1:48 plumb && \
-# /sbin/ifconfig $1:48 127.0.0.2 netmask 255.255.255.0 up
+# /sbin/ifconfig $1:48 127.0.0.2 broadcast 127.0.0.255 netmask
255.255.255.0 up
# SVR4 IP routing
#/usr/sbin/route add 127.0.0.2 127.0.0.1
# BSD virtual network interface manipulation
-#/sbin/ifconfig $1 >/dev/null 2>&1 || \
-# /sbin/ifconfig $1 alias 127.0.0.2 netmask 255.255.255.255
+#/sbin/ifconfig $1:48 >/dev/null 2>&1 || \
+# /sbin/ifconfig $1:48 alias 127.0.0.2 broadcast 127.0.0.255 netmask
255.255.255.255 up
# BSD IP routing
-#/sbin/route add 127.0.0.2 127.0.0.1 $1
+#/sbin/route add 127.0.0.2 127.0.0.1 $1:48
+
+# Debian Linux virtual network interface manipulation
+#/sbin/ifconfig $1:48 >/dev/null 2>&1 || \
+# /sbin/ifconfig $1:48 127.0.0.2 broadcast 127.0.0.255 netmask
255.255.255.0 up
-# Linux virtual network interface manipulation
-#/sbin/ip addr add 127.0.0.2/24 dev $1
+# Other Linux virtual network interface manipulation
+#/sbin/ip addr add 127.0.0.2/24 dev $1:48
# Linux IP routing
-#/sbin/route add 127.0.0.2 127.0.0.1 $1
+#/sbin/route add -host 127.0.0.2 dev $1:48
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
