bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade dibbler to 0.7.1 (#3778)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11860 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-18 14:11:35 +00:00
parent 9287394e8f
commit 2d7213e219
4 changed files with 34 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ipv6/dibbler/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dibbler
PKG_VERSION:=0.6.1
PKG_VERSION:=0.7.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_MD5SUM:=220e68795ab0375cb3bc1f40c47e0bb2
PKG_MD5SUM:=76a814d528274b2dc7ff7623bd6f6b45
include $(INCLUDE_DIR)/package.mk
@ -27,21 +27,42 @@ define Package/dibbler/Default
URL:=http://klub.com.pl/dhcpv6/
endef
define Package/dibbler/Default/description
Dibbler is a portable DHCPv6 implementation. It supports stateful (i.e.
IPv6 address granting) as well as stateless (i.e. option granting)
autoconfiguration for IPv6.
endef
define Package/dibbler-client
$(call Package/dibbler/Default)
TITLE+= (client)
endef
define Package/dibbler-client/description
$(call Package/dibbler/Default/description)
This package contains the dibbler client.
endef
define Package/dibbler-relay
$(call Package/dibbler/Default)
TITLE+= (relay)
endef
define Package/dibbler-relay/description
$(call Package/dibbler/Default/description)
This package contains the dibbler relay.
endef
define Package/dibbler-server
$(call Package/dibbler/Default)
TITLE+= (server)
endef
define Package/dibbler-server/description
$(call Package/dibbler/Default/description)
This package contains the dibbler server.
endef
define Build/Configure
(cd $(PKG_BUILD_DIR)/poslib; \
$(TARGET_CONFIGURE_OPTS) \

4
ipv6/dibbler/patches/001-fix_avr32_compile
View File

@ -1,5 +1,5 @@
--- dibbler-0.6.1/poslib/config.sub.orig 2008-05-15 23:10:27.000000000 -0500
+++ dibbler-0.6.1/poslib/config.sub 2008-05-15 23:10:57.000000000 -0500
--- a/poslib/config.sub
+++ b/poslib/config.sub
@@ -230,7 +230,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \

58
ipv6/dibbler/patches/001-uclibcxx.patch
View File

@ -1,17 +1,6 @@
Index: dibbler-0.6.1/Makefile
===================================================================
--- dibbler-0.6.1.orig/Makefile 2008-03-12 13:27:35.000000000 +0100
+++ dibbler-0.6.1/Makefile 2008-03-12 13:27:36.000000000 +0100
@@ -39,7 +39,7 @@
$(CLIENTBIN): libposlib includes commonlibs clntlibs $(MISC)/DHCPClient.o $(CLIENT)
@echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
- $(CXX) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
+ $(CXXLD) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
-L$(MISC) -lMisc \
-L$(ADDRMGR) -lAddrMgr \
-L$(CLNTADDRMGR) -lClntAddrMgr \
@@ -57,7 +57,8 @@
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,8 @@
-L$(MESSAGES) -lMsg \
-lClntOptions -lOptions -lLowLevel \
-L$(MISC) -lMisc \
@ -19,18 +8,9 @@ Index: dibbler-0.6.1/Makefile
+ -L$(POSLIB) $(CLNTPOSLIB) \
+ $(CLNT_LIBS)
ifndef MOD_CLNT_DISABLE_DNSUPDATE
CLNTPOSLIB=-lposlib
@@ -67,7 +68,7 @@
server: $(SERVERBIN)
$(SERVERBIN): libposlib includes commonlibs srvlibs $(MISC)/DHCPServer.o $(SERVER)
@echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
- $(CXX) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER) \
+ $(CXXLD) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER) \
-L$(SRVADDRMGR) -lSrvAddrMgr \
-L$(ADDRMGR) -lAddrMgr \
-L$(LOWLEVEL) \
@@ -88,7 +89,8 @@
@@ -93,7 +94,8 @@
-L$(MISC) -lMisc \
-L$(LOWLEVEL) -lLowLevel \
-L$(IFACEMGR) -lIfaceMgr \
@ -38,18 +18,9 @@ Index: dibbler-0.6.1/Makefile
+ -L$(POSLIB) $(SRVPOSLIB) \
+ $(SRV_LIBS)
ifndef MOD_SRV_DISABLE_DNSUPDATE
SRVPOSLIB=-lposlib
@@ -98,7 +100,7 @@
$(RELAYBIN): poslib-configure includes commonlibs relaylibs $(MISC)/DHCPRelay.o $(RELAY)
@echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
- $(CXX) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY) \
+ $(CXXLD) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY) \
-L$(RELTRANSMGR) -lRelTransMgr \
-L$(RELCFGMGR) -lRelCfgMgr \
-L$(RELIFACEMGR) -lRelIfaceMgr \
@@ -111,7 +113,8 @@
relay: $(RELAYBIN)
@@ -113,7 +115,8 @@
-L$(MESSAGES) -lMsg \
-L$(MISC) -lMisc \
-L$(OPTIONS) -lOptions \
@ -57,16 +28,5 @@ Index: dibbler-0.6.1/Makefile
+ -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions \
+ $(SRV_LIBS)
objs: includes
@for dir in $(COMMONSUBDIRS); do \
Index: dibbler-0.6.1/Makefile.inc
===================================================================
--- dibbler-0.6.1.orig/Makefile.inc 2008-03-12 13:27:35.000000000 +0100
+++ dibbler-0.6.1/Makefile.inc 2008-03-12 13:27:36.000000000 +0100
@@ -1,5 +1,6 @@
# === used tools ===
CXX ?= g++
+CXXLD ?= $(CXX)
CC ?= gcc
FLEX = flex
BISONPP = $(PREFIX)/bison++/bison++ -S $(PREFIX)/bison++/bison.cc -H $(PREFIX)/bison++/bison.h
requestor: $(REQUESTORBIN)
$(REQUESTORBIN): includes commonlibs Requestor $(REQUESTORDIRS)

16
ipv6/dibbler/patches/100-fix_typo.patch
View File

@ -1,16 +0,0 @@
Index: dibbler-0.6.1/Misc/Makefile
===================================================================
--- dibbler-0.6.1.orig/Misc/Makefile 2008-03-12 13:27:35.000000000 +0100
+++ dibbler-0.6.1/Misc/Makefile 2008-03-12 13:27:36.000000000 +0100
@@ -26,9 +26,9 @@
$(CC) $(COPTS) -std=c99 -c sha512.c
# MD5 routined
-md.o: md.c md.h
+md5.o: md5.c md5.h
@echo "[CC ] $(SUBDIR)/$@"
- $(CC) $(COPTS) -c md.c
+ $(CC) $(COPTS) -c md5.c
# HMAC-SHA and HMAC-MD5
hmac-sha-md5.o: hmac-sha-md5.c hmac.h