[csw-devel] SF.net SVN: gar:[8529] csw/mgar/pkg/tcpwrappers/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Feb 12 17:12:46 CET 2010 

Revision: 8529
          http://gar.svn.sourceforge.net/gar/?rev=8529&view=rev
Author:   dmichelsen
Date:     2010-02-12 16:12:45 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
tcpwrappers: Use alternatives

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/checksums
    csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch

Added Paths:
-----------
    csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2010-02-12 16:08:57 UTC (rev 8528)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2010-02-12 16:12:45 UTC (rev 8529)
@@ -14,6 +14,7 @@
 DISTFILES = $(DISTNAME).tar.gz
 DISTFILES += COPYING
 DISTFILES += README
+DISTFILES += CSWtcpwrap.postmsg
 
 PATCHFILES = patch-cflags.diff
 PATCHFILES += man.patch
@@ -35,6 +36,7 @@
 BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
 BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
 BUILD_ARGS += USER_CFLAGS="$(CFLAGS)"
+BUILD_ARGS += LIBS="-lsocket -lnsl"
 
 BUILD64 = 1
 
@@ -53,26 +55,32 @@
 
 INSTALL_SCRIPTS = custom
 
-MERGE_SCRIPTS_isa-sparcv8-extended-off = copy-all
- MERGE_SCRIPTS_isa-sparcv8-extended-on = copy-relocated-only
-    MERGE_DIRS_isa-sparcv8-extended-on = $(libdir)
+MERGE_SCRIPTS_isa-default-extended-off = copy-all
+ MERGE_SCRIPTS_isa-default-extended-on = copy-only
+    MERGE_DIRS_isa-default-extended-on = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv9-extended-off = copy-relocated-only
-   MERGE_DIRS_isa-sparcv9-extended-off = $(libdir)
- MERGE_SCRIPTS_isa-sparcv9-extended-on = copy-relocated-only
-    MERGE_DIRS_isa-sparcv9-extended-on = $(libdir)
+MERGE_SCRIPTS_isa-default64-extended-off = copy-relocated-only
+   MERGE_DIRS_isa-default64-extended-off = $(libdir)
+ MERGE_SCRIPTS_isa-default64-extended-on = copy-relocated-only
+    MERGE_DIRS_isa-default64-extended-on = $(libdir)
 
-   MERGE_SCRIPTS_isa-i386-extended-off = copy-all
-    MERGE_SCRIPTS_isa-i386-extended-on = copy-relocated-only
-       MERGE_DIRS_isa-i386-extended-on = $(libdir)
+MIGRATE_FILES = hosts.allow hosts.deny
 
-  MERGE_SCRIPTS_isa-amd64-extended-off = copy-relocated-only
-     MERGE_DIRS_isa-amd64-extended-off = $(libdir)
-   MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only
-      MERGE_DIRS_isa-amd64-extended-on = $(libdir)
+ALTERNATIVES = std ext
+ALTERNATIVES_std  = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200
+ALTERNATIVES_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1
+ALTERNATIVES_ext  = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100
+ALTERNATIVES_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1
 
-MIGRATE_FILES = hosts.allow hosts.deny
+POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg
 
+# These binaries link against libwrap.so which will be linked by alternatives
+# after package install. Until then they can obviously not link properly.
+CHECKPKG_OVERRIDES  = CSWtcpwrap|symbol-not-found|tcpdmatch
+CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpd
+CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|try-from
+CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpdchk
+
 include gar/category.mk
 
 build-custom:
@@ -98,9 +106,9 @@
 	@$(MAKECOOKIE)
 
 post-merge:
-	ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1
+	ginstall -d $(PKGROOT)$(dir $(POSTMSG))
+	ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG)
 	ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so
-	ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1
 	ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/checksums	2010-02-12 16:08:57 UTC (rev 8528)
+++ csw/mgar/pkg/tcpwrappers/trunk/checksums	2010-02-12 16:12:45 UTC (rev 8529)
@@ -1,6 +1,7 @@
 071bd69cb78b18888ea5e3da5c3127fa  COPYING
+4976fe1425f77a0d4c494bb9a032c992  CSWtcpwrap.postmsg
 b268880c14ab6d31140015275c82d6aa  README
 89e8f9d1ed25d8e809674af9bf3d18e6  man.patch
 af28873e5c16c4f921237148e2507826  patch-cflags.diff
-c82569b24080fc41c8b9bf9b25b831c2  sharedlib.patch
+61ef4684e9615e45e4a66d83bdd541d0  sharedlib.patch
 ccbc2676977c31bbd43783abfbf2fdcf  tcp_wrappers_7.6-ipv6.4.tar.gz

Copied: csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg (from rev 8522, csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg)
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	                        (rev 0)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	2010-02-12 16:12:45 UTC (rev 8529)
@@ -0,0 +1,12 @@
+There are now two versions of tcpwrappers on the system installed:
+
+  * libwrap-std.so.1  The "standard" tcp wrapper library
+  * libwrap-ext.so.1  The "extended" tcp wrapper library
+
+You can easily select between the versions with the alternatives(8)
+system by executing
+
+  /opt/csw/sbin/alternatives --config tcpwrappers
+
+See http://wiki.opencsw.org/package-alternatives for details.
+

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2010-02-12 16:08:57 UTC (rev 8528)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2010-02-12 16:12:45 UTC (rev 8529)
@@ -8,7 +8,7 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
 +	LIB=libwrap.so.1 VSYSLOG= \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
@@ -17,7 +17,7 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
 +	LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \


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