diff --git a/build/gnupg/build.sh b/build/gnupg/build.sh index 69aba673c..7fe67ef3c 100755 --- a/build/gnupg/build.sh +++ b/build/gnupg/build.sh @@ -136,7 +136,6 @@ PATH+=":$DEPROOT$PREFIX/bin" download_source $PROG $PROG $VER patch_source -run_autoreconf -fi build install_execattr run_testsuite check diff --git a/build/gnupg/local.mog b/build/gnupg/local.mog index 1f019096a..0162dd3df 100644 --- a/build/gnupg/local.mog +++ b/build/gnupg/local.mog @@ -22,6 +22,7 @@ license ../pinentry-$(PINENTRY)/COPYING license=GPLv2 dir group=bin mode=0755 owner=root path=etc/$(PREFIX) drop> + drop> # gpg needs the proc_lock_memory privilege in order to be able to lock a # memory segment. If it can't do that, it utters diff --git a/build/gnupg/patches/gcc14.patch b/build/gnupg/patches/gcc14.patch index 47a0abed1..0d59c9dd6 100644 --- a/build/gnupg/patches/gcc14.patch +++ b/build/gnupg/patches/gcc14.patch @@ -1,13 +1,23 @@ -diff -wpruN --no-dereference '--exclude=*.orig' a~/acinclude.m4 a/acinclude.m4 ---- a~/acinclude.m4 1970-01-01 00:00:00 -+++ a/acinclude.m4 1970-01-01 00:00:00 -@@ -84,7 +84,8 @@ AC_DEFUN([GNUPG_CHECK_ENDIAN], - not big endian - #endif]])], gnupg_cv_c_endian=big, gnupg_cv_c_endian=little)]) - if test "$gnupg_cv_c_endian" = unknown; then -- AC_RUN_IFELSE([AC_LANG_SOURCE([[main () { -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ int main (void) { +unfortunately we need to patch configure instead of acinclude.m4 +as running autoconf will lead to gnupg being flagged as dev release + +./gpg --version +gpg (GnuPG) 2.4.7-unknown +libgcrypt 1.11.0 +NOTE: THIS IS A DEVELOPMENT VERSION! +It is only intended for test purposes and should NOT be +used in a production environment or with production keys! + +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure +--- a~/configure 1970-01-01 00:00:00 ++++ a/configure 1970-01-01 00:00:00 +@@ -14096,7 +14096,8 @@ rm -f core conftest.err conftest.$ac_obj + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-main () { ++#include ++int main (void) { /* Are we little or big endian? From Harbison&Steele. */ union { diff --git a/build/gnupg/patches/no-html-doc.patch b/build/gnupg/patches/no-html-doc.patch index 73255483c..4497aa98d 100644 --- a/build/gnupg/patches/no-html-doc.patch +++ b/build/gnupg/patches/no-html-doc.patch @@ -1,25 +1,23 @@ -diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/Makefile.am a/doc/Makefile.am ---- a~/doc/Makefile.am 1970-01-01 00:00:00 -+++ a/doc/Makefile.am 1970-01-01 00:00:00 -@@ -95,7 +95,7 @@ myhtmlman_pages = \ +see comment in gcc14.patch + +diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/Makefile.in a/doc/Makefile.in +--- a~/doc/Makefile.in 1970-01-01 00:00:00 ++++ a/doc/Makefile.in 1970-01-01 00:00:00 +@@ -538,11 +538,11 @@ myhtmlman_pages = \ gpg-wks-server.1.html \ dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html -man_MANS = $(myman_pages) gnupg.7 gnupg.7.html +man_MANS = $(myman_pages) gnupg.7 - watchgnupg_SOURCE = gnupg.texi - -@@ -103,7 +103,7 @@ watchgnupg_SOURCE = gnupg.texi CLEANFILES = yat2m mkdefsinc defs.inc - DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ - $(myman_pages) gnupg.7 gnupg.7.html $(myhtmlman_pages) + $(myman_pages) gnupg.7 - yat2m: yat2m.c - $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c -@@ -152,7 +152,7 @@ yat2m-stamp: $(myman_sources) defs.inc + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am +@@ -1260,7 +1260,7 @@ yat2m-stamp: $(myman_sources) defs.inc yat2m-stamp: $(YAT2M)