pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: gnupg vs gnupg2 conflict



Hi,

I have no idea about pinegpg.
If it does not use gpgsplit command,
the attached patch will fix the conflict
and will work.

Could you test my attached patch?

$NetBSD$

* Install gpgsplit tool as gpg1split.

--- tools/Makefile.in.orig	2018-06-11 08:47:56.000000000 +0000
+++ tools/Makefile.in
@@ -98,7 +98,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DLOCALEDIR="\"$(localedir)\""
-bin_PROGRAMS = gpgsplit$(EXEEXT)
+bin_PROGRAMS = gpg1split$(EXEEXT)
 noinst_PROGRAMS = mpicalc$(EXEEXT) bftest$(EXEEXT) clean-sat$(EXEEXT) \
 	mk-tdata$(EXEEXT) shmtest$(EXEEXT) make-dns-cert$(EXEEXT) \
 	$(am__EXEEXT_1)
@@ -148,9 +148,9 @@ bftest_DEPENDENCIES = $(needed_libs) $(a
 clean_sat_SOURCES = clean-sat.c
 clean_sat_OBJECTS = clean-sat.$(OBJEXT)
 clean_sat_LDADD = $(LDADD)
-gpgsplit_SOURCES = gpgsplit.c
-gpgsplit_OBJECTS = gpgsplit.$(OBJEXT)
-gpgsplit_DEPENDENCIES = $(needed_libs) $(am__DEPENDENCIES_2)
+gpg1split_SOURCES = gpgsplit.c
+gpg1split_OBJECTS = gpgsplit.$(OBJEXT)
+gpg1split_DEPENDENCIES = $(needed_libs) $(am__DEPENDENCIES_2)
 make_dns_cert_SOURCES = make-dns-cert.c
 make_dns_cert_OBJECTS = make-dns-cert.$(OBJEXT)
 make_dns_cert_LDADD = $(LDADD)
@@ -435,7 +435,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a 
 other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 @HAVE_USTAR_TRUE@bin_SCRIPTS = gpg-zip
-gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@
+gpg1split_LDADD = $(needed_libs) $(other_libs) @ZLIBS@
 mpicalc_LDADD = $(needed_libs) $(other_libs) @W32LIBS@
 bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ @LIBREADLINE@
 shmtest_LDADD = $(needed_libs) $(other_libs) @LIBREADLINE@
@@ -545,9 +545,9 @@ clean-sat$(EXEEXT): $(clean_sat_OBJECTS)
 	@rm -f clean-sat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(clean_sat_OBJECTS) $(clean_sat_LDADD) $(LIBS)
 
-gpgsplit$(EXEEXT): $(gpgsplit_OBJECTS) $(gpgsplit_DEPENDENCIES) $(EXTRA_gpgsplit_DEPENDENCIES) 
-	@rm -f gpgsplit$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gpgsplit_OBJECTS) $(gpgsplit_LDADD) $(LIBS)
+gpg1split$(EXEEXT): $(gpg1split_OBJECTS) $(gpg1split_DEPENDENCIES) $(EXTRA_gpg1split_DEPENDENCIES) 
+	@rm -f gpg1split$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(gpg1split_OBJECTS) $(gpg1split_LDADD) $(LIBS)
 
 make-dns-cert$(EXEEXT): $(make_dns_cert_OBJECTS) $(make_dns_cert_DEPENDENCIES) $(EXTRA_make_dns_cert_DEPENDENCIES) 
 	@rm -f make-dns-cert$(EXEEXT)
@@ -851,7 +851,7 @@ uninstall-am: uninstall-binPROGRAMS unin
 	uninstall-binSCRIPTS
 
 
-gpgsplit mpicalc bftest shmtest: $(needed_libs)
+gpg1split mpicalc bftest shmtest: $(needed_libs)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Paul Goyette <paul%whooppee.com@localhost> writes:

> Is there some way to allow both versions of gnupg to coexist?
>
> gnupg is required by mail/pinepgp and gnupg2 is required by 
> security/gpgme which in turn is required by libreoffice.
>
> Thanks in advance!
>
> +--------------------+--------------------------+-----------------------+
> | Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
> | (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
> | Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
> +--------------------+--------------------------+-----------------------+

-- 
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3


Home | Main Index | Thread Index | Old Index