diff options
Diffstat (limited to 'network/d4x/patches')
-rw-r--r-- | network/d4x/patches/d4x-2.5.7.1-cd.patch | 19 | ||||
-rw-r--r-- | network/d4x/patches/d4x-2.5.7.1-gentoo.patch | 101 | ||||
-rw-r--r-- | network/d4x/patches/newftpd.diff | 12 | ||||
-rw-r--r-- | network/d4x/patches/newhttpd.diff | 12 |
4 files changed, 0 insertions, 144 deletions
diff --git a/network/d4x/patches/d4x-2.5.7.1-cd.patch b/network/d4x/patches/d4x-2.5.7.1-cd.patch deleted file mode 100644 index e261ceb36a..0000000000 --- a/network/d4x/patches/d4x-2.5.7.1-cd.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/main/dlist.cc 2006-04-06 01:14:54.000000000 +0600 -+++ b/main/dlist.cc 2008-04-17 08:50:22.000000000 +0600 -@@ -1023,11 +1023,12 @@ - cpfrom=oldname; - }else - cpfrom=newname; -- -- WL->log_printf(LOG_WARNING,_("Trying to copy %s to %s due 'Content-Disposition'"), -+ if(strcmp(cpfrom,tmp)){ -+ WL->log_printf(LOG_WARNING,_("Trying to copy %s to %s due 'Content-Disposition'"), - cpfrom,tmp); -- if (file_copy(cpfrom,tmp,buf,1000)) -- WL->log(LOG_ERROR,_("Error during copying!")); -+ if (file_copy(cpfrom,tmp,buf,1000)) -+ WL->log(LOG_ERROR,_("Error during copying!")); -+ } - delete[] buf; - delete[] tmp; - delete[] newname; diff --git a/network/d4x/patches/d4x-2.5.7.1-gentoo.patch b/network/d4x/patches/d4x-2.5.7.1-gentoo.patch deleted file mode 100644 index f0014ca81c..0000000000 --- a/network/d4x/patches/d4x-2.5.7.1-gentoo.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -ur d4x-2.5.7.1.orig/configure d4x-2.5.7.1/configure ---- d4x-2.5.7.1.orig/configure 2006-04-12 19:48:29.000000000 +0300 -+++ d4x-2.5.7.1/configure 2007-10-28 10:56:11.000000000 +0200 -@@ -18398,11 +18398,6 @@ - - - cat >>confdefs.h <<\_ACEOF --#define GTK_DISABLE_DEPRECATED --_ACEOF -- -- --cat >>confdefs.h <<\_ACEOF - #define _FILE_OFFSET_BITS 64 - _ACEOF - -diff -ur d4x-2.5.7.1.orig/configure.ac d4x-2.5.7.1/configure.ac ---- d4x-2.5.7.1.orig/configure.ac 2005-11-05 01:35:38.000000000 +0200 -+++ d4x-2.5.7.1/configure.ac 2007-10-28 10:56:11.000000000 +0200 -@@ -298,7 +298,6 @@ - - # Other needed defines - AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc]) --AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage]) - AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB]) - - # Prepare all requiered flags -Only in d4x-2.5.7.1: de.po -diff -ur d4x-2.5.7.1.orig/main/face/list.cc d4x-2.5.7.1/main/face/list.cc ---- d4x-2.5.7.1.orig/main/face/list.cc 2006-03-20 02:29:41.000000000 +0200 -+++ d4x-2.5.7.1/main/face/list.cc 2007-10-28 10:56:11.000000000 +0200 -@@ -8,7 +8,6 @@ - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ --#define GTK_DISABLE_DEPRECATED - - #include <stdio.h> - #include <gtk/gtk.h> -diff -ur d4x-2.5.7.1.orig/main/face/prefs.cc d4x-2.5.7.1/main/face/prefs.cc ---- d4x-2.5.7.1.orig/main/face/prefs.cc 2005-11-05 21:03:19.000000000 +0200 -+++ d4x-2.5.7.1/main/face/prefs.cc 2007-10-28 11:04:15.000000000 +0200 -@@ -9,6 +9,7 @@ - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -+#include <libintl.h> - #include <gtk/gtk.h> - #include <gdk/gdkkeysyms.h> - #include "../ntlocale.h" -diff -ur d4x-2.5.7.1.orig/main/signal.cc d4x-2.5.7.1/main/signal.cc ---- d4x-2.5.7.1.orig/main/signal.cc 2006-04-05 23:11:43.000000000 +0300 -+++ d4x-2.5.7.1/main/signal.cc 2007-10-28 10:56:11.000000000 +0200 -@@ -89,7 +89,7 @@ - - - void my_pthreads_mutex_init(pthread_mutex_t *lock){ --#if defined(__linux__) -+#if defined(__linux__) || defined(__GLIBC__) - /* manual page for mutexes said that mutexes in linux is fast by - default... - */ -diff -ur d4x-2.5.7.1.orig/main/socket.cc d4x-2.5.7.1/main/socket.cc ---- d4x-2.5.7.1.orig/main/socket.cc 2006-04-09 15:39:25.000000000 +0300 -+++ d4x-2.5.7.1/main/socket.cc 2007-10-28 10:56:11.000000000 +0200 -@@ -165,10 +165,10 @@ - return(SOCKET_CANT_ALLOCATE); - int a=1; - setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a)); -- setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a)); -+ //setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a)); - - size_t sl=2000; //set receive buffer to default+30% MTU size -- setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl)); -+ //setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl)); - - if (!connect_impl()) - return(SOCKET_CANT_CONNECT); -diff -ur d4x-2.5.7.1.orig/Makefile.am d4x-2.5.7.1/Makefile.am ---- d4x-2.5.7.1.orig/Makefile.am 2005-08-30 04:48:55.000000000 +0300 -+++ d4x-2.5.7.1/Makefile.am 2007-10-28 11:28:02.000000000 +0200 -@@ -4,7 +4,7 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = DOC intl main po share -+SUBDIRS = intl main po share - - # Extra files/dirs to be included in distribution - EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \ -diff -ur d4x-2.5.7.1.orig/Makefile.in d4x-2.5.7.1/Makefile.in ---- d4x-2.5.7.1.orig/Makefile.in 2006-04-12 19:48:32.000000000 +0300 -+++ d4x-2.5.7.1/Makefile.in 2007-10-28 11:27:53.000000000 +0200 -@@ -256,7 +256,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = DOC intl main po share -+SUBDIRS = intl main po share - - # Extra files/dirs to be included in distribution - EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \ diff --git a/network/d4x/patches/newftpd.diff b/network/d4x/patches/newftpd.diff deleted file mode 100644 index 4afa95f284..0000000000 --- a/network/d4x/patches/newftpd.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- d4x-2.5.7.1/main/ftpd.cc 2006-04-05 21:02:36.000000000 +0200 -+++ d4x-2.5.7.1.src/main/ftpd.cc 2006-04-27 20:44:51.000000000 +0200 -@@ -663,7 +663,8 @@ - - SocketPtr tFtpDownload::export_ctrl_socket(){ - if (FTP) return(FTP->export_ctrl_socket()); -- return(SocketPtr()); -+ SocketPtr dummy = SocketPtr(); -+ return(dummy); - }; - - tFtpDownload::~tFtpDownload() { diff --git a/network/d4x/patches/newhttpd.diff b/network/d4x/patches/newhttpd.diff deleted file mode 100644 index ce5388adc5..0000000000 --- a/network/d4x/patches/newhttpd.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- d4x-2.5.7.1/main/httpd.cc 2006-04-05 21:01:41.000000000 +0200 -+++ d4x-2.5.7.1.src/main/httpd.cc 2006-04-27 20:55:24.000000000 +0200 -@@ -581,7 +581,8 @@ - - SocketPtr tHttpDownload::export_ctrl_socket(){ - if (HTTP) return(HTTP->export_ctrl_socket()); -- return(SocketPtr()); -+ SocketPtr dummy = SocketPtr(); -+ return(dummy); - }; - - tHttpDownload::~tHttpDownload() { |