[csw-devel] SF.net SVN: gar:[15175] csw/mgar/pkg/bash/trunk

[chninkel at users.sourceforge.net]

Revision: 15175
          http://gar.svn.sourceforge.net/gar/?rev=15175&view=rev
Author:   chninkel
Date:     2011-07-20 23:37:15 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
bash: now use cswetcshells class action scripts in order to update /etc/shells

Modified Paths:
--------------
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bash/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/bash/trunk/files/shells

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2011-07-20 23:14:30 UTC (rev 15174)
+++ csw/mgar/pkg/bash/trunk/Makefile	2011-07-20 23:37:15 UTC (rev 15175)
@@ -31,12 +31,6 @@
 
 SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html
 
-SPKG_CLASSES = none build
-
-# /etc/shells is only updated by an action class scripts
-# this file collision is not important
-CHECKPKG_OVERRIDES_CSWbash += file-collision|/etc/shells|CSWbash|CSWksh
-
 # /usr/local is present in the default path, this can be safely ignored
 CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bash
 CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bashbug
@@ -46,13 +40,6 @@
 CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bashref.html
 CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash.html
 
-
-# We must modify /etc/shells, this is the cause of the following checkpkg errors that we must override
-# This will be better fixed when we will use cswetcshells (soon)
-CHECKPKG_OVERRIDES_CSWbash += missing-dependency|BOstdenv|or|CSWboincclient|or|CSWconserver|or|CSWdevmon|or|CSWhobbit|or|CSWhobbitc|or|CSWhylafax|or|CSWjabberd|or|CSWjetty6|or|CSWopenvpn|or|CSWw9wm-dtlogin|or|IPLTdsr
-CHECKPKG_OVERRIDES_CSWbash += bad-location-of-file|file=/etc/shells
-
-
 ###### Upstream and opencsw files information #######
 
 # Patches download location
@@ -65,9 +52,6 @@
 DISTFILES  = $(NAME)-$(BASH_VERSION).tar.gz
 DISTFILES += changelog.CSW
 
-# build action script to modify /etc/shells at package installation and removal time
-DISTFILES += shells
-
 PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION))
 PATCHDIRLEVEL = 0
 # we generate the list of patches from the PATCHLEVEL
@@ -91,15 +75,8 @@
 LICENSE = COPYING
 
 # we add CSW bash to the /etc/shells files using the build script
-PROTOTYPE_MODIFIERS = shell
-PROTOTYPE_FILES_shell = \/etc\/shells   # a normal Perl regexp. Watch out for links!
-PROTOTYPE_PERMS_shell = ?
-PROTOTYPE_CLASS_shell = build
-PROTOTYPE_USER_shell = ?
-PROTOTYPE_GROUP_shell = ?
-PROTOTYPE_FTYPE_shell = e
+ETCSHELLS = /opt/csw/bin/bash
 
-
 ##### Build and installation information #####
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -118,6 +95,5 @@
 		 ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(NAME)/`basename $$FILE`; \
 	done )
 	ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW
-	ginstall -D $(WORKDIR_FIRSTMOD)/shells $(PKGROOT)/etc/shells
 	( cd "$(PKGROOT)/$(bindir)" && rm -f rbash && ln -sf bash rbash )
 	rm -f $(PKGROOT)/$(infodir)/bash.info

Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash/trunk/files/changelog.CSW	2011-07-20 23:14:30 UTC (rev 15174)
+++ csw/mgar/pkg/bash/trunk/files/changelog.CSW	2011-07-20 23:37:15 UTC (rev 15175)
@@ -1,3 +1,11 @@
+bash (4.2.10,REV=2011.07.21) unstable
+
+  * New upstream release.
+  * Updated dependancy names (CSWgettextrt -> CSWlibintl8)
+  * Now use cswetcshells class action scripts in order to update /etc/shells.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 18 Dec 2010 09:19:42 +0100
+
 bash (4.1.09,REV=2010.12.18) unstable
 
   * Added bash patches bash41-008 and bash41-009.

Deleted: csw/mgar/pkg/bash/trunk/files/shells
===================================================================
--- csw/mgar/pkg/bash/trunk/files/shells	2011-07-20 23:14:30 UTC (rev 15174)
+++ csw/mgar/pkg/bash/trunk/files/shells	2011-07-20 23:37:15 UTC (rev 15175)
@@ -1,40 +0,0 @@
-if [ install = "$1" ]; then 
-	if [ -f "$PKG_INSTALL_ROOT/etc/shells" ]; then 
-		cat "$PKG_INSTALL_ROOT/etc/shells"
-	else
-		cat <<-__EOT__
-# default entries
-/usr/bin/sh
-/usr/bin/csh
-/usr/bin/ksh
-/usr/bin/jsh
-/bin/sh
-/bin/csh
-/bin/ksh
-/bin/jsh
-/sbin/sh
-/sbin/jsh
-/usr/bin/pfsh
-/usr/bin/pfcsh
-/usr/bin/pfksh
-/usr/bin/bash
-/usr/bin/tcsh
-/usr/bin/zsh
-/bin/pfsh
-/bin/pfcsh
-/bin/pfksh
-/bin/bash
-/bin/tcsh
-/bin/zsh
-/usr/xpg4/bin/sh
-
-# added entries
-__EOT__
-	fi &&
-	cat <<-__EOT__
-/opt/csw/bin/bash    # added by $PKGINST
-__EOT__
-
-elif [ remove = "$1" ] && [ -f "$PKG_INSTALL_ROOT/etc/shells" ]; then 
-	egrep -v "^/opt/csw/bin/bash(#| |  |\$)" <$PKG_INSTALL_ROOT/etc/shells || echo "#"
-fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.