[csw-devel] SF.net SVN: gar:[7929] csw/mgar/pkg/dante/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Sat Jan 9 19:05:43 CET 2010
Revision: 7929
http://gar.svn.sourceforge.net/gar/?rev=7929&view=rev
Author: skayser
Date: 2010-01-09 18:05:41 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
dante: bump to 1.2.0, some remaining TODOs
Modified Paths:
--------------
csw/mgar/pkg/dante/trunk/Makefile
csw/mgar/pkg/dante/trunk/checksums
csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante
csw/mgar/pkg/dante/trunk/files/README.CSW
csw/mgar/pkg/dante/trunk/files/changelog.CSW
Removed Paths:
-------------
csw/mgar/pkg/dante/trunk/files/man-conflocations.diff
Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 18:05:41 UTC (rev 7929)
@@ -1,7 +1,12 @@
-# Todo
-# * Ponder about the SOCKS_CONF / issetguid() issue
+# Known issue:
+# - The libsocks build doesn't support $SOCKS_CONF. See README.CSW
+# and INSTALL with its description of `--without-glibc-secure'.
+#
+# Todo:
+# - Look into kerberos linking issues
+# - Test sockd and its init script
GARNAME = dante
-GARVERSION = 1.1.19
+GARVERSION = 1.2.0
CATEGORIES = net
DESCRIPTION = Dante SOCKS packages
@@ -16,76 +21,62 @@
the server administrator.
endef
-MASTER_SITES = ftp://ftp.inet.no/pub/socks/
-MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
SPKG_SOURCEURL = http://www.inet.no/dante/
+MASTER_SITES = ftp://ftp.inet.no/pub/socks/
+MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
LICENSE = LICENSE
PACKAGES = CSWlibsocks CSWdante
SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper)
SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon
-SPKG_CLASSES_CSWdante = none cswinitsmf
-# There is no pkg compiling against dante right now, just drop the .h file
-EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/socks.h
+# There is no pkg compiling against dante right now, just drop the dev files
+EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/.*
-PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.*
+PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.*
PKGFILES_CSWlibsocks += $(docdir)/libsocks/.*
-PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante
-PKGFILES_CSWdante += $(docdir)/dante/.*
+PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante
+PKGFILES_CSWdante += $(docdir)/dante/.*
-REQUIRED_PKGS_CSWdante = CSWlibsocks CSWcswclassutils CSWtcpwrap
+REQUIRED_PKGS_CSWdante = CSWtcpwrap
-# CSWlibsocks not yet installed on the build farm
-ENABLE_CHECK = 0
+TEST_SCRIPTS =
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
-# Make the man pages reference our CSW locations instead of /etc/*.conf
-PATCHFILES = man-conflocations.diff
+# Don't bother about the "not found" modules after the ./configure run,
+# they are commercial add-ons (http://www.inet.no/dante/module.html).
+#
+# Features disabled via --without will be also stated as "not found"
+# in the summary messages that ./configure displays at the end
-TEST_SCRIPTS =
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-socks-conf=$(sysconfdir)/socks.conf
CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf
-CONFIGURE_ARGS += --with-pidfile=/var/opt/csw/dante/sockd.pid
+CONFIGURE_ARGS += --with-pidfile=/var/run/cswsockd.pid
+CONFIGURE_ARGS += --without-glibc-secure
-# Don't bother about the "not found" modules after the ./configure run,
-# they are commercial add-ons (http://www.inet.no/dante/module.html).
+# Kerberos linking fails .. looks like it is missing -L/opt/csw/lib.
+# Needs investigation.
+CONFIGURE_ARGS += --without-gssapi
-PROTOTYPE_FILTER = awk '\
- $$$$3 ~ /\/init.d\/cswdante$$$$/ { $$$$2 = "cswinitsmf" } \
- { print }'
+# UPNP support requires miniupnp from http://miniupnp.free.fr/
+CONFIGURE_ARGS += --without-upnp
-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)
-#
-# 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)
+INITSMF = /etc/opt/csw/init\.d/cswdante
+include gar/category.mk
post-configure-modulated:
- # Get rid of -misalign which is meant for /usr/ucb/cc
- @perl -pi -e 's|-misalign || if /^CFLAGS =/' $(WORKSRC)/*/Makefile
ifneq ($(GARFLAVOR),DBG)
- # Get rid of -g.
- # configure wants to use -g even if --disable-debugging (default)
- @perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile
+ # Get rid of debugging flags which ./configure determines per default
+ perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile
endif
@$(MAKECOOKIE)
@@ -93,10 +84,10 @@
post-install-libsocks: DOCS = CREDITS NEWS SUPPORT
post-install-libsocks: CSWDOCS = README.CSW changelog.CSW
post-install-libsocks:
- @ginstall -d $(DOCDEST)/examples
- @cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples
- @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);)
- @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);)
+ ginstall -d $(DOCDEST)/examples
+ cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples
+ cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST)
+ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST)
@$(MAKECOOKIE)
@@ -104,17 +95,27 @@
post-install-dante: DOCS = CREDITS NEWS SUPPORT
post-install-dante: CSWDOCS = changelog.CSW
post-install-dante:
- @ginstall -d $(DESTDIR)/var/opt/csw/dante
- @ginstall -d $(DOCDEST)/examples
- @cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples
- @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);)
- @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);)
+ ginstall -d $(DESTDIR)/var/opt/csw/dante
+ ginstall -d $(DOCDEST)/examples
+ cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples
+ cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST)
+ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST)
- @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- @ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \
+ ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+ ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \
$(DESTDIR)/etc/opt/csw/init.d/cswdante
@$(MAKECOOKIE)
+# Make the man pages reference our CSW locations instead of /etc/*.conf
+fix-manpages:
+ gsed -i \
+ -e 's,/etc/socks.conf,$(sysconfdir)/socks.conf,' \
+ -e 's,/etc/sockd.conf,$(sysconfdir)/sockd.conf,' \
+ $(DESTDIR)$(mandir)/man1/socksify.1 \
+ $(DESTDIR)$(mandir)/man5/socks.conf.5 \
+ $(DESTDIR)$(mandir)/man5/sockd.conf.5 \
+ $(DESTDIR)$(mandir)/man8/sockd.8
+ @$(MAKECOOKIE)
-post-install-modulated: post-install-libsocks post-install-dante
+post-install-modulated: post-install-libsocks post-install-dante fix-manpages
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/dante/trunk/checksums
===================================================================
--- csw/mgar/pkg/dante/trunk/checksums 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/checksums 2010-01-09 18:05:41 UTC (rev 7929)
@@ -1,2 +1,2 @@
-58b56d1e964f3f0186f3eeed3d95d9a4 download/dante-1.1.19.tar.gz
-a38ad03fa8cc40b0ee527cb15e41fa9c download/man-conflocations.diff
+af00063243cc94e524497342982615cd dante-1.2.0.tar.gz
+a38ad03fa8cc40b0ee527cb15e41fa9c man-conflocations.diff
Modified: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante
===================================================================
--- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 18:05:41 UTC (rev 7929)
@@ -5,12 +5,9 @@
PATH=/usr/bin:/opt/csw/bin:/usr/sbin
-PIDFILE=/var/opt/csw/dante/sockd.pid
-CONFIG=/opt/csw/etc/sockd.conf
-CONFIG_LOCAL=/etc/opt/csw/etc/sockd.conf
+PIDFILE=/var/run/cswsockd.pid
+CONFIG=/etc/opt/csw/etc/sockd.conf
-[ -r $CONFIG_LOCAL ] && CONFIG=$CONFIG_LOCAL
-
case $1 in
'start')
printf "Starting SOCKS proxy: cswdante ... "
Modified: csw/mgar/pkg/dante/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 18:05:41 UTC (rev 7929)
@@ -1,12 +1,16 @@
-Known client issue: $SOCKS_CONF not used
-----------------------------------------
+Known issue: libsocks does not support $SOCKS_CONF
+--------------------------------------------------
-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.
+This build of the libsocks _does not_ support an alternate socks.conf
+passed via the environment variable SOCKS_CONF. As a workaround you can
+specify a SOCKS server via the environment variables pointed out in
+socksify(1).
-Dante employs SETUID/SETGID safety checks before evaluating $SOCKS_CONF
-and Solaris 8 (our base build platform) does not offer the required system
-calls. Dante hence deactivates looking for $SOCK_CONF.
+ SOCKS_SERVER, SOCKS4_SERVER, SOCKS5_SERVER
-This might change in a future version of this package or Dante.
+Background information:
+libsocks employs a setuid/setgid safety check via issetugid(2) before
+opening $SOCKS_CONF. Our base build platform (Solaris 8) does not offer
+this system call, thus the libsocks build completely deactivates support
+for $SOCK_CONF out of security reasons. This might change if we decide
+to provide a Solaris 10 specific package of libsocks.
Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 18:05:41 UTC (rev 7929)
@@ -1,5 +1,5 @@
-dante|libsocks (1.1.19,REV=2009.06.05)
+dante (1.2.0,REV=2010.01.09)
- * Adopted and updated to 1.1.19.
+ * Adopted and updated to 1.2.0
- -- Sebastian Kayser <skayser at opencsw.org> Fri, 5 Jun 2009 00:02:09 +0200
+ -- Sebastian Kayser <skayser at opencsw.org> Sat, 9 Jan 2010 19:18:23 +0100
Deleted: csw/mgar/pkg/dante/trunk/files/man-conflocations.diff
===================================================================
--- csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 17:33:54 UTC (rev 7928)
+++ csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 18:05:41 UTC (rev 7929)
@@ -1,40 +0,0 @@
-diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.8 dante-1.1.19/doc/sockd.8
---- dante-1.1.19.orig/doc/sockd.8 2005-01-24 11:24:20.000000000 +0100
-+++ dante-1.1.19/doc/sockd.8 2009-06-10 13:28:07.589216602 +0200
-@@ -112,7 +112,8 @@
- be set to a (local) filesystem with low latency.
- .SH FILES
- .TP
--/etc/sockd.conf
-+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf
-+.br
- .B Dante
- server configuration file.
- .SH AUTHORS
-diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.conf.5 dante-1.1.19/doc/sockd.conf.5
---- dante-1.1.19.orig/doc/sockd.conf.5 2006-01-20 14:13:55.000000000 +0100
-+++ dante-1.1.19/doc/sockd.conf.5 2009-06-10 13:27:47.748142347 +0200
-@@ -315,8 +315,9 @@
- See the example directory in the distribution.
- .SH FILES
- .nf
--.ta \w 1
--/etc/sockd.conf \fBDante\fP server configuration file.
-+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf
-+.br
-+ \fBDante\fP server configuration file.
- /etc/passwd file used when checking username/passwords.
- .fi
- .SH AUTHORS
-diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/socks.conf.5 dante-1.1.19/doc/socks.conf.5
---- dante-1.1.19.orig/doc/socks.conf.5 2005-12-19 20:13:37.000000000 +0100
-+++ dante-1.1.19/doc/socks.conf.5 2009-06-10 13:23:37.252560424 +0200
-@@ -119,7 +119,7 @@
- authentication. Not recommended as other users on the system
- might be able to see your password.
- .SH FILES
--.I /etc/socks.conf
-+.I /opt/csw/etc/socks.conf
- .SH AUTHORS
- For Inferno Nettverk A/S, Norway:
- Michael Shuldman <michaels at inet.no>: Design and implementation.
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