Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 886046 Details for
Bug 925557
app-crypt/pinentry-1.2.1: Bad #include / implicit declaration of function ‘secmem_free’
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
8ab1682e80a2b4185ee9ef66cbb44340245966fc backport
pinentry-1.2.1-fix-memory-h.patch (text/plain), 9.40 KB, created by
Suvi Adams
on 2024-02-26 19:58:41 UTC
(
hide
)
Description:
8ab1682e80a2b4185ee9ef66cbb44340245966fc backport
Filename:
MIME Type:
Creator:
Suvi Adams
Created:
2024-02-26 19:58:41 UTC
Size:
9.40 KB
patch
obsolete
>diff -Naur pinentry-1.2.1/fltk/main.cxx pinentry-1.2.1-fix-memory-h/fltk/main.cxx >--- pinentry-1.2.1/fltk/main.cxx 2019-03-05 23:09:48.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/fltk/main.cxx 2024-02-26 11:02:47.822134762 -0800 >@@ -34,7 +34,6 @@ > #include <getopt.h> > #include <assert.h> > >-#include "memory.h" > #include <memory> > > #include <pinentry.h> >diff -Naur pinentry-1.2.1/fltk/pinwindow.cxx pinentry-1.2.1-fix-memory-h/fltk/pinwindow.cxx >--- pinentry-1.2.1/fltk/pinwindow.cxx 2017-12-03 08:13:05.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/fltk/pinwindow.cxx 2024-02-26 11:02:47.822134762 -0800 >@@ -32,7 +32,7 @@ > #include <FL/Fl_Return_Button.H> > #include <FL/Fl_Pixmap.H> > >-#include "memory.h" >+#include "../secmem/secmem.h" > > #include "encrypt.xpm" > #include "icon.xpm" >diff -Naur pinentry-1.2.1/gnome3/pinentry-gnome3.c pinentry-1.2.1-fix-memory-h/gnome3/pinentry-gnome3.c >--- pinentry-1.2.1/gnome3/pinentry-gnome3.c 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/gnome3/pinentry-gnome3.c 2024-02-26 11:02:47.822134762 -0800 >@@ -30,8 +30,6 @@ > > #include <assuan.h> > >-#include "memory.h" >- > #include "pinentry.h" > > #ifdef FALLBACK_CURSES >diff -Naur pinentry-1.2.1/pinentry/password-cache.c pinentry-1.2.1-fix-memory-h/pinentry/password-cache.c >--- pinentry-1.2.1/pinentry/password-cache.c 2017-12-03 08:13:15.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/pinentry/password-cache.c 2024-02-26 11:02:47.822134762 -0800 >@@ -31,7 +31,7 @@ > #endif > > #include "password-cache.h" >-#include "memory.h" >+#include "../secmem/secmem.h" > > #ifdef HAVE_LIBSECRET > static const SecretSchema * >diff -Naur pinentry-1.2.1/pinentry/pinentry.c pinentry-1.2.1-fix-memory-h/pinentry/pinentry.c >--- pinentry-1.2.1/pinentry/pinentry.c 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/pinentry/pinentry.c 2024-02-26 11:02:47.822134762 -0800 >@@ -44,7 +44,6 @@ > > #include <assuan.h> > >-#include "memory.h" > #include "secmem-util.h" > #include "argparse.h" > #include "pinentry.h" >diff -Naur pinentry-1.2.1/pinentry/pinentry-curses.c pinentry-1.2.1-fix-memory-h/pinentry/pinentry-curses.c >--- pinentry-1.2.1/pinentry/pinentry-curses.c 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/pinentry/pinentry-curses.c 2024-02-26 11:02:47.822134762 -0800 >@@ -62,8 +62,6 @@ > #include <utime.h> > #endif /*HAVE_UTIME_H*/ > >-#include <memory.h> >- > #ifdef HAVE_WCHAR_H > #include <wchar.h> > #endif /*HAVE_WCHAR_H*/ >@@ -1017,10 +1015,11 @@ > #ifndef HAVE_DOSISH_SYSTEM > int no_input = 1; > #endif >- > #ifdef HAVE_NCURSESW > char *old_ctype = NULL; >+#endif > >+#ifdef HAVE_NCURSESW > if (pinentry->lc_ctype) > { > old_ctype = strdup (setlocale (LC_CTYPE, NULL)); >diff -Naur pinentry-1.2.1/pinentry/pinentry-emacs.c pinentry-1.2.1-fix-memory-h/pinentry/pinentry-emacs.c >--- pinentry-1.2.1/pinentry/pinentry-emacs.c 2021-08-11 04:16:10.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/pinentry/pinentry-emacs.c 2024-02-26 11:02:47.822134762 -0800 >@@ -48,7 +48,7 @@ > #include <assuan.h> > > #include "pinentry-emacs.h" >-#include "memory.h" >+#include "../secmem/secmem.h" > #include "secmem-util.h" > > /* The communication mechanism is similar to emacsclient, but there >diff -Naur pinentry-1.2.1/pinentry/pinentry.h pinentry-1.2.1-fix-memory-h/pinentry/pinentry.h >--- pinentry-1.2.1/pinentry/pinentry.h 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/pinentry/pinentry.h 2024-02-26 11:02:47.822134762 -0800 >@@ -21,6 +21,8 @@ > #ifndef PINENTRY_H > #define PINENTRY_H > >+#include "../secmem/secmem.h" >+ > #ifdef __cplusplus > extern "C" { > #if 0 >diff -Naur pinentry-1.2.1/secmem/Makefile.am pinentry-1.2.1-fix-memory-h/secmem/Makefile.am >--- pinentry-1.2.1/secmem/Makefile.am 2017-12-03 08:13:05.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/secmem/Makefile.am 2024-02-26 11:02:47.822134762 -0800 >@@ -22,7 +22,7 @@ > noinst_LIBRARIES = libsecmem.a > > libsecmem_a_SOURCES = \ >- memory.h \ >+ secmem.h \ > secmem-util.h \ > util.h \ > secmem.c \ >diff -Naur pinentry-1.2.1/secmem/memory.h pinentry-1.2.1-fix-memory-h/secmem/memory.h >--- pinentry-1.2.1/secmem/memory.h 2017-12-03 08:13:05.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/secmem/memory.h 1969-12-31 16:00:00.000000000 -0800 >@@ -1,55 +0,0 @@ >-/* Quintuple Agent secure memory allocation >- * Copyright (C) 1998,1999 Free Software Foundation, Inc. >- * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at> >- * >- * This program is free software; you can redistribute it and/or modify >- * it under the terms of the GNU General Public License as published by >- * the Free Software Foundation; either version 2 of the License, or >- * (at your option) any later version. >- * >- * This program is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >- * GNU General Public License for more details. >- * >- * You should have received a copy of the GNU General Public License >- * along with this program; if not, see <https://www.gnu.org/licenses/>. >- * SPDX-License-Identifier: GPL-2.0+ >- */ >- >-#ifndef _MEMORY_H >-#define _MEMORY_H >- >-#include <sys/types.h> >- >-#ifdef __cplusplus >-extern "C" { >-#if 0 >-} >-#endif >-#endif >- >- >-/* values for flags, hardcoded in secmem.c */ >-#define SECMEM_WARN 0 >-#define SECMEM_DONT_WARN 1 >-#define SECMEM_SUSPEND_WARN 2 >- >-void secmem_init( size_t npool ); >-void secmem_term( void ); >-void *secmem_malloc( size_t size ); >-void *secmem_realloc( void *a, size_t newsize ); >-void secmem_free( void *a ); >-int m_is_secure( const void *p ); >-void secmem_dump_stats(void); >-void secmem_set_flags( unsigned flags ); >-unsigned secmem_get_flags(void); >-size_t secmem_get_max_size (void); >- >-#if 0 >-{ >-#endif >-#ifdef __cplusplus >-} >-#endif >-#endif /* _MEMORY_H */ >diff -Naur pinentry-1.2.1/secmem/secmem.c pinentry-1.2.1-fix-memory-h/secmem/secmem.c >--- pinentry-1.2.1/secmem/secmem.c 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/secmem/secmem.c 2024-02-26 11:02:47.822134762 -0800 >@@ -34,7 +34,7 @@ > #endif > #include <string.h> > >-#include "memory.h" >+#include "secmem.h" > > #ifdef ORIGINAL_GPG_VERSION > #include "types.h" >diff -Naur pinentry-1.2.1/secmem/secmem++.h pinentry-1.2.1-fix-memory-h/secmem/secmem++.h >--- pinentry-1.2.1/secmem/secmem++.h 2017-12-03 08:13:05.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/secmem/secmem++.h 2024-02-26 11:02:47.822134762 -0800 >@@ -19,7 +19,7 @@ > #ifndef __SECMEM_SECMEMPP_H__ > #define __SECMEM_SECMEMPP_H__ > >-#include "secmem/memory.h" >+#include "../secmem/secmem.h" > #include <cstddef> > > namespace secmem { >diff -Naur pinentry-1.2.1/secmem/secmem.h pinentry-1.2.1-fix-memory-h/secmem/secmem.h >--- pinentry-1.2.1/secmem/secmem.h 1969-12-31 16:00:00.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/secmem/secmem.h 2024-02-26 11:02:47.822134762 -0800 >@@ -0,0 +1,55 @@ >+/* Quintuple Agent secure memory allocation >+ * Copyright (C) 1998,1999 Free Software Foundation, Inc. >+ * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at> >+ * >+ * This program is free software; you can redistribute it and/or modify >+ * it under the terms of the GNU General Public License as published by >+ * the Free Software Foundation; either version 2 of the License, or >+ * (at your option) any later version. >+ * >+ * This program is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+ * GNU General Public License for more details. >+ * >+ * You should have received a copy of the GNU General Public License >+ * along with this program; if not, see <https://www.gnu.org/licenses/>. >+ * SPDX-License-Identifier: GPL-2.0+ >+ */ >+ >+#ifndef _MEMORY_H >+#define _MEMORY_H >+ >+#include <sys/types.h> >+ >+#ifdef __cplusplus >+extern "C" { >+#if 0 >+} >+#endif >+#endif >+ >+ >+/* values for flags, hardcoded in secmem.c */ >+#define SECMEM_WARN 0 >+#define SECMEM_DONT_WARN 1 >+#define SECMEM_SUSPEND_WARN 2 >+ >+void secmem_init( size_t npool ); >+void secmem_term( void ); >+void *secmem_malloc( size_t size ); >+void *secmem_realloc( void *a, size_t newsize ); >+void secmem_free( void *a ); >+int m_is_secure( const void *p ); >+void secmem_dump_stats(void); >+void secmem_set_flags( unsigned flags ); >+unsigned secmem_get_flags(void); >+size_t secmem_get_max_size (void); >+ >+#if 0 >+{ >+#endif >+#ifdef __cplusplus >+} >+#endif >+#endif /* _MEMORY_H */ >diff -Naur pinentry-1.2.1/tqt/secqstring.h pinentry-1.2.1-fix-memory-h/tqt/secqstring.h >--- pinentry-1.2.1/tqt/secqstring.h 2017-12-03 08:33:12.000000000 -0800 >+++ pinentry-1.2.1-fix-memory-h/tqt/secqstring.h 2024-02-26 11:02:47.822134762 -0800 >@@ -65,7 +65,7 @@ > > extern "C" > { >-#include "memory.h" >+#include "../secmem/secmem.h" > } > > /* We need the original qchar and qstring for transparent conversion >diff -Naur pinentry-1.2.1/tty/pinentry-tty.c pinentry-1.2.1-fix-memory-h/tty/pinentry-tty.c >--- pinentry-1.2.1/tty/pinentry-tty.c 2021-08-11 04:16:10.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/tty/pinentry-tty.c 2024-02-26 11:02:47.822134762 -0800 >@@ -41,7 +41,6 @@ > #include <gpg-error.h> > > #include "pinentry.h" >-#include "memory.h" > > #ifndef HAVE_DOSISH_SYSTEM > static int timed_out; >diff -Naur pinentry-1.2.1/w32/main.c pinentry-1.2.1-fix-memory-h/w32/main.c >--- pinentry-1.2.1/w32/main.c 2022-08-24 03:31:59.000000000 -0700 >+++ pinentry-1.2.1-fix-memory-h/w32/main.c 2024-02-26 11:02:47.822134762 -0800 >@@ -29,7 +29,6 @@ > #endif > > #include "pinentry.h" >-#include "memory.h" > > #include "resource.h" > /* #include "msgcodes.h" */
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=886046">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 925557
:
886041
| 886046
