commit lftp for openSUSE:Factory

26 Mar 2009

Hello community,

here is the log from the commit of package lftp for openSUSE:Factory
checked in at Thu Mar 26 01:12:01 CET 2009.


--------

--- lftp/lftp.changes	2008-02-26 01:44:09.000000000 +0100
+++ lftp/lftp.changes	2009-03-23 15:59:16.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 23 15:58:51 CET 2009 - crrodriguez@suse.de
+
+- fix build, missing sentinel 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  lftp-3.6.3-missing-sentinel.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.N17985/_old	2009-03-26 01:11:37.000000000 +0100
+++ /var/tmp/diff_new_pack.N17985/_new	2009-03-26 01:11:37.000000000 +0100
@@ -1,10 +1,17 @@
 #
 # spec file for package lftp (Version 3.6.3)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -16,7 +23,6 @@
 #
 # spec file for package lftp (Version 2.6.5)
 #
-# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -27,12 +33,13 @@
 Url:            http://lftp.yar.ru/
 AutoReqProv:    on
 Version:        3.6.3
-Release:        5
+Release:        56
 Summary:        LFTP Command Line File Transfer Program
 Source:         %{name}-%{version}.tar.bz2
 Patch1:         %{name}-nostrip.patch
 Patch2:         %{name}-wrapper.patch
 Patch3:         %{name}-compat-mode.patch
+Patch4:         lftp-3.6.3-missing-sentinel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Conflicts:      ftp
 Provides:       nkitb:/usr/bin/ftp
@@ -64,6 +71,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build
 touch AUTHORS
@@ -113,6 +121,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 23 2009 crrodriguez@suse.de
+- fix build, missing sentinel
 * Tue Feb 26 2008 crrodriguez@suse.de
 - fix file-not-in-lang errors
 - fix library-without-ldconfig* errors
@@ -175,7 +185,7 @@
      --while-ok, --until-ok
   * added support for ALLO command and ftp:use-allo setting
   * changed default for http:use-propfind to no
-* Sat Apr 15 2006 pnemec@suse.cz
+* Fri Apr 14 2006 pnemec@suse.cz
 - decreased priority of alternative system [#162595]
 - another fix for lftp wrapper [#164726]
 * Fri Apr 07 2006 pnemec@suse.cz

++++++ lftp-3.6.3-missing-sentinel.patch ++++++
Index: src/CmdExec.cc
===================================================================
--- src/CmdExec.cc.orig	2009-03-23 15:20:45.000000000 +0100
+++ src/CmdExec.cc	2009-03-23 15:29:23.000000000 +0100
@@ -1057,7 +1057,7 @@ char *ArgV::CombineQuoted(int start) con
    {
       const char *arg=String(start++);
       if(CmdExec::needs_quotation(arg))
-	 res.vappend("\"",CmdExec::unquote(arg),"\"",NULL);
+	 res.vappend("\"",CmdExec::unquote(arg),"\"", (char *) NULL);
       else
 	 res.append(arg);
       if(start>=Count())
@@ -1284,7 +1284,7 @@ CmdExec  *CmdExec::GetQueue(bool create)
    queue->SetParentFg(this,false);
    queue->AllocJobno();
    const char *url=session->GetConnectURL(FA::NO_PATH);
-   queue->cmdline.vset("queue (",url,slot?"; ":"",slot?slot.get():"",")",NULL);
+   queue->cmdline.vset("queue (",url,slot?"; ":"",slot?slot.get():"",")", (char *)NULL);
    queue->queue_feeder=new QueueFeeder(session->GetCwd(), cwd->GetName());
    queue->SetCmdFeeder(queue->queue_feeder);
    queue->Reconfig(0);
Index: src/DummyProto.cc
===================================================================
--- src/DummyProto.cc.orig	2007-04-23 09:11:40.000000000 +0200
+++ src/DummyProto.cc	2009-03-23 15:30:46.000000000 +0100
@@ -60,6 +60,6 @@ FileAccess *DummyNoProto::Clone() const 
 const char *DummyNoProto::StrError(int)
 {
    static xstring str;
-   str.vset(proto.get(),_(" - not supported protocol"),NULL);
+   str.vset(proto.get(),_(" - not supported protocol"), (char *)NULL);
    return str;
 }
Index: src/FileGlob.cc
===================================================================
--- src/FileGlob.cc.orig	2007-12-28 11:23:10.000000000 +0100
+++ src/FileGlob.cc	2009-03-23 15:32:15.000000000 +0100
@@ -330,6 +330,6 @@ const char *GenericGlob::Status()
       return st;
 
    static xstring buf;
-   buf.vset(curr_dir,": ",st,NULL);
+   buf.vset(curr_dir,": ",st, (char *)NULL);
    return buf;
 }
Index: src/GetJob.cc
===================================================================
--- src/GetJob.cc.orig	2007-12-28 15:55:13.000000000 +0100
+++ src/GetJob.cc	2009-03-23 15:33:10.000000000 +0100
@@ -81,7 +81,7 @@ FileCopyPeer *GetJob::DstLocal(const cha
 	       count++;
 	       return 0;
 	    }
-	    backup_file.vset(f,"~",NULL);
+	    backup_file.vset(f,"~", (char *)NULL);
 	    if(rename(f,backup_file)!=0)
 	       backup_file.set(0);
 	    else
Index: src/LocalAccess.cc
===================================================================
--- src/LocalAccess.cc.orig	2007-12-28 11:23:10.000000000 +0100
+++ src/LocalAccess.cc	2009-03-23 15:35:26.000000000 +0100
@@ -71,9 +71,9 @@ void LocalAccess::errno_handle()
    int e=errno;
    const char *err=strerror(e);
    if(mode==RENAME)
-      error.vset("rename(",file.get(),", ",file1.get(),"): ",err,NULL);
+      error.vset("rename(",file.get(),", ",file1.get(),"): ",err, (char *)NULL);
    else
-      error.vset(file.get(),": ",err,NULL);
+      error.vset(file.get(),": ",err, (char *)NULL);
    if(e!=EEXIST)
       LogError(0,"%s",error.get());
 }
Index: src/QueueFeeder.cc
===================================================================
--- src/QueueFeeder.cc.orig	2007-04-06 18:14:39.000000000 +0200
+++ src/QueueFeeder.cc	2009-03-23 15:36:38.000000000 +0100
@@ -40,16 +40,16 @@ const char *QueueFeeder::NextCmd(CmdExec
    buffer.truncate(0);
 
    if(xstrcmp(cur_pwd, job->pwd)) {
-      buffer.vappend("cd \"",CmdExec::unquote(job->pwd),"\"; ",NULL);
+      buffer.vappend("cd \"",CmdExec::unquote(job->pwd),"\"; ", (char *)NULL);
       cur_pwd.set(job->pwd);
    }
 
    if(xstrcmp(cur_lpwd, job->lpwd)) {
-      buffer.vappend("lcd \"",CmdExec::unquote(job->lpwd),"\"; ",NULL);
+      buffer.vappend("lcd \"",CmdExec::unquote(job->lpwd),"\"; ", (char *)NULL);
       cur_lpwd.set(job->lpwd);
    }
 
-   buffer.vappend(job->cmd.get(),"\n",NULL);
+   buffer.vappend(job->cmd.get(),"\n", (char *)NULL);
    delete job;
    return buffer;
 }
Index: src/history.cc
===================================================================
--- src/history.cc.orig	2007-09-10 12:40:12.000000000 +0200
+++ src/history.cc	2009-03-23 15:37:22.000000000 +0100
@@ -40,7 +40,7 @@ History::History()
    modified=false;
    const char *home=get_lftp_home();
    if(home)
-      file.vset(home,"/cwd_history",NULL);
+      file.vset(home,"/cwd_history", (char *)NULL);
 }
 
 History::~History()

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)