[csw-devel] SF.net SVN: gar:[2685] csw/mgar/pkg/dhcp/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Mon Dec 22 14:35:36 CET 2008
Revision: 2685
http://gar.svn.sourceforge.net/gar/?rev=2685&view=rev
Author: bonivart
Date: 2008-12-22 13:35:36 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
dhcp: upgrade to 4.1.0
Modified Paths:
--------------
csw/mgar/pkg/dhcp/trunk/Makefile
csw/mgar/pkg/dhcp/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW
csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd
csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove
csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec
Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 11:34:48 UTC (rev 2684)
+++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 13:35:36 UTC (rev 2685)
@@ -1,7 +1,3 @@
-# split into devel package
-# use cswclassutils for conf files and smf support (add init file)
-# create doc dir with license
-
GARNAME = dhcp
GARVERSION = 4.1.0
CATEGORIES = net
@@ -16,14 +12,51 @@
MASTER_SITES = http://ftp.isc.org/isc/dhcp/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWdhcp,)
+DISTFILES += $(call admfiles,CSWdhcp,preremove)
+DISTFILES += $(call admfiles,CSWdhcpdevel,)
+SPKG_DESC_CSWdhcp = ISC DHCP reference implementation
+
+REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt
+REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = (\d+(?:\.\d+)*)
+
GARCOMPILER = GNU
TEST_TARGET = check
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
+CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp
+EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la
+
+PKGFILES_CSWdhcpdevel = $(PKGFILES_DEVEL)
+
+ENABLE_CHECK = 0
+
+INSTALL_SCRIPTS = custom
+
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'
+
SPKG_SOURCEURL = https://www.isc.org/software/dhcp
+SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf
include gar/category.mk
+install-custom:
+ @echo " ==> Installing $(GARNAME) (custom)"
+ @( cd $(WORKSRC) ; \
+ gmake DESTDIR=$(DESTDIR) install )
+ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+ @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd
+ @( cd $(DESTDIR)/etc/opt/csw ; \
+ mv dhcpd.conf dhcpd.conf.CSW ; \
+ mv dhclient.conf dhclient.conf.CSW )
+ @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
+ @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)
+ @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
+ @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)
+ @touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 11:34:48 UTC (rev 2684)
+++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:35:36 UTC (rev 2685)
@@ -1,2 +1,4 @@
1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz
688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec
+cceb064ddfcd48d8dbaba37f3fc7dbd3 download/CSWdhcp.preremove
+5d8f4f34a43f235e28db4da8ecb1837d download/CSWdhcpdevel.gspec
Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW (rev 0)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW 2008-12-22 13:35:36 UTC (rev 2685)
@@ -0,0 +1,17 @@
+README.CSW
+==========
+
+Default locations
+-----------------
+Configuration directory: /etc/opt/csw.
+Work directory: /var/opt/csw/dhcp.
+
+Installation
+------------
+1. Modify the dhcpd.conf file in /etc/opt/csw.
+2. Start DHCP with "/etc/init.d/cswdhcp start".
+
+More info here: http://www.isc.org/products/DHCP/.
+
+
+bonivart/071024
Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd (rev 0)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2008-12-22 13:35:36 UTC (rev 2685)
@@ -0,0 +1,33 @@
+#!/sbin/sh
+
+# rc-script for CSW DHCP
+# Peter Bonivart, 2008-12-21
+
+PID=/var/opt/csw/dhcp/dhcpd.pid
+#OPTIONS="-cf /opt/csw/etc/dhcpd.conf" # use old location of conf file
+
+ZONE= # used for initialization, do not change
+
+case "$1" in
+ 'start')
+ if [ -f /opt/csw/sbin/dhcpd -a -f /etc/opt/csw/dhcpd.conf ]; then
+ echo 'Starting dhcp.'
+ /opt/csw/sbin/dhcpd $OPTIONS &
+ fi
+ ;;
+ 'stop')
+ echo 'Shutting down dhcp.'
+ if [ -x /usr/bin/zonename ]; then
+ if [ "`/usr/bin/zonename`" = "global" ]; then
+ ZONE="-z global"
+ fi
+ fi
+ pkill $ZONE -x dhcpd
+ [ -f $PID ] && /usr/bin/rm $PID
+ exit 0
+ ;;
+ *)
+ echo "Usage: $0 { start | stop }"
+ exit 1
+ ;;
+esac
Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove (rev 0)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 13:35:36 UTC (rev 2685)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# 2008-12-22
+
+VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp
+
+# clean up work dir
+[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases"
+[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~"
+[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid"
+
+exit 0
Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec (rev 0)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec 2008-12-22 13:35:36 UTC (rev 2685)
@@ -0,0 +1,7 @@
+%var bitname dhcp_devel
+%var pkgname CSWdhcpdevel
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright
+
+Please see /opt/csw/share/doc/dhcp/LICENSE for license information
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list