Revision: 15428
http://gar.svn.sourceforge.net/gar/?rev=15428&view=rev
Author: dmichelsen
Date: 2011-08-24 15:02:17 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
tcpwrappers: back out r15426 to reenable libwrap.so.1 as lots of packages
already bind to that SONAME
Revision Links:
--------------
http://gar.svn.sourceforge.net/gar/?rev=15426&view=rev
Modified Paths:
--------------
csw/mgar/pkg/tcpwrappers/trunk/Makefile
csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2011-08-24 14:36:06 UTC (rev
15427)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2011-08-24 15:02:17 UTC (rev
15428)
@@ -24,21 +24,22 @@
PATCHFILES += sharedlib.patch
PACKAGES += CSWtcpwrapper
-SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.0
+SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.1
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap0
+RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap1
OBSOLETED_BY_CSWtcpwrapper += CSWtcpwrap
CATALOGNAME_CSWtcpwrap = tcpwrappers_stub
-PACKAGES += CSWlibwrap0
-SPKG_DESC_CSWlibwrap0 = Socket wrappers for pre-screening tcp connections
(ipv6.4 patched), libwrap.so.0
-PKGFILES_CSWlibwrap0 += $(call pkgfiles_lib,libwrap.so.0)
-PKGFILES_CSWlibwrap0 += $(mandir)/man5/.*
+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)
PACKAGES += CSWlibwrap-dev
-SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.0
+SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.1
PKGFILES_CSWlibwrap-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap0
+RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap1
BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
@@ -63,7 +64,7 @@
INSTALL_SCRIPTS = custom
-MIGRATE_FILES_CSWlibwrap0 = hosts.allow hosts.deny
+MIGRATE_FILES_CSWlibwrap1 = hosts.allow hosts.deny
# 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
@@ -94,8 +95,8 @@
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)/libwrap.so.0
- gln -s libwrap.so.0 $(DESTDIR)$(libdir)/libwrap.so
+ 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
Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2011-08-24
14:36:06 UTC (rev 15427)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2011-08-24
15:02:17 UTC (rev 15428)
@@ -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.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
