[pisa-src] r1245 - in trunk: Makefile.am configure.ac docs/config.txt openwrt/trunk/package/pisa/Makefile openwrt/trunk/package/pisa/files/pisand.init pisand test/Makefile.am test/checkhipd.c test/packaging/d...
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 21 Oct 2009 12:31:36 +0200
Author: tjansen
Date: Wed Oct 21 12:31:35 2009
New Revision: 1245
Log:
Removed pisand.
As preauth code is deprecated there is no more need for a neighbor daemon.
List of removed chunks:
- the code itself: pisand
- documentation: docs/config.txt
- build system: Makefile.am, configure.ac, test/Makefile.am
- packaging: test/packaging, openwrt/trunk/package/pisa
- minor fix for unnecessary header inclusion: test/checkhipd.c
Deleted:
trunk/openwrt/trunk/package/pisa/files/pisand.init
trunk/pisand/
trunk/test/packaging/debian-init.d-pisand
trunk/test/packaging/rh-init.d-pisand
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/docs/config.txt
trunk/openwrt/trunk/package/pisa/Makefile
trunk/test/Makefile.am
trunk/test/checkhipd.c
trunk/test/packaging/pisa-deb.spec
trunk/test/packaging/pisa-rpm.spec
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/Makefile.am Wed Oct 21 12:31:35 2009 (r1245)
@@ -21,7 +21,7 @@
tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
tools_msleep_SOURCES = tools/msleep.c
-SUBDIRS = libpisa pairing performance pisacd pisand pisasd test
+SUBDIRS = libpisa pairing performance pisacd pisasd test
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
pisaincludedir=$(includedir)
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/configure.ac Wed Oct 21 12:31:35 2009 (r1245)
@@ -185,7 +185,6 @@
AC_CONFIG_FILES([
libpisa/Makefile
pisacd/Makefile
- pisand/Makefile
pairing/Makefile
pisasd/Makefile
test/Makefile
Modified: trunk/docs/config.txt
==============================================================================
--- trunk/docs/config.txt Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/docs/config.txt Wed Oct 21 12:31:35 2009 (r1245)
@@ -4,21 +4,13 @@
The options below can be configured in the config file of each daemon:
- pisand.conf for neighbor daemon, pisacd.conf for client daemon and
- pisasd.conf for server daemon.
+ pisacd.conf for client daemon and pisasd.conf for server daemon.
Each option can be overrided by an explicit command line argument.
See usage message of each daemon executing it with the option '-h'.
* Default directory for configuration files: /usr/local/etc/pisa
-* PISA neighbor daemon configurations (pisand.conf)
-
- - default port neighbor exchange : UDP 50551
- - default port pseudo tunnel : UDP 50552
- - default ethernet interface : eth0
- - default wireless interface : wlan0
-
* PISA client daemon configurations (pisacd.conf)
- default wireless interface : wlan0
Modified: trunk/openwrt/trunk/package/pisa/Makefile
==============================================================================
--- trunk/openwrt/trunk/package/pisa/Makefile Wed Oct 21 12:05:01 2009
(r1244)
+++ trunk/openwrt/trunk/package/pisa/Makefile Wed Oct 21 12:31:35 2009
(r1245)
@@ -25,7 +25,7 @@
define Package/pisa
$(call Package/pisa/Default)
- DEPENDS:=+libconfig +libopenssl +uclibc +pisa-mobile-guest
+pisa-access-point +pisa-trust-point
+ DEPENDS:=+libconfig +libopenssl +uclibc +pisa-mobile-guest +pisa-trust-point
endef
CONFIGURE_VARS += \
@@ -43,7 +43,6 @@
--enable-force-shlib \
--enable-openwrt \
--enable-performance=false \
- --enable-preauth \
);
endef
@@ -96,27 +95,6 @@
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
endef
-define Package/pisa-access-point
-$(call Package/pisa/Default)
- TITLE:=PISA access point applications
- DEPENDS:=+libpisa
-endef
-
-define Package/pisa-access-point/description
- This package contains PISA access point applications including the pisand,
pisa neighbor daemon.
-endef
-
-define Package/pisa-access-point/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisand.init $(1)/etc/init.d/pisand
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisand.conf
$(1)/etc/pisa/pisand.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisand $(1)/usr/sbin/
-endef
-
define Package/pisa-trust-point
$(call Package/pisa/Default)
TITLE:=PISA trust point applications
@@ -141,5 +119,4 @@
$(eval $(call BuildPackage,pisa))
$(eval $(call BuildPackage,libpisa))
$(eval $(call BuildPackage,pisa-mobile-guest))
-$(eval $(call BuildPackage,pisa-access-point))
$(eval $(call BuildPackage,pisa-trust-point))
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/test/Makefile.am Wed Oct 21 12:31:35 2009 (r1245)
@@ -6,7 +6,6 @@
EXTRA_DIST =
INCLUDES = -I@PISA_PISACD_INCLUDES@
-INCLUDES += -I@PISA_PISAND_INCLUDES@
INCLUDES += -I@PISA_PISASD_INCLUDES@
bin_PROGRAMS = checkhipd
@@ -15,7 +14,6 @@
bin_PROGRAMS += ifdefgw
bin_PROGRAMS += iwessid
bin_PROGRAMS += iwlist
-bin_PROGRAMS += sendnereq
bin_PROGRAMS += udpserver
bin_PROGRAMS += udpclient
@@ -23,6 +21,7 @@
#if PISA_PREAUTH
#bin_PROGRAMS += hipl
#bin_PROGRAMS += parsepares
+#bin_PROGRAMS += sendnereq
#bin_PROGRAMS += sendpareq
#bin_PROGRAMS += sendbureq
#bin_PROGRAMS += sendbures
@@ -32,12 +31,10 @@
EXTRA_DIST += packaging/create-package.sh
EXTRA_DIST += packaging/debbuild
EXTRA_DIST += packaging/debian-init.d-pisacd
-EXTRA_DIST += packaging/debian-init.d-pisand
EXTRA_DIST += packaging/debian-init.d-pisasd
EXTRA_DIST += packaging/pisa-deb.spec
EXTRA_DIST += packaging/pisa-rpm.spec
EXTRA_DIST += packaging/rh-init.d-pisacd
-EXTRA_DIST += packaging/rh-init.d-pisand
EXTRA_DIST += packaging/rh-init.d-pisasd
LDFLAGS += -lconfig -lm
Modified: trunk/test/checkhipd.c
==============================================================================
--- trunk/test/checkhipd.c Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/test/checkhipd.c Wed Oct 21 12:31:35 2009 (r1245)
@@ -10,8 +10,6 @@
#include <arpa/inet.h>
#include "packet.h"
-#include "pisand.h"
-#include "ndmsg.h"
#include "util.h"
int main(int argc, char *argv[])
Modified: trunk/test/packaging/pisa-deb.spec
==============================================================================
--- trunk/test/packaging/pisa-deb.spec Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/test/packaging/pisa-deb.spec Wed Oct 21 12:31:35 2009 (r1245)
@@ -25,7 +25,7 @@
%package all
Summary: PISA software bundle: libraries, client daemon, neighbor daemon and
server daemon
Group: System Environment/Base
-Requires: pisa-lib, pisa-mobile-guest, pisa-access-point, pisa-trust-point,
pisa-community-operator
+Requires: pisa-lib, pisa-mobile-guest, pisa-trust-point,
pisa-community-operator
%description all
%package lib
@@ -38,11 +38,6 @@
Group: System Environment/Daemons
%description mobile-guest
-%package access-point
-Summary: PISA access point applications
-Group: System Environment/Daemons
-%description access-point
-
%package trust-point
Summary: PISA trust point applications
Group: System Environment/Daemons
@@ -77,9 +72,6 @@
%post mobile-guest
update-rc.d pisacd defaults 31
-%post access-point
-update-rc.d pisand defaults 32
-
%post trust-point
update-rc.d pisasd defaults 33
@@ -88,10 +80,6 @@
invoke-rc.d --force --quiet pisacd stop
update-rc.d -f pisacd remove
-%preun access-point
-invoke-rc.d --force --quiet pisand stop
-update-rc.d -f pisand remove
-
%preun trust-point
invoke-rc.d --force --quiet pisasd stop
update-rc.d -f pisasd remove
@@ -113,12 +101,6 @@
%config /etc/pisa/pisacd.conf
%defattr (755, root, root)
-%files access-point
-/usr/sbin/pisand
-%config /etc/init.d/pisand
-%config /etc/pisa/pisand.conf
-%defattr (755, root, root)
-
%files trust-point
/usr/sbin/pisasd
%config /etc/init.d/pisasd
@@ -130,6 +112,9 @@
%files all
%changelog
+* Wed Oct 21 2009 Thomas Jansen <mithi@xxxxxxxxx>
+- removed access-point subpackage
+
* Mon Mar 17 2009 Dongsu Park <dpark1978@xxxxxxxxx>
- Split into separate packages
- Fixed wrong script names
Modified: trunk/test/packaging/pisa-rpm.spec
==============================================================================
--- trunk/test/packaging/pisa-rpm.spec Wed Oct 21 12:05:01 2009 (r1244)
+++ trunk/test/packaging/pisa-rpm.spec Wed Oct 21 12:31:35 2009 (r1245)
@@ -28,7 +28,7 @@
%package all
Summary: PISA software bundle: libraries, client daemon, neighbor daemon and
server daemon
Group: System Environment/Base
-Requires: pisa-lib, pisa-mobile-guest, pisa-access-point, pisa-trust-point,
pisa-community-operator
+Requires: pisa-lib, pisa-mobile-guest, pisa-trust-point,
pisa-community-operator
%description all
%package lib
@@ -41,11 +41,6 @@
Group: System Environment/Daemons
%description mobile-guest
-%package access-point
-Summary: PISA access point applications
-Group: System Environment/Daemons
-%description access-point
-
%package trust-point
Summary: PISA trust point applications
Group: System Environment/Daemons
@@ -84,18 +79,6 @@
/sbin/service pisacd start
fi
-%post access-point
-if [ "$1" = "2" ]
-then
- # upgrade
- /sbin/service pisand restart
-else
- # first install
- /sbin/chkconfig --add pisand
- /sbin/chkconfig --level 2 pisand on
- /sbin/service pisand start
-fi
-
%post trust-point
if [ "$1" = "2" ]
then
@@ -116,14 +99,6 @@
/sbin/chkconfig --del pisacd
fi
-%preun access-point
-if [ "$1" = "0" ]
-then
- # remove package completely
- /sbin/service pisand stop
- /sbin/chkconfig --del pisand
-fi
-
%preun trust-point
if [ "$1" = "0" ]
then
@@ -146,12 +121,6 @@
%config /etc/pisa/pisacd.conf
%defattr (755, root, root)
-%files access-point
-/usr/sbin/pisand
-%config /etc/init.d/pisand
-%config /etc/pisa/pisand.conf
-%defattr (755, root, root)
-
%files trust-point
/usr/sbin/pisasd
%config /etc/init.d/pisasd
@@ -164,6 +133,9 @@
%changelog
+* Wed Oct 21 2009 Thomas Jansen <mithi@xxxxxxxxx>
+- removed access-point subpackage
+
* Mon Mar 17 2009 Dongsu Park <dpark1978@xxxxxxxxx>
- Split into separate packages
- Fixed wrong script names
Other related posts:
- » [pisa-src] r1245 - in trunk: Makefile.am configure.ac docs/config.txt openwrt/trunk/package/pisa/Makefile openwrt/trunk/package/pisa/files/pisand.init pisand test/Makefile.am test/checkhipd.c test/packaging/d... - Thomas Jansen
