Index: head/www/apt-cacher-ng/Makefile =================================================================== --- head/www/apt-cacher-ng/Makefile (revision 489292) +++ head/www/apt-cacher-ng/Makefile (revision 489293) @@ -1,48 +1,55 @@ # $FreeBSD$ PORTNAME= apt-cacher-ng PORTVERSION= 3.2 +PORTREVISION= 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 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 ssl tar:xz +USES= compiler:c++11-lang cmake tar:xz USE_RC_SUBR= apt_cacher_ng CMAKE_ARGS= -DLIBDIR:PATH=${DATADIR} \ - -DMANDIR:PATH=${PREFIX}/man \ - -Dopenssl_FOUND=1 \ - -Dopenssl_CFLAGS="-I ${OPENSSLINC}" \ - -Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto" -CMAKE_ON= USE_SSL + -DMANDIR:PATH=${PREFIX}/man + SUB_FILES= backends_debian backends_freebsd backends_ubuntu \ freebsd_mirrors pkg-message -OPTIONS_DEFINE= DOCS FUSE +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 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 Index: head/www/apt-cacher-ng/files/patch-conf_acng.conf.in =================================================================== --- head/www/apt-cacher-ng/files/patch-conf_acng.conf.in (revision 489292) +++ head/www/apt-cacher-ng/files/patch-conf_acng.conf.in (revision 489293) @@ -1,18 +1,18 @@ --- conf/acng.conf.in.orig 2018-09-07 13:02:18 UTC +++ conf/acng.conf.in -@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora EPEL +@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora 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@ # 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 Index: head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt =================================================================== --- head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt (revision 489292) +++ head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt (revision 489293) @@ -1,27 +1,29 @@ --- fs/CMakeLists.txt.orig 2018-09-07 13:02:18 UTC +++ fs/CMakeLists.txt @@ -3,6 +3,10 @@ ## Attempt to build acngfs where possible ## ############################################ +option(USE_FUSE "Use FUSE library to build acngfs" on) + +if(USE_FUSE) + pkg_check_modules(fuse fuse) _append(acngfs_cflags -DMINIBUILD ${fuse_CFLAGS} ${CFLAGS_PTHREAD}) -@@ -22,6 +26,7 @@ if(fuse_FOUND AND HAVE_FUSE_25) +@@ -22,7 +26,8 @@ if(fuse_FOUND AND HAVE_FUSE_25) ADD_EXECUTABLE(acngfs ${fsSRCS} $) SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}") +- INSTALL(TARGETS acngfs DESTINATION ${LIBDIR}) + target_compile_features(acngfs PRIVATE cxx_auto_type) - INSTALL(TARGETS acngfs DESTINATION ${LIBDIR}) ++ INSTALL(TARGETS acngfs DESTINATION ${SBINDIR}) if(HAVE_DLOPEN) _append(EXTRA_LIBS_ACNGFS dl) + endif() @@ -32,4 +37,4 @@ else(fuse_FOUND AND HAVE_FUSE_25) message("- FUSE not found or not compatible, not building acngfs") endif(fuse_FOUND AND HAVE_FUSE_25) - +endif() Index: head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt =================================================================== --- head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt (revision 489292) +++ head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt (revision 489293) @@ -1,20 +1,22 @@ --- source/CMakeLists.txt.orig 2018-09-07 13:02:18 UTC +++ source/CMakeLists.txt -@@ -2,14 +2,17 @@ set(SHAREDSRCS acbuf.cc acfg.cc acfg_defaults.cc aclog +@@ -2,15 +2,18 @@ set(SHAREDSRCS acbuf.cc acfg.cc acfg_def set(ACNG_SRCS apt-cacher.cc bgtask.cc cacheman.cc cleaner.cc conn.cc conserver.cc expiration.cc job.cc lockable.cc maintenance.cc mirror.cc pkgimport.cc rfc2553emu.cc showinfo.cc) ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS}) +target_compile_features(acngstuff PRIVATE cxx_auto_type) SET_TARGET_PROPERTIES(acngstuff PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}") ADD_EXECUTABLE(apt-cacher-ng $ ${ACNG_SRCS} apt-cacher.cc $) +target_compile_features(apt-cacher-ng PRIVATE cxx_auto_type) TARGET_LINK_LIBRARIES(apt-cacher-ng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG}) SET_TARGET_PROPERTIES(apt-cacher-ng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}") INSTALL(TARGETS apt-cacher-ng DESTINATION ${SBINDIR}) ADD_EXECUTABLE(acngtool acngtool.cc $ $) +target_compile_features(acngtool PRIVATE cxx_auto_type) SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}") TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL}) - INSTALL(TARGETS acngtool DESTINATION ${LIBDIR}) +-INSTALL(TARGETS acngtool DESTINATION ${LIBDIR}) ++INSTALL(TARGETS acngtool DESTINATION ${SBINDIR}) + Index: head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc =================================================================== --- head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc (revision 489292) +++ head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc (revision 489293) @@ -1,21 +1,21 @@ --- source/acfg_defaults.cc.orig 2018-09-07 13:02:18 UTC +++ source/acfg_defaults.cc -@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u|d)?deb|\\.rpm|\\.drpm|\\.dsc +@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u|d)?deb|\\.rpm| "|\\.asc$" // all remaining PGP signatures. Assuming that volatile ones are matched below. "|changelogs/pool/.*/changelog.txt$" // packages.ultimediaos.com "|/objects/.*/.*\\.(dirtree|filez|commit|commitmeta)|/repo/deltas/.*" // FlatPak + "|(base|doc|games|kernel|lib32|ports|src)\\.txz$" // FreeBSD releases + "|(packagesite|meta)\\.txz?$" // FreeBSD packagesite + "|\\.txz(\\.sig)?$" // FreeBSD package/signature ")$"); string svfilepat("/development/rawhide/.*" @@ -66,7 +69,7 @@ string vfilepat(INFOLDER "|\\.o" // https://bugs.launchpad.net/ubuntu/+source/apt-cacher-ng/+bug/1078224 "|Components-.*yml" COMPOPT // DEP-11 aka AppStream" "|icons-[x0-9]+\\.tar" COMPOPT - "|(latest|pub)\\.ssl" // FreeBSD + "|(latest|pub|snapshot)\\.ssl|[0-9a-f]{64}.tgz|MANIFEST|/ports-distfiles/.*" // FreeBSD ")$" // end of filename-only patterns "|/dists/.*/installer-[^/]+/[^0-9][^/]+/images/.*" // d-i stuff but not containing a date (year number) in the revision directory (like "current", "beta", ...) Index: head/www/apt-cacher-ng/files/patch-source_acngtool.cc =================================================================== --- head/www/apt-cacher-ng/files/patch-source_acngtool.cc (nonexistent) +++ head/www/apt-cacher-ng/files/patch-source_acngtool.cc (revision 489293) @@ -0,0 +1,13 @@ +--- source/acngtool.cc.orig 2018-09-07 13:02:18 UTC ++++ source/acngtool.cc +@@ -562,8 +562,10 @@ int maint_job() + if (!ids.send(m_conFd)) + return; + ++#ifdef HAVE_SSL + m_ssl = nullptr; + m_bio = nullptr; ++#endif + // better match the TCP socket parameters + m_sHostName = "localhost"; + m_sPort = sDefPortHTTP; Property changes on: head/www/apt-cacher-ng/files/patch-source_acngtool.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc =================================================================== --- head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc (nonexistent) +++ head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc (revision 489293) @@ -0,0 +1,17 @@ +--- source/tcpconnect.cc.orig 2018-09-07 13:02:18 UTC ++++ source/tcpconnect.cc +@@ -41,13 +41,13 @@ atomic_int nConCount(0), nDisconCount(0) + #include + #include + #include +-#endif + #ifndef HAVE_SSL_HOST_VALIDATION + extern "C" + { + #include "oldssl-workaround/openssl_hostname_validation.h" + } + #endif ++#endif + + namespace acng + { Property changes on: head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/apt-cacher-ng/pkg-plist =================================================================== --- head/www/apt-cacher-ng/pkg-plist (revision 489292) +++ head/www/apt-cacher-ng/pkg-plist (revision 489293) @@ -1,49 +1,49 @@ @sample %%ETCDIR%%/acng.conf.sample @sample %%ETCDIR%%/backends_debian.sample @sample %%ETCDIR%%/backends_freebsd.sample @sample %%ETCDIR%%/backends_ubuntu.sample -@sample %%ETCDIR%%/security.conf.sample +@sample(proxy,proxy,400) %%ETCDIR%%/security.conf.sample etc/avahi/services/apt-cacher-ng.service -%%FUSE%%man/man8/acngfs.8.gz -man/man8/apt-cacher-ng.8.gz -sbin/apt-cacher-ng -%%FUSE%%%%DATADIR%%/acngfs -%%DATADIR%%/acngtool %%DATADIR%%/archlx_mirrors %%DATADIR%%/backends_debian.default %%DATADIR%%/backends_gentoo.default %%DATADIR%%/backends_ubuntu.default %%DATADIR%%/cygwin_mirrors %%DATADIR%%/deb_mirrors.gz %%DATADIR%%/debvol_mirrors.gz %%DATADIR%%/delconfirm.html %%DATADIR%%/epel_mirrors %%DATADIR%%/fedora_mirrors %%DATADIR%%/freebsd_mirrors %%DATADIR%%/gentoo_mirrors.gz %%DATADIR%%/in.acng %%DATADIR%%/maint.html %%DATADIR%%/report.html %%DATADIR%%/sfnet_mirrors %%DATADIR%%/sl_mirrors %%DATADIR%%/style.css %%DATADIR%%/ubuntu_mirrors %%DATADIR%%/userinfo.html +sbin/apt-cacher-ng +sbin/acngtool +%%FUSE%%sbin/acngfs %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/apt-cacher-ng.pdf %%PORTDOCS%%%%DOCSDIR%%/html/Intro.html %%PORTDOCS%%%%DOCSDIR%%/html/bugs.html %%PORTDOCS%%%%DOCSDIR%%/html/config-serv.html %%PORTDOCS%%%%DOCSDIR%%/html/config-servquick.html %%PORTDOCS%%%%DOCSDIR%%/html/cont.html %%PORTDOCS%%%%DOCSDIR%%/html/distinstructions.html %%PORTDOCS%%%%DOCSDIR%%/html/howtos.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/maint.html %%PORTDOCS%%%%DOCSDIR%%/html/secure.html %%PORTDOCS%%%%DOCSDIR%%/html/troublefaq.html %%PORTDOCS%%%%DOCSDIR%%/html/usage.html +man/man8/apt-cacher-ng.8.gz +%%FUSE%%man/man8/acngfs.8.gz @dir(proxy,proxy,755) /var/cache/apt-cacher-ng @dir(proxy,proxy,755) /var/log/apt-cacher-ng