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

[skayser at users.sourceforge.net]

Revision: 7946
          http://gar.svn.sourceforge.net/gar/?rev=7946&view=rev
Author:   skayser
Date:     2010-01-10 16:25:20 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
dante: move LIBTOOL hack to pre-configure, further socksify core dump debugging

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

Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 15:22:49 UTC (rev 7945)
+++ csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 16:25:20 UTC (rev 7946)
@@ -1,10 +1,12 @@
 # Known limitation:
 # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW
 #   and INSTALL with its description of `--without-glibc-secure'.
-# 
-# TODO
-# - socksify throws a core dump after the request is finished,
-#   to reproduce: /opt/csw/bin/socksify wget -qO http://google.com
+#
+# Known issues:
+# - When compiled with GSSAPI/kerberos support, socksify core dumps
+#   at the end of the connection (when all data has been transmitted).
+#   To reproduce: /opt/csw/bin/socksify wget -qO http://google.com
+#
 GARNAME = dante
 GARVERSION = 1.2.0
 CATEGORIES = net
@@ -64,9 +66,9 @@
 CONFIGURE_ARGS += --without-glibc-secure
 # UPNP support requires miniupnp from http://miniupnp.free.fr/
 CONFIGURE_ARGS += --without-upnp
+# See "Known issues" at the top of this Makefile
+#CONFIGURE_ARGS += --without-gssapi
 
-CONFIGURE_ARGS += --without-gssapi
-
 SAMPLECONF  = $(sysconfdir)/socks.conf
 SAMPLECONF += $(sysconfdir)/sockd.conf
 INITSMF     = /etc/opt/csw/init\.d/cswdante
@@ -75,16 +77,19 @@
 
 include gar/category.mk
 
+pre-configure-modulated:
+	# Kerberos linking fails with the shipped libtool, so make ./configure
+	# use /opt/csw/bin/libtool (similar to what Debian does). See
+	# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275
+	gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \
+		$(WORKSRC)/configure
+	@$(MAKECOOKIE)
+
 post-configure-modulated:
 ifneq ($(GARFLAVOR),DBG)
 	# Get rid of debugging flags which ./configure determines per default
 	perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile
 endif
-	# Kerberos linking fails with the shipped libtool, so make ./configure
-    # use /opt/csw/bin/libtool (similar to what Debian does). See
-	# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275
-	#gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \
-	#	$(WORKSRC)/configure
 	@$(MAKECOOKIE)
 
 post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks
@@ -98,6 +103,9 @@
 
 	ginstall -d $(DESTDIR)$(sysconfdir)
 	cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf
+
+	# /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no
+	gsed -ie 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify
 	@$(MAKECOOKIE)
 
 


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