diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index d0132de24200..e649421c1482 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -1,39 +1,42 @@ PORTNAME= metamail PORTVERSION= 2.7 PORTREVISION= 16 CATEGORIES= mail MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \ ftp://ftp.research.telcordia.com/pub/nsb/ DISTNAME= mm${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions LICENSE= MIT USES= ncurses tar:Z MAKE_ARGS= LDLIBS="${LDFLAGS}" WRKSRC= ${WRKDIR}/${DISTNAME}/src OPTIONS_DEFINE= X11 OPTIONS_SUB= yes X11_DESC= X11 hebrew font support X11_BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \ mkfontscale>=0:x11-fonts/mkfontscale X11_RUN_DEPENDS= xloadimage:x11/xloadimage \ mkfontscale>=0:x11-fonts/mkfontscale X11_USES= xorg X11_USE= XORG=x11 X11_EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile-x11 X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile-nox11 post-patch-X11-off: @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile +post-patch: + @${REINPLACE_CMD} -e '/^MAN.DIR/s,/man,/share/man,' ${WRKSRC}/Makefile + post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/mailcap \ ${STAGEDIR}${PREFIX}/etc/mailcap.sample .include diff --git a/mail/metamail/pkg-plist b/mail/metamail/pkg-plist index abeebead1c9e..163ba8737fb2 100644 --- a/mail/metamail/pkg-plist +++ b/mail/metamail/pkg-plist @@ -1,52 +1,52 @@ bin/audiocompose bin/audiosend bin/extcompose bin/getfilename bin/mailserver bin/mailto %%X11%%bin/mailto-hebrew bin/metamail bin/metasend bin/mimencode bin/mmencode bin/patch-metamail bin/rcvAppleSingle bin/richtext bin/richtoatk bin/showaudio bin/showexternal %%X11%%bin/shownonascii bin/showpartial bin/showpicture bin/sndAppleSingle bin/splitmail bin/sun-audio-file bin/sun-message.csh bin/sun-to-mime bin/sun2mime %%X11%%lib/metamail/fonts/heb6x13.pcf %%X11%%lib/metamail/fonts/heb8x13.pcf %%X11%%lib/metamail/fonts/heb8x13B.pcf %%X11%%lib/metamail/fonts/fonts.dir %%X11%%lib/metamail/fonts/fonts.alias @sample etc/mailcap.sample -man/man1/audiocompose.1.gz -man/man1/audiosend.1.gz -man/man1/extcompose.1.gz -man/man1/getfilename.1.gz -man/man1/mailto-hebrew.1.gz -man/man1/mailto.1.gz -man/man1/metamail.1.gz -man/man1/metasend.1.gz -man/man1/mime.1.gz -man/man1/mimencode.1.gz -man/man1/mmencode.1.gz -man/man1/patch-metamail.1.gz -man/man1/richtext.1.gz -man/man1/showaudio.1.gz -man/man1/showexternal.1.gz -man/man1/shownonascii.1.gz -man/man1/showpartial.1.gz -man/man1/showpicture.1.gz -man/man1/splitmail.1.gz -man/man4/mailcap.4.gz +share/man/man1/audiocompose.1.gz +share/man/man1/audiosend.1.gz +share/man/man1/extcompose.1.gz +share/man/man1/getfilename.1.gz +share/man/man1/mailto-hebrew.1.gz +share/man/man1/mailto.1.gz +share/man/man1/metamail.1.gz +share/man/man1/metasend.1.gz +share/man/man1/mime.1.gz +share/man/man1/mimencode.1.gz +share/man/man1/mmencode.1.gz +share/man/man1/patch-metamail.1.gz +share/man/man1/richtext.1.gz +share/man/man1/showaudio.1.gz +share/man/man1/showexternal.1.gz +share/man/man1/shownonascii.1.gz +share/man/man1/showpartial.1.gz +share/man/man1/showpicture.1.gz +share/man/man1/splitmail.1.gz +share/man/man4/mailcap.4.gz diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 314bd92b18d3..cc9196e8decc 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -1,99 +1,101 @@ PORTNAME= milter-greylist PORTVERSION= 4.6.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \ http://fossies.org/unix/privat/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= Easy-to-use greylist milter for sendmail and postfix WWW= http://hcpnet.free.fr/milter-greylist/ LICENSE= BSD3CLAUSE USES= tar:tgz MAKE_JOBS_UNSAFE= yes ## # Use the following quirks to choose which sendmail to use (ports or system): # # WITH_MILTER_BASE=yes # or # WITH_MILTER_PORT=yes # # If unspecified, check for an up-to-date system version but give an # installed port preference over it. ## OPTIONS_DEFINE= DKIM SPF CURL LDAP P0F \ DRAC SPAMASSASSIN \ POSTFIX DOCS EXAMPLES GEOIP OPTIONS_DEFAULT= DKIM SPF CURL GEOIP DKIM_DESC= DKIM support SPF_DESC= SPF support CURL_DESC= curl support P0F_DESC= P0F support DRAC_DESC= DRAC support SPAMASSASSIN_DESC= SpamAssassin support POSTFIX_DESC= Use Postfix instead of Sendmail DKIM_LIB_DEPENDS= libopendkim.so:mail/opendkim DKIM_USES= ssl P0F_RUN_DEPENDS= p0f:net-mgmt/p0f SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb CURL_LIB_DEPENDS= libcurl.so:ftp/curl POSTFIX_CONFIGURE_ENABLE= postfix P0F_CONFIGURE_ENABLE= p0f306 DRAC_CONFIGURE_ENABLE= drac SPAMASSASSIN_CONFIGURE_ENABLE= spamassassin SPAMASSASSIN_RUN_DEPENDS= spamc:mail/spamassassin DKIM_CONFIGURE_ON= --with-libopendkim=${LOCALBASE} SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE} GEOIP_CONFIGURE_ON= --with-libmaxminddb=${LOCALBASE} CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USES= ldap .include LIBS+= -lpthread GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --with-user=mailnull \ --with-libmilter=${MILTERBASE} \ --enable-dnsrbl \ --with-thread-safe-resolver \ --with-dumpfile=/var/milter-greylist/greylist.db ALL_TARGET= milter-greylist SUB_FILES+= pkg-message USE_RC_SUBR= milter-greylist PORTDOCS= README PORTEXAMPLES= greylist.conf do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail ${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 \ - ${STAGEDIR}${PREFIX}/man/man5/ + ${STAGEDIR}${PREFIX}/share/man/man5/ ${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 \ - ${STAGEDIR}${PREFIX}/man/man8/ + ${STAGEDIR}${PREFIX}/share/man/man8/ ${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist \ ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_DATA} ${WRKSRC}/greylist.conf \ ${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample @${MKDIR} ${STAGEDIR}/var/milter-greylist do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/greylist.conf ${STAGEDIR}${EXAMPLESDIR}/ do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" .include diff --git a/mail/milter-greylist/pkg-plist b/mail/milter-greylist/pkg-plist index cad49829bfb5..8191ebbcc60f 100644 --- a/mail/milter-greylist/pkg-plist +++ b/mail/milter-greylist/pkg-plist @@ -1,5 +1,5 @@ libexec/milter-greylist -man/man5/greylist.conf.5.gz -man/man8/milter-greylist.8.gz +share/man/man5/greylist.conf.5.gz +share/man/man8/milter-greylist.8.gz @sample etc/mail/greylist.conf.sample @dir(mailnull,mailnull,) /var/milter-greylist diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 13d7a1c50cd8..84e5196e2d53 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,44 +1,44 @@ PORTNAME= procmail PORTVERSION= 3.22 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \ ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/ \ ftp://ftp.kfki.hu/pub/packages/mail/procmail/ \ http://www.ring.gr.jp/archives/net/mail/procmail/ \ ftp://ftp.ring.gr.jp/pub/net/mail/procmail/ \ ftp://ftp.mirrorservice.org/sites/ftp.procmail.org/pub/procmail/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Local mail delivery agent WWW= https://www.procmail.org/ LICENSE= GPLv2 .if defined(QEMU_EMULATING) && "${QEMU_EMULATING}" == "1" BROKEN= fails to build under qemu: killing runaway build after 21600 seconds with no output .endif OPTIONS_DEFINE= DOCS EXAMPLES INSTALL_TARGET= install.bin install.man USES= cpe EXTRA_PATCHES= ${FILESDIR}/procmail-3.22-getline.patch:-p1 PORTDOCS= FAQ FEATURES HISTORY KNOWN_BUGS README PORTEXAMPLES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \ advanced dirname forward local_procmail_lmtp.m4 mailstat post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf # Allow parallel builds (-jX) to work - @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' + @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E -e 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' -e '/^MANDIR/s|/man|/share/man|' post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/ .include diff --git a/mail/procmail/pkg-plist b/mail/procmail/pkg-plist index ea5728893183..7c8a5f9c3e2c 100644 --- a/mail/procmail/pkg-plist +++ b/mail/procmail/pkg-plist @@ -1,10 +1,10 @@ bin/formail @(,mail,2755) bin/lockfile bin/mailstat @(,mail,6755) bin/procmail -man/man1/formail.1.gz -man/man1/lockfile.1.gz -man/man1/procmail.1.gz -man/man5/procmailex.5.gz -man/man5/procmailrc.5.gz -man/man5/procmailsc.5.gz +share/man/man1/formail.1.gz +share/man/man1/lockfile.1.gz +share/man/man1/procmail.1.gz +share/man/man5/procmailex.5.gz +share/man/man5/procmailrc.5.gz +share/man/man5/procmailsc.5.gz diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index f24a74f87fcd..408ba8a61a1e 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -1,56 +1,57 @@ PORTNAME= flowd PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://mindrot.org/files/flowd/ MAINTAINER= bofh@FreeBSD.org COMMENT= Small, fast, and secure NetFlow collector WWW= https://www.mindrot.org/projects/flowd/ LICENSE= MIT BSD2CLAUSE BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake shebangfix SHEBANG_FILES= tools/*.pl GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --localstatedir=/var USE_RC_SUBR= flowd PORTDOCS= README INSTALL FLOWD_USER= _flowd USERS= ${FLOWD_USER} GROUPS= ${FLOWD_USER} OPTIONS_DEFINE= PERL DOCS EXAMPLES OPTIONS_DEFAULT=PERL OPTIONS_SUB= yes PERL_DESC= Install flowd perl module PERL_USES= perl5 post-patch: @${REINPLACE_CMD} -e "s;%%FLOWD_USER%%;${FLOWD_USER};g" \ ${WRKSRC}/flowd.h post-build-PERL-on: (cd ${WRKSRC}/Flowd-perl && ${PERL} Makefile.PL \ INSTALLSITEMAN3DIR=${PERL5_MAN3} \ DESTDIR=${STAGEDIR} PREFIX=${PREFIX} && \ ${MAKE_CMD}) pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} pre-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ( cd ${WRKSRC}/tools && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ) pre-install-PERL-on: ( cd ${WRKSRC}/Flowd-perl && ${MAKE_CMD} install ) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so .include diff --git a/net-mgmt/flowd/pkg-plist b/net-mgmt/flowd/pkg-plist index 8a5765dede69..cd3b2009b4c4 100644 --- a/net-mgmt/flowd/pkg-plist +++ b/net-mgmt/flowd/pkg-plist @@ -1,28 +1,28 @@ bin/flowd-reader etc/flowd.conf.sample include/flowd/addr.h include/flowd/crc32.h include/flowd/flowd-common.h include/flowd/flowd-config.h include/flowd/flowd-pytypes.h include/flowd/store-v2.h include/flowd/store.h lib/libflowd.a %%PERL%%%%PERL5_MAN3%%/Flowd.3.gz %%PERL%%%%SITE_ARCH%%/Flowd.pm %%PERL%%%%SITE_ARCH%%/auto/Flowd/Flowd.so -man/man5/flowd.conf.5.gz -man/man8/flowd-reader.8.gz -man/man8/flowd.8.gz +share/man/man5/flowd.conf.5.gz +share/man/man8/flowd-reader.8.gz +share/man/man8/flowd.8.gz sbin/flowd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.tools %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowinsert.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowrrd/bytes.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowrrd/flow_rrd.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowrrd/flows.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowrrd/packets.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flowrrd/plot.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/flows.sql %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockclient.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wormsuspects.pl diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index ac8f7cbb130d..3badb46a3ec5 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -1,154 +1,155 @@ PORTNAME= openvpn DISTVERSION= g20231109 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security net net-vpn PKGNAMESUFFIX= -devel MAINTAINER= gert@greenie.muc.de # let's use ?= in spite of portlint WARNings because this might become # security/openvpn one day which would then have a slave port: COMMENT?= Secure IP/Ethernet tunnel daemon WWW= https://openvpn.net/community/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \ rst2man:textproc/py-docutils LIB_DEPENDS+= liblzo2.so:archivers/lzo2 USES= autoreconf cpe libtool pkgconfig python:build shebangfix tar:xz IGNORE_SSL= libressl libressl-devel USE_GITLAB= yes GL_TAGNAME= efad93d049c318a3bd9ea5956c6ac8237b8d6d70 USE_RC_SUBR= openvpn SHEBANG_FILES= sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/totpauth.py \ sample/sample-scripts/ucn.pl \ sample/sample-scripts/verify-cn GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" # let OpenVPN's configure script pick up the requisite libraries, # but do not break the plugin build if an older version is installed .ifdef (LOG_OPENVPN) CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -DCONFIGURE_GIT_REVISION='\"${GL_TAGNAME}\"' -DCONFIGURE_GIT_FLAGS= LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta \ openvpn-devel openvpn-mbedtls SUB_FILES= openvpn-client pkg-message PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EASYRSA EXAMPLES LZ4 PKCS11 SMALL DCO TEST \ X509ALTUSERNAME OPTIONS_DEFAULT= EASYRSA LZ4 OPENSSL TEST DCO OPTIONS_EXCLUDE_FreeBSD_13= DCO # FreeBSD 14 only OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL # option descriptions and interdependencies EASYRSA_DESC= Install security/easy-rsa RSA helper package MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) PKCS11_DESC= Use security/pkcs11-helper PKCS11_PREVENTS= MBEDTLS PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. \ Disable PKCS11, or use OpenSSL instead SMALL_DESC= Build a smaller executable with fewer features DCO_DESC= Build with Data Channel Offload (ovpn(4)) support X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) X509ALTUSERNAME_PREVENTS= MBEDTLS X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use \ --x509-username-field with mbedTLS. Disable \ X509ALTUSERNAME, or use OpenSSL instead # option implementations EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 LZ4_CONFIGURE_OFF= --disable-lz4 MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 SMALL_CONFIGURE_ON= --enable-small DCO_CONFIGURE_OFF= --disable-dco TEST_ALL_TARGET= check TEST_TEST_TARGET_OFF= check X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" .else @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6" @${ECHO} "" .endif post-configure: ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ ${WRKSRC}/src/plugins/auth-pam/Makefile \ ${WRKSRC}/src/plugins/down-root/Makefile .include .if ${PORT_OPTIONS:MMBEDTLS} _tlslibs= libmbedtls libmbedx509 libmbedcrypto .else # OpenSSL _tlslibs= libssl libcrypto .endif # sanity check that we don't inherit incompatible SSL libs through, # for instance, pkcs11-helper: post-build: @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.up ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.down ${STAGEDIR}${PREFIX}/libexec/openvpn-client.down ${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client ${MKDIR} ${STAGEDIR}${PREFIX}/include post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ .for i in AUTHORS ChangeLog PORTS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor post-install-EXAMPLES-on: (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* ${RM} ${STAGEDIR}${EXAMPLESDIR}/sample-config-files/*.orig .include diff --git a/security/openvpn-devel/pkg-plist b/security/openvpn-devel/pkg-plist index d989a73fcc38..0f61a65b38a2 100644 --- a/security/openvpn-devel/pkg-plist +++ b/security/openvpn-devel/pkg-plist @@ -1,10 +1,10 @@ include/openvpn-msg.h include/openvpn-plugin.h lib/openvpn/plugins/openvpn-plugin-auth-pam.so lib/openvpn/plugins/openvpn-plugin-down-root.so -man/man5/openvpn-examples.5.gz -man/man8/openvpn.8.gz +share/man/man5/openvpn-examples.5.gz +share/man/man8/openvpn.8.gz sbin/openvpn libexec/openvpn-client.down libexec/openvpn-client.up sbin/openvpn-client diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index e05870b5b11c..3179ddf1be34 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -1,170 +1,171 @@ PORTNAME= openvpn DISTVERSION= 2.6.8 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ LOCAL/mandree MAINTAINER= mandree@FreeBSD.org COMMENT?= Secure IP/Ethernet tunnel daemon WWW= https://openvpn.net/community/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \ rst2man:textproc/py-docutils@${PY_FLAVOR} USES= cpe libtool localbase:ldflags pkgconfig python:build shebangfix ssl USE_RC_SUBR= openvpn SHEBANG_FILES= sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/totpauth.py \ sample/sample-scripts/ucn.pl \ sample/sample-scripts/verify-cn GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --enable-strict --with-crypto-library=openssl # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" CONFLICTS_INSTALL?= openvpn-2* openvpn-devel openvpn-mbedtls SUB_FILES= pkg-message openvpn-client USERS= openvpn GROUPS= openvpn PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= ASYNC_PUSH DCO DOCS EASYRSA EXAMPLES LZ4 LZO PKCS11 SMALL \ TEST UNITTESTS X509ALTUSERNAME OPTIONS_DEFAULT= DCO EASYRSA LZ4 LZO PKCS11 TEST OPTIONS_EXCLUDE_FreeBSD_13= DCO # FreeBSD 14 only ASYNC_PUSH_DESC= Enable async-push support DCO_DESC= Data Channel Offload/ovpn(4) support->README.dco.md EASYRSA_DESC= Install security/easy-rsa RSA helper package LZO_DESC= LZO compression (incompatible with LibreSSL) PKCS11_DESC= Use security/pkcs11-helper, needs same SSL lib! SMALL_DESC= Build a smaller executable with fewer features UNITTESTS_DESC= Enable unit tests X509ALTUSERNAME_DESC= Enable --x509-username-field ASYNC_PUSH_LIB_DEPENDS= libinotify.so:devel/libinotify ASYNC_PUSH_CONFIGURE_ENABLE= async-push DCO_CONFIGURE_ENABLE= dco EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 LZ4_CONFIGURE_ENABLE= lz4 LZO_LIB_DEPENDS+= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_ENABLE= lzo PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 SMALL_CONFIGURE_ENABLE= small TEST_ALL_TARGET= check TEST_TEST_TARGET_OFF= check UNITTESTS_BUILD_DEPENDS= cmocka>=0:sysutils/cmocka UNITTESTS_CONFIGURE_ENABLE= unit-tests X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username .ifdef (LOG_OPENVPN) CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif .include .if ${PORT_OPTIONS:MLZO} IGNORE_SSL=libressl libressl-devel IGNORE_SSL_REASON=OpenVPN does not have permission to include LZO with LibreSSL. Compile against OpenSSL, or if your setups support it, disable LZO support .endif .if ! ${PORT_OPTIONS:MLZ4} && ! ${PORT_OPTIONS:MLZO} CONFIGURE_ARGS+= --enable-comp-stub .endif .include .if !empty(PORT_OPTIONS:MLZO) && !empty(SSL_DEFAULT:Nbase:Nopenssl*) # in-depth security net if Mk/Uses/ssl.mk changes pre-everything:: @${ECHO_CMD} >&2 "ERROR: OpenVPN is not licensed to combine LZO with other OpenSSL-licensed libraries than OpenSSL. Compile against OpenSSL, or if your setups support it, disable LZO support." @${SHELL} -c 'exit 1' .endif post-patch: ${REINPLACE_CMD} -E -i '' -e 's/(user|group) nobody/\1 openvpn/' \ -e 's/"nobody"( after init)/"openvpn" \1/' \ ${WRKSRC}/sample/sample-config-files/*.conf \ ${WRKSRC}/doc/man-sections/generic-options.rst pre-configure: # just too many of sign-compare; bitwise-instead-of-logical was audited and is intentional, # and unused-function affects test---these are developer-side warnings, not relevant on end systems ${REINPLACE_CMD} 's/-Wsign-compare/-Wno-unknown-warning-option -Wno-sign-compare -Wno-bitwise-instead-of-logical -Wno-unused-function/' ${WRKSRC}/configure .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" .else @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6" @${ECHO} "" .endif .if !empty(SSL_DEFAULT:Mlibressl*) @${ECHO} "### --------------------------------------------------------- ###" @${ECHO} "### NOTE that libressl is not primarily supported by OpenVPN ###" @${ECHO} "### Do not report bugs without fixes/patches unless the issue ###" @${ECHO} "### can be reproduced with a released OpenSSL version. ###" @${ECHO} "### --------------------------------------------------------- ###" @sleep 10 .endif post-configure: ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ ${WRKSRC}/src/plugins/auth-pam/Makefile \ ${WRKSRC}/src/plugins/down-root/Makefile # sanity check that we don't inherit incompatible SSL libs through, # for instance, pkcs11-helper: _tlslibs=libssl libcrypto post-build: @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ if test "$$*" != "1" ; then ( set -x ; ldd -a ${WRKSRC}/src/openvpn/openvpn ) ; ${PRINTF} '%s\n' "$$a" ; ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.up ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.down ${STAGEDIR}${PREFIX}/libexec/openvpn-client.down ${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client ${MKDIR} ${STAGEDIR}${PREFIX}/include post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ .for i in AUTHORS ChangeLog Changes.rst CONTRIBUTING.rst PORTS README README.ec ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .if !empty(PORT_OPTIONS:MDCO) ${INSTALL_MAN} ${WRKSRC}/README.dco.md ${STAGEDIR}${DOCSDIR}/ .endif post-install-EXAMPLES-on: (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* ${RM} ${STAGEDIR}${EXAMPLESDIR}/sample-config-files/*.orig .include diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist index d247b39c1eed..a91ef85f2ee3 100644 --- a/security/openvpn/pkg-plist +++ b/security/openvpn/pkg-plist @@ -1,10 +1,10 @@ include/openvpn-msg.h include/openvpn-plugin.h lib/openvpn/plugins/openvpn-plugin-auth-pam.so lib/openvpn/plugins/openvpn-plugin-down-root.so libexec/openvpn-client.down libexec/openvpn-client.up -man/man5/openvpn-examples.5.gz -man/man8/openvpn.8.gz +share/man/man5/openvpn-examples.5.gz +share/man/man8/openvpn.8.gz sbin/openvpn sbin/openvpn-client