Browse Source

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

Michael Schloh von Bennewitz 21 years ago
parent
commit
1928eb1fc6
3 changed files with 27 additions and 19 deletions
  1. 4 4
      ucarp/ucarp.spec
  2. 11 7
      ucarp/vip-down.sh
  3. 12 8
      ucarp/vip-up.sh

+ 4 - 4
ucarp/ucarp.spec

@@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Network
 License:      Specific
 Version:      1.1
-Release:      20041105
+Release:      20041110
 
 #   package options
 %option       with_fsl  yes
@@ -50,7 +50,7 @@ Patch0:       ucarp.patch
 #   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 @@ AutoReqProv:  no
 
     #   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 \

+ 11 - 7
ucarp/vip-down.sh

@@ -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

+ 12 - 8
ucarp/vip-up.sh

@@ -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