Attachment #200725 for bug #234582

View | Details | Raw Unified | Return to bug 234582
Collapse All | Expand All





PORTNAME=	apt-cacher-ng
PORTVERSION=	3.2
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	DEBIAN_POOL/apt-cacher-ng
DISTFILES=	${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}

LICENSE_FILE=	${WRKSRC}/COPYING
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		compiler:c++11-lang cmake tar:xz
USE_RC_SUBR=	apt_cacher_ng

CMAKE_ARGS=	-DLIBDIR:PATH=${DATADIR} \
		-DMANDIR:PATH=${PREFIX}/man

		-Dopenssl_CFLAGS="-I ${OPENSSLINC}" \
		-Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto"
CMAKE_ON=	USE_SSL
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

Lines 1-6 Link Here

(-)files/patch-conf_acng.conf.in (-1 / +1 lines)
1	--- conf/acng.conf.in.orig 2018-09-07 13:02:18 UTC	1	--- conf/acng.conf.in.orig 2018-09-07 13:02:18 UTC
2	+++ conf/acng.conf.in	2	+++ conf/acng.conf.in
3	@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora EPEL	3	@@ -69,6 +69,7 @@ Remap-epel: file:epel_mirrors # Fedora
4	Remap-slrep: file:sl_mirrors # Scientific Linux	4	Remap-slrep: file:sl_mirrors # Scientific Linux
5	Remap-gentoo: file:gentoo_mirrors.gz /gentoo ; file:backends_gentoo # Gentoo Archives	5	Remap-gentoo: file:gentoo_mirrors.gz /gentoo ; file:backends_gentoo # Gentoo Archives
6	Remap-secdeb: security.debian.org ; security.debian.org deb.debian.org/debian-security	6	Remap-secdeb: security.debian.org ; security.debian.org deb.debian.org/debian-security




 pkg_check_modules(fuse fuse)
 
 _append(acngfs_cflags -DMINIBUILD ${fuse_CFLAGS} ${CFLAGS_PTHREAD})
@@ -22,7 +26,8 @@ if(fuse_FOUND AND HAVE_FUSE_25)
 
         ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
         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 ${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)

Lines 1-6 Link Here

(-)files/patch-source_CMakeLists.txt (-2 / +4 lines)
1	--- source/CMakeLists.txt.orig 2018-09-07 13:02:18 UTC	1	--- source/CMakeLists.txt.orig 2018-09-07 13:02:18 UTC
2	+++ source/CMakeLists.txt	2	+++ source/CMakeLists.txt
3	@@ -2,14 +2,17 @@ set(SHAREDSRCS acbuf.cc acfg.cc acfg_defaults.cc aclog	3	@@ -2,15 +2,18 @@ set(SHAREDSRCS acbuf.cc acfg.cc acfg_def
4	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)	4	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)
5		5
6	ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})	6	ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})
Lines 17-20 Link Here
17	+target_compile_features(acngtool PRIVATE cxx_auto_type)	17	+target_compile_features(acngtool PRIVATE cxx_auto_type)
18	SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")	18	SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")
19	TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})	19	TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})
20	INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})	20	-INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})
		21	+INSTALL(TARGETS acngtool DESTINATION ${SBINDIR})
		22

Lines 1-6 Link Here

(-)files/patch-source_acfg__defaults.cc (-1 / +1 lines)
1	--- source/acfg_defaults.cc.orig 2018-09-07 13:02:18 UTC	1	--- source/acfg_defaults.cc.orig 2018-09-07 13:02:18 UTC
2	+++ source/acfg_defaults.cc	2	+++ source/acfg_defaults.cc
3	@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u\|d)?deb\|\\.rpm\|\\.drpm\|\\.dsc	3	@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u\|d)?deb\|\\.rpm\|
4	"\|\\.asc$" // all remaining PGP signatures. Assuming that volatile ones are matched below.	4	"\|\\.asc$" // all remaining PGP signatures. Assuming that volatile ones are matched below.
5	"\|changelogs/pool/.*/changelog.txt$" // packages.ultimediaos.com	5	"\|changelogs/pool/.*/changelog.txt$" // packages.ultimediaos.com
6	"\|/objects/./.\\.(dirtree\|filez\|commit\|commitmeta)\|/repo/deltas/.*" // FlatPak	6	"\|/objects/./.\\.(dirtree\|filez\|commit\|commitmeta)\|/repo/deltas/.*" // FlatPak




--- 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;




--- 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 <openssl/crypto.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/x509v3.h>
-#endif
 #ifndef HAVE_SSL_HOST_VALIDATION
 extern "C"
 {
 #include "oldssl-workaround/openssl_hostname_validation.h"
 }
 #endif
+#endif
 
 namespace acng
 {

Lines 2-14 Link Here

(-)pkg-plist (-6 / +6 lines)
2	@sample %%ETCDIR%%/backends_debian.sample	2	@sample %%ETCDIR%%/backends_debian.sample
3	@sample %%ETCDIR%%/backends_freebsd.sample	3	@sample %%ETCDIR%%/backends_freebsd.sample
4	@sample %%ETCDIR%%/backends_ubuntu.sample	4	@sample %%ETCDIR%%/backends_ubuntu.sample
5	@sample %%ETCDIR%%/security.conf.sample	5	@sample(proxy,proxy,400) %%ETCDIR%%/security.conf.sample
6	etc/avahi/services/apt-cacher-ng.service	6	etc/avahi/services/apt-cacher-ng.service
7	%%FUSE%%man/man8/acngfs.8.gz
8	man/man8/apt-cacher-ng.8.gz
9	sbin/apt-cacher-ng
10	%%FUSE%%%%DATADIR%%/acngfs
11	%%DATADIR%%/acngtool
12	%%DATADIR%%/archlx_mirrors	7	%%DATADIR%%/archlx_mirrors
13	%%DATADIR%%/backends_debian.default	8	%%DATADIR%%/backends_debian.default
14	%%DATADIR%%/backends_gentoo.default	9	%%DATADIR%%/backends_gentoo.default
Lines 29-34 Link Here
29	%%DATADIR%%/style.css	24	%%DATADIR%%/style.css
30	%%DATADIR%%/ubuntu_mirrors	25	%%DATADIR%%/ubuntu_mirrors
31	%%DATADIR%%/userinfo.html	26	%%DATADIR%%/userinfo.html
		27	sbin/apt-cacher-ng
		28	sbin/acngtool
		29	%%FUSE%%sbin/acngfs
32	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	30	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
33	%%PORTDOCS%%%%DOCSDIR%%/README	31	%%PORTDOCS%%%%DOCSDIR%%/README
34	%%PORTDOCS%%%%DOCSDIR%%/TODO	32	%%PORTDOCS%%%%DOCSDIR%%/TODO
Lines 45-49 Link Here
45	%%PORTDOCS%%%%DOCSDIR%%/html/secure.html	43	%%PORTDOCS%%%%DOCSDIR%%/html/secure.html
46	%%PORTDOCS%%%%DOCSDIR%%/html/troublefaq.html	44	%%PORTDOCS%%%%DOCSDIR%%/html/troublefaq.html
47	%%PORTDOCS%%%%DOCSDIR%%/html/usage.html	45	%%PORTDOCS%%%%DOCSDIR%%/html/usage.html
		46	man/man8/apt-cacher-ng.8.gz
		47	%%FUSE%%man/man8/acngfs.8.gz
48	@dir(proxy,proxy,755) /var/cache/apt-cacher-ng	48	@dir(proxy,proxy,755) /var/cache/apt-cacher-ng
49	@dir(proxy,proxy,755) /var/log/apt-cacher-ng	49	@dir(proxy,proxy,755) /var/log/apt-cacher-ng

Return to bug 234582

Lines 1-6 Link Here

(-)files/patch-source_acfg__defaults.cc (-1 / +1 lines)
1	--- source/acfg_defaults.cc.orig 2018-09-07 13:02:18 UTC	1	--- source/acfg_defaults.cc.orig 2018-09-07 13:02:18 UTC
2	+++ source/acfg_defaults.cc	2	+++ source/acfg_defaults.cc
3	@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u\|d)?deb\|\\.rpm\|\\.drpm\|\\.dsc	3	@@ -40,6 +40,9 @@ string pfilepat(".*(\\.(u\|d)?deb\|\\.rpm\|
4	"\|\\.asc$" // all remaining PGP signatures. Assuming that volatile ones are matched below.	4	"\|\\.asc$" // all remaining PGP signatures. Assuming that volatile ones are matched below.
5	"\|changelogs/pool/.*/changelog.txt$" // packages.ultimediaos.com	5	"\|changelogs/pool/.*/changelog.txt$" // packages.ultimediaos.com
6	"\|/objects/./.\\.(dirtree\|filez\|commit\|commitmeta)\|/repo/deltas/.*" // FlatPak	6	"\|/objects/./.\\.(dirtree\|filez\|commit\|commitmeta)\|/repo/deltas/.*" // FlatPak

Lines 2-7 Link Here

(-)Makefile (-7 / +14 lines)
2		2
3	PORTNAME= apt-cacher-ng	3	PORTNAME= apt-cacher-ng
4	PORTVERSION= 3.2	4	PORTVERSION= 3.2
		5	PORTREVISION= 1
5	CATEGORIES= www	6	CATEGORIES= www
6	MASTER_SITES= DEBIAN_POOL/apt-cacher-ng	7	MASTER_SITES= DEBIAN_POOL/apt-cacher-ng
7	DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}	8	DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
Lines 14-34 Link Here
14	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
15	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16		17
17	USES= compiler:c++11-lang cmake ssl tar:xz	18	USES= compiler:c++11-lang cmake tar:xz
18	USE_RC_SUBR= apt_cacher_ng	19	USE_RC_SUBR= apt_cacher_ng
19		20
20	CMAKE_ARGS= -DLIBDIR:PATH=${DATADIR} \	21	CMAKE_ARGS= -DLIBDIR:PATH=${DATADIR} \
21	-DMANDIR:PATH=${PREFIX}/man \	22	-DMANDIR:PATH=${PREFIX}/man
22	-Dopenssl_FOUND=1 \	23
23	-Dopenssl_CFLAGS="-I ${OPENSSLINC}" \
24	-Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto"
25	CMAKE_ON= USE_SSL
26	SUB_FILES= backends_debian backends_freebsd backends_ubuntu \	24	SUB_FILES= backends_debian backends_freebsd backends_ubuntu \
27	freebsd_mirrors pkg-message	25	freebsd_mirrors pkg-message
28		26
29	OPTIONS_DEFINE= DOCS FUSE	27	OPTIONS_DEFINE= DOCS SSL FUSE
		28	OPTIONS_DEFAULT= SSL
30	OPTIONS_SUB= yes	29	OPTIONS_SUB= yes
31		30
		31	SSL_DESC= SSL support to allow proxying https siteS
		32
		33	SSL_CMAKE_BOOL= USE_SSL
		34	SSL_USES= ssl
		35	SSL_CMAKE_ON= -Dopenssl_FOUND=1 \
		36	-Dopenssl_CFLAGS="-I ${OPENSSLINC}" \
		37	-Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto"
		38
32	FUSE_DESC= FUSE support for interfacing with the proxy via acngfs	39	FUSE_DESC= FUSE support for interfacing with the proxy via acngfs
33		40
34	FUSE_CMAKE_BOOL= USE_FUSE	41	FUSE_CMAKE_BOOL= USE_FUSE

Lines 11-24 Link Here

(-)files/patch-fs_CMakeLists.txt (-2 / +4 lines)
11	pkg_check_modules(fuse fuse)	11	pkg_check_modules(fuse fuse)
12		12
13	_append(acngfs_cflags -DMINIBUILD ${fuse_CFLAGS} ${CFLAGS_PTHREAD})	13	_append(acngfs_cflags -DMINIBUILD ${fuse_CFLAGS} ${CFLAGS_PTHREAD})
14	@@ -22,6 +26,7 @@ if(fuse_FOUND AND HAVE_FUSE_25)	14	@@ -22,7 +26,8 @@ if(fuse_FOUND AND HAVE_FUSE_25)
15		15
16	ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)	16	ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
17	SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")	17	SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")
		18	- INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})
18	+ target_compile_features(acngfs PRIVATE cxx_auto_type)	19	+ target_compile_features(acngfs PRIVATE cxx_auto_type)
19	INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})	20	+ INSTALL(TARGETS acngfs DESTINATION ${SBINDIR})
20	if(HAVE_DLOPEN)	21	if(HAVE_DLOPEN)
21	_append(EXTRA_LIBS_ACNGFS dl)	22	_append(EXTRA_LIBS_ACNGFS dl)
		23	endif()
22	@@ -32,4 +37,4 @@ else(fuse_FOUND AND HAVE_FUSE_25)	24	@@ -32,4 +37,4 @@ else(fuse_FOUND AND HAVE_FUSE_25)
23	message("- FUSE not found or not compatible, not building acngfs")	25	message("- FUSE not found or not compatible, not building acngfs")
24	endif(fuse_FOUND AND HAVE_FUSE_25)	26	endif(fuse_FOUND AND HAVE_FUSE_25)

Line 0 Link Here

(-)files/patch-source_acngtool.cc (+13 lines)
	1	--- source/acngtool.cc.orig 2018-09-07 13:02:18 UTC
	2	+++ source/acngtool.cc
	3	@@ -562,8 +562,10 @@ int maint_job()
	4	if (!ids.send(m_conFd))
	5	return;
	6
	7	+#ifdef HAVE_SSL
	8	m_ssl = nullptr;
	9	m_bio = nullptr;
	10	+#endif
	11	// better match the TCP socket parameters
	12	m_sHostName = "localhost";
	13	m_sPort = sDefPortHTTP;

Line 0 Link Here

(-)files/patch-source_tcpconnect.cc (+17 lines)
	1	--- source/tcpconnect.cc.orig 2018-09-07 13:02:18 UTC
	2	+++ source/tcpconnect.cc
	3	@@ -41,13 +41,13 @@ atomic_int nConCount(0), nDisconCount(0)
	4	#include <openssl/crypto.h>
	5	#include <openssl/x509_vfy.h>
	6	#include <openssl/x509v3.h>
	7	-#endif
	8	#ifndef HAVE_SSL_HOST_VALIDATION
	9	extern "C"
	10	{
	11	#include "oldssl-workaround/openssl_hostname_validation.h"
	12	}
	13	#endif
	14	+#endif
	15
	16	namespace acng
	17	{