[csw-devel] SF.net SVN: gar:[18914] csw/mgar/pkg/vsftpd/trunk

[chninkel at users.sourceforge.net]

Revision: 18914
          http://gar.svn.sourceforge.net/gar/?rev=18914&view=rev
Author:   chninkel
Date:     2012-08-12 18:37:27 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
vsftpd/trunk: removed superfluous resolv.so dependency

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/vsftpd/trunk/files/removed-resolv.so-dependency.patch

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2012-08-12 18:04:53 UTC (rev 18913)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2012-08-12 18:37:27 UTC (rev 18914)
@@ -95,6 +95,10 @@
 # error when compiling under Solaris with -Werror
 PATCHFILES += avoid_pam_conv_warning.patch
 
+# vsftpd need to be linked against resolv.so
+# only in Solaris 5.9 but not for Solaris >= 5.10
+PATCHFILES += removed-resolv.so-dependency.patch
+
 # Documentation files
 DOCFILES  = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS
 DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security
@@ -105,7 +109,9 @@
 DOCFILES += EXAMPLE/INTERNET_SITE/README EXAMPLE/INTERNET_SITE/vsftpd.conf
 DOCFILES += EXAMPLE/INTERNET_SITE_NOINETD/README EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+
 ##### Build and installation information #####
 
 GARCOMPILER = SUN

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2012-08-12 18:04:53 UTC (rev 18913)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2012-08-12 18:37:27 UTC (rev 18914)
@@ -1,3 +1,9 @@
+vsftpd (3.0.0,REV=2012.08.12) unstable
+
+  * Removed superfluous dependency on libresolv.so
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 12 Aug 2012 20:36:24 +0200
+
 vsftpd (3.0.0,REV=2012.05.17) unstable
 
   * Rebuilt against libssl 1.0

Added: csw/mgar/pkg/vsftpd/trunk/files/removed-resolv.so-dependency.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/removed-resolv.so-dependency.patch	                        (rev 0)
+++ csw/mgar/pkg/vsftpd/trunk/files/removed-resolv.so-dependency.patch	2012-08-12 18:37:27 UTC (rev 18914)
@@ -0,0 +1,27 @@
+From 51df46ba25bdb5475a9734710fa24f65db8bc5ef Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 12 Aug 2012 20:32:38 +0200
+Subject: [PATCH] removed resolv.so dependency
+
+---
+ vsf_findlibs.sh |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vsf_findlibs.sh b/vsf_findlibs.sh
+index f5d485d..9269fb7 100755
+--- a/vsf_findlibs.sh
++++ b/vsf_findlibs.sh
+@@ -38,8 +38,8 @@ locate_library /lib/libsocket.so && echo "-lsocket";
+ # Look for libnsl. Solaris needs this.
+ locate_library /lib/libnsl.so && echo "-lnsl";
+ 
+-# Look for libresolv. Solaris needs this.
+-locate_library /lib/libresolv.so && echo "-lresolv";
++# Look for libresolv. Solaris 5.9 needs this.
++[ `uname -r` = "5.9" ] && locate_library /lib/libresolv.so && echo "-lresolv";
+ 
+ # Look for libutil. Older FreeBSD need this for setproctitle().
+ locate_library /usr/lib/libutil.so && echo "-lutil";
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.