summaryrefslogtreecommitdiff
path: root/net-misc/apt-cacher-ng
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
commitd99093fb4bb5652015c06274d64083daa2439e4f (patch)
treecf61513204d97974179580065e85df5c8009087c /net-misc/apt-cacher-ng
parent463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
gentoo resync : 03.03.2021
Diffstat (limited to 'net-misc/apt-cacher-ng')
-rw-r--r--net-misc/apt-cacher-ng/Manifest9
-rw-r--r--net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild (renamed from net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild)24
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch62
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch18
-rw-r--r--net-misc/apt-cacher-ng/metadata.xml8
5 files changed, 80 insertions, 41 deletions
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index a25486a436ef..e86f44326ff9 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,12 +1,11 @@
AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
-AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
+AUX apt-cacher-ng-3.6-optional-systemd.patch 2307 BLAKE2B aaf31601172f378c403dea6fc9f5d0ace9a6bb5f4d1eb2a4cdfd5198c15b59ad5f98663618d2303fd52147de40cfb2f8ac6e0b149ea73e9bf4cdba27c647a14c SHA512 b337dbaf7379e1cdbfab32c93046312e7e69ffebc5229f056c11434ae2fd1248ff94595eaeb0810d7a8a6e127fb663919c5d4311be06e6b0013e057912062aeb
AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666
AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-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
-EBUILD apt-cacher-ng-3.5_p3.ebuild 2449 BLAKE2B 71da549cdea5abb9a301aeeee78b8c9507d833fbdd545b747f75fab9684f02f8934be2ddbf6de1d66ba82de5ec180fd82a630280b4e452ca674ab02bba7cc814 SHA512 e04544ab9969f7384893efdc68220c0293ebaf38eb7da085b55bbbc154fad4a4d3710f7a283c0ca2021daf70058fe342943d2fd29c1a38a7dc820f715006fbd1
+DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e
+EBUILD apt-cacher-ng-3.6_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4
-MISC metadata.xml 514 BLAKE2B fc89f43d55b9d0d2250522ffa3704a51e336a9c7ec13b928ec483be4da6cf01edd7ab11bdd6e2ede0b1203eef2682270479e1703822849f50c2ccbc32cc0502f SHA512 fe3e1774feb81e61d22f56d6095d7d6caaaecadccda26812c4677c02470e0a6528c474a53ec73615abd5ecd22d4410991d0ce01b7f1177b92fccfd8cca3cf0a7
+MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
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
index 56294639238b..ce6af89f9fa7 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 000000000000..944802015e59
--- /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)
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
deleted file mode 100644
index 8fe769ada328..000000000000
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,15 +114,6 @@
-
- if(CMAKE_BUILD_TYPE MATCHES Debug)
- set(USE_LTO_DEFAULT off)
--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})
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 453387392cc2..70b0627d8086 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -2,12 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>jchelmert3@posteo.net</email>
- <name>John Helmert III</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>ajak@gentoo.org</email>
+ <name>John Helmert III</name>
</maintainer>
<use>
<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-11 21:14:31 +0000