| author | Neng Xue <neng.xue@oracle.com> |
| Fri, 14 Oct 2016 11:36:01 -0700 | |
| changeset 7111 | a0e4f5518caa |
| parent 6238 | e530e1a7f687 |
| permissions | -rw-r--r-- |
|
6238
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
1 |
This patch updates the ordering of two header files in the |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
2 |
pinentry-curses.c; without the fix the compilation fails with: |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
3 |
"/var/tmp/userland-clone-new/components/pinentry/pinentry-0.9.7/pinentry/pinentry-curses.c", line 1028: duplicate case in switch: 13 |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
4 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
5 |
The problem is caused by the the fact, that ERR definition in |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
6 |
sys/regset.h on Solaris can overwrite ERR macro defined in curses.h. |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
7 |
The paths below describe the sources of the problematic macro expansion. |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
8 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
9 |
pinentry/pinentry-curses.c: |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
10 |
#include <curses.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
11 |
#include <signal.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
12 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
13 |
/usr/include/sys/signal.h |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
14 |
`-> #include <sys/ucontext.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
15 |
`-> #include <sys/regset.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
16 |
`-> #define ERR 13 |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
17 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
18 |
/usr/include/curses.h |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
19 |
`-> #if !defined(ERR) || ((ERR) != -1) |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
20 |
#define ERR (-1) |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
21 |
#endif |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
22 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
23 |
The patch was developed internally. |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
24 |
|
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
25 |
--- ./pinentry/pinentry-curses.c.orig Tue Jun 7 08:10:33 2016 |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
26 |
+++ ./pinentry/pinentry-curses.c Tue Jun 7 08:10:53 2016 |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
27 |
@@ -22,8 +22,8 @@ |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
28 |
#include <config.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
29 |
#endif |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
30 |
#include <assert.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
31 |
-#include <curses.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
32 |
#include <signal.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
33 |
+#include <curses.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
34 |
#include <fcntl.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
35 |
#include <unistd.h> |
|
e530e1a7f687
23093523 update pinentry to version 0.9.7
Jan Friedel <jan.friedel@oracle.com>
parents:
diff
changeset
|
36 |
#include <stdlib.h> |