[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2019-11-13 10:08 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2019-11-13 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     d0e515d3cb5c375b6068029d621c2fa4f2cf55ba
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 10:05:02 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 10:08:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e515d3

net-misc/apt-cacher-ng: Old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild | 118 ------------------------
 net-misc/apt-cacher-ng/files/initd              |  32 -------
 2 files changed, 150 deletions(-)

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
deleted file mode 100644
index d04cec3cc61..00000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-S=${WORKDIR}/${P/_}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure(){
-	mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dosbin ${PN}
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd
-
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/html/*
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}

diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd
deleted file mode 100644
index d054b4de76b..00000000000
--- a/net-misc/apt-cacher-ng/files/initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="apt-cacher-ng"
-DAEMON="/usr/sbin/$NAME"
-RUNDIR="/var/run/$NAME"
-PIDFILE="$RUNDIR/$NAME.pid"
-SOCKETFILE="$RUNDIR/$NAME.socket"
-DAEMON_OPTS="$DAEMON_OPTS pidfile=$PIDFILE SocketPath=$SOCKETFILE foreground=0"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting $NAME"
-	checkpath -d -m 0755 -o ${NAME}:${NAME} ${RUNDIR}
-	start-stop-daemon --start --exec $DAEMON \
-	    --user $NAME --group $NAME \
-	    --pidfile $PIDFILE \
-	    -- $DAEMON_OPTS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --retry 15 --exec $DAEMON \
-	    --pidfile $PIDFILE
-	rm -f $PIDFILE
-	eend $?
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2019-11-13 10:08 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2019-11-13 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4aa2b39b617de63c345c48f07063091fe363dde9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 10:02:56 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 10:08:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa2b39b

net-misc/apt-cacher-ng: Version 3.3_p1

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/apt-cacher-ng/Manifest                    |   2 +
 net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild | 129 +++++++++++++++++++++
 .../files/apt-cacher-ng-3.3-flags.patch            |  75 ++++++++++++
 3 files changed, 206 insertions(+)

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 75ce6eb025d..1684579e929 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,4 @@
 DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
 DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
+DIST apt-cacher-ng_3.3-1.debian.tar.xz 48472 BLAKE2B 9d7f531d84f470ada8236a5603d06e45d9b7acb7bdeb8bd639c250724013a0552819cabe67f1cee0a1f337d7725429932bdf179afae307242e4d45081854614e SHA512 44a241791b92d6b9231caff8296ed1d9536ffcdc18263451d662da01f1b257b8ea4741e5cfb09c5cd90986c46fe1e91b3110379442d9ed20434e696c6cf645aa
+DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
new file mode 100644
index 00000000000..a2ab7261f60
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="
+	https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-flags.patch
+)
+S=${WORKDIR}/${P/_*}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=/usr"
+	)
+	if use fuse; then
+		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
+	fi
+	if use tcpd; then
+		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN} acngtool
+	dolib.so libsupacng.so
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd || die
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc doc/README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+
+		docinto html
+		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch
new file mode 100644
index 00000000000..a2f43a4d378
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch
@@ -0,0 +1,75 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+-#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
++set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
+ 
+ INCLUDE(CheckIncludeFiles) 
+ INCLUDE(CheckCXXSourceCompiles)
+@@ -27,7 +27,7 @@
+ INCLUDE(GNUInstallDirs)
+ 
+ IF(NOT DEFINED(CMAKE_INSTALL_PREFIX))
+-set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space")
++#_cmake_modify_IGNORE set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space")
+ ENDIF()
+ IF(NOT DEFINED(LIBDIR))
+ 	set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}" CACHE STRING "Location of ${PACKAGE} extra files")
+@@ -94,23 +94,6 @@
+         _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden)
+ endif()
+ 
+-foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold)
+-	STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}")
+-	set(CMAKE_REQUIRED_FLAGS "${linkarg}")
+-	CHECK_CXX_COMPILER_FLAG("" "LD_${optname}")
+-	if(LD_${optname})
+-          _append(CMAKE_EXE_LINKER_FLAGS ${linkarg})
+-	endif()
+-	set(CMAKE_REQUIRED_FLAGS "")
+-endforeach(linkarg)
+-
+-set(CMAKE_REQUIRED_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads")
+-CHECK_CXX_COMPILER_FLAG("" LD_MULTITHREADED)
+-if(LD_MULTITHREADED)
+-	_append(CMAKE_EXE_LINKER_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads")
+-endif()
+-set(CMAKE_REQUIRED_FLAGS "")
+-
+ option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on)
+ 
+ IF(CMAKE_SYSTEM MATCHES "Darwin")
+@@ -132,15 +115,6 @@
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(USE_LTO_DEFAULT off)
+    _append(ACNG_COMPFLAGS -DDEBUG)
+-else()
+-   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
+-   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
+-   if(GC_SECTIONS)
+-           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
+-           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
+-           _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections)
+-   endif()
+-   set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+ 
+ option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
+@@ -385,3 +359,14 @@
+ LIBDIR: ${LIBDIR}
+ AVAHIDIR: ${AVAHIDIR}
+ ")
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type      ${CMAKE_BUILD_TYPE}
++Install path    ${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C               ${CMAKE_C_FLAGS}
++C++             ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable      ${CMAKE_EXE_LINKER_FLAGS}
++Module          ${CMAKE_MODULE_LINKER_FLAGS}
++Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2020-01-20 15:26 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-01-20 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a3abfe512fddebcd61e3c15bbfe149163cefa707
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 15:25:53 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 15:26:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3abfe51

net-misc/apt-cacher-ng: Version 3.3.1_p2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/apt-cacher-ng/Manifest                    |   1 +
 .../apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild    | 139 +++++++++++++++++++++
 .../files/apt-cacher-ng-3.3.1-flags.patch          |  11 ++
 3 files changed, 151 insertions(+)

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 015b3ca868e..c04034341df 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,4 +1,5 @@
 DIST apt-cacher-ng_3.3-2.debian.tar.xz 48496 BLAKE2B 327d57cdf74798b99067cdd7153aaba4d3fb03c047203fb1d59fce730c68a28b6db2853f5f944843b96d8613f213c0399ba78aed1b3a186968f8767d03c0fd0c SHA512 aa446b8147a42fa44fcd29754dabe388eedc9829cd908314ba97e0cacbd17d6a0222789015827196ab6fe3efd51ab08a2673ae7c04f5c0781705310e28ca44e7
 DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b68fc891202c6406e91252eb4b1aee6ca87f3497e6f4a1ca9353d3a86f3a8a24059339f2c370a707427f5baecb1e8b6d3977b445a SHA512 b643d9b38891ffd6603239ddb8635dd3dcd7c31d7a32fa128e9b4d632fa08c95ca652e1bdbd2bb046895341bc4611c436e6ff4d997ae2050cdb84e56fb311078
+DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
new file mode 100644
index 00000000000..21f1ce96df0
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="
+	https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.1-flags.patch
+	"${WORKDIR}"/debian/patches/debian-changes
+)
+S=${WORKDIR}/${P/_*}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=/usr"
+	)
+	if use fuse; then
+		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
+	fi
+	if use tcpd; then
+		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
+	fi
+	if tc-ld-is-gold; then
+		mycmakeargs+=( "-DUSE_GOLD=yes" )
+	else
+		mycmakeargs+=( "-DUSE_GOLD=no" )
+	fi
+
+	cmake-utils_src_configure
+
+	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN} acngtool
+	dolib.so libsupacng.so
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd || die
+
+	newinitd "${FILESDIR}"/initd-r2 ${PN}
+	newconfd "${FILESDIR}"/confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc doc/README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+
+		docinto html
+		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	newdoc "${WORKDIR}"/debian/changelog debian.changelog
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch
new file mode 100644
index 00000000000..c721fac7a57
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3.1-flags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+-#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
++set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
+ 
+ INCLUDE(CheckIncludeFiles) 
+ INCLUDE(CheckCXXSourceCompiles)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2021-02-21 16:39 John Helmert III
  0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2021-02-21 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     77484e1a1c3c1b2d96fb7271aba8e3a433330c89
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 01:30:59 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 16:39:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77484e1a

net-misc/apt-cacher-ng: bump to 3.6_p1

Fix broken symlink by installing the symlink's target instead. Re-add
systemd dependency/IUSE because an installed binary links to it when
available. Drop debian patches because they don't exist for this
version, and appear to be necessary anyway.

Closes: https://bugs.gentoo.org/770046
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/19513
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 net-misc/apt-cacher-ng/Manifest                    |  3 +-
 ...g-3.5_p3.ebuild => apt-cacher-ng-3.6_p1.ebuild} | 24 ++++-----
 .../files/apt-cacher-ng-3.6-optional-systemd.patch | 62 ++++++++++++++++++++++
 3 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 8f5b3dcee4f..db811e62000 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1 @@
-DIST apt-cacher-ng_3.5-3.debian.tar.xz 49708 BLAKE2B 85092374207a252dcb4ef7b95dc434f81f9b67791e20099dc058022a9a575130070c12827f3fd04640fcec3b44a444fb85d8cea6439d5eaeeb359f263fb05682 SHA512 f690ae69d38b8e9c73ef095e9779364c7c5ccd246b19e8f5ce2edde47861e44c0aedabc75bcf11f5b408e034e52190dc8ed1789b503284f8f68dc1f5e84e1712
-DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
+DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
similarity index 84%
rename from net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild
rename to net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
index 56294639238..ce6af89f9fa 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
@@ -8,13 +8,12 @@ inherit cmake
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
 	https://packages.qa.debian.org/a/apt-cacher-ng.html"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz"
 
 LICENSE="BSD-4 ZLIB public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse tcpd"
+IUSE="doc fuse systemd tcpd"
 
 DEPEND="acct-user/apt-cacher-ng
 	acct-group/apt-cacher-ng
@@ -23,6 +22,7 @@ DEPEND="acct-user/apt-cacher-ng
 	dev-libs/openssl:0=
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse:0 )
+	systemd? ( sys-apps/systemd )
 	tcpd? ( sys-apps/tcp-wrappers )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${DEPEND}
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-3.3.1-flags.patch"
 	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
-	"${WORKDIR}/debian/patches/debian-changes"
+	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
 )
 
 S="${WORKDIR}/${P/_*}"
@@ -47,6 +47,7 @@ src_prepare() {
 		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
 		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
 	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
@@ -54,22 +55,21 @@ src_configure() {
 	local mycmakeargs=(
 		"-DHAVE_FUSE_25=$(usex fuse)"
 		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		# Unconditionally install systemd service file
-		"-DSDINSTALL=1"
+		"-DSDINSTALL=$(usex systemd)"
 	)
 
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
 	cmake_src_configure
 
 	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
 
 src_install() {
+	# README is a symlink to doc/README and README automatically gets
+	# installed, leading to a broken symlink installed. Fix this by removing
+	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
+	rm README || die
+	dodoc doc/README
+
 	newinitd "${FILESDIR}/initd-r3" "${PN}"
 	newconfd "${FILESDIR}/confd-r2" "${PN}"
 

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch
new file mode 100644
index 00000000000..944802015e5
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch
@@ -0,0 +1,62 @@
+commit f73ba7b31712c1c5543da5a6dab554cac48d2904
+Author: John Helmert III <jchelmert3@posteo.net>
+Date:   Fri Feb 19 10:59:51 2021 -0600
+
+    Make systemd fully optional
+    
+    Avoid linking to systemd without SDINSTALL set. Unconditionally install
+    systemd files with SDTYPE=notify because <systemd-209 is long gone.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c99864..5bafc45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -228,14 +228,16 @@ CHECK_CXX_SOURCE_COMPILES("${TESTSRC}" HAVE_PREAD)
+ FILE(READ ${TESTKITDIR}/HAVE_DAEMON.cc TESTSRC)
+ CHECK_CXX_SOURCE_COMPILES("${TESTSRC}" HAVE_DAEMON)
+ 
+-pkg_check_modules(lsd "libsystemd>=209")
+-# either part of the big library nowadays or in the helper library on older systems
+-if(NOT lsd_FOUND)
+-pkg_check_modules(lsd libsystemd-daemon)
++if(SDINSTALL)
++	pkg_check_modules(lsd "libsystemd>=209")
++	# either part of the big library nowadays or in the helper library on older systems
++	if(NOT lsd_FOUND)
++	pkg_check_modules(lsd libsystemd-daemon)
++	endif()
++	_append(CFLAGS_DAEMON ${lsd_CFLAGS})
++	_append(LDFLAGS_DAEMON ${lsd_LDFLAGS})
++	set(HAVE_SD_NOTIFY ${lsd_FOUND})
+ endif()
+-_append(CFLAGS_DAEMON ${lsd_CFLAGS})
+-_append(LDFLAGS_DAEMON ${lsd_LDFLAGS})
+-set(HAVE_SD_NOTIFY ${lsd_FOUND})
+ 
+ SET(CMAKE_REQUIRED_LIBRARIES dl)
+ FILE(READ ${TESTKITDIR}/HAVE_DLOPEN.cc TESTSRC)
+diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
+index 850f9b8..6ba333f 100644
+--- a/systemd/CMakeLists.txt
++++ b/systemd/CMakeLists.txt
+@@ -1,17 +1,10 @@
+ cmake_minimum_required(VERSION 3.1)
+ 
+ unset(SDTYPE)
+-if(HAVE_SD_NOTIFY)
+-	set(SDTYPE notify)
+-else()
+-	set(SDTYPE simple)
+-endif()
++set(SDTYPE notify)
+ CONFIGURE_FILE(apt-cacher-ng.service.in apt-cacher-ng.service)
+ CONFIGURE_FILE(apt-cacher-ng.conf.in apt-cacher-ng.conf)
+ unset(SDTYPE)
+ 
+-# this is experimental and is supposed to match LSB
+-if(SDINSTALL)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d/)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.service DESTINATION /lib/systemd/system)
+-endif()
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.service DESTINATION /lib/systemd/system)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2024-03-24 14:16 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-24 14:16 UTC (permalink / raw
  To: gentoo-commits

commit:     32043b1ee1d7473b06ddddd83c5c12505273bd91
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 14:15:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 14:15:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32043b1e

net-misc/apt-cacher-ng: fix build with glibc-2.38

Closes: https://bugs.gentoo.org/913133
Thanks-to: Richard Liu <richliu <AT> techarea.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild |  3 +-
 .../apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch   | 41 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
index 3f1113b4af76..390dc77a0974 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.3.1-flags.patch"
 	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
 	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
+	"${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch"
 )
 
 S="${WORKDIR}/${MY_P}"

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch
new file mode 100644
index 000000000000..4d97d6b0d05c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/913133
+
+From 7f4bb9de7c84bf55c446c98056259e4e6d8b61e7 Mon Sep 17 00:00:00 2001
+From: Richard Liu <richliu@techarea.org>
+Date: Fri, 19 Jan 2024 00:38:27 +0800
+Subject: [PATCH] fix compile error
+
+---
+ src/meta.cc | 2 +-
+ src/meta.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meta.cc b/src/meta.cc
+index 9a2053f..5b15eff 100644
+--- a/src/meta.cc
++++ b/src/meta.cc
+@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b)
+     return true;
+ }
+ 
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize)
+ {
+     auto p = src;
+diff --git a/src/meta.h b/src/meta.h
+index a1f4080..dafb754 100644
+--- a/src/meta.h
++++ b/src/meta.h
+@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map<mstring, mstring, ltstring>
+ static constexpr string_view svRN = szRN;
+ static constexpr string_view svLF = "\n";
+ 
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize);
+ #endif
+ }
+-- 
+2.43.0
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/
@ 2024-03-24 14:42 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-24 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     779308f3b6981624f39e260016565e8384ba61c9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 14:20:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 14:27:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779308f3

net-misc/apt-cacher-ng: fix build w/ musl

Closes: https://bugs.gentoo.org/716564
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild     |  1 +
 net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
index 390dc77a0974..1e0a7e08db8f 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
 	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
 	"${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch"
+	"${FILESDIR}/${PN}-3.7.4-musl.patch"
 )
 
 S="${WORKDIR}/${MY_P}"

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
new file mode 100644
index 000000000000..01fb990fc98c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/716564
+--- a/src/meta.h
++++ b/src/meta.h
+@@ -20,6 +20,7 @@
+ #include <strings.h>
+ #include <cstdlib>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "astrop.h"
+ 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-03-24 14:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-20 15:26 [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-03-24 14:42 Sam James
2024-03-24 14:16 Sam James
2021-02-21 16:39 John Helmert III
2019-11-13 10:08 Jeroen Roovers
2019-11-13 10:08 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox