From 5aec1ebc2fbfd65c289656fca4992777e62c1622 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 29 Mar 2005 23:26:17 +0000 Subject: [PATCH] Add dhcp-forwarder package git-svn-id: svn://svn.openwrt.org/openwrt/trunk@474 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/Config.in | 1 + openwrt/package/Makefile | 1 + openwrt/package/dhcp-forwarder/Config.in | 9 + openwrt/package/dhcp-forwarder/Makefile | 48 +++++ .../dhcp-forwarder/dhcp-forwarder-0.7-4.diff | 179 ++++++++++++++++++ 5 files changed, 238 insertions(+) create mode 100644 openwrt/package/dhcp-forwarder/Config.in create mode 100644 openwrt/package/dhcp-forwarder/Makefile create mode 100644 openwrt/package/dhcp-forwarder/dhcp-forwarder-0.7-4.diff diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index 080c2c463..6e369935a 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -18,6 +18,7 @@ comment "Networking" source "package/tcpdump/Config.in" source "package/ppp/Config.in" source "package/dropbear/Config.in" +source "package/dhcp-forwarder/Config.in" source "package/ebtables/Config.in" source "package/arptables/Config.in" source "package/iproute2/Config.in" diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index d010cb2fb..0f1193db4 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -37,6 +37,7 @@ package-$(BR2_PACKAGE_STRACE) += strace package-$(BR2_PACKAGE_TCPDUMP) += tcpdump package-$(BR2_PACKAGE_WOL) += wol package-$(BR2_PACKAGE_ZLIB) += zlib +package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder all: compile install clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean diff --git a/openwrt/package/dhcp-forwarder/Config.in b/openwrt/package/dhcp-forwarder/Config.in new file mode 100644 index 000000000..28992fbb0 --- /dev/null +++ b/openwrt/package/dhcp-forwarder/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_DHCPFWD + tristate "dhcp-forwarder (a DHCP relay agent)" + default n + help + A DHCP relay agent + + http://www.nongnu.org/dhcp-fwd/ + + diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile new file mode 100644 index 000000000..bfedfa4c5 --- /dev/null +++ b/openwrt/package/dhcp-forwarder/Makefile @@ -0,0 +1,48 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME := dhcp-forwarder +PKG_VERSION := 0.7 +PKG_RELEASE := 4 +PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2 + +PKG_SOURCE_SITE := http://savannah.nongnu.org/download/dhcp-fwd/ +PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_CAT := bzcat +PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) +PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) + +$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) + mkdir -p $(TOOL_BUILD_DIR) + $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff + chmod a+x $(PKG_BUILD_DIR)/ipkg/rules + +$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules + cd $(PKG_BUILD_DIR); \ + ipkg/rules \ + TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ + package + +$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/ipkg/rules +compile: $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list + +clean: + -cd $(PKG_BUILD_DIR); \ + ipkg/rules \ + TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ + clean + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPK) + diff --git a/openwrt/package/dhcp-forwarder/dhcp-forwarder-0.7-4.diff b/openwrt/package/dhcp-forwarder/dhcp-forwarder-0.7-4.diff new file mode 100644 index 000000000..7df8fef3e --- /dev/null +++ b/openwrt/package/dhcp-forwarder/dhcp-forwarder-0.7-4.diff @@ -0,0 +1,179 @@ +diff -ruN dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/CONTROL/conffiles dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/CONTROL/conffiles +--- dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/CONTROL/conffiles 1970-01-01 01:00:00.000000000 +0100 ++++ dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/CONTROL/conffiles 2005-03-09 06:20:12.000000000 +0100 +@@ -0,0 +1 @@ ++/etc/dhcp-fwd.conf +diff -ruN dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/CONTROL/control dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/CONTROL/control +--- dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/CONTROL/control 1970-01-01 01:00:00.000000000 +0100 ++++ dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/CONTROL/control 2005-03-09 06:33:30.000000000 +0100 +@@ -0,0 +1,8 @@ ++Package: dhcp-forwarder ++Priority: optional ++Section: net ++Version: [TBDL] ++Architecture: [TBDL] ++Maintainer: Nico ++Source: http://nthill.free.fr/openwrt/sources/dhcp-forwarder/ ++Description: a DHCP relay agent +diff -ruN dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd +--- dhcp-forwarder-0.7-orig/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd 1970-01-01 01:00:00.000000000 +0100 ++++ dhcp-forwarder-0.7-4/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd 2005-03-09 10:43:02.000000000 +0100 +@@ -0,0 +1,21 @@ ++#!/bin/sh ++ ++LOG_D=/var/log ++RUN_D=/var/run ++PID_F=$RUN_D/dhcpd-fwd.pid ++ ++case $1 in ++ start) ++ [ -d $LOG_D ] || mkdir -p $LOG_D ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ dhcp-fwd >/dev/null 2>&1 ++ ;; ++ stop) ++ [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1 ++ ;; ++ *) ++ echo "usage: $0 (start|stop)" ++ exit 1 ++esac ++ ++exit $? +diff -ruN dhcp-forwarder-0.7-orig/ipkg/rules dhcp-forwarder-0.7-4/ipkg/rules +--- dhcp-forwarder-0.7-orig/ipkg/rules 1970-01-01 01:00:00.000000000 +0100 ++++ dhcp-forwarder-0.7-4/ipkg/rules 2005-03-13 13:07:27.000000000 +0100 +@@ -0,0 +1,128 @@ ++#!/usr/bin/make -f ++ ++ifneq ($(strip ${IPKG_RULES_INC}),) ++ include $(IPKG_RULES_INC) ++endif ++ ++## ++ ++PKG_VERSION := $(shell cat ./ipkg/version) ++CURRENT_DIR := $(shell pwd) ++INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install ++ ++unexport INSTALL_DIR ++ ++I_DHCP_FORWARDER := ipkg/dhcp-forwarder ++ ++BUILD_DEPS := \ ++ ++CONFIGURE_OPTS = \ ++ ++## ++ ++all: package ++ ++ ++.stamp-configured: $(BUILD_DEPS) ++ ++ rm -rf config.cache ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ++ ac_cv_func_malloc_0_nonnull="yes" \ ++ ./configure \ ++ --target=$(GNU_TARGET_NAME) \ ++ --host=$(GNU_TARGET_NAME) \ ++ --build=$(GNU_HOST_NAME) \ ++ --program-prefix="" \ ++ --program-suffix="" \ ++ --prefix=/usr \ ++ --exec-prefix=/usr \ ++ --bindir=/usr/bin \ ++ --datadir=/usr/share \ ++ --includedir=/usr/include \ ++ --infodir=/usr/share/info \ ++ --libdir=/usr/lib \ ++ --libexecdir=/usr/lib \ ++ --localstatedir=/var \ ++ --mandir=/usr/share/man \ ++ --sbindir=/usr/sbin \ ++ --sysconfdir=/etc \ ++ $(DISABLE_LARGEFILE) \ ++ $(DISABLE_NLS) \ ++ $(CONFIGURE_OPTS) \ ++ ++ touch .stamp-configured ++ ++ ++.stamp-built: .stamp-configured ++ ++ $(MAKE) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ cfg_filename="/etc/dhcp-fwd.conf" \ ++ ++ touch .stamp-built ++ ++ ++$(INSTALL_DIR)/usr/sbin/dhcp-fwd: .stamp-built ++ ++ mkdir -p $(INSTALL_DIR) ++ ++ $(MAKE) \ ++ DESTDIR="$(INSTALL_DIR)" \ ++ install ++ ++ ++configure: .stamp-configured ++ ++ ++build: .stamp-built ++ ++ ++install: $(INSTALL_DIR)/usr/sbin/dhcp-fwd ++ ++ ++package: $(INSTALL_DIR)/usr/sbin/dhcp-fwd ++ ++ mkdir -p $(I_DHCP_FORWARDER)/etc ++ cp -fpR contrib/dhcp-fwd.conf $(I_DHCP_FORWARDER)/etc/ ++ ++ mkdir -p $(I_DHCP_FORWARDER)/usr/sbin ++ cp -fpR $(INSTALL_DIR)/usr/sbin/dhcp-fwd $(I_DHCP_FORWARDER)/usr/sbin/ ++ $(STRIP) $(I_DHCP_FORWARDER)/usr/sbin/* ++ ++ chmod 0755 $(I_DHCP_FORWARDER)/etc/ ++ chmod 0600 $(I_DHCP_FORWARDER)/etc/dhcp-fwd.conf ++ chmod 0755 $(I_DHCP_FORWARDER)/etc/init.d/ ++ chmod 0755 $(I_DHCP_FORWARDER)/etc/init.d/dhcp-fwd ++ ++ chmod 0755 ipkg/*/CONTROL/ ++ chmod 0644 ipkg/*/CONTROL/control ++ -chmod 0644 ipkg/*/CONTROL/conffiles ++ ++ perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control ++ifneq ($(strip $(PKG_VERSION)),) ++ perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control ++endif ++ ++ $(IPKG_BUILD) $(I_DHCP_FORWARDER) $(IPKG_TARGET_DIR) ++ ++ ++clean: ++ ++ -$(MAKE) \ ++ DESTDIR="$(INSTALL_DIR)" \ ++ uninstall clean ++ ++ rm -rf .stamp-* \ ++ $(I_DHCP_FORWARDER)/etc/dhcp-fwd.conf \ ++ $(I_DHCP_FORWARDER)/usr \ ++ ++ ++control: ++ ++ @cat $(I_DHCP_FORWARDER)/CONTROL/control ++ @echo ++ ++ ++.PHONY: configure build install package clean control +diff -ruN dhcp-forwarder-0.7-orig/ipkg/version dhcp-forwarder-0.7-4/ipkg/version +--- dhcp-forwarder-0.7-orig/ipkg/version 1970-01-01 01:00:00.000000000 +0100 ++++ dhcp-forwarder-0.7-4/ipkg/version 2005-03-09 06:22:11.000000000 +0100 +@@ -0,0 +1 @@ ++0.7-4