diff options
| author | agc <agc@pkgsrc.org> | 2019-01-17 17:26:23 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2019-01-17 17:26:23 +0000 |
| commit | b737c5348dbda9aff17d0ced1091e450c4f3864b (patch) | |
| tree | ef978c1b5f4c91dd38eb8ccf8056aa7b40843b5d | |
| parent | bec4bd506ad6c3aa9b92544fb4c06848162b4e67 (diff) | |
| download | pkgsrc-b737c5348dbda9aff17d0ced1091e450c4f3864b.tar.gz | |
Update netpgpverify and libnetpgpverify to 20190117
jperkin reported a bootstrapping failure in the newer pre-processor
conditionals, so revert to the older, less comprehensive versions without
gcc version level checks.
| -rw-r--r-- | security/netpgpverify/files/bn.h | 37 | ||||
| -rw-r--r-- | security/netpgpverify/files/verify.h | 6 |
2 files changed, 7 insertions, 36 deletions
diff --git a/security/netpgpverify/files/bn.h b/security/netpgpverify/files/bn.h index a1e4e94bd41..ebb37feaab0 100644 --- a/security/netpgpverify/files/bn.h +++ b/security/netpgpverify/files/bn.h @@ -34,41 +34,12 @@ #if !defined(__BEGIN_DECLS) # if defined(__cplusplus) -# define __BEGIN_EXTERN_C extern "C" { -# define __END_EXTERN_C } -# define __static_cast(x,y) static_cast<x>(y) +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } # else -# define __BEGIN_EXTERN_C -# define __END_EXTERN_C -# define __static_cast(x,y) (x)y +# define __BEGIN_DECLS +# define __END_DECLS # endif - -# if __GNUC_PREREQ__(4, 0) -# define __dso_public __attribute__((__visibility__("default"))) -# define __dso_hidden __attribute__((__visibility__("hidden"))) -# define __BEGIN_PUBLIC_DECLS \ - _Pragma("GCC visibility push(default)") __BEGIN_EXTERN_C -# define __END_PUBLIC_DECLS __END_EXTERN_C _Pragma("GCC visibility pop") -# define __BEGIN_HIDDEN_DECLS \ - _Pragma("GCC visibility push(hidden)") __BEGIN_EXTERN_C -# define __END_HIDDEN_DECLS __END_EXTERN_C _Pragma("GCC visibility pop") -# else -# define __dso_public -# define __dso_hidden -# define __BEGIN_PUBLIC_DECLS __BEGIN_EXTERN_C -# define __END_PUBLIC_DECLS __END_EXTERN_C -# define __BEGIN_HIDDEN_DECLS __BEGIN_EXTERN_C -# define __END_HIDDEN_DECLS __END_EXTERN_C -# endif -# if __GNUC_PREREQ__(4, 2) -# define __dso_protected __attribute__((__visibility__("protected"))) -# else -# define __dso_protected -# endif - -# define __BEGIN_DECLS __BEGIN_PUBLIC_DECLS -# define __END_DECLS __END_PUBLIC_DECLS - #endif __BEGIN_DECLS diff --git a/security/netpgpverify/files/verify.h b/security/netpgpverify/files/verify.h index 9ff01bec148..4121d377122 100644 --- a/security/netpgpverify/files/verify.h +++ b/security/netpgpverify/files/verify.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012,2013,2014,2015,2016 Alistair Crooks <agc@NetBSD.org> + * Copyright (c) 2012-2019 Alistair Crooks <agc@NetBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef NETPGP_VERIFY_H_ -#define NETPGP_VERIFY_H_ 20190111 +#define NETPGP_VERIFY_H_ 20190117 -#define NETPGPVERIFY_VERSION "netpgpverify portable 20190111" +#define NETPGPVERIFY_VERSION "netpgpverify portable 20190117" #include <sys/types.h> |