[csw-devel] SF.net SVN: gar:[15196] csw/mgar/pkg/lftp/trunk

[chninkel at users.sourceforge.net]

Revision: 15196
          http://gar.svn.sourceforge.net/gar/?rev=15196&view=rev
Author:   chninkel
Date:     2011-07-23 00:22:55 +0000 (Sat, 23 Jul 2011)

Log Message:
-----------
lftp: updated file path in man page

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch
    csw/mgar/pkg/lftp/trunk/files/0007-update-configuration-files-paths-in-documentation.patch

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2011-07-23 00:16:48 UTC (rev 15195)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2011-07-23 00:22:55 UTC (rev 15196)
@@ -63,6 +63,9 @@
 # SUN_LEN macro is not defined under Solaris
 PATCHFILES += sun_len_definition.patch
 
+# Update the system-wide lftp.conf path in the man page
+PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch
+
 PRESERVECONF = $(sysconfdir)/lftp.conf
 MIGRATE_FILES_CSWlftp = lftp.conf
 

Added: csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch	2011-07-23 00:22:55 UTC (rev 15196)
@@ -0,0 +1,24 @@
+From 4dcd1af03e96e63ea860b8da1a3845f94c85b4a0 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 22 Jul 2011 23:26:04 +0200
+Subject: [PATCH] no ipv6_v6only setsock option under solaris 9
+
+---
+ src/network.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/network.cc b/src/network.cc
+index fc7b407..e5af45a 100644
+--- a/src/network.cc
++++ b/src/network.cc
+@@ -285,7 +285,7 @@ int Networker::SocketAccept(int fd,sockaddr_u *u,const char *hostname)
+ 
+ void Networker::SocketSinglePF(int s,int pf)
+ {
+-#if INET6
++#if INET6 && IPV6_V6ONLY
+    if(pf==PF_INET6) {
+       int on = 1;
+       if(-1==setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&on, sizeof(on)))
+-- 
+1.7.6

Added: csw/mgar/pkg/lftp/trunk/files/0007-update-configuration-files-paths-in-documentation.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/0007-update-configuration-files-paths-in-documentation.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/0007-update-configuration-files-paths-in-documentation.patch	2011-07-23 00:22:55 UTC (rev 15196)
@@ -0,0 +1,25 @@
+From cf77aa35548cfa9399165f7363270b051e813a51 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 23 Jul 2011 02:01:55 +0200
+Subject: [PATCH] update configuration files paths in documentation files
+
+---
+ doc/lftp.1 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/lftp.1 b/doc/lftp.1
+index 3446281..5232795 100644
+--- a/doc/lftp.1
++++ b/doc/lftp.1
+@@ -1963,7 +1963,7 @@ used to set initial color:dir-colors variable.
+ 
+ .SH FILES
+ .TP
+-.I "/etc/lftp.conf"
++.I "/etc/opt/csw/lftp.conf"
+ system-wide startup file. Actual location depends on \-\-sysconfdir
+ configure option. It is \fI/etc\fR when prefix is \fI/usr\fR,
+ \fI/usr/local/etc\fR by default.
+-- 
+1.7.6
+


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