diff --git a/www/apt-cacher-ng/Makefile b/www/apt-cacher-ng/Makefile index fbfe6c8f8dce..d1f3ba749d8a 100644 --- a/www/apt-cacher-ng/Makefile +++ b/www/apt-cacher-ng/Makefile @@ -1,56 +1,61 @@ PORTNAME= apt-cacher-ng -PORTVERSION= 3.2 -PORTREVISION= 2 +PORTVERSION= 3.2.1 CATEGORIES= www MASTER_SITES= DEBIAN_POOL/apt-cacher-ng DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX} MAINTAINER= keve@keve.hu COMMENT= Specialized http/s proxy for caching software distribution sites WWW= https://www.unix-ag.uni-kl.de/~bloch/acng/ LICENSE= EduardBloch LICENSE_NAME= Eduard Bloch license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= compiler:c++11-lang cmake cpe tar:xz CPE_VENDOR= ${PORTNAME}_project USE_RC_SUBR= apt_cacher_ng CMAKE_ARGS= -DLIBDIR:PATH=${DATADIR} \ -DMANDIR:PATH=${PREFIX}/man SUB_FILES= backends_debian backends_freebsd backends_ubuntu \ freebsd_mirrors pkg-message OPTIONS_DEFINE= DOCS SSL FUSE OPTIONS_DEFAULT= SSL OPTIONS_SUB= yes SSL_DESC= SSL support to allow proxying https sites SSL_CMAKE_BOOL= USE_SSL SSL_USES= ssl SSL_CMAKE_ON= -Dopenssl_FOUND=1 \ -Dopenssl_CFLAGS="-I ${OPENSSLINC}" \ -Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto" FUSE_DESC= FUSE support for interfacing with the proxy via acngfs FUSE_CMAKE_BOOL= USE_FUSE FUSE_USES= fuse pkgconfig +.include + +#.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} +#CXXFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L +#.endif + post-install: ${MV} ${STAGEDIR}${ETCDIR}/acng.conf ${STAGEDIR}${ETCDIR}/acng.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/security.conf ${STAGEDIR}${ETCDIR}/security.conf.sample ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} .for f in backends_debian backends_freebsd backends_ubuntu ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor ${INSTALL_DATA} ${WRKDIR}/freebsd_mirrors ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}/var/cache/apt-cacher-ng \ ${STAGEDIR}/var/log/apt-cacher-ng -.include +.include diff --git a/www/apt-cacher-ng/distinfo b/www/apt-cacher-ng/distinfo index 33f6809385e1..a82c5046ddc0 100644 --- a/www/apt-cacher-ng/distinfo +++ b/www/apt-cacher-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543055307 -SHA256 (apt-cacher-ng_3.2.orig.tar.xz) = 405de837becb9ce89e0fb068565bdf4a49d8742be067f8d91da36742702f5acd -SIZE (apt-cacher-ng_3.2.orig.tar.xz) = 319036 +TIMESTAMP = 1691009781 +SHA256 (apt-cacher-ng_3.2.1.orig.tar.xz) = 9da88292d36e3f95918a96b5057b49f7e3057a4799ec64a890817e3cddb368b6 +SIZE (apt-cacher-ng_3.2.1.orig.tar.xz) = 320392 diff --git a/www/apt-cacher-ng/files/patch-CMakeLists.txt b/www/apt-cacher-ng/files/patch-CMakeLists.txt index f7dd49d82da2..5ce9db663bb3 100644 --- a/www/apt-cacher-ng/files/patch-CMakeLists.txt +++ b/www/apt-cacher-ng/files/patch-CMakeLists.txt @@ -1,100 +1,100 @@ ---- CMakeLists.txt.orig 2018-09-07 13:02:18 UTC +--- CMakeLists.txt.orig 2020-02-03 18:54:57 UTC +++ CMakeLists.txt @@ -26,20 +26,20 @@ INCLUDE(CheckSymbolExists) INCLUDE(FindPkgConfig) set(PACKAGE "apt-cacher-ng") -IF(NOT DEFINED(CMAKE_INSTALL_PREFIX)) +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space") ENDIF() -IF(NOT DEFINED(DATADIR)) +IF(NOT DEFINED DATADIR) set(DATADIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Shared data files directory") ENDIF() -IF(NOT DEFINED(LIBDIR)) +IF(NOT DEFINED LIBDIR) set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}" CACHE STRING "Location of ${PACKAGE} extra files") ENDIF() -IF(NOT DEFINED(DOCDIR)) +IF(NOT DEFINED DOCDIR) set(DOCDIR "${DATADIR}/doc/${PACKAGE}" CACHE STRING "Location of documentation files") ENDIF() -IF(NOT DEFINED(SYSCONFDIR)) +IF(NOT DEFINED SYSCONFDIR) if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") set(SYSCONFDIR /etc) else() @@ -47,15 +47,15 @@ IF(NOT DEFINED(SYSCONFDIR)) endif() ENDIF() -if(NOT DEFINED(CFGDIR)) +if(NOT DEFINED CFGDIR) set(CFGDIR "${SYSCONFDIR}/${PACKAGE}") endif() -if(NOT DEFINED(SBINDIR)) +if(NOT DEFINED SBINDIR) set(SBINDIR "${CMAKE_INSTALL_PREFIX}/sbin") endif() -if(NOT DEFINED(RUNDIR)) +if(NOT DEFINED RUNDIR) set(RUNDIR "/run") endif() - -@@ -71,7 +71,7 @@ endmacro() + set(SOCKET_PATH "${RUNDIR}/${PACKAGE}/socket") +@@ -73,7 +73,7 @@ endmacro() INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "include") -IF(NOT DEFINED(ACVERSION)) +IF(NOT DEFINED ACVERSION) FILE(READ "${CMAKE_SOURCE_DIR}/VERSION" ACVERSION) string(REPLACE "\n" "" ACVERSION ${ACVERSION}) #MESSAGE(STATUS "Version: ${ACVERSION}") -@@ -308,7 +308,9 @@ SET(CMAKE_REQUIRED_LIBRARIES "") +@@ -310,7 +310,9 @@ SET(CMAKE_REQUIRED_LIBRARIES "") set(HAVE_CHECKSUM on) if(USE_SSL) - pkg_check_modules(openssl openssl) + if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + pkg_check_modules(openssl openssl) + endif() if(openssl_FOUND) set(HAVE_SSL on) _append(ACNG_COMPFLAGS ${openssl_CFLAGS}) -@@ -388,18 +390,22 @@ add_subdirectory(systemd) +@@ -390,18 +392,22 @@ add_subdirectory(systemd) ### ### Extra install rules for static files ### -if(NOT DEFINED(HTMLDIR)) +if(NOT DEFINED HTMLDIR) set(HTMLDIR ${DOCDIR}/html) endif() -if(NOT DEFINED(MANDIR)) +if(NOT DEFINED MANDIR) set(MANDIR ${DATADIR}/man) endif() install(FILES doc/README doc/apt-cacher-ng.pdf DESTINATION ${DOCDIR}) install(DIRECTORY doc/html/ DESTINATION ${HTMLDIR} FILES_MATCHING PATTERN "*.*") install(DIRECTORY doc/man/ DESTINATION ${MANDIR}/man8 - FILES_MATCHING PATTERN "*.8") -if(NOT DEFINED(AVAHIDIR)) + FILES_MATCHING PATTERN "apt-cacher-ng.8") +if (USE_FUSE) +install(DIRECTORY doc/man/ DESTINATION ${MANDIR}/man8 + FILES_MATCHING PATTERN "acngfs.8") +endif() +if(NOT DEFINED AVAHIDIR) set(AVAHIDIR "${SYSCONFDIR}/avahi/services") endif() install(FILES contrib/apt-cacher-ng.service DESTINATION ${AVAHIDIR}) -@@ -414,4 +420,5 @@ DOCDIR: ${DOCDIR} +@@ -416,4 +422,5 @@ DOCDIR: ${DOCDIR} SYSCONFDIR: ${SYSCONFDIR} CFGDIR: ${CFGDIR} SBINDIR: ${SBINDIR} +MANDIR: ${MANDIR} ") diff --git a/www/apt-cacher-ng/files/patch-conf_acng.conf.in b/www/apt-cacher-ng/files/patch-conf_acng.conf.in index e9b488943761..5a3023e3b2b3 100644 --- a/www/apt-cacher-ng/files/patch-conf_acng.conf.in +++ b/www/apt-cacher-ng/files/patch-conf_acng.conf.in @@ -1,18 +1,18 @@ ---- conf/acng.conf.in.orig 2018-09-07 13:02:18 UTC +--- conf/acng.conf.in.orig 2020-02-03 18:54:57 UTC +++ conf/acng.conf.in -@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora +@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora EPEL Remap-slrep: file:sl_mirrors # Scientific Linux Remap-gentoo: file:gentoo_mirrors.gz /gentoo ; file:backends_gentoo # Gentoo Archives Remap-secdeb: security.debian.org ; security.debian.org deb.debian.org/debian-security +Remap-FreeBSD: file:freebsd_mirrors ; file:backends_freebsd # FreeBSD Archives # Virtual page accessible in a web browser to see statistics and status # information, i.e. under http://localhost:3142/acng-report.html -@@ -365,6 +366,7 @@ LocalDirs: acng-doc @DOCDIR@ +@@ -366,6 +367,7 @@ LocalDirs: acng-doc @DOCDIR@ # in /etc/hosts.allow or /etc/hosts.deny files. # # UseWrap: 0 +UseWrap: 0 # If many machines from the same local network attempt to update index files # (apt-get update) at nearly the same time, the known state of these index file diff --git a/www/apt-cacher-ng/files/patch-source_acngtool.cc b/www/apt-cacher-ng/files/patch-source_acngtool.cc index 2ddff95f00da..3eb86a2e617c 100644 --- a/www/apt-cacher-ng/files/patch-source_acngtool.cc +++ b/www/apt-cacher-ng/files/patch-source_acngtool.cc @@ -1,13 +1,22 @@ ---- source/acngtool.cc.orig 2018-09-07 13:02:18 UTC +--- source/acngtool.cc.orig 2020-02-03 18:54:57 UTC +++ source/acngtool.cc -@@ -562,8 +562,10 @@ int maint_job() - if (!ids.send(m_conFd)) - return; - +@@ -579,8 +579,10 @@ struct TUdsFactory : public ::acng::IDlConFactory + udsconnection() : tcpconnect(nullptr) + { + // some static and dummy parameters, and invalidate SSL for sure +#ifdef HAVE_SSL - m_ssl = nullptr; - m_bio = nullptr; + m_ssl = nullptr; + m_bio = nullptr; +#endif - // better match the TCP socket parameters - m_sHostName = "localhost"; - m_sPort = sDefPortHTTP; + m_sHostName = FAKE_UDS_HOSTNAME; + m_sPort = cfg::port; + +@@ -1006,7 +1008,7 @@ std::unordered_map parms = { + } + } + }, +- { ++ { + "patch", + { + 3, 3, [](LPCSTR p) diff --git a/www/apt-cacher-ng/files/patch-source_tcpconnect.cc b/www/apt-cacher-ng/files/patch-source_tcpconnect.cc index e10141f199a3..a45065470499 100644 --- a/www/apt-cacher-ng/files/patch-source_tcpconnect.cc +++ b/www/apt-cacher-ng/files/patch-source_tcpconnect.cc @@ -1,17 +1,27 @@ ---- source/tcpconnect.cc.orig 2018-09-07 13:02:18 UTC +--- source/tcpconnect.cc.orig 2020-02-03 18:54:57 UTC +++ source/tcpconnect.cc -@@ -41,13 +41,13 @@ atomic_int nConCount(0), nDisconCount(0) +@@ -41,13 +41,13 @@ atomic_int nConCount(0), nDisconCount(0), nReuseCount( #include #include #include -#endif #ifndef HAVE_SSL_HOST_VALIDATION extern "C" { #include "oldssl-workaround/openssl_hostname_validation.h" } #endif +#endif namespace acng { +@@ -626,7 +626,9 @@ void globalSslInit() + return; + inited = true; + SSL_load_error_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_BIO_strings(); ++#endif + ERR_load_crypto_strings(); + ERR_load_SSL_strings(); + OpenSSL_add_all_algorithms();