Attachment 41859 Details for Bug 65371 – file.diff

[patch] file.diff

file.diff (text/plain), 7.69 KB, created by tkato on 2004-04-09 16:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-04-09 16:10:14 UTC

Size: 7.69 KB

patch

obsolete

>diff -urN /usr/ports/www/aria/Makefile www/aria/Makefile
>--- /usr/ports/www/aria/Makefile	Sun Mar 14 18:18:40 2004
>+++ www/aria/Makefile	Fri Apr  9 19:46:06 2004
>@@ -17,14 +17,12 @@
> 
> USE_BZIP2=	yes
> USE_X_PREFIX=	yes
>-USE_GNOME=	gtk12
>+USE_GNOME=	gnometarget gtk12
> USE_OPENSSL=	yes
>-USE_GETOPT_LONG=yes
>+USE_GETOPT_LONG=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-USE_LIBTOOL_VER=13
>-
>-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+USE_LIBTOOL_VER=	13
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> 
> CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
>@@ -46,13 +44,6 @@
> 		${WRKSRC}/src/Makefile.in
> 	@${REINPLACE_CMD} -e 's|"getopt.h"|<getopt.h>|g' \
> 		${WRKSRC}/src/main.cc
>-
>-pre-build:
>-.for file in src/AppOption.cc src/HistoryWindow.cc src/RetrieveHTTP.cc \
>-	src/RetrieveHTTP2.cc src/gui_file_open_and_save.cc
>-	@cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \
>-		&& iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE}
>-.endfor
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -urN /usr/ports/www/aria/files/patch-src::GtrlSocket.cc www/aria/files/patch-src::GtrlSocket.cc
>--- /usr/ports/www/aria/files/patch-src::GtrlSocket.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::GtrlSocket.cc	Thu Apr  8 22:43:08 2004
>@@ -0,0 +1,11 @@
>+--- src/CtrlSocket.cc.orig	2002-10-01 17:32:00.000000000 +0200
>++++ src/CtrlSocket.cc	2004-01-10 02:13:30.000000000 +0100
>+@@ -183,7 +183,7 @@
>+     stored_uid = getuid();
>+     euid = geteuid();
>+     setuid(euid);
>+-    sprintf(saddr.sun_path, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
>++    snprintf(saddr.sun_path, sizeof(saddr.sun_path)-1, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
>+     setreuid(stored_uid, euid);
>+     if (connect(fd, (struct sockaddr *) &saddr, sizeof (saddr)) != -1)
>+       return fd;
>diff -urN /usr/ports/www/aria/files/patch-src::HistoryWindow.cc www/aria/files/patch-src::HistoryWindow.cc
>--- /usr/ports/www/aria/files/patch-src::HistoryWindow.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::HistoryWindow.cc	Thu Apr  8 22:41:41 2004
>@@ -0,0 +1,11 @@
>+--- src/HistoryWindow.cc.orig	Wed Oct  2 00:32:00 2002
>++++ src/HistoryWindow.cc	Thu Apr  8 22:41:14 2004
>+@@ -479,7 +479,7 @@
>+ {
>+   ifstream infile(filename.c_str(), ios::in);
>+ 
>+-  if(infile.bad()) return false;
>++  if(!infile.is_open() || infile.bad()) return false;
>+   int count = 0;
>+   while(!infile.eof() && count < maxHistory) {
>+     string line;
>diff -urN /usr/ports/www/aria/files/patch-src::ItemList.h www/aria/files/patch-src::ItemList.h
>--- /usr/ports/www/aria/files/patch-src::ItemList.h	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::ItemList.h	Thu Apr  8 22:56:49 2004
>@@ -0,0 +1,11 @@
>+--- src/ItemList.h.orig	Sat Mar 16 23:13:00 2002
>++++ src/ItemList.h	Thu Apr  8 22:56:34 2004
>+@@ -31,7 +31,7 @@
>+ #include <string>
>+ #include <fstream>
>+ //#include <map>
>+-#include <pair.h>
>++//#include <pair.h>
>+ #include "aria.h"
>+ #include "utils.h"
>+ #include "ProxyList.h"
>diff -urN /usr/ports/www/aria/files/patch-src::ProxyList.cc www/aria/files/patch-src::ProxyList.cc
>--- /usr/ports/www/aria/files/patch-src::ProxyList.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::ProxyList.cc	Thu Apr  8 22:42:06 2004
>@@ -0,0 +1,17 @@
>+--- src/ProxyList.cc.orig	Sun Nov  4 19:18:08 2001
>++++ src/ProxyList.cc	Thu Apr  8 22:41:14 2004
>+@@ -130,12 +130,12 @@
>+ bool ProxyList::Read_proxy_list(const string& file_proxy_list)
>+ {
>+   ifstream infile(file_proxy_list.c_str(), ios::in);//ios::skipws|ios::in);
>+-  if(infile.bad() || infile.eof()) return false;
>++  if(!infile.is_open() || infile.bad() || infile.eof()) return false;
>+ 
>+   while(!infile.eof()) {
>+     string line;
>+     getline(infile, line, '\n');
>+-    if(infile.bad()) return false;
>++    if(!infile.is_open() || infile.bad()) return false;
>+     line = Remove_white(line);
>+     if(line.empty() || line.at(0) == '#') continue;
>+     string server_name = Token_splitter(line, ": \t");
>diff -urN /usr/ports/www/aria/files/patch-src::RetrieveFTP.h www/aria/files/patch-src::RetrieveFTP.h
>--- /usr/ports/www/aria/files/patch-src::RetrieveFTP.h	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::RetrieveFTP.h	Thu Apr  8 22:57:42 2004
>@@ -0,0 +1,11 @@
>+--- src/RetrieveFTP.h.orig	Wed Feb 13 21:09:24 2002
>++++ src/RetrieveFTP.h	Thu Apr  8 22:57:28 2004
>+@@ -27,7 +27,7 @@
>+ #include <arpa/inet.h>
>+ #include <errno.h>
>+ #include <fstream>
>+-#include <pair.h>
>++//#include <pair.h>
>+ #include "aria.h"
>+ #include "FTPcontainer.h"
>+ #include "ItemCell.h"
>diff -urN /usr/ports/www/aria/files/patch-src::gui_download.cc www/aria/files/patch-src::gui_download.cc
>--- /usr/ports/www/aria/files/patch-src::gui_download.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::gui_download.cc	Thu Apr  8 22:55:54 2004
>@@ -0,0 +1,11 @@
>+--- src/gui_download.cc.orig	Wed Oct  2 00:32:00 2002
>++++ src/gui_download.cc	Thu Apr  8 22:55:40 2004
>+@@ -24,7 +24,7 @@
>+ #include <sys/time.h>
>+ #include <sys/types.h>
>+ #include <sys/socket.h>
>+-#include <pair.h>
>++//#include <pair.h>
>+ #include <list>
>+ #include <algorithm>
>+ #include "aria.h"
>diff -urN /usr/ports/www/aria/files/patch-src::gui_file.cc www/aria/files/patch-src::gui_file.cc
>--- /usr/ports/www/aria/files/patch-src::gui_file.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::gui_file.cc	Thu Apr  8 22:59:01 2004
>@@ -0,0 +1,16 @@
>+--- src/gui_file.cc.orig	Mon Sep 30 22:29:46 2002
>++++ src/gui_file.cc	Thu Apr  8 22:58:36 2004
>+@@ -19,12 +19,12 @@
>+ 
>+ // $Id: gui_file.cc,v 1.45 2002/09/30 13:29:46 tujikawa Exp $
>+ 
>+-#include <fstream.h>
>+ #include <stdlib.h>
>+ #include <unistd.h>
>+ #include <sys/time.h>
>+ #include <sys/types.h>
>+ #include <sys/stat.h>
>++#include <fstream>
>+ #include "aria.h"
>+ #include "ItemCell.h"
>+ #include "ListManager.h"
>diff -urN /usr/ports/www/aria/files/patch-src::gui_main.cc www/aria/files/patch-src::gui_main.cc
>--- /usr/ports/www/aria/files/patch-src::gui_main.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::gui_main.cc	Thu Apr  8 22:42:20 2004
>@@ -0,0 +1,13 @@
>+--- src/gui_main.cc.orig	Thu Dec 19 00:41:05 2002
>++++ src/gui_main.cc	Thu Apr  8 22:41:14 2004
>+@@ -830,8 +830,8 @@
>+   */
>+   ifstream infile(filename.c_str(), ios::in);
>+   map<string, string> guiInfoMap;
>+-  if(infile.bad()) return false;
>+-  
>++  if(!infile.is_open() || infile.bad()) return false;
>++
>+   if(infile.eof()) return false;
>+   while(!infile.eof()) {
>+     string line;
>diff -urN /usr/ports/www/aria/files/patch-src::gui_popup.cc www/aria/files/patch-src::gui_popup.cc
>--- /usr/ports/www/aria/files/patch-src::gui_popup.cc	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::gui_popup.cc	Thu Apr  8 22:59:38 2004
>@@ -0,0 +1,11 @@
>+--- src/gui_popup.cc.orig	Wed Apr  3 22:33:52 2002
>++++ src/gui_popup.cc	Thu Apr  8 22:59:27 2004
>+@@ -19,7 +19,7 @@
>+ 
>+ // $Id: gui_popup.cc,v 1.14 2002/04/03 13:33:52 tujikawa Exp $
>+ 
>+-#include <iostream.h>
>++#include <iostream>
>+ #include "aria.h"
>+ #include "gui_utils.h"
>+ 
>diff -urN /usr/ports/www/aria/files/patch-src::md5.c www/aria/files/patch-src::md5.c
>--- /usr/ports/www/aria/files/patch-src::md5.c	Thu Jan  1 09:00:00 1970
>+++ www/aria/files/patch-src::md5.c	Thu Apr  8 22:42:42 2004
>@@ -0,0 +1,13 @@
>+--- src/md5.c.orig	2001-05-19 20:38:59.000000000 +0200
>++++ src/md5.c	2003-08-07 01:34:12.000000000 +0200
>+@@ -291,8 +291,8 @@
>+ 
>+     p = hd->buf;
>+   #ifdef BIG_ENDIAN_HOST
>+-    #define X(a) do { *p++ = hd->##a	  ; *p++ = hd->##a >> 8;      \
>+-		      *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0)
>++    #define X(a) do { *p++ = hd->a	  ; *p++ = hd->a >> 8;      \
>++		      *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
>+   #else /* little endian */
>+     /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/
>+     /* Unixware's cpp doesn't like the above construct so we do it his way:

Actions: View | Diff

Attachments on bug 65371: 41859