Contents of /trunk/man-db/patches/man-db-2.6.0.2-flock.patch
Parent Directory | Revision Log
Revision 1613 -
(show annotations)
(download)
Fri Jan 13 14:31:39 2012 UTC (12 years, 8 months ago) by niro
File size: 1339 byte(s)
Fri Jan 13 14:31:39 2012 UTC (12 years, 8 months ago) by niro
File size: 1339 byte(s)
-files and patches for man-db
1 | Bug #371937 |
2 | |
3 | === modified file 'NEWS' |
4 | --- a/NEWS 2011-04-13 10:57:54 +0000 |
5 | +++ a/NEWS 2011-06-16 11:22:10 +0000 |
6 | @@ -1,3 +1,13 @@ |
7 | +man-db 2.6.1 |
8 | +============ |
9 | + |
10 | +Major changes since man-db 2.6.0.2: |
11 | + |
12 | + Fixes: |
13 | + ------ |
14 | + |
15 | + o --with-db=db* and --with-db=ndbm compile again. |
16 | + |
17 | man-db 2.6.0.2 (13 April 2011) |
18 | ============================== |
19 | |
20 | |
21 | === modified file 'libdb/db_btree.c' |
22 | --- a/libdb/db_btree.c 2010-09-26 21:08:59 +0000 |
23 | +++ a/libdb/db_btree.c 2011-06-16 11:22:10 +0000 |
24 | @@ -32,10 +32,7 @@ |
25 | #include <errno.h> |
26 | #include <string.h> |
27 | |
28 | -#if HAVE_SYS_FILE_H |
29 | -# include <sys/file.h> /* for flock() */ |
30 | -#endif |
31 | - |
32 | +#include <sys/file.h> /* for flock() */ |
33 | #include <sys/types.h> /* for open() */ |
34 | #include <sys/stat.h> |
35 | |
36 | @@ -48,7 +45,6 @@ |
37 | #include "manconfig.h" |
38 | |
39 | #include "error.h" |
40 | -#include "flock.h" |
41 | #include "hashtable.h" |
42 | |
43 | #include "mydbm.h" |
44 | |
45 | === modified file 'libdb/db_ndbm.c' |
46 | --- a/libdb/db_ndbm.c 2008-12-03 10:57:14 +0000 |
47 | +++ a/libdb/db_ndbm.c 2011-06-16 11:22:10 +0000 |
48 | @@ -29,10 +29,7 @@ |
49 | #include <stdlib.h> |
50 | #include <stdio.h> |
51 | |
52 | -#if HAVE_SYS_FILE_H |
53 | -# include <sys/file.h> /* for flock() */ |
54 | -#endif |
55 | - |
56 | +#include <sys/file.h> /* for flock() */ |
57 | #include <sys/types.h> /* for open() */ |
58 | #include <sys/stat.h> |
59 | |
60 | @@ -46,8 +43,6 @@ |
61 | |
62 | #include "manconfig.h" |
63 | |
64 | -#include "flock.h" |
65 | - |
66 | #include "mydbm.h" |
67 | #include "db_storage.h" |
68 | |
69 |