[Lunar-commits] <moonbase> tcp_wrappers: Switching the SOURCE2 patch with the one from the LFS folks.

[Dennis `stumbles` Veatch]

commit 66ec29ee6fdd83d23c09b4a82c722b3e76688e12
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Feb 2 11:54:19 2011 -0500

    tcp_wrappers: Switching the SOURCE2 patch with the one from the LFS folks.
    
    http://www.linuxfromscratch.org/patches/blfs/svn/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
    
    This started off with a module I plan to add; dcmtk, which tanked on the wrappers. Their
    INSTALL says it will only work with tcp_wrappers that are ANSI C compliant. Seems
    our patches lack in that area.
    
    A `lunar fix` found no issues and I have recompiled xinetd, inetutils, openldap and openssh with
    no problems. At Ratlers request, the hosts.deny has been verified to work.
    
    Bumping the UPDATED because of the patch change and what it does.
---
 security/tcp_wrappers/BUILD   |   18 ++++++++++++++----
 security/tcp_wrappers/DETAILS |    8 ++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/security/tcp_wrappers/BUILD b/security/tcp_wrappers/BUILD
index a5c69d5..5c61e1c 100644
--- a/security/tcp_wrappers/BUILD
+++ b/security/tcp_wrappers/BUILD
@@ -1,9 +1,14 @@
 (
 
-  patch_it $SOURCE2 1 &&
+  VER=`lvu version tcp_wrappers` &&
+
+  cd ../ &&
+  patch_it $SOURCE2 0 &&
+  cd $SOURCE_DIRECTORY &&
+
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 0 &&
-  
+
   make  REAL_DAEMON_DIR=/usr/sbin linux  &&
   prepare_install                        &&
   for  EXECUTABLE in *; do
@@ -11,7 +16,12 @@
       cp       $EXECUTABLE  /usr/sbin
     fi
   done                                   &&
-  cp  tcpd.h     /usr/include            &&
-  cp  libwrap.a  /usr/lib
+
+  cp -f tcpd.h     /usr/include/           &&
+  cp -f libwrap.a  /usr/lib/               &&
+  cp -f shared/libwrap.so.0.$VER /usr/lib/ &&
+
+  ln -sf /usr/lib/libwrap.so.0.$VER /usr/lib/libwrap.so  &&
+  ln -sf /usr/lib/libwrap.so.0.$VER /usr/lib/libwrap.so.0
 
 ) > $C_FIFO 2>&1
diff --git a/security/tcp_wrappers/DETAILS b/security/tcp_wrappers/DETAILS
index e7743d5..34a47c9 100644
--- a/security/tcp_wrappers/DETAILS
+++ b/security/tcp_wrappers/DETAILS
@@ -1,7 +1,7 @@
           MODULE=tcp_wrappers
          VERSION=7.6
           SOURCE=${MODULE}_$VERSION.tar.gz
-         SOURCE2=$MODULE-$VERSION.patch.gz
+         SOURCE2=tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
          SOURCE3=$MODULE-$VERSION-gcc34-fix.patch.gz
          SOURCE4=$MODULE-7.6-fpic.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}_$VERSION
@@ -10,15 +10,15 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}_$VERSION
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
       SOURCE_VFY=sha1:61689ec85b80f4ca0560aef3473eccd9e9e80481
-     SOURCE2_VFY=sha1:84ac59a177f6b715eb7b530718f3ce11f7a84abc
+     SOURCE2_VFY=sha1:4843c44106e5c07639eaa503b631e1e1cff68cd3
      SOURCE3_VFY=sha1:9bf3fad71214242c7eae59cb3d47610b4c1a7471
      SOURCE4_VFY=sha1:e55da5ed49c569d4b68ff98cf9e7aaebc205abce
         WEB_SITE=ftp://ftp.porcupine.org/pub/security/index.html
          ENTERED=20010922
-         UPDATED=20071101
+         UPDATED=20110202
            SHORT="allows monitoring and filtering of inbound network requests"
-PSAFE=no
 
+PSAFE=no
 cat << EOF
 The tcp_wrappers package allows you to monitor and filter incoming
 requests for the SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP,