From owner-svn-ports-head@freebsd.org Sat Jan 5 02:16:35 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4351148358F; Sat, 5 Jan 2019 02:16:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 587DC902BF; Sat, 5 Jan 2019 02:16:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A3419BCB; Sat, 5 Jan 2019 02:16:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x052GZD0016696; Sat, 5 Jan 2019 02:16:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x052GX3M016687; Sat, 5 Jan 2019 02:16:33 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901050216.x052GX3M016687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 5 Jan 2019 02:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489293 - in head/www/apt-cacher-ng: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/apt-cacher-ng: . files X-SVN-Commit-Revision: 489293 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 587DC902BF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.944,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jan 2019 02:16:36 -0000 Author: swills Date: Sat Jan 5 02:16:33 2019 New Revision: 489293 URL: https://svnweb.freebsd.org/changeset/ports/489293 Log: www/apt-cacher-ng: Restore SSL option While here, move acngtool and acngfs into sbin and set tigher permissions on sample security config PR: 234582 Submitted by: keve@keve.hu (maintainer) Added: head/www/apt-cacher-ng/files/patch-source_acngtool.cc (contents, props changed) head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc (contents, props changed) Modified: head/www/apt-cacher-ng/Makefile (contents, props changed) head/www/apt-cacher-ng/files/patch-conf_acng.conf.in (contents, props changed) head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt (contents, props changed) head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt (contents, props changed) head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc (contents, props changed) head/www/apt-cacher-ng/pkg-plist (contents, props changed) Modified: head/www/apt-cacher-ng/Makefile ============================================================================== --- head/www/apt-cacher-ng/Makefile Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/Makefile Sat Jan 5 02:16:33 2019 (r489293) @@ -2,6 +2,7 @@ PORTNAME= apt-cacher-ng PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= DEBIAN_POOL/apt-cacher-ng DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX} @@ -14,20 +15,26 @@ 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 Modified: head/www/apt-cacher-ng/files/patch-conf_acng.conf.in ============================================================================== --- head/www/apt-cacher-ng/files/patch-conf_acng.conf.in Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/files/patch-conf_acng.conf.in Sat Jan 5 02:16:33 2019 (r489293) @@ -1,6 +1,6 @@ --- 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 Modified: head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt ============================================================================== --- head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/files/patch-fs_CMakeLists.txt Sat Jan 5 02:16:33 2019 (r489293) @@ -11,14 +11,16 @@ 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) Modified: head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt ============================================================================== --- head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/files/patch-source_CMakeLists.txt Sat Jan 5 02:16:33 2019 (r489293) @@ -1,6 +1,6 @@ --- 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}) @@ -17,4 +17,6 @@ +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}) + Modified: head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc ============================================================================== --- head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/files/patch-source_acfg__defaults.cc Sat Jan 5 02:16:33 2019 (r489293) @@ -1,6 +1,6 @@ --- 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 Added: head/www/apt-cacher-ng/files/patch-source_acngtool.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apt-cacher-ng/files/patch-source_acngtool.cc Sat Jan 5 02:16:33 2019 (r489293) @@ -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; Added: head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apt-cacher-ng/files/patch-source_tcpconnect.cc Sat Jan 5 02:16:33 2019 (r489293) @@ -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 + { Modified: head/www/apt-cacher-ng/pkg-plist ============================================================================== --- head/www/apt-cacher-ng/pkg-plist Sat Jan 5 02:03:48 2019 (r489292) +++ head/www/apt-cacher-ng/pkg-plist Sat Jan 5 02:16:33 2019 (r489293) @@ -2,13 +2,8 @@ @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 @@ -29,6 +24,9 @@ sbin/apt-cacher-ng %%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 @@ -45,5 +43,7 @@ sbin/apt-cacher-ng %%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