summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-09-22 19:48:47 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-09-22 19:48:47 +0000
commit7686872f40880c0ebd80a5e4e8684e655078ccf1 (patch)
tree6eb960ea6e1fad395fea6eb095d4e03b8d1bee84 /net-fs/davfs2/files
parentversion bump (diff)
downloadgentoo-2-7686872f40880c0ebd80a5e4e8684e655078ccf1.tar.gz
gentoo-2-7686872f40880c0ebd80a5e4e8684e655078ccf1.tar.bz2
gentoo-2-7686872f40880c0ebd80a5e4e8684e655078ccf1.zip
Add patch to fix some bugs thanks to Butchie <butchie@free.fr> in bug 148566
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'net-fs/davfs2/files')
-rw-r--r--net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch63
-rw-r--r--net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r13
2 files changed, 66 insertions, 0 deletions
diff --git a/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch b/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch
new file mode 100644
index 000000000000..f2b75a47c83b
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-cvs1.0.2-badpointer.patch
@@ -0,0 +1,63 @@
+diff -Naur davfs2/src/cache.c davfs2-new/src/cache.c
+--- davfs2/src/cache.c 2006-08-21 22:51:51.000000000 +0200
++++ davfs2-new/src/cache.c 2006-09-17 10:29:06.720200399 +0200
+@@ -236,7 +236,7 @@
+
+ static int is_busy(const dav_node *node);
+
+-static inline int is_cached(const dav_node *node) {
++static inline int is_cached(dav_node *node) {
+
+ if (!S_ISREG(node->mode) || node->cache_path == NULL)
+ return 0;
+@@ -244,6 +244,7 @@
+ return 1;
+ } else {
+ free(node->cache_path);
++ node->cache_path = NULL;
+ return 0;
+ }
+ }
+@@ -299,6 +300,8 @@
+
+ static inline void set_cache_file_times(dav_node *node) {
+
++ if (node->cache_path == NULL)
++ return;
+ struct utimbuf t;
+ t.actime = node->atime;
+ t.modtime = node->mtime;
+@@ -1790,6 +1793,7 @@
+ syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR),
+ "Error %i creating: %s", errno, node->cache_path);
+ free(node->cache_path);
++ node->cache_path = NULL;
+ return EIO;
+ }
+
+@@ -1817,6 +1821,7 @@
+ syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR),
+ "Error %i creating: %s", errno, node->cache_path);
+ free(node->cache_path);
++ node->cache_path = NULL;
+ return EIO;
+ }
+
+@@ -1839,6 +1844,7 @@
+ "Error writing directory %s", node->cache_path);
+ remove(node->cache_path);
+ free(node->cache_path);
++ node->cache_path = NULL;
+ return EIO;
+ }
+ }
+@@ -1973,7 +1979,7 @@
+
+ struct stat st;
+ if (stat(index, &st) == 0) {
+- blocksize = st.st_blksize;
++ blocksize = (st.st_blksize > 4096) ? 4096 : st.st_blksize;
+ } else {
+ blocksize = 1024;
+ }
+
diff --git a/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1 b/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1
new file mode 100644
index 000000000000..3754423c8bcd
--- /dev/null
+++ b/net-fs/davfs2/files/digest-davfs2-1.0.2_p20060820-r1
@@ -0,0 +1,3 @@
+MD5 b508ee29fe5f06ded4fc43f87fe9e54b davfs2-1.0.2_p20060820.tar.bz2 80240
+RMD160 b07b6b0a458d7da6c3dba9a5a194b693c04e6828 davfs2-1.0.2_p20060820.tar.bz2 80240
+SHA256 1446e1cf1800d6b85d44f5c0f593d4616b0514dd3e3b4f6034f94ccfce6acd0e davfs2-1.0.2_p20060820.tar.bz2 80240