- up to 4.3.6; home_etc dropped

Changed files:
    lftp-home_etc.patch -> 1.3
    lftp.spec -> 1.312

diff --git a/lftp-home_etc.patch b/lftp-home_etc.patch
deleted file mode 100644 (file)
index 5bb3688..0000000
--- a/lftp-home_etc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ruN lftp-2.5.2.org/src/bookmark.cc lftp-2.5.2/src/bookmark.cc
---- lftp-2.5.2.org/src/bookmark.cc     Mon Jan 21 17:25:16 2002
-+++ lftp-2.5.2/src/bookmark.cc Mon Jun  3 10:38:02 2002
-@@ -34,9 +34,16 @@
-    const char *home=getenv("HOME");
-    if(home==0)
-       home="";
--   const char *add="/.lftp/bookmarks";
--   bm_file=xstrdup(home,+strlen(add));
--   strcat(bm_file,add);
-+   if (getenv("CONFIG_DIR")) {
-+       const char *add="/lftp/bookmarks";
-+       bm_file=xstrdup(home,+strlen(add)+strlen(getenv("CONFIG_DIR"))+1);
-+       sprintf(bm_file,"%s/%s%s", home, getenv("CONFIG_DIR"), add);
-+   }
-+   else {
-+       const char *add="/.lftp/bookmarks";
-+       bm_file=xstrdup(home,+strlen(add));
-+       strcat(bm_file,add);
-+   }
- 
-    bm_fd=-1;
-    stamp=(time_t)-1;
-diff -ruN lftp-2.5.2.org/src/commands.cc lftp-2.5.2/src/commands.cc
---- lftp-2.5.2.org/src/commands.cc     Sun May  5 16:22:55 2002
-+++ lftp-2.5.2/src/commands.cc Mon Jun  3 10:38:02 2002
-@@ -2451,7 +2451,10 @@
-    }
-    else if(!strcasecmp(op,"edit"))
-    {
--      parent->PrependCmd("shell \"/bin/sh -c 'exec ${EDITOR:-vi} $HOME/.lftp/bookmarks'\"\n");
-+      if (getenv("CONFIG_DIR"))
-+        parent->PrependCmd("shell \"/bin/sh -c 'exec ${EDITOR:-vi} $HOME/$CONFIG_DIR/lftp/bookmarks'\"\n");
-+      else
-+        parent->PrependCmd("shell \"/bin/sh -c 'exec ${EDITOR:-vi} $HOME/.lftp/bookmarks'\"\n");
-    }
-    else if(!strcasecmp(op,"import"))
-    {
-diff -ruN lftp-2.5.2.org/src/history.cc lftp-2.5.2/src/history.cc
---- lftp-2.5.2.org/src/history.cc      Mon Jan 21 17:25:17 2002
-+++ lftp-2.5.2/src/history.cc  Mon Jun  3 10:38:02 2002
-@@ -42,9 +42,16 @@
-    const char *home=getenv("HOME");
-    if(home==0)
-       home="";
--   const char *add="/.lftp/cwd_history";
--   file=xstrdup(home,+strlen(add));
--   strcat(file,add);
-+   if (getenv("CONFIG_DIR")) {
-+       const char *add="/lftp/cwd_history";
-+       file=xstrdup(home,+strlen(add)+strlen(getenv("CONFIG_DIR"))+1);
-+       sprintf(file,"%s/%s%s", home, getenv("CONFIG_DIR"), add);
-+   }
-+   else {
-+       const char *add="/.lftp/cwd_history";
-+       file=xstrdup(home,+strlen(add));
-+       strcat(file,add);
-+   }
- }
- 
- History::~History()
-diff -ruN lftp-2.5.2.org/src/lftp.cc lftp-2.5.2/src/lftp.cc
---- lftp-2.5.2.org/src/lftp.cc Wed Feb 27 10:15:57 2002
-+++ lftp-2.5.2/src/lftp.cc     Mon Jun  3 10:39:57 2002
-@@ -231,8 +231,15 @@
-       const char *home=getenv("HOME");
-       if(home)
-       {
--       char *log=(char*)alloca(strlen(home)+1+9+1);
--       sprintf(log,"%s/.lftp",home);
-+       char *log;
-+       if (getenv("CONFIG_DIR")) {
-+           log=(char*)alloca(strlen(home)+strlen(getenv("CONFIG_DIR"))+1+9+1);
-+           sprintf(log,"%s/%s/lftp",home,getenv("CONFIG_DIR"));
-+       }
-+       else {
-+           log=(char*)alloca(strlen(home)+1+9+1);
-+           sprintf(log,"%s/.lftp",home);
-+       }
-        if(access(log,F_OK)==-1)
-           strcat(log,"_log");
-        else
-@@ -329,9 +336,19 @@
-    const char *home=getenv("HOME");
-    if(home)
-    {
--      char *rc=(char*)alloca(strlen(home)+9+1);
-+    // create lftp own directory
-+    if (getenv("CONFIG_DIR")) {
-+      char *rc=(char*)alloca(strlen(home)+strlen(getenv("CONFIG_DIR"))+9+1);
-+      sprintf(rc,"%s/%s/lftp",home,getenv("CONFIG_DIR"));
-+      mkdir(rc,0755);
- 
--      // create lftp own directory
-+      sprintf(rc,"%s/%s/lftprc",home,getenv("CONFIG_DIR"));
-+      source_if_exist(top_exec,rc);
-+      sprintf(rc,"%s/%s/lftp/rc",home,getenv("CONFIG_DIR"));
-+      source_if_exist(top_exec,rc);
-+    }
-+    else {
-+      char *rc=(char*)alloca(strlen(home)+9+1);
-       sprintf(rc,"%s/.lftp",home);
-       mkdir(rc,0755);
- 
-@@ -339,6 +356,7 @@
-       source_if_exist(top_exec,rc);
-       sprintf(rc,"%s/.lftp/rc",home);
-       source_if_exist(top_exec,rc);
-+    }
-    }
- 
-    WaitDone(top_exec);

diff --git a/lftp.spec b/lftp.spec
index 8f0111e90452a6c62e674402a1ade149aa3330b9..43ae3a18286c570a4a98c0da5c5715867e73c3d7 100644 (file)
--- a/lftp.spec
+++ b/lftp.spec
@@ -19,18 +19,17 @@ Summary(pl.UTF-8):  Zaawansowany klient FTP/HTTP
 Summary(pt_BR.UTF-8):  Sofisticado programa de transferência de arquivos (cliente FTP/HTTP)
 Summary(zh_CN.UTF-8):  lftp 客户端程序
 Name:          lftp
-Version:       4.3.5
-Release:       2
+Version:       4.3.6
+Release:       1
 License:       GPL v3+
 Group:         Applications/Networking
 Source0:       http://ftp.yars.free.net/pub/source/lftp/%{name}-%{version}.tar.xz
-# Source0-md5: 8a14b0a5a8c745f368cc2d3b362081da
+# Source0-md5: ffcdbaec5d1416cb6dd754efd43fa61a
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: cdad8fb5342eebd9916eccefc98a855b
 Source2:       %{name}.desktop
 Source3:       %{name}-icon.png
-# outdated and nobody cared for 8+ years... will be dropped
-Patch0:                %{name}-home_etc.patch
+
 Patch1:                %{name}-makefile.patch
 Patch2:                %{name}-m4.patch
 Patch3:                aliases.patch
@@ -84,7 +83,7 @@ o arquivo FEATURES para uma lista mais detalhada.
 
 %prep
 %setup -q
-#%%patch0 -p1
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1