upgrade to most recent pEp releases

master
Claudio Luck 2 years ago
parent a8a3d5c24a
commit 9638d76622
  1. 11
      Makefile
  2. 56
      mail/libpep-adapter-webserver/Portfile
  3. 36
      mail/libpep-adapter/Portfile
  4. 36
      mail/libpep-engine-thunderbird/Portfile
  5. 3
      mail/libpep-etpan/Portfile
  6. 58
      mail/pep-adapter-enigmail/Portfile
  7. 82
      mail/pep-adapter-thunderbird/Portfile
  8. 25
      mail/pep-adapter-thunderbird/patches/0001-undo-static-linking.patch
  9. 16
      python/py-yml2/Portfile
  10. 12
      security/sequoia-pgp/Portfile

@ -12,14 +12,15 @@ all: ../$(SLUG).tar.gz
../$(SLUG).tar.gz:
-@rm -f ../$(SLUG).tar ../$(SLUG).tar.gz
# mkdir -p ..
-@rm -rf ../ports/PortIndex_*
for CAT in $(shell ls -1d */. | xargs -n1 dirname) ; do ln -fsh "../repo/$$CAT" "../ports/$$CAT" ; done
# See https://rsync.macports.org/macports/release/ports/PortIndex_*
for PLAT in \
darwin_11_i386 darwin_12_i386 darwin_13_i386 darwin_14_i386 darwin_15_i386 \
darwin_16_i386 darwin_17_i386 darwin_18_i386 darwin_19_i386 \
darwin_20_i386 darwin_20_arm ; do \
$(PORT_PREFIX)/bin/portindex -p "$${PLAT}" -o ../ports/PortIndex_"$${PLAT}" ; \
11_i386 12_i386 13_i386 14_i386 15_i386 16_i386 17_i386 18_i386 19_i386 \
20_i386 20_arm ; do \
$(PORT_PREFIX)/bin/portindex -p "darwin_$${PLAT}" -o ../ports/PortIndex_darwin_"$${PLAT}" ; \
done
rm -f ../ports/PortIndex ../ports/PortIndex.quick
git archive --format=tar --prefix=ports/ -o ../$(SLUG).tar HEAD \
mail python security
# tar -r -f ../$(SLUG).tar ../ports/PortIndex_darwin_{11,12,13,14,15,16,17,18}_i386

@ -0,0 +1,56 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
PortGroup python 1.0
name libpep-adapter-webserver
version 2.1.0-RC7
revision 2
categories mail
platforms darwin
license GPL-2+
maintainers x-pep cluck
description pEp Engine for pEp JSON Mini Adapter for Thunderbird
long_description pEp Engine for pEp JSON Mini Adapter for Thunderbird
homepage https://pep.software/
master_sites https://gitea.pep.foundation/fdik/webserver/archive/
distfiles Release_${version}.tar.gz
checksums rmd160 90dac7e1c40e6d5311d8bbe2a7513285849be255 \
sha256 292ba114a20e172e3e63d60c53a224fb68565a83dc3ea4728c130ca33e80ca41 \
size 19110
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
depends_build port:boost
depends_lib port:boost
use_configure no
build.type default
build.cmd make
build.target all
pre-build {
system "echo '# local.conf' >${worksrcpath}/local.conf"
system "echo PREFIX=${prefix}/pEp >>${worksrcpath}/local.conf"
}
pre-destroot {
system "mkdir -p '${destroot}${prefix}/pEp/lib'"
}
destroot.cmd make
destroot.target install
destroot.pre_args ${destroot.target}
destroot.args PREFIX=${destroot}${prefix}/pEp
destroot.post_args ""

@ -4,7 +4,10 @@
PortSystem 1.0
name libpep-adapter
version 1.0.102
version 2.1.3
revision 2
categories mail
platforms darwin
license GPL-2+
@ -15,42 +18,33 @@ homepage https://pep.software/
master_sites https://pep.foundation/dev/repos/libpEpAdapter/archive/
distfiles 0f0ef635bff9.tar.bz2
distfiles Release_${version}.tar.gz
checksums rmd160 c906a74e0aa2d70e99cc3ced534623673e55c0d7 \
sha256 44f941e12fd6ffe15404c86a25caf8883a3e48fa3827b21846d42fd33204bdb7
checksums rmd160 e9dbe58c985a4acb2ffa18add00ff4d8bba5de51 \
sha256 3e2ef05cb9a62bc9e4ddf094c81d7c6c082680e1094f68ba3b28ea045542a00d \
size 35234
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
depends_build port:libpep-engine-enigmail
# port:autoconf \
# port:libtool
# depends_lib port:libiconv
depends_build port:libpep-engine-thunderbird
use_configure no
#
# configure.cmd ${worksrcdir}/autogen.sh
# configure.pre_args --prefix=${prefix}/pep \
# --bindir=${prefix}/bin --sbindir=${prefix}/sbin
# configure.args --program-prefix=libpep- \
# --datarootdir=${prefix}/pep/share
build.type default
build.cmd make
build.target all
build.args PREFIX=${prefix} \
\"ENGINE_LIB=-L${prefix}/lib\" \"ENGINE_INC=-I${prefix}/include\"
build.args PREFIX=${prefix}/pEp \
\"ENGINE_LIB=-L${prefix}/pEp/lib\" \"ENGINE_INC=-I${prefix}/pEp/include\" \
\"LDFLAGS=-Wl,-rpath,${prefix}/pEp/lib -Wl,-rpath,${prefix}/lib\"
destroot.cmd make
destroot.target install
destroot.pre_args ${destroot.target}
destroot.args PREFIX=${destroot}${prefix} \
\"ENGINE_LIB=-L${prefix}/lib\" \"ENGINE_INC=-I${prefix}/include\"
destroot.args PREFIX=${destroot}${prefix}/pEp \
\"ENGINE_LIB=-L${prefix}/pEp/lib\" \"ENGINE_INC=-I${prefix}/pEp/include\"
destroot.post_args ""
# destroot.violate_mtree yes

@ -4,8 +4,12 @@
PortSystem 1.0
PortGroup python 1.0
name libpep-engine-enigmail
name libpep-engine-thunderbird
# version 2.1.6
version 2.1.10
revision 3
categories mail
platforms darwin
license GPL-2+
@ -18,18 +22,25 @@ master_sites https://pep.foundation/dev/repos/pEpEngine/archive/
distfiles Release_${version}.tar.gz
# 2.1.10:
checksums rmd160 684fe983e0a7ecea975c46884e9f401ab6d5d690 \
sha256 dbaf0230e027e0fadb9735f0e32e7c651d203d8748052917239eca4a6500ce37 \
size 8208939
# 2.1.6:
# checksums rmd160 e26dd3a0644a5b4207b001498e3a12a6e18982a3 \
# sha256 652669e6a0c0b67f3f658a07250ca3d7717f33995d027b6a5aea555329e5cc42 \
# size 8207588
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
set yml2_pyver 38
depends_build port:libiconv \
port:asn1c \
port:libpep-etpan \
port:py38-yml2 \
port:py${yml2_pyver}-yml2 \
port:sequoia-pgp
depends_lib port:libiconv \
@ -37,27 +48,32 @@ depends_lib port:libiconv \
use_configure no
set yml2proc_cmd ${prefix}/bin/yml2proc
# set yml2_path /opt/local/Library/Frameworks/Python.framework/Versions/${yml2_pyver}/lib/python${yml2_pyver}/site-packages/yml2
set python_ver_dot [join [split ${yml2_pyver} {}] "."]
set yml2proc_cmd ${prefix}/bin/yml2proc-${python_ver_dot}
build.type default
build.cmd make
build.target all
build.target-append db
# \"YML2_PATH=${yml2_path}\" \
# \"YML2_PROC=LC_ALL=en_US.UTF-8 '${yml2proc_cmd}'" \
pre-build {
system "echo '# local.conf' >${worksrcpath}/local.conf"
system "echo YML2_PROC=\"LC_ALL=en_US.UTF-8 '${yml2proc_cmd}'\" >>${worksrcpath}/local.conf"
system "echo OPENPGP=SEQUOIA >>${worksrcpath}/local.conf"
system "echo PREFIX=${prefix}/pEp >>${worksrcpath}/local.conf"
system "echo YML2_PROC=LC_ALL=en_US.UTF-8 '${yml2proc_cmd}' >>${worksrcpath}/local.conf"
system "echo PER_MACHINE_DIRECTORY=${prefix}/pEp/share/pEp >>${worksrcpath}/local.conf"
# TODO: pgp_cert_merge was renamed to pgp_cert_merge_public in src/pgp_sequoia.c
system "sed -i.bak 's/cert = pgp_cert_merge/cert = pgp_cert_merge_public/' '${worksrcpath}/src/pgp_sequoia.c'"
}
build.args PREFIX=${prefix}/pEp \"SYSTEM_DB=${prefix}/pEp/share/pEp/system.db\" \
build.args \"SYSTEM_DB=${prefix}/pEp/share/pEp/system.db\" \
ASN1C=${prefix}/bin/asn1c \
\"ETPAN_LIB=-L${prefix}/pEp/lib\" \"ETPAN_INC=-I${prefix}/pEp/include\"
pre-destroot {
system "/usr/bin/install_name_tool -id \
'${prefix}/lib/libpEpEngine.dylib' \
'${prefix}/pEp/lib/libpEpEngine.dylib' \
'${worksrcpath}/src/libpEpEngine.dylib'"
xinstall -d ${destroot}${prefix}/pEp/share/pEp
xinstall -m 0644 ${worksrcpath}/db/system.db ${destroot}${prefix}/pEp/share/pEp/system.db
@ -66,6 +82,6 @@ pre-destroot {
destroot.cmd make
destroot.target install
destroot.pre_args ${destroot.target}
destroot.args PREFIX=${destroot}${prefix}
destroot.args PREFIX=${destroot}${prefix}/pEp
destroot.post_args ""

@ -5,6 +5,8 @@ PortSystem 1.0
name libpep-etpan
version 1.6.2
revision 5
categories mail
platforms darwin
license GPL-2+
@ -37,3 +39,4 @@ configure.args --program-prefix=libpEp- \
--datarootdir=${prefix}/pEp/share
destroot.violate_mtree yes

@ -1,58 +0,0 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
PortGroup python 1.0
name pep-adapter-enigmail
version 1.0.102
categories mail
platforms darwin
license GPL-2+
maintainers x-pep cluck
description pEp Engine for pEp JSON Mini Adapter for Enigmail
long_description pEp Engine for pEp JSON Mini Adapter for Enigmail
homepage https://pep.software/
master_sites https://pep.foundation/dev/repos/pEpJSONServerAdapter/archive
distfiles e10d96f5dcc8.tar.bz2
checksums rmd160 32eb0a67136c34b85d1d287470fd85f562b2cbae \
sha256 59adbba732f1a6bee22a9ce9c744327cdec7f1db194ea08f7b4c8e9b4bd74c47
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
depends_build port:boost \
port:libevent \
port:libpep-engine-enigmail \
port:gtest
depends_lib port:libpep-engine-enigmail
use_configure no
build.type default
build.cmd make -C server
build.target all
build.args PREFIX=${prefix} \
\"HTML_DIRECTORY=${prefix}/share/pEp/html\" \
\"GTEST_DIR=${prefix}/src/googletest\" \
\"GTEST_INC=${prefix}/src/googletest/include\" \
\"ENGINE_LIB=-L${prefix}/lib\" \"ENGINE_INC=-I${prefix}/include\" \
\"EVENT_LIB=-L${prefix}/lib\" \"EVENT_INC=-I${prefix}/include\" \
\"LDFLAGS=-Wl,-rpath,${prefix}/lib\"
destroot.cmd make -C server
destroot.target install
destroot.pre_args ${destroot.target}
destroot.args PREFIX=${destroot}${prefix} \
\"HTML_DIRECTORY=${destroot}${prefix}/share/pEp/html\" \
\"GTEST_DIR=${prefix}/src/googletest\" \
\"GTEST_INC=${prefix}/src/googletest/include\" \
\"ENGINE_LIB=-L${prefix}/lib\" \"ENGINE_INC=-I${prefix}/include\" \
\"EVENT_LIB=-L${prefix}/lib\" \"EVENT_INC=-I${prefix}/include\"
destroot.post_args ""

@ -0,0 +1,82 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
PortGroup python 1.0
name pep-adapter-thunderbird
version 2.1.0-RC15
revision 2
categories mail
platforms darwin
license GPL-2+
maintainers x-pep cluck
description pEp Engine for pEp JSON Mini Adapter for Thunderbird
long_description pEp Engine for pEp JSON Mini Adapter for Thunderbird
homepage https://pep.software/
master_sites https://pep.foundation/dev/repos/pEpJSONServerAdapter/archive
patch_sites https://gitea.pep.foundation/claudio/pEp-dist-patches/raw/branch/master/json/
distfiles Release_${version}.tar.gz
checksums 0000-no-static-build.patch \
rmd160 e3ff06a6628f2961bb4d77a23cdfede2c6094e98 \
sha256 708b1845b41ebc54d07c98c41c417c03fb99442e74e8db997f7467dd92237c22 \
size 1261 \
Release_2.1.0-RC15.tar.gz \
rmd160 30ee63a34cb6d74fc2f9a86f5789a80c283f16cd \
sha256 aa04dbd9e5c14ebb740987ce3a13c68707ee6c84948b7ae5aefef56b7a2385d9 \
size 172696
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
depends_build port:boost \
port:libpep-engine-thunderbird \
port:libpep-adapter-webserver \
port:libpep-adapter \
port:gtest
depends_lib port:libpep-engine-thunderbird \
port:libpep-adapter
use_configure no
patch.pre_args -p1
patchfiles 0000-no-static-build.patch
build.type default
build.cmd make -C server
build.target libjson-adapter.a pEp-mini-json-adapter
build.args PREFIX=${prefix} \
\"HTML_DIRECTORY=${prefix}/share/pEp/html\" \
\"GTEST_DIR=${prefix}/src/googletest\" \
\"GTEST_INC=${prefix}/src/googletest/include\" \
\"ENGINE_LIB=-L${prefix}/pEp/lib\" \"ENGINE_INC=-I${prefix}/pEp/include\" \
\"EVENT_LIB=-L${prefix}/lib\" \"EVENT_INC=-I${prefix}/include\" \
\"PEP_WEBSERVER=${prefix}/pEp/lib\" \
\"PEP_INCLUDE=${prefix}/pEp/include\" \
\"BOOST_INCLUDE_PATH=${prefix}/lib\" \
\"LDFLAGS=-L ${prefix}/pEp/lib -Wl,-rpath,${prefix}/pEp/lib -L ${prefix}/lib -Wl,-rpath,${prefix}/lib\"
destroot.cmd make -C server
destroot.target install
destroot.pre_args ${destroot.target}
destroot.args PREFIX=${destroot}${prefix} \
\"HTML_DIRECTORY=${destroot}${prefix}/share/pEp/html\" \
\"GTEST_DIR=${prefix}/src/googletest\" \
\"GTEST_INC=${prefix}/src/googletest/include\" \
\"ENGINE_LIB=-L${prefix}/pEp/lib\" \"ENGINE_INC=-I${prefix}/pEp/include\" \
\"EVENT_LIB=-L${prefix}/lib\" \"EVENT_INC=-I${prefix}/include\"
post-destroot {
system "mkdir -p '${destroot}${prefix}/pEp/bin'"
system "install '${worksrcpath}/server/pEp-mini-json-adapter' '${destroot}${prefix}/pEp/bin/pEp-mini-json-adapter'"
}
destroot.post_args ""

@ -0,0 +1,25 @@
--- Makefile.static 2021-01-12 15:55:17.000000000 +0100
+++ Makefile 2021-01-12 15:55:56.000000000 +0100
@@ -84,22 +84,6 @@
$(CXX) $(LDFLAGS) -liconv \
-lobjc -framework Foundation -framework Security \
$(PEP_WEBSERVER)/libpEpwebserver.a \
- $(BOOST_LIBRARY_PATH)/libboost_filesystem$(BOOST_MT).a \
- $(BOOST_LIBRARY_PATH)/libboost_program_options$(BOOST_MT).a \
- $(BOOST_LIBRARY_PATH)/libboost_system$(BOOST_MT).a \
- $(BOOST_LIBRARY_PATH)/libboost_thread$(BOOST_MT).a \
- $(BOOST_LIBRARY_PATH)/libboost_regex$(BOOST_MT).a \
- $(ICONV_LIBRARY_PATH)/libiconv.a \
- $(LIBZ_LIBRARY_PATH)/libz.a \
- $(SQLITE3_LIBRARY_PATH)/libsqlite3.a \
- $(GMP_LIBRARY_PATH)/libgmp.a \
- $(NETTLE)/libnettle.a $(NETTLE)/libhogweed.a \
- $(SEQUOIA_PGP)/libsequoia_ffi.a \
- $(SEQUOIA_PGP)/libsequoia_openpgp_ffi.a \
- $(LIBETPAN_FDIK)/libetpan.a \
- $(PEP_ENGINE)/libpEpEngine.a \
- $(ASN1_PATH)/libasn1.a \
- $(PEP_ADAPTER_LIBRARY)/libpEpAdapter.a \
$(MA_OBJECTS) $(SPIRIT_OBJECTS) $(LIB_TARGET) -o "$@"
%.o: %.cc

@ -4,8 +4,12 @@
PortSystem 1.0
PortGroup python 1.0
name py38-yml2
name py-yml2
version 2.6.3
revision 3
distname ${python.rootname}-${version}
categories python
categories-append devel
platforms darwin
@ -23,15 +27,15 @@ checksums rmd160 69de1acbfaef08c99c291d8bb0b36960d4e9855d \
sha256 4c61dccdda966fe63082712a35e615299bc2a5bc7be56070da6ff92db7895255 \
size 55750
# python.versions 35 36 37 38 39
python.versions 35 36 37 38
extract.suffix .tar.gz
extract.post_args | tar --strip-components 1 -xf -
worksrcdir .
# if {$subport ne $name} {
# depends_build port:py${python.version}-lxml \
# }
depends_build port:py${python.version}-lxml
#depends_build port:py${python.version}-lxml
if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
}

@ -4,6 +4,8 @@ PortSystem 1.0
name sequoia-pgp
version 1.0.0
revision 0
categories security
maintainers {jann @roederja} openmaintainer
license GPL-3+
@ -35,6 +37,16 @@ depends_lib port:capnproto \
port:sqlite3 \
path:lib/libssl.dylib:openssl
pre-destroot {
system "/usr/bin/install_name_tool -id \
'${prefix}/lib/libsequoia_openpgp_ffi.dylib' \
'${worksrcpath}/sequoia-v${version}/target/release/deps/libsequoia_openpgp_ffi.dylib'"
system "/usr/bin/install_name_tool -id \
'${prefix}/lib/libsequoia_ffi.dylib' \
'${worksrcpath}/sequoia-v${version}/target/release/deps/libsequoia_ffi.dylib'"
}
livecheck.type regex
livecheck.url https://gitlab.com/sequoia-pgp/sequoia/-/tags
livecheck.regex v(\\d+\\.\\d+\\.\\d+)

Loading…
Cancel
Save