net-misc/apt-cacher-ng: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2020-01-14 05:13:50 +01:00
parent 828edf4017
commit b05498cbaa
7 changed files with 0 additions and 524 deletions

View File

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

View File

@@ -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
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}
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/*
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}
}

View File

@@ -1,131 +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=(
"${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}
}

View File

@@ -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=(
"${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}
}

View File

@@ -1,97 +0,0 @@
- 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)
--- a/fs/CMakeLists.txt
+++ b/fs/CMakeLists.txt
@@ -20,7 +20,7 @@
list(APPEND fsSRCS ../source/aclogger.cc)
endif()
- ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
+ ADD_EXECUTABLE(acngfs ${fsSRCS})
SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")
INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})
if(HAVE_DLOPEN)
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -4,12 +4,12 @@
ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})
SET_TARGET_PROPERTIES(acngstuff PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
-ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc $<TARGET_OBJECTS:osslcompat>)
+ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc)
TARGET_LINK_LIBRARIES(apt-cacher-ng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG})
SET_TARGET_PROPERTIES(apt-cacher-ng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
INSTALL(TARGETS apt-cacher-ng DESTINATION ${SBINDIR})
-ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff> $<TARGET_OBJECTS:osslcompat>)
+ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff>)
SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")
TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})
INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})

View File

@@ -1,2 +0,0 @@
# Additional options that are passed to the Daemon.
DAEMON_OPTS=" -c /etc/apt-cacher-ng "

View File

@@ -1,33 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
DAEMON="/usr/sbin/${RC_SVCNAME}"
RUNDIR="/var/run/${RC_SVCNAME}"
CACHEDIR="var/cache/${RC_SVCNAME}"
PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
depend() {
use net
}
start() {
ebegin "Starting ${RC_SVCNAME}"
checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
start-stop-daemon --start --exec ${DAEMON} \
--user ${RC_SVCNAME} --group ${RC_SVCNAME} \
--pidfile ${PIDFILE} \
-- ${DAEMON_OPTS}
eend $?
}
stop() {
ebegin "Stopping ${RC_SVCNAME}"
start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
--pidfile ${PIDFILE}
rm -f ${PIDFILE}
eend $?
}