[csw-devel] SF.net SVN: gar:[2620] csw/mgar/pkg/bind/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Tue Dec 16 17:14:01 CET 2008
Revision: 2620
http://gar.svn.sourceforge.net/gar/?rev=2620&view=rev
Author: bonivart
Date: 2008-12-16 16:14:01 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
bind: using cswclassutils made it possible to remove postinstall
Modified Paths:
--------------
csw/mgar/pkg/bind/trunk/Makefile
csw/mgar/pkg/bind/trunk/checksums
csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed
csw/mgar/pkg/bind/trunk/files/CSWbind.gspec
csw/mgar/pkg/bind/trunk/files/CSWbind.preremove
csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec
csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec
csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec
Removed Paths:
-------------
csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall
Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 16:14:01 UTC (rev 2620)
@@ -17,11 +17,16 @@
UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/
MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/
DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz
-DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove)
+DISTFILES += $(call admfiles,CSWbind,preinstall preremove)
DISTFILES += $(call admfiles,CSWbinddevel,)
DISTFILES += $(call admfiles,CSWlibbind,)
DISTFILES += $(call admfiles,CSWbindutils,)
+SPKG_DESC_CSWbind = ISC BIND main package
+SPKG_DESC_CSWbinddevel = ISC BIND development package
+SPKG_DESC_CSWlibbind = ISC BIND library package
+SPKG_DESC_CSWbindutils = ISC BIND utilities package
+
REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils
REQUIRED_PKGS_CSWbinddevel = CSWbind
REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib
@@ -44,24 +49,23 @@
PKGFILES_CSWlibbind = $(libdir)/.*
PKGFILES_CSWbindutils = $(bindir)/.*
+ENABLE_CHECK = 0
+
INSTALL_SCRIPTS = custom
-PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/named.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }'
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
SPKG_SOURCEURL = http://www.isc.org/software/bind
-SPKG_CLASSES = none cswinitsmf
+SPKG_CLASSES_CSWbind = none cswcpsampleconf cswinitsmf
include gar/category.mk
+SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
+
install-custom:
@echo " ==> Installing $(GARNAME) (custom)"
- @rm -rf $(DESTDIR)
@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
@cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed
-# @ginstall -d $(DESTDIR)/etc/init.d
-# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed
- @ginstall -d $(DESTDIR)/etc/opt/csw
@cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW
@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
@cp $(FILEDIR)/CSWbind.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
@@ -73,4 +77,5 @@
@cp $(WORKSRC)/COPYRIGHT $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE
( cd $(WORKSRC) ; \
gmake DESTDIR=$(DESTDIR) install )
+ @touch $(DESTDIR)/var/opt/csw/named/named.pid
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/bind/trunk/checksums
===================================================================
--- csw/mgar/pkg/bind/trunk/checksums 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/checksums 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,8 +1,7 @@
16c893f73a394c8cc36d7900cb9bb801 download/bind-9.5.0-P2.tar.gz
-9d20fd7cceac478243ac485868b9ef35 download/CSWbind.gspec
+e346b8d43181db864605c76435a0f731 download/CSWbind.gspec
9338f20547092ec54136ebebd5f663d3 download/CSWbind.preinstall
-78702926bd064e3a1f4ac56ae85866a9 download/CSWbind.postinstall
-104f5539928c029738b0a1808f8af262 download/CSWbind.preremove
-af16ec4f9c20614932f67acd116e52ad download/CSWbinddevel.gspec
-40e00ac3e92ec835dbf567581930d34e download/CSWlibbind.gspec
-7f81505db2da9fbc899b9abeac434c58 download/CSWbindutils.gspec
+90026b0ca15e2435ddae730c5bed4a42 download/CSWbind.preremove
+771f4b6098f7bdeb83c5690dfeb6b5eb download/CSWbinddevel.gspec
+d5c381cd0cf6be25fc3a75fc470eeaf6 download/CSWlibbind.gspec
+a6c7fa764b592aed3b370b9a49e9920e download/CSWbindutils.gspec
Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,7 +1,7 @@
#!/sbin/sh
# rc-script for CSW Bind
-# Peter Bonivart, 2008-11-18
+# Peter Bonivart, 2008-12-16
USER=named
#OPTIONS="-d 1" # debug mode
@@ -11,14 +11,14 @@
ZONE= # used for initialization, do not change
case "$1" in
- 'start')
+ start)
if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then
echo 'Starting bind.'
# ulimit -n 1024
/opt/csw/sbin/named $OPTIONS &
fi
;;
- 'stop')
+ stop)
echo 'Shutting down bind.'
if [ -x /usr/bin/zonename ]; then
if [ "`/usr/bin/zonename`" = "global" ]; then
@@ -28,7 +28,7 @@
pkill $ZONE named
exit 0
;;
- 'reload')
+ reload|refresh)
echo 'Reloading bind.'
if [ -x /usr/bin/zonename ]; then
if [ "`/usr/bin/zonename`" = "global" ]; then
@@ -39,7 +39,7 @@
exit 0
;;
*)
- echo "Usage: $0 { start | stop | reload }"
+ echo "Usage: $0 { start | stop | reload | refresh }"
exit 1
;;
esac
Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.gspec
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,7 +1,6 @@
%var bitname bind
%var pkgname CSWbind
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
%copyright
Please see /opt/csw/share/doc/bind/LICENSE for license information
Deleted: csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# 2008-11-19
-
-ETC=$PKG_INSTALL_ROOT/etc/opt/csw
-VAR=$PKG_INSTALL_ROOT/var/opt/csw/named
-
-# check csw.conf
-if [ -x $BASEDIR/etc/csw.conf ] ; then
- . $BASEDIR/etc/csw.conf
-fi
-if [ -x $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-fi
-
-# enable?
-if [ ! -f "$ETC/named.conf" ]; then
- if [ "$autoenable_daemons" = "no" ]; then
- echo "named.conf not created due to csw.conf setting."
- else
- cp -p $ETC/named.conf.CSW $ETC/named.conf
- fi
-else
- echo "named.conf already exists, will not copy named.conf.CSW to it."
-fi
-
-# set owner on var dir
-chown -R named $VAR
-
-echo
-echo ">>> Read /opt/csw/share/doc/bind/README.CSW for more info <<<"
-echo
-
-exit 0
Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.preremove
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,14 +1,7 @@
#!/bin/sh
-# 2008-11-19
+# 2008-12-16
-ETC=$PKG_INSTALL_ROOT/etc/opt/csw
-
-echo
-
-# stop bind
-/etc/init.d/cswnamed stop
-
# remove named user if created by this package
/usr/bin/grep "^named:" $PKG_INSTALL_ROOT/etc/passwd | /usr/bin/grep ":CSW BIND DNS:" > /dev/null 2>&1
if [ "$?" = "0" ]; then
@@ -16,11 +9,4 @@
/usr/sbin/userdel named > /dev/null 2>&1
fi
-# remove conf files
-if [ "`cmp "$ETC/named.conf" "$ETC/named.conf.CSW"`" ]; then
- echo "named.conf modified, will not remove it."
-else
- /bin/rm $ETC/named.conf
-fi
-
exit 0
Modified: csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,7 +1,6 @@
%var bitname bind_devel
%var pkgname CSWbinddevel
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
%copyright
Please see /opt/csw/share/doc/bind/LICENSE for license information
Modified: csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,7 +1,6 @@
%var bitname bind_utils
%var pkgname CSWbindutils
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
%copyright
Please see /opt/csw/share/doc/bind/LICENSE for license information
Modified: csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec
===================================================================
--- csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 15:28:19 UTC (rev 2619)
+++ csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 16:14:01 UTC (rev 2620)
@@ -1,7 +1,6 @@
%var bitname libbind
%var pkgname CSWlibbind
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
%copyright
Please see /opt/csw/share/doc/bind/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