Revision: 7371
http://sourceforge.net/p/ipcop/svn/7371
Author: owes
Date: 2014-03-24 19:11:42 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
Use arping from iputils and install to /usr/bin. Adjust setaliases to match.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/iputils
ipcop/trunk/doc/Packages-monitoring-urls
ipcop/trunk/lfs/iputils
ipcop/trunk/make.sh
ipcop/trunk/src/misc-progs/setaliases.c
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/setup
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/arping
ipcop/trunk/lfs/arping
Deleted: ipcop/trunk/config/rootfiles/common/arping
===================================================================
--- ipcop/trunk/config/rootfiles/common/arping 2014-03-24 19:06:08 UTC (rev
7370)
+++ ipcop/trunk/config/rootfiles/common/arping 2014-03-24 19:11:42 UTC (rev
7371)
@@ -1 +0,0 @@
-usr/sbin/arping
Modified: ipcop/trunk/config/rootfiles/common/iputils
===================================================================
--- ipcop/trunk/config/rootfiles/common/iputils 2014-03-24 19:06:08 UTC (rev
7370)
+++ ipcop/trunk/config/rootfiles/common/iputils 2014-03-24 19:11:42 UTC (rev
7371)
@@ -1,4 +1,3 @@
-## iputils ss020927
-##
bin/ping
bin/ping6
+usr/bin/arping
Modified: ipcop/trunk/doc/Packages-monitoring-urls
===================================================================
--- ipcop/trunk/doc/Packages-monitoring-urls 2014-03-24 19:06:08 UTC (rev
7370)
+++ ipcop/trunk/doc/Packages-monitoring-urls 2014-03-24 19:11:42 UTC (rev
7371)
@@ -32,7 +32,6 @@
URI
http://www.cpan.org/modules/by-module/URI/URI-1.35.tar.gz
aboot https://sourceforge.net/projects/aboot/
httpd-2.2.6.tar.gz
http://www.apache.org/foundation/mailinglists.html#foundation-announce (a bit
verbose with the numerous projects)
-arping http://freshmeat.net/projects/arping
bash http://freshmeat.net/projects/gnubash
(http://lists.gnu.org/mailman/listinfo/bash-announce exist but not updated at
all patches)
beep http://www.johnath.com/beep/beep-1.2.2.tar.gz
bind http://www.isc.org/index.pl?/sw/bind/bind-lists.php
Deleted: ipcop/trunk/lfs/arping
===================================================================
--- ipcop/trunk/lfs/arping 2014-03-24 19:06:08 UTC (rev 7370)
+++ ipcop/trunk/lfs/arping 2014-03-24 19:11:42 UTC (rev 7371)
@@ -1,91 +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 <r...@sunsetsystems.com>
#
-# #
-# Modifications by: #
-# 21-4-2004 Roy Walker < rwal...@miracomnetwork.com> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = arping
-VER = 2.13
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://www.habets.pp.se/synscan/files
-#DL_FROM = $(URL_SFNET)/ipcop
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 698e4a87d4ea6c8535b07b06d9ed503e
-
-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 xf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install-exec
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/lfs/iputils
===================================================================
--- ipcop/trunk/lfs/iputils 2014-03-24 19:06:08 UTC (rev 7370)
+++ ipcop/trunk/lfs/iputils 2014-03-24 19:11:42 UTC (rev 7371)
@@ -83,8 +83,9 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
# Set CCOPTOPT with CFLAGS and original -O3 value
- cd $(DIR_APP) && make ping ping6 CCOPTOPT="${CFLAGS} -O3" USE_GNUTLS=no
+ cd $(DIR_APP) && make ping ping6 arping CCOPTOPT="${CFLAGS} -O3"
USE_GNUTLS=no
cd $(DIR_APP) && install -m 0755 ping ping6 /bin
+ cd $(DIR_APP) && install -m 0755 arping /usr/bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-03-24 19:06:08 UTC (rev 7370)
+++ ipcop/trunk/make.sh 2014-03-24 19:11:42 UTC (rev 7371)
@@ -1871,7 +1871,6 @@
chroot_make usbutils
chroot_make acpid
chroot_make apache
- chroot_make arping
chroot_make beep
chroot_make bind
chroot_make capi4k-utils
Modified: ipcop/trunk/src/misc-progs/setaliases.c
===================================================================
--- ipcop/trunk/src/misc-progs/setaliases.c 2014-03-24 19:06:08 UTC (rev
7370)
+++ ipcop/trunk/src/misc-progs/setaliases.c 2014-03-24 19:11:42 UTC (rev
7371)
@@ -176,18 +176,12 @@
verbose_printf(1, "Add alias %s/%s\n", aliasip, netmask);
}
safe_system(command);
- /*
- TODO:
- When not STATIC we do not have a default_gw in ethernet/settings
... So arping fails.
- Do we need arping in such cases? Only useful for RED is STATIC?
- */
- if (!strcmp(ipcop_ethernet.red_type[1], "STATIC")) {
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/arping -q -c 1 -w 1 -i %s -S %s %s",
- ipcop_ethernet.device[RED][1], aliasip,
ipcop_ethernet.default_gateway);
- safe_system(command);
- }
+ /* Send gratuitous ARP (request) to update neighbours */
+ memset(command, 0, STRING_SIZE);
+ snprintf(command, STRING_SIZE - 1,
+ "/usr/bin/arping -q -c 1 -U -I %s -s %s %s",
+ ipcop_ethernet.device[RED][1], aliasip, aliasip);
+ safe_system(command);
}
return 0;
}
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-24 19:06:08 UTC
(rev 7370)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-24 19:11:42 UTC
(rev 7371)
@@ -12,6 +12,7 @@
/usr/local/bin/emailhelper
/usr/local/bin/installpackage
/usr/local/bin/makegraphs.pl
+/usr/local/bin/setaliases
/usr/local/bin/setddns.pl
/usr/local/bin/vpn-watch
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
@@ -216,6 +217,9 @@
/sbin/ss
/sbin/tc
##
+## iputils arping
+/usr/bin/arping
+##
## libgcrypt-1.6.1
/usr/lib/libgcrypt.so.20
/usr/lib/libgcrypt.so.20.0.1
Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup 2014-03-24 19:06:08 UTC (rev 7370)
+++ ipcop/trunk/updates/2.1.3/setup 2014-03-24 19:11:42 UTC (rev 7371)
@@ -144,6 +144,8 @@
/bin/rm -f /usr/lib/libreadline.so.6
/bin/rm -f /usr/lib/libreadline.so.6.2
+# arping now in /usr/bin
+/bin/rm -f /usr/sbin/arping
# renamed makegraphs
/bin/rm -f /usr/local/bin/makegraphs
# pidof now in /usr/bin
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
