Tue Dec 16 16:49:52 2008 UTC ()
Re-generate these patches because GNU patch doesn't accept them.


(tron)
diff -r1.19 -r1.20 pkgsrc/net/rtorrent/distinfo
diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/patch-ae
cvs diff -r1.19 -r1.20 pkgsrc/net/rtorrent/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/distinfo 2008/12/05 16:31:52 1.19
+++ pkgsrc/net/rtorrent/distinfo 2008/12/16 16:49:52 1.20
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.19 2008/12/05 16:31:52 tron Exp $ 1$NetBSD: distinfo,v 1.20 2008/12/16 16:49:52 tron Exp $
2 2
3SHA1 (rtorrent-0.8.2.tar.gz) = 891093c5d600c2e3853eadbbec369a12dfe6ec11 3SHA1 (rtorrent-0.8.2.tar.gz) = 891093c5d600c2e3853eadbbec369a12dfe6ec11
4RMD160 (rtorrent-0.8.2.tar.gz) = e86b0082d1788e4e7cd8fcf631f7f857d642c799 4RMD160 (rtorrent-0.8.2.tar.gz) = e86b0082d1788e4e7cd8fcf631f7f857d642c799
5Size (rtorrent-0.8.2.tar.gz) = 506015 bytes 5Size (rtorrent-0.8.2.tar.gz) = 506015 bytes
6SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914 6SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914
7SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47 7SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47
8SHA1 (patch-ad) = 902a95e7edcd4f1f6c4cebe04c28e5ddefc650cf 8SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55
9SHA1 (patch-ae) = cd24c34d28d1c15f028a3ba7b786e40592c7a395 9SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8
cvs diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/patches/Attic/patch-ad 2008/12/05 16:31:52 1.1
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ad 2008/12/16 16:49:52 1.2
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1$NetBSD: patch-ad,v 1.1 2008/12/05 16:31:52 tron Exp $ 1$NetBSD: patch-ad,v 1.2 2008/12/16 16:49:52 tron Exp $
2 2
3--- src/utils/directory.cc.orig 2008-12-05 13:20:16 +0100 3--- src/utils/directory.cc.orig 2008-05-07 13:19:11.000000000 +0100
4+++ src/utils/directory.cc 2008-12-05 13:27:27 +0100 4+++ src/utils/directory.cc 2008-12-16 16:45:58.000000000 +0000
5@@ -38,6 +38,7 @@ 5@@ -38,6 +38,7 @@
6  6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9+#include <sys/stat.h> 9+#include <sys/stat.h>
10 #include <dirent.h> 10 #include <dirent.h>
11 #include <rak/path.h> 11 #include <rak/path.h>
12 #include <torrent/exceptions.h> 12 #include <torrent/exceptions.h>
13@@ -63,6 +64,8 @@ 13@@ -63,7 +64,9 @@
14 if (m_path.empty()) 14 if (m_path.empty())
15 throw torrent::input_error("Directory::update() tried to open an empty path."); 15 throw torrent::input_error("Directory::update() tried to open an empty path.");
16  16
 17- DIR* d = opendir(rak::path_expand(m_path).c_str());
17+ std::string path=rak::path_expand(m_path); 18+ std::string path=rak::path_expand(m_path);
18+ 19+
19- DIR* d = opendir(rak::path_expand(m_path).c_str()); 
20+ DIR* d = opendir(path.c_str()); 20+ DIR* d = opendir(path.c_str());
21  21
22 if (d == NULL) 22 if (d == NULL)
 23 return false;
23@@ -73,12 +76,18 @@ 24@@ -73,12 +76,18 @@
24 while ((entry = readdir(d)) != NULL) { 25 while ((entry = readdir(d)) != NULL) {
25 if ((flags & update_hide_dot) && entry->d_name[0] == '.') 26 if ((flags & update_hide_dot) && entry->d_name[0] == '.')
26 continue; 27 continue;
27+  28+
28+ std::string full_path = path + '/'; 29+ std::string full_path = path + '/';
29+ full_path += entry->d_name; 30+ full_path += entry->d_name;
30+  31+
31+ struct stat sb; 32+ struct stat sb;
32+ if (stat(full_path.c_str(), &sb)) 33+ if (stat(full_path.c_str(), &sb))
33+ continue; 34+ continue;
34  35
35 iterator itr = base_type::insert(end(), value_type()); 36 iterator itr = base_type::insert(end(), value_type());
cvs diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/patches/Attic/patch-ae 2008/12/05 16:31:52 1.1
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ae 2008/12/16 16:49:52 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-ae,v 1.1 2008/12/05 16:31:52 tron Exp $ 1$NetBSD: patch-ae,v 1.2 2008/12/16 16:49:52 tron Exp $
2 2
3--- src/utils/directory.h.orig 2008-12-05 13:22:18 +0100 3--- src/utils/directory.h.orig 2008-05-07 13:19:11.000000000 +0100
4+++ src/utils/directory.h 2008-12-05 13:22:24 +0100 4+++ src/utils/directory.h 2008-12-16 16:45:58.000000000 +0000
5@@ -49,7 +49,6 @@ 5@@ -49,8 +49,7 @@
6  6
7 // The name and types should match POSIX. 7 // The name and types should match POSIX.
8 uint32_t d_fileno; 8 uint32_t d_fileno;
9- uint32_t d_reclen; 9- uint32_t d_reclen;
10- uint8_t d_type; 10- uint8_t d_type;
11+ uint32_t d_type; 11+ uint32_t d_type;
12  12
13 std::string d_name; 13 std::string d_name;
 14 };