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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Aug 24 13:52:00 CEST 2011 

Revision: 15425
          http://gar.svn.sourceforge.net/gar/?rev=15425&view=rev
Author:   dmichelsen
Date:     2011-08-24 11:52:00 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
tcpwrappers: Tag alternatives release and make unified packages with just extended

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

Added Paths:
-----------
    csw/mgar/pkg/tcpwrappers/tags/tcpwrappers-7.6-alternatives-std-ext/

Removed Paths:
-------------
    csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg
    csw/mgar/pkg/tcpwrappers/trunk/files/man.patch

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 11:52:00 UTC (rev 15425)
@@ -19,29 +19,38 @@
 DISTFILES = $(DISTNAME).tar.gz
 DISTFILES += COPYING
 DISTFILES += README
-DISTFILES += CSWtcpwrap.postmsg
 
 PATCHFILES = patch-cflags.diff
-PATCHFILES += man.patch
 PATCHFILES += sharedlib.patch
 
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+PACKAGES += CSWtcpwrapper
+SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap1
+OBSOLETED_BY_CSWtcpwrapper += CSWtcpwrap
+CATALOGNAME_CSWtcpwrap = tcpwrappers_stub
 
-PACKAGES = CSWtcpwrap
-CATALOGNAME = tcpwrappers
+PACKAGES += CSWlibwrap1
+SPKG_DESC_CSWlibwrap1 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.1
+PKGFILES_CSWlibwrap1 += $(call pkgfiles_lib,libwrap.so.1)
+PKGFILES_CSWlibwrap1 += $(mandir)/man5/.*
 SPKG_DESC_CSWtcpwrap = $(DESCRIPTION)
 
-SPKG_VERSION = $(BASEVERSION)
+PACKAGES += CSWlibwrap-dev
+SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.1
+PKGFILES_CSWlibwrap-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap1
 
-EXTRA_MODULATORS = EXTENDED
-MODULATIONS_EXTENDED = on off
-
 BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
 BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
 BUILD_ARGS += USER_CFLAGS="$(CFLAGS)"
 BUILD_ARGS += LIBS="-lsocket -lnsl"
 
+# EXTENDED = off
+EXTENDED = on
+
 BUILD64 = 1
+NOISALIST = 1
 
 CONFIGURE_SCRIPTS =
 
@@ -53,64 +62,41 @@
 # No test suite
 TEST_SCRIPTS =
 
-LIBNAME_EXTENDED-off = libwrap-std.so.0
-LIBNAME_EXTENDED-on  = libwrap-ext.so.0
-
 INSTALL_SCRIPTS = custom
 
-MERGE_SCRIPTS_isa-default-extended-off = copy-all
- MERGE_SCRIPTS_isa-default-extended-on = copy-only
-    MERGE_DIRS_isa-default-extended-on = $(libdir)
+MIGRATE_FILES_CSWlibwrap1 = hosts.allow hosts.deny
 
-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)
+# This is an example to /usr/local/lib/ntalkd
+CHECKPKG_OVERRIDES_CSWtcpwrapper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tcpd.8
 
-MIGRATE_FILES = hosts.allow hosts.deny
+include gar/category.mk
 
-ALTERNATIVES = std ext
-ALTERNATIVE_std  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-std.so.0 200
-ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.0
-ALTERNATIVE_ext  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-ext.so.0 100
-ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.0
+SPKG_VERSION = $(subst -,_,$(VERSION))
 
-POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg
+post-extract-modulated:
+	-cd $(WORKSRC) && perl -pi -e 's,/etc/hosts\.,$(sysconfdir)/hosts.,g' \
+		hosts_access.3 \
+		hosts_access.5 \
+		tcpd.8 \
+		tcpdchk.8 \
+		tcpdmatch.8
+	@$(MAKECOOKIE)
 
-PACKAGES += CSWlibwrap0
-CATALOGNAME_CSWlibwrap0 = libwrap0
-PKGFILES_CSWlibwrap0 += $(call baseisadirs,$(libdir),libwrap\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibwrap0 += $(DESCRIPTION), libwrap.so.0
-RUNTIME_DEP_PKGS_CSWtcpwrap += CSWlibwrap0
-
-PACKAGES += CSWtcpwrap-dev
-SPKG_DESC_CSWtcpwrap-dev = $(DESCRIPTION) development package
-PKGFILES_CSWtcpwrap-dev += $(PKGFILES_DEVEL)
-CATALOGNAME_CSWtcpwrap-dev = tcpwrappers_dev
-
-# 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  = symbol-not-found|tcpdmatch
-CHECKPKG_OVERRIDES += symbol-not-found|tcpd
-CHECKPKG_OVERRIDES += symbol-not-found|try-from
-CHECKPKG_OVERRIDES += symbol-not-found|tcpdchk
-
-include gar/category.mk
-
 build-custom:
-	$(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED))
+	$(BUILD_ENV) $(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED))
 	@$(MAKECOOKIE)
 
 install-custom:
-	@echo " => Installing $(CATALOGNAME)"
-	ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME)
-	cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(CATALOGNAME)
+	@echo " => Installing tcpwrapper"
+	ginstall -d $(DESTDIR)$(docdir)/tcpwrapper"
+	cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/tcpwrapper/README
 	ginstall -d $(DESTDIR)$(libexecdir)
 	cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir)
 	ginstall -d $(DESTDIR)$(includedir)
 	cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir)
 	ginstall -d $(DESTDIR)$(libdir)
-	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED))
+	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so.1
+	gln -s libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so
 	ginstall -d $(DESTDIR)$(mandir)/man3
 	cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3
 	ginstall -d $(DESTDIR)$(mandir)/man5
@@ -119,17 +105,3 @@
 	cd $(WORKSRC) && ginstall -v -m 644 *.8 $(DESTDIR)$(mandir)/man8
 	@$(MAKECOOKIE)
 
-post-merge:
-	ginstall -d $(PKGROOT)$(dir $(POSTMSG))
-	ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG)
-	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/libwrap.so
-	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so
-	@# As libwrap.so.0 is the SONAME to be bound against we must register it with the package
-	@# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives
-	@# on installation and is solely to register the link path, the destination doesn't matter.
-	ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.0
-	ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.0
-	@$(MAKECOOKIE)
-
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
-

Deleted: csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	2011-08-24 11:52:00 UTC (rev 15425)
@@ -1,12 +0,0 @@
-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/README
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/README	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/README	2011-08-24 11:52:00 UTC (rev 15425)
@@ -15,14 +15,5 @@
 This is to allow for ./configure style tests, that break in the transition
 from lib.a to lib.so
 
-
-Note also that there are TWO versions of libwrap.so: 
-libwrap-std.so.1      The "standard" tcp wrapper library
-libwrap-ext.so.1      The "extended" tcp wrapper library
-
-By default, /opt/csw/lib/libwrap.so.1 is linked to the std version.
-To use the extended syntax in hosts_options(5), you need to change
-the link to point to libwrap-ext.so.1
-Unfortunately, the syntax for the two versions, is slightly incompatible,
-which is why there are two versions.
-
+libwrap has been compiled to use the "extended" syntax as described in
+hosts_options(5).

Deleted: csw/mgar/pkg/tcpwrappers/trunk/files/man.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/man.patch	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/man.patch	2011-08-24 11:52:00 UTC (rev 15425)
@@ -1,154 +0,0 @@
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3
---- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3	1996-02-11 17:01:27.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3	2009-09-11 18:54:28.630235290 +0200
-@@ -78,7 +78,7 @@
- hosts_access(5), format of the access control tables.
- hosts_options(5), optional extensions to the base language.
- .SH FILES
--/etc/hosts.allow, /etc/hosts.deny, access control tables.
-+/etc/opt/csw/hosts.allow, /etc//opt/csw/hosts.deny, access control tables.
- .SH BUGS
- hosts_access() uses the strtok() library function. This may interfere
- with other code that relies on strtok().
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5
---- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5	1995-01-30 19:51:47.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5	2009-09-11 18:54:28.633332432 +0200
-@@ -21,10 +21,10 @@
- at the first match:
- .IP \(bu
- Access will be granted when a (daemon,client) pair matches an entry in
--the \fI/etc/hosts.allow\fR file.
-+the \fI/etc/opt/csw/hosts.allow\fR file.
- .IP \(bu
- Otherwise, access will be denied when a (daemon,client) pair matches an
--entry in the \fI/etc/hosts.deny\fR file.
-+entry in the \fI/etc/opt/csw/hosts.deny\fR file.
- .IP \(bu
- Otherwise, access will be granted.
- .PP
-@@ -268,7 +268,7 @@
- file:
- .PP
- .ne 2
--/etc/hosts.deny: 
-+/etc/opt/csw/hosts.deny: 
- .in +3
- ALL: ALL
- .PP
-@@ -279,7 +279,7 @@
- For example:
- .PP
- .ne 2
--/etc/hosts.allow: 
-+/etc/opt/csw/hosts.allow: 
- .in +3
- ALL: LOCAL @some_netgroup
- .br
-@@ -298,7 +298,7 @@
- that it can be omitted.  The explicitly non-authorized hosts are listed
- in the deny file. For example:
- .PP
--/etc/hosts.deny:
-+/etc/opt/csw/hosts.deny:
- .in +3
- ALL: some.host.name, .some.domain
- .br
-@@ -313,13 +313,13 @@
- host. The result is mailed to the superuser.
- .PP
- .ne 2
--/etc/hosts.allow:
-+/etc/opt/csw/hosts.allow:
- .in +3
- .nf
- in.tftpd: LOCAL, .my.domain
- .PP
- .ne 2
--/etc/hosts.deny:
-+/etc/opt/csw/hosts.deny:
- .in +3
- .nf
- in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
-@@ -353,8 +353,8 @@
- .SH FILES
- .na
- .nf
--/etc/hosts.allow, (daemon,client) pairs that are granted access.
--/etc/hosts.deny, (daemon,client) pairs that are denied access.
-+/etc/opt/csw/hosts.allow, (daemon,client) pairs that are granted access.
-+/etc/opt/csw/hosts.deny, (daemon,client) pairs that are denied access.
- .ad
- .fi
- .SH SEE ALSO
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 tcp_wrappers_7.6-ipv6.4.patched/tcpd.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpd.8	1996-02-21 16:39:16.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpd.8	2009-09-11 18:54:28.635231817 +0200
-@@ -146,7 +146,7 @@
- only non-trivial service that is affected by this limitation is
- \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great
- loss.  On most systems, \fIrexd\fR is less secure than a wildcard in
--/etc/hosts.equiv.
-+/etc/opt/csw/hosts.equiv.
- .PP
- RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always
- appear to come from the responding host. What happens is that the
-@@ -158,9 +158,9 @@
- .PP
- The default locations of the host access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8	1995-01-08 17:00:31.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8	2009-09-11 18:54:28.636911201 +0200
-@@ -8,7 +8,7 @@
- \fItcpdchk\fR examines your tcp wrapper configuration and reports all
- potential and real problems it can find. The program examines the
- \fItcpd\fR access control files (by default, these are
--\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the
-+\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR), and compares the
- entries in these files against entries in the \fIinetd\fR or \fItlid\fR
- network configuration files.
- .PP
-@@ -44,9 +44,9 @@
- .PP
- The default locations of the \fItcpd\fR access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8	1996-02-11 17:01:36.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8	2009-09-11 18:54:28.638584325 +0200
-@@ -11,7 +11,7 @@
- request for service.  Examples are given below.
- .PP
- The program examines the \fItcpd\fR access control tables (default
--\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its
-+\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR) and prints its
- conclusion.  For maximal accuracy, it extracts additional information
- from your \fIinetd\fR or \fItlid\fR network configuration file.
- .PP
-@@ -76,9 +76,9 @@
- .PP
- The default locations of the \fItcpd\fR access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 11:52:00 UTC (rev 15425)
@@ -8,8 +8,8 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= \
++	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)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
@@ -17,8 +17,8 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
++	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)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all

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