[csw-devel] SF.net SVN: gar:[5146] csw/mgar/pkg/dante/trunk

Thu Jun 4 01:39:42 CEST 2009

Revision: 5146
          http://gar.svn.sourceforge.net/gar/?rev=5146&view=rev
Author:   skayser
Date:     2009-06-03 23:39:42 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
dante: added CSW docs, deactived issetugid() workaround, naming like it is now

Modified Paths:
--------------
    csw/mgar/pkg/dante/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dante/trunk/files/README.CSW
    csw/mgar/pkg/dante/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================

--- csw/mgar/pkg/dante/trunk/Makefile	2009-06-03 19:42:00 UTC (rev 5145)
+++ csw/mgar/pkg/dante/trunk/Makefile	2009-06-03 23:39:42 UTC (rev 5146)
@@ -1,7 +1,6 @@
 # Todo
-# * Add changelog.CSW
 # * Compare with current catalog package WRT to config file etc.
-# * Client libraries ignore SOCKS_CONF, fix possible culprit issetguid()
+# * Ponder about the SOCKS_CONF / issetguid() issue
 GARNAME = dante
 GARVERSION = 1.1.19
 CATEGORIES = net
@@ -23,31 +22,21 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 SPKG_SOURCEURL = http://www.inet.no/dante/
 
-PACKAGES = CSWlibsocks CSWdante CSWdanteclient
+PACKAGES = CSWlibsocks CSWdante
 
-SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries
+SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper)
 SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon
-SPKG_DESC_CSWdanteclient = Dante SOCKS wrapper to SOCKsify applications
 SPKG_CLASSES_CSWdante = none cswinitsmf
 
-CATALOGNAME_CSWdanteclient = dante-client
-
-# There is no pkg compiling against dante right now, just drop the
-# header file
+# There is no pkg compiling against dante right now, just drop the .h file
 EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/socks.h
 
-# Would have liked to keep it simple and just put *.sockd.* and
-# *.socks.* in the server/client package, but then some _RT end up in
-# the client package also. Seems as if files can be matched by multiple
-# packages.
-PKGFILES_CSWlibsocks = $(PKGFILES_RT)
+PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.*
+PKGFILES_CSWlibsocks += $(addprefix $(docdir)/,NEWS SUPPORT CREDITS )
+PKGFILES_CSWlibsocks += $(docdir)/*.CSW
 PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante
-PKGFILES_CSWdanteclient = $(mandir)/.*socks.*
-PKGFILES_CSWdanteclient += $(docdir)/.*socks.*
-PKGFILES_CSWdanteclient += $(bindir)/.*socks.*
 
 REQUIRED_PKGS_CSWdante = CSWlibsocks CSWcswclassutils CSWtcpwrap
-REQUIRED_PKGS_CSWdanteclient = CSWlibsocks
 
 # CSWlibsocks not yet installed on the build farm
 ENABLE_CHECK = 0
@@ -71,23 +60,29 @@
 
 include gar/category.mk
 
+# The SOCKS_CONF and issetugid() issue needs some thought. Are there any
+# secure alternative to the simple get{ug}id below? Could ask upstream.
+#
 # Fix missing issetugid on Solaris 8, it is not nice, but the best i can
 # come up with for now, ref. 
 #   http://bugs.gentoo.org/attachment.cgi?id=180390
-#	issetugid(2) on a Solaris 10 box (WRT to concerns)
-# This should be revamped into a patch for libscompat/issetugid.c
-post-extract-modulated:
-	@perl -pi -e '\
-		s/int issetugid __P\(\(void\)\)/#define issetugid() (getuid() != geteuid()) || (getgid() != getegid())/' \
-			$(WORKSRC)/include/common.h
-	@$(MAKECOOKIE)
+#   issetugid(2) on a Solaris 10 box (WRT to concerns)
+#
+# If at all this needs to be revamped into a patch for libscompat/issetugid.c
+#post-extract-modulated:
+#	@perl -pi -e '\
+#		s/int issetugid __P\(\(void\)\)/#define issetugid() (getuid() != geteuid()) || (getgid() != getegid())/' \
+#			$(WORKSRC)/include/common.h
+#	@$(MAKECOOKIE)
 
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated: DOCS = CREDITS NEWS SUPPORT
+post-install-modulated: CSWDOCS = README.CSW changelog.CSW
 post-install-modulated:
 	@ginstall -d $(DOCDEST)/examples
 	@cp $(WORKSRC)/example/*.conf $(DOCDEST)/examples
-	@$(foreach D,$(DOCS),cp $(WORKSRC)/$(D) $(DOCDEST);)
+	@$(foreach D,$(DOCS),    cp $(WORKSRC)/$(D) $(DOCDEST);)
+	@$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);)
 
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@cp $(FILEDIR)/CSWdante.cswdante $(DESTDIR)/etc/opt/csw/init.d/cswdante

Added: csw/mgar/pkg/dante/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/dante/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/dante/trunk/files/README.CSW	2009-06-03 23:39:42 UTC (rev 5146)
@@ -0,0 +1,13 @@
+Known client issue: $SOCKS_CONF not used
+----------------------------------------
+
+The Dante socks client libraries are supposed to evaluate the environment
+variable $SOCKS_CONF that can be used to specify an alternative config
+location. This is _not working_ with this version. 
+
+Dante employs SETUID/SETGID safety checks before evaluating $SOCKS_CONF 
+and Solaris 8 (our base build platform) does not offer the required system
+calls that are used for these checks. Dante hence deactivates looking
+for $SOCK_CONF completely.
+
+This might change in a future version of this package or Dante.

Added: csw/mgar/pkg/dante/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/dante/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/dante/trunk/files/changelog.CSW	2009-06-03 23:39:42 UTC (rev 5146)
@@ -0,0 +1,5 @@
+dante|libsocks (1.1.19,REV=2009.06.04)
+
+  * Adopted and updated to 1.1.19.
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Thu,  4 Jun 2009 01:17:08 +0200


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

