Skip to content

Commit

Permalink
gnupg: compile with -fcommon
Browse files Browse the repository at this point in the history
This fixes a segfault because gnupg/g10/options.h struct opt
is otherwise not shared between the different compilation units,
resulting in opt.homedir being NULL when passed to make_filename.

$ gpg1 -i

gpg: signal 11 caught ... exiting
Segmentation fault

(gdb) bt
    #0  0x00007f17bb2185e2 in strlen (s=s@entry=0x0) at src/string/strlen.c:17
    #1  0x0000000000460ea0 in make_filename (first_part=first_part@entry=0x0) at gnupg-1.4.23/util/fileutil.c:174
    #2  0x000000000040ee42 in keydb_add_resource (url=url@entry=0x46bfe3 "secring.gpg", flags=flags@entry=4, secret=secret@entry=1)
        at gnupg-1.4.23/g10/keydb.c:238
    #3  0x00000000004062ee in main (argc=<optimized out>, argv=<optimized out>) at gnupg-1.4.23/g10/gpg.c:3323

Signed-off-by: Tjeu Kayim <15987676+TjeuKayim@users.noreply.github.com>
  • Loading branch information
TjeuKayim authored and neheb committed Nov 24, 2022
1 parent 98e12e5 commit f4058c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions utils/gnupg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=gnupg
PKG_VERSION:=1.4.23
PKG_RELEASE:=4
PKG_RELEASE:=5

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg
Expand Down Expand Up @@ -87,7 +87,7 @@ CONFIGURE_ARGS += \
MAKE_FLAGS += \
SUBDIRS="m4 intl zlib util mpi cipher tools g10 keyserver ${checks}" \

TARGET_CFLAGS += -DEXTERN_UNLESS_MAIN_MODULE=static
TARGET_CFLAGS += -fcommon

define Package/gnupg/install
$(INSTALL_DIR) $(1)/usr/bin
Expand Down

0 comments on commit f4058c1

Please sign in to comment.