[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 4ae8f96b83215d032a76cfc9e3b33f1beb47844d
Author: Sam James gentoo org>
AuthorDate: Sun Mar 24 14:27:36 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 24 14:27:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae8f96b
net-misc/apt-cacher-ng: fix build w/ gcc 14
Signed-off-by: Sam James gentoo.org>
.../apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild | 1 +
.../files/apt-cacher-ng-3.7.4-gcc14.patch | 39 ++
2 files changed, 40 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 1e0a7e08db8f..a97170d14427 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
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
"${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch"
"${FILESDIR}/${PN}-3.7.4-musl.patch"
+ "${FILESDIR}/${PN}-3.7.4-gcc14.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
new file mode 100644
index ..345d7d5c80e4
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
@@ -0,0 +1,39 @@
+--- a/src/aconnect.cc
b/src/aconnect.cc
+@@ -6,6 +6,7 @@
+ #include "debug.h"
+ #include "portutils.h"
+
++#include
+ #include
+
+ #include
+--- a/src/acregistry.cc
b/src/acregistry.cc
+@@ -5,6 +5,7 @@
+ #include "cleaner.h"
+ #include "evabase.h"
+
++#include
+ #include
+
+ #define IN_ABOUT_ONE_DAY 10
+--- a/src/caddrinfo.cc
b/src/caddrinfo.cc
+@@ -1,5 +1,6 @@
+ #include "meta.h"
+
++#include
+ #include
+ #include
+ #include
+--- a/src/header.cc
b/src/header.cc
+@@ -10,6 +10,7 @@
+ #include "filereader.h"
+ #include "httpdate.h"
+
++#include
+ #include
+ #include
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 643ed593c89f5f81e01cd5371cd06ab41b7349a9
Author: John Helmert III posteo net>
AuthorDate: Sat Jan 30 05:26:18 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 11 08:56:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643ed593
net-misc/apt-cacher-ng: bump to 3.5_p3
Rework so as to not install everything manually in src_install but rely
on the build system, clean up src_configure a bit, clean up
dependencies, drop useless IUSE=systemd and related dependency, drop
user.eclass and depend on acct-{user,group} packages, and update the
OpenRC init.d and conf.d files to fix a security bug. These files were
written by Michael Orlitzky (mjo).
Bug: https://bugs.gentoo.org/631878
Closes: https://bugs.gentoo.org/538214
Closes: https://bugs.gentoo.org/701220
Thanks-to: Michael Orlitzky gentoo.org>
Signed-off-by: John Helmert III posteo.net>
Signed-off-by: Joonas Niilola gentoo.org>
net-misc/apt-cacher-ng/Manifest| 2 +-
.../apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild | 129 -
net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild | 97
net-misc/apt-cacher-ng/files/confd-r2 | 9 ++
net-misc/apt-cacher-ng/files/initd-r3 | 20
5 files changed, 127 insertions(+), 130 deletions(-)
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 5715fe065c4..8f5b3dcee4f 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B
c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea
SHA512
8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359
+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
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
deleted file mode 100644
index 362e497b3c1..000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake 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/libevent:=
- dev-libs/openssl:0=
- sys-libs/zlib
- systemd? (
- sys-apps/systemd
- )
-"
-BDEPEND="
- ${COMMON_DEPEND}
- 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
- "${FILESDIR}"/${PN}-3.5-perl-syntax.patch
- "${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_setup() {
- # add new user & group for daemon
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure() {
- local mycmakeargs=()
- 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_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 "${FILESD
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 61a8ef12e3fcbd7b4393d2983b04892cd45c36b0
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue May 26 13:18:21 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue May 26 13:19:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a8ef12
net-misc/apt-cacher-ng: Fix expire-caller.pl, disable by default
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Jeroen Roovers gentoo.org>
...cacher-ng-3.5_p1.ebuild => apt-cacher-ng-3.5_p1-r1.ebuild} | 5 +++--
net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild | 5 +++--
.../apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch | 11 +++
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
similarity index 96%
rename from net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
rename to net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index 4061fff1f9c..97eab60040b 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-3.3.1-flags.patch
+ "${FILESDIR}"/${PN}-3.5-perl-syntax.patch
"${WORKDIR}"/debian/patches/debian-changes
)
S=${WORKDIR}/${P/_*}
@@ -121,8 +122,8 @@ src_install() {
# perl daily cron script
dosbin scripts/expire-caller.pl
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/cron.daily ${PN}
+ insinto /etc/cron.daily
+ doins "${FILESDIR}"/cron.daily ${PN}
# default configuration
insinto /etc/${PN}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
index 402b95991ac..9740af934f3 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
tcpd? ( sys-apps/tcp-wrappers )
"
PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-perl-syntax.patch
"${FILESDIR}"/${PN}-999-flags.patch
)
S=${WORKDIR}/${P/_*}
@@ -113,8 +114,8 @@ src_install() {
# perl daily cron script
dosbin scripts/expire-caller.pl
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/cron.daily ${PN}
+ insinto /etc/cron.daily
+ doins "${FILESDIR}"/cron.daily ${PN}
# default configuration
insinto /etc/${PN}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
new file mode 100644
index 000..32421a07eef
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
@@ -0,0 +1,11 @@
+--- a/scripts/expire-caller.pl
b/scripts/expire-caller.pl
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ #
+
+-print STDERR "WARNING: this script is considered deprecated. It may still
work but could print incorrect results!\n"
++print STDERR "WARNING: this script is considered deprecated. It may still
work but could print incorrect results!\n";
+
+ use strict;
+ use Socket;
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 626fd040e346a0bc1dba93fb6ac32dd710ab3a0c
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Apr 9 08:03:36 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Apr 9 08:04:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626fd040
net-misc/apt-cacher-ng: Old
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/apt-cacher-ng/Manifest| 3 -
.../apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild| 132 -
net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild | 131
.../files/apt-cacher-ng-3.3-flags.patch| 60 --
4 files changed, 326 deletions(-)
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 6921cc91729..8a6735c2a99 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,7 +1,4 @@
-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
DIST apt-cacher-ng_3.4-1.debian.tar.xz 49880 BLAKE2B
a49dc9ca415cd00f275f8aab61836ef002b9463a8ce22b2fbf1379ce908737d0df813e9d112e64667790e0c9c29ae44ca12291ff531fa565a30b0345c3970824
SHA512
49879c8786ba5aa6398ce43d733a71529a5c2a93a0e8e3e856bb7bf6d6dd0d8dcf9f6a96b291a3e77e0a71a9a990b5d0ade9134e5ec670a33592c9a1ab61a48e
DIST apt-cacher-ng_3.4.orig.tar.xz 324040 BLAKE2B
0164ac35815fb42a2197830134172c4b93677f6ee6add71d115e975a3b8538db18e635fae2fe9556346229dc076c732b3b3f6fb9958e347fee8876f0f2363c9e
SHA512
956366431f4671afd46f3bc0cdb9acaf02378606a7e210a190902e519ed25d2d102a336032c31fcc8b71c879bd219f249f411af732bfb6f9213e485ba6981c5d
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
deleted file mode 100644
index b8e37722181..000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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-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-majo
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: b05498cbaa0342ca56feb1adbc3428c3cb998937
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Jan 14 04:13:50 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Jan 14 04:14:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05498cb
net-misc/apt-cacher-ng: Old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/apt-cacher-ng/Manifest| 3 -
.../apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild | 129
.../apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild | 131 -
net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild | 129
.../files/apt-cacher-ng-3.2-flags.patch| 97 ---
net-misc/apt-cacher-ng/files/confd | 2 -
net-misc/apt-cacher-ng/files/initd-r1 | 33 --
7 files changed, 524 deletions(-)
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 3adcdfe507d..015b3ca868e 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,6 +1,3 @@
-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-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.orig.tar.xz 321996 BLAKE2B
b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40
SHA512
0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
deleted file mode 100644
index 4e825f700ed..000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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=(
- "${WORKDIR}"/debian/patches/debian-changes
- "${FILESDIR}"/${PN}-3.2-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
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 828edf401796143ad465f0d1f8313cc80e0d3e14
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Jan 14 04:04:58 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Jan 14 04:14:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828edf40
net-misc/apt-cacher-ng: Add live ebuild
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
.../apt-cacher-ng/apt-cacher-ng-999.ebuild | 130 +
.../files/apt-cacher-ng-999-flags.patch| 18 +++
2 files changed, 148 insertions(+)
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
new file mode 100644
index 000..8bde423cde0
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-999.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils git-r3 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"
+EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git";
+EGIT_BRANCH="upstream/sid"
+
+KEYWORDS=""
+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}-999-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"
+ "-DCMAKE_SKIP_BUILD_RPATH=on"
+ )
+ 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
+
+ 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
+
+ # 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-999-flags.patch
b/net-misc/apt-cacher-ng/files/apt-cacher-ng-999-flags.patch
new file mode 100644
index 000..8fe769ada32
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-999-flags.patch
@@ -0,0 +1,18 @@
+--- 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: bd9f55582889b29951a062daa13064b08765ebb5
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 15 11:28:48 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 15 11:29:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9f5558
net-misc/apt-cacher-ng: Create default LogDir
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers gentoo.org>
.../apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild | 131 +
net-misc/apt-cacher-ng/files/confd-r1 | 3 +
net-misc/apt-cacher-ng/files/initd-r2 | 34 ++
3 files changed, 168 insertions(+)
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
new file mode 100644
index 000..682a66fd9f0
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
@@ -0,0 +1,131 @@
+# 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
+
+ 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
+
+ # 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/confd-r1
b/net-misc/apt-cacher-ng/files/confd-r1
new file mode 100644
index 000..84b659bc488
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/confd-r1
@@ -0,0 +1,3 @@
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=" -c /etc/apt-cacher-ng "
+LOGDIR=""
diff --git a/net-misc/apt-cacher-ng/files/initd-r2
b/net-misc/apt-cacher-ng/files/initd-r2
new file mode 100644
index 000..ae9ab7258cc
--- /dev/null
+++ b/net-mi
[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/
commit: 01cb1df8882b9fbac492b6fbd28a6848f5012194
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed May 29 09:31:02 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed May 29 09:31:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01cb1df8
net-misc/apt-cacher-ng: Fix CFLAGS/LDFLAGS/openssl
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Bug: https://bugs.gentoo.org/show_bug.cgi?id=686608
Signed-off-by: Jeroen Roovers gentoo.org>
2_p2.ebuild => apt-cacher-ng-3.2_p2-r1.ebuild} | 9 +-
.../files/apt-cacher-ng-3.2-flags.patch| 112 +
2 files changed, 118 insertions(+), 3 deletions(-)
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r1.ebuild
similarity index 95%
rename from net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild
rename to net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r1.ebuild
index 97f303d5634..c66c11d82fa 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r1.ebuild
@@ -28,7 +28,7 @@ COMMON_DEPEND="
sys-apps/systemd
)
"
-DEPEND="
+BDEPEND="
${COMMON_DEPEND}
dev-util/cmake
>sys-devel/gcc-4.8
@@ -42,6 +42,7 @@ RDEPEND="
"
PATCHES=(
"${WORKDIR}"/debian/patches/debian-changes
+ "${FILESDIR}"/${PN}-3.2-flags.patch
)
S=${WORKDIR}/${P/_*}
@@ -60,7 +61,9 @@ pkg_setup() {
}
src_configure(){
- mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
+ mycmakeargs=(
+ "-DCMAKE_INSTALL_PREFIX=/usr"
+ )
if use fuse; then
mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
else
@@ -76,7 +79,7 @@ src_configure(){
}
src_install() {
- pushd ${BUILD_DIR} || die
+ pushd "${BUILD_DIR}" || die
dosbin ${PN}
if use fuse; then
dobin acngfs
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
new file mode 100644
index 000..9a909dcc057
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
@@ -0,0 +1,112 @@
+- Rip out additional CFLAGS/LDFLAGS
+- Drop osslcompat (bug #686608)
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -106,16 +106,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 -Wl,--threads)
+- 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)
+-
+ option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality"
on)
+
+ IF(CMAKE_SYSTEM MATCHES "Darwin")
+@@ -134,14 +124,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)
+- endif()
+- set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+
+ # XXX: could use the modern macros instead but they were not available in
CMake 2.x
+@@ -167,23 +149,6 @@
+endif()
+ endif()
+
+-option(USE_LTO "Enable Link Time Optimization (requires modern compilers)"
${USE_LTO_DEFAULT})
+-
+-if(USE_LTO)
+-SET(LDFLAGS_BACKUP "${CMAKE_EXE_LINKER_FLAGS}")
+-SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS} -flto")
+-_append(CMAKE_EXE_LINKER_FLAGS -flto)
+-CHECK_CXX_SOURCE_COMPILES("${CXX11_TESTSRC}" HAS_LTO)
+-if(HAS_LTO)
+-SET(ACNG_COMPFLAGS ${CMAKE_REQUIRED_FLAGS})
+-else()
+-SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS}")
+-SET(CMAKE_EXE_LINKER_FLAGS "${LDFLAGS_BACKUP}")
+-message(WARNING "Link Time Optimization support broken,
disabling it.")
+-endif()
+-endif()
+-message("-- LTO use: ${USE_LTO}")
+-
+ FIND_LIBRARY(HAVE_SOCKETLIB socket) # separate socket lib looks like
Solaris-like environment
+ if(HAVE_SOCKETLIB)
+LIST(APPEND BaseNetworkLibs socket nsl)
+@@ -378,7 +343,6 @@
+
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/acsyscap.h.in"
"${CMAKE_BINARY_DIR}/acsyscap.h")
+
+-add_subdirectory(oldssl-workaround)
+ add_subdirectory(client)
+ add_subdirectory(fs)
+ add_subdirectory(source)
+@@ -415,3 +379,14 @@
+ CFGDIR: ${CFGDIR}
+ SBINDIR: ${SBINDIR}
+ ")
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type ${CMAKE_BUILD_TYPE}
++Install path${CMAKE_INSTALL_PREFIX}
++Compiler flags:
