diff options
Diffstat (limited to 'app-backup')
325 files changed, 7198 insertions, 9959 deletions
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest index b2a1971bce97..541ae7894914 100644 --- a/app-backup/amanda/Manifest +++ b/app-backup/amanda/Manifest @@ -1,8 +1 @@ -DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e -DIST amanda-3.4.1.tar.gz 5338575 BLAKE2B 286ca826cf80253fd4491b4e94db08cdeea9b13d115021859398ac940b55fb452561baa7545a5c8f3f973a0d595a220056e383a79577d1e9113a00960c9ba038 SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16 -DIST amanda-3.4.2.tar.gz 5353734 BLAKE2B b7c2bc78a1900d0c87f93ff9eea5cd8a9cb5ad8484475424a6a05d951d9ea543e936bec2fab1624f8ee512dc0a3f87228e07c1720b9a6ddf37f5525ca54260c4 SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd -DIST amanda-3.4.3.tar.gz 5355137 BLAKE2B 920e34c50a624aeab8ed1e6a4555d6b6e34ede45a8d896892a562a5b82ebf4be17acc49ba688238bae0e374bed0c2be8e683974de574038565cf1e7ad1cb65f0 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a -DIST amanda-3.4.4.tar.gz 5363929 BLAKE2B a3da69f63c43ba4821a28d380262b99444c45dbfaa5ff748c6e4d0d452c1ad3e1d6a254dd27fec7afc7f4f8ba0a56c56d90192f1a5ba714ed83e26e52700f397 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 -DIST amanda-3.4.5.tar.gz 5365381 BLAKE2B 61c18603d48c4e9c647cfc7e185292e8764d62bd1ea9212da04958029cc87472872fa2e4a45ec52bb15f6342d2f3e41e486a6618024f775dbedffcc762190ae4 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f -DIST amanda-3.5.tar.gz 5386719 BLAKE2B 93a382a9091ec7cfc5f21fe7131a6bf0c1aceb169a2274ce66c1f77a08b594beeca430687a6a28403d8cc35e85beecce99fde9c2d7d34c8460999a3ca63937f1 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild deleted file mode 100644 index 9936440e11b5..000000000000 --- a/app-backup/amanda/amanda-3.3.9.ebuild +++ /dev/null @@ -1,480 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="amd64 ppc ppc64 ~sparc x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87 - [ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda - [ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda - [ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87 - [ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash - [ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}" - [ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1 - [ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda - [ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP= - [ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP= - [ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH= - [ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS= - - # What tar to use - [ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval `echo "${currentamanda}"` - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" - done - - ( - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 - use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 - ) > "${T}"/amandahosts - - if ! use minimal; then - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - fi - - epatch "${FILESDIR}"/${P}-stuck.patch -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} `use_with kerberos krb5-security`" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild deleted file mode 100644 index dd358b4cf73b..000000000000 --- a/app-backup/amanda/amanda-3.4.1.ebuild +++ /dev/null @@ -1,487 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply "${FILESDIR}"/${P}-slots.patch || die - eapply "${FILESDIR}"/${P}-labelstr.patch || die - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild deleted file mode 100644 index a6f09df6878a..000000000000 --- a/app-backup/amanda/amanda-3.4.2.ebuild +++ /dev/null @@ -1,484 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild deleted file mode 100644 index a6f09df6878a..000000000000 --- a/app-backup/amanda/amanda-3.4.3.ebuild +++ /dev/null @@ -1,484 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild deleted file mode 100644 index a6f09df6878a..000000000000 --- a/app-backup/amanda/amanda-3.4.4.ebuild +++ /dev/null @@ -1,484 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild deleted file mode 100644 index a6f09df6878a..000000000000 --- a/app-backup/amanda/amanda-3.4.5.ebuild +++ /dev/null @@ -1,484 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket || die - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} - chmod u=srwx,g=rx,o= "${root}"/${i} - done -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.5-r1.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild deleted file mode 100644 index 9d5d9a365d92..000000000000 --- a/app-backup/amanda/amanda-3.5-r1.ebuild +++ /dev/null @@ -1,498 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs - -DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" -HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" - -LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" -SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk - app-arch/tar - dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON - dev-perl/Encode-Locale - nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) - samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) - xfs? ( sys-fs/xfsdump ) - !minimal? ( - dev-perl/XML-Simple - virtual/mailx - app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) - app-crypt/aespipe - app-crypt/gnupg - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 - app-text/docbook-xml-dtd - dev-libs/libxslt - dev-lang/swig - " - -MYFILESDIR="${T}/files" -ENVDIR="/etc/env.d" -ENVDFILE="97amanda" -TMPENVFILE="${T}/${ENVDFILE}" - -# This is a complete list of Amanda settings that the ebuild takes from the -# build environment. This allows users to alter the behavior of the package as -# upstream intended, but keeping with Gentoo style. We store a copy of them in -# /etc/env.d/97amanda during the install, so that they are preserved for future -# installed. This variable name must not start with AMANDA_, as we do not want -# it captured into the env file. -ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS -AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX -AMANDA_TAR_LISTDIR AMANDA_TAR -AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS -AMANDA_CONFIG_NAME AMANDA_TMPDIR" - -amanda_variable_setup() { - - # Setting vars - local currentamanda - - # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" - - # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" - - # This installs Amanda, with the server. However, it could be a client, - # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" - # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= - - # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar - - # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then - # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') - fi - - # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - -} - -pkg_setup() { - amanda_variable_setup - - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" -} - -src_unpack() { - # we do not want the perl src_unpack - default_src_unpack -} - -src_prepare() { - # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die - - # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die - - eautoreconf - - # places for us to work in - mkdir -p "${MYFILESDIR}" || die - # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die - - # Prepare our custom files - einfo "Building custom configuration files" - local i # our iterator - local sedexpr # var for sed expr - sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do - local val - eval "val=\"\${${i}}\"" - sedexpr="${sedexpr}s|__${i}__|${val}|g;" - done - - # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do - sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die - done - - if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die - else - sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ - server-src/am{addclient,serverconfig}.pl || die - cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die - fi - - eapply_user -} - -src_configure() { - # fix bug #36316 - addpredict /var/cache/samba/gencache.tdb - # fix bug #376169 - addpredict /run/blkid - addpredict /etc/blkid.tab - - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - local myconf - - einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" - einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" - einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" - einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" - einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" - einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" - einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" - einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" - einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" - - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then - eerror "If you want _both_ UDP and TCP ports, please use only the" - eerror "AMANDA_PORTS environment variable for identical ports, or set" - eerror "AMANDA_PORTS_BOTH." - die "Bad port setup!" - fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then - einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" - fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then - einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" - fi - if [ -n "${AMANDA_PORTS}" ]; then - einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" - fi - - # Extras - # Speed option - myconf="${myconf} --with-buffered-dump" - # "debugging" in the configuration is NOT debug in the conventional sense. - # It is actually just useful output in the application, and should remain - # enabled. There are some cases of breakage with MTX tape changers as of - # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" - # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" - - # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" - - # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by - # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" - - # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" - - # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" - - # libcurl is required for S3 but otherwise optional - if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" - fi - - # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" - else - # amplot - myconf="${myconf} $(use_with gnuplot)" - fi - - # IPv6 fun. - myconf="${myconf} `use_with ipv6`" - # This is to prevent the IPv6-is-working test - # As the test fails on binpkg build hosts with no IPv6. - use ipv6 && export amanda_cv_working_ipv6=yes - - # I18N - myconf="${myconf} `use_enable nls`" - - # Bug #296634: Perl location - perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" - - # Bug 296633: --disable-syntax-checks - # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" - - # build manpages - myconf="${myconf} --enable-manpage-build" - - # Bug #636262 - myconf="${myconf} $(use_with ndmp ndmp)" - - # bug #483120 - tc-export AR - - econf \ - $(use_with readline) \ - ${myconf} -} - -src_compile() { - # Again, do not want the perl-module src_compile - default_src_compile -} - -src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source ${TMPENVFILE} - - einfo "Doing stock install" - emake DESTDIR="${D}" install - - # Build the envdir file - # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d - einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" - - einfo "Installing systemd service and socket files for Amanda" - systemd_dounit "${FILESDIR}"/amanda.socket - systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' - - # Lock down next section (up until docs). - insopts -m0640 - # Installing Amanda Xinetd Services Definition - einfo "Installing xinetd service file" - insinto /etc/xinetd.d - if use minimal ; then - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda - else - newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda - fi - - if ! use minimal; then - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda - fi - - insinto /etc/amanda - einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" - doins "${T}/amandahosts" - fperms 600 /etc/amanda/amandahosts - - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" - insinto "${AMANDA_USER_HOMEDIR}" - einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile - - insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then - insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" - keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" - fi - - keepdir "${AMANDA_TAR_LISTDIR}" - keepdir "${AMANDA_USER_HOMEDIR}/amanda" - keepdir "${AMANDA_TMPDIR}/dumps" - # Just make sure it exists for XFS to work... - use xfs && keepdir /var/xfsdump/inventory - - local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do - einfo "Securing directory (${i})" - fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} - done - # Do NOT use -R - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda - - if ! use minimal ; then - fperms 0700 \ - "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ - /etc/amanda/${AMANDA_CONFIG_NAME} - fi - - einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" - - # Relax permissions again - insopts -m0644 - - # docs - einfo "Installing documentation" - dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING - # our inetd sample - einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample - # Amanda example configs - einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die - docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf - - einfo "Cleaning up dud .la files" - perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die -} - -pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" - source "${TMPENVFILE}" - - # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then - einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" - einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die - fi - if [ -f "${ROOT}/etc/amandates" ]; then - einfo "If you have migrated safely, please delete /etc/amandates" - fi - - einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" - - elog "You should configure Amanda in /etc/amanda now." - elog - elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda" - elog "and restart xinetd afterwards!" - elog - elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample" - elog "as an example of how to configure your inetd." - elog - elog "systemd-users: enable and start amanda.socket or the relevant services" - elog "regarding what auth method you use." - elog - elog "NOTICE: If you need raw access to partitions you need to add the" - elog "amanda user to the 'disk' group." - elog - elog "NOTICE: If you have a tape changer, you need to add the amanda user" - elog "to the 'tape' group." - elog - elog "If you use localhost in your disklist your restores may break." - elog "You should replace it with the actual hostname!" - elog "Please also see the syntax changes to amandahosts." - elog "The only exception is when you use the authentication method 'local'." - elog - elog "Please note that this package no longer explicitly depends on" - elog "virtual/inetd, as it supports modes where an inetd is not needed" - elog "(see bug #506028 for details)." -} - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - local i - for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar "${le}"/dumper \ - "${le}"/planner ; do - [ -e "${root}"/${i} ] || continue - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die - chmod u=srwx,g=rx,o= "${root}"/${i} || die - done - - # amanda-security.conf is a config file with similar requirements: - # writable only by root - # world-readable - # 3.3.9: introduced in /etc/amanda-security.conf - # 3.4.2: moved to /etc/amanda/amanda-security.conf - f=/etc/amanda/amanda-security.conf - chown root:root "${root}""${f}" || die - chmod u=rw,go=r "${root}""${f}" || die -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/amanda-3.5.1-r1.ebuild b/app-backup/amanda/amanda-3.5.1-r5.ebuild index 24ae22aa02ca..7496f6cc59e6 100644 --- a/app-backup/amanda/amanda-3.5.1-r1.ebuild +++ b/app-backup/amanda/amanda-3.5.1-r5.ebuild @@ -1,51 +1,63 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools perl-module user systemd toolchain-funcs +EAPI=7 + +inherit autotools perl-module systemd toolchain-funcs DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver" HOMEPAGE="http://www.amanda.org/" -SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/amanda/${P}.tar.gz" LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" SLOT="0" -IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs" +IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba selinux systemd xfs" +KEYWORDS="amd64 ppc ppc64 ~sparc x86" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="sys-libs/readline:= - virtual/awk +DEPEND=" + acct-group/amanda + acct-user/amanda + app-arch/dump app-arch/tar + dev-libs/glib:2 dev-lang/perl:= - app-arch/dump - net-misc/openssh - >=dev-libs/glib-2.26.0 - dev-perl/JSON dev-perl/Encode-Locale + dev-perl/JSON + virtual/openssh + sys-libs/readline:= + app-alternatives/awk + kerberos? ( app-crypt/mit-krb5 ) + ndmp? ( net-libs/libtirpc:= ) nls? ( virtual/libintl ) - s3? ( >=net-misc/curl-7.10.0 ) - !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) - kerberos? ( app-crypt/mit-krb5 ) + s3? ( net-misc/curl ) + !s3? ( curl? ( net-misc/curl ) ) xfs? ( sys-fs/xfsdump ) !minimal? ( - dev-perl/XML-Simple - virtual/mailx app-arch/mt-st:= - sys-block/mtx - gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg + dev-perl/XML-Simple + sys-block/mtx + virtual/mailx + gnuplot? ( sci-visualization/gnuplot ) )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - >=app-text/docbook-xsl-stylesheets-1.72.0 +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-amanda ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd - dev-libs/libxslt dev-lang/swig - " + dev-libs/libxslt + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-3.5.1-configure-clang16.patch +) MYFILESDIR="${T}/files" ENVDIR="/etc/env.d" @@ -59,58 +71,52 @@ TMPENVFILE="${T}/${ENVDFILE}" # installed. This variable name must not start with AMANDA_, as we do not want # it captured into the env file. ENV_SETTINGS_AMANDA=" -AMANDA_GROUP_GID AMANDA_GROUP_NAME -AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS +AMANDA_GROUP_NAME +AMANDA_USER_NAME AMANDA_USER_HOMEDIR AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_TAR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS AMANDA_CONFIG_NAME AMANDA_TMPDIR" amanda_variable_setup() { - # Setting vars local currentamanda # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" + currentamanda="$(set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" # First we set the defaults - [[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87 - [[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda - [[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda - [[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87 - [[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash - [[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda - [[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}" + AMANDA_GROUP_NAME=amanda + AMANDA_USER_NAME=amanda + AMANDA_USER_HOMEDIR=/var/spool/amanda # This installs Amanda, with the server. However, it could be a client, # just specify an alternate server name in AMANDA_SERVER. - [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}" - [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}" - [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0" - [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}" - [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists - [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1 - [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda - [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR" + : ${AMANDA_SERVER:=${HOSTNAME}} + : ${AMANDA_SERVER_TAPE:=${AMANDA_SERVER}} + : ${AMANDA_SERVER_TAPE_DEVICE:="${EPREFIX}"/dev/nst0} + : ${AMANDA_SERVER_INDEX:=${AMANDA_SERVER}} + : ${AMANDA_TAR_LISTDIR:=${AMANDA_USER_HOMEDIR}/tar-lists} + : ${AMANDA_CONFIG_NAME:=DailySet1} + : ${AMANDA_TMPDIR:="${EPREFIX}"/var/tmp/amanda} + : ${AMANDA_DBGDIR:=${AMANDA_TMPDIR}} # These are left empty by default - [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP= - [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP= - [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH= - [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS= + : ${AMANDA_PORTS_UDP:=""} + : ${AMANDA_PORTS_TCP:=""} + : ${AMANDA_PORTS_BOTH:=""} + : ${AMANDA_PORTS:=""} # What tar to use - [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar + : ${AMANDA_TAR:=/bin/tar} # Now pull in the old stuff - if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then + if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') + eval $(grep -E "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') fi # Re-apply the new settings if any - [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}") - + [[ -n ${currentamanda} ]] && eval $(echo "${currentamanda}") } pkg_setup() { @@ -118,7 +124,7 @@ pkg_setup() { # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then + if use minimal && [[ ${AMANDA_SERVER} == ${HOSTNAME} ]]; then elog "You are installing a client-only version of Amanda." elog "You should set the variable \$AMANDA_SERVER to point at your" elog "Amanda-tape-server, otherwise you will have to specify its name" @@ -127,47 +133,46 @@ pkg_setup() { elog "AMANDA_SERVER=\"myserver\" emerge amanda" elog fi - - enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" - enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" } src_unpack() { # we do not want the perl src_unpack - default_src_unpack + default } src_prepare() { + default + use ndmp && eapply "${FILESDIR}"/${P}-tirpc.patch # gentoo bug #331111 - sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die - sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die + sed -i '/^check-local: check-perl$/d' config/automake/scripts.am || die + sed -i '/^check-local:/s,syntax-check,,g' perl/Makefile.am || die # bug with glibc-2.16.0 - sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die + sed -i -e '/gets is a security/d' gnulib/stdio.in.h || die # https://bugs.gentoo.org/701416 sandbox violation - sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' "${S}"/config/amanda/dumpers.m4 || die + sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' config/amanda/dumpers.m4 || die eautoreconf # places for us to work in mkdir -p "${MYFILESDIR}" || die # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die + set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die # Prepare our custom files einfo "Building custom configuration files" local i # our iterator local sedexpr # var for sed expr sedexpr='' - for i in ${ENV_SETTINGS_AMANDA} ; do + for i in ${ENV_SETTINGS_AMANDA}; do local val eval "val=\"\${${i}}\"" sedexpr="${sedexpr}s|__${i}__|${val}|g;" done # now apply the sed expr - for i in "${FILESDIR}"/amanda-* ; do + for i in "${FILESDIR}"/amanda-*; do sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die done @@ -189,126 +194,155 @@ src_configure() { addpredict /run/blkid addpredict /etc/blkid.tab - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" + [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!" source "${TMPENVFILE}" - local myconf + local myconf=() einfo "Using ${AMANDA_SERVER_TAPE} for tape server." - myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}" + myconf+=( --with-tape-server="${AMANDA_SERVER_TAPE}" ) einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server." - myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}" + myconf+=( --with-tape-device="${AMANDA_SERVER_TAPE_DEVICE}" ) einfo "Using ${AMANDA_SERVER_INDEX} for index server." - myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}" + myconf+=( --with-index-server="${AMANDA_SERVER_INDEX}" ) einfo "Using ${AMANDA_USER_NAME} for amanda user." - myconf="${myconf} --with-user=${AMANDA_USER_NAME}" + myconf+=( --with-user="${AMANDA_USER_NAME}" ) einfo "Using ${AMANDA_GROUP_NAME} for amanda group." - myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}" + myconf+=( --with-group="${AMANDA_GROUP_NAME}" ) einfo "Using ${AMANDA_TAR} as Tar implementation." - myconf="${myconf} --with-gnutar=${AMANDA_TAR}" + myconf+=( --with-gnutar="${AMANDA_TAR}" ) einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir." - myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}" + myconf+=( --with-gnutar-listdir="${AMANDA_TAR_LISTDIR}" ) einfo "Using ${AMANDA_CONFIG_NAME} as default config name." - myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}" + myconf+=( --with-config="${AMANDA_CONFIG_NAME}" ) einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory." - myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}" + myconf+=( --with-tmpdir="${AMANDA_TMPDIR}" ) - if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then + if [[ -n ${AMANDA_PORTS_UDP} && -n ${AMANDA_PORTS_TCP} && -z ${AMANDA_PORTS_BOTH} ]]; then eerror "If you want _both_ UDP and TCP ports, please use only the" eerror "AMANDA_PORTS environment variable for identical ports, or set" eerror "AMANDA_PORTS_BOTH." die "Bad port setup!" fi - if [ -n "${AMANDA_PORTS_UDP}" ]; then + if [[ -n ${AMANDA_PORTS_UDP} ]]; then einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}" - myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}" + myconf+=( --with-udpportrange="${AMANDA_PORTS_UDP}" ) fi - if [ -n "${AMANDA_PORTS_TCP}" ]; then + if [[ -n ${AMANDA_PORTS_TCP} ]]; then einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}" - myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}" + myconf+=( --with-tcpportrange="${AMANDA_PORTS_TCP}" ) fi - if [ -n "${AMANDA_PORTS}" ]; then + if [[ -n ${AMANDA_PORTS} ]]; then einfo "Using ports ${AMANDA_PORTS/,/-}" - myconf="${myconf} --with-portrange=${AMANDA_PORTS}" + myconf+=( --with-portrange="${AMANDA_PORTS}" ) fi # Extras # Speed option - myconf="${myconf} --with-buffered-dump" + myconf+=( --with-buffered-dump ) # "debugging" in the configuration is NOT debug in the conventional sense. # It is actually just useful output in the application, and should remain # enabled. There are some cases of breakage with MTX tape changers as of # 2.5.1p2 that it exposes when turned off as well. - myconf="${myconf} --with-debugging" + myconf+=( --with-debugging ) # Where to put our files - myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}" + myconf+=( --localstatedir="${AMANDA_USER_HOMEDIR}" ) # Samba support - myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)" + myconf+=( $(use_with samba smbclient /usr/bin/smbclient) ) # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by # default - myconf="${myconf} --with-bsd-security" - myconf="${myconf} --with-ssh-security" - myconf="${myconf} --with-bsdudp-security" - myconf="${myconf} --with-bsdtcp-security" + myconf+=( --with-bsd-security ) + myconf+=( --with-ssh-security ) + myconf+=( --with-bsdudp-security ) + myconf+=( --with-bsdtcp-security ) # kerberos-security mechanism version 5 - myconf="${myconf} $(use_with kerberos krb5-security)" + myconf+=( $(use_with kerberos krb5-security) ) # Amazon S3 support - myconf="${myconf} `use_enable s3 s3-device`" + myconf+=( $(use_enable s3 s3-device) ) # libcurl is required for S3 but otherwise optional if ! use s3; then - myconf="${myconf} $(use_with curl libcurl)" + myconf+=( $(use_with curl libcurl) ) fi # Client only, as requested in bug #127725 - if use minimal ; then - myconf="${myconf} --without-server" + if use minimal; then + myconf+=( --without-server ) else # amplot - myconf="${myconf} $(use_with gnuplot)" + myconf+=( $(use_with gnuplot) ) fi # IPv6 fun. - myconf="${myconf} `use_with ipv6`" + myconf+=( $(use_with ipv6) ) # This is to prevent the IPv6-is-working test # As the test fails on binpkg build hosts with no IPv6. use ipv6 && export amanda_cv_working_ipv6=yes # I18N - myconf="${myconf} `use_enable nls`" + myconf+=( $(use_enable nls) ) # Bug #296634: Perl location perl_set_version - myconf="${myconf} --with-amperldir=${VENDOR_LIB}" + myconf+=( --with-amperldir="${VENDOR_LIB}" ) # Bug 296633: --disable-syntax-checks # Some tests are not safe for production systems - myconf="${myconf} --disable-syntax-checks" + myconf+=( --disable-syntax-checks ) # build manpages - myconf="${myconf} --enable-manpage-build" + myconf+=( --enable-manpage-build ) # Bug #636262 - myconf="${myconf} $(use_with ndmp ndmp)" + myconf+=( $(use_with ndmp ndmp) ) # bug #483120 tc-export AR econf \ + --disable-static \ $(use_with readline) \ - ${myconf} + "${myconf[@]}" } src_compile() { # Again, do not want the perl-module src_compile - default_src_compile + default +} + +# We do not want the perl-module tests. +src_test() { + default +} + +# We have had reports of amanda file permissions getting screwed up. +# Losing setuid, becoming too lax etc. +# ONLY root and users in the amanda group should be able to run these binaries! +amanda_permissions_fix() { + local root="$1" + [[ -z ${root} ]] && die "Failed to pass root argument to amanda_permissions_fix!" + local i le=/usr/libexec/amanda + for i in "${le}"/calcsize "${le}"/killpgrp "${le}"/rundump "${le}"/runtar; do + [[ -e ${root}/${i} ]] || continue + chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die + chmod u=srwx,g=rx,o= "${root}"/${i} || die + done + + # amanda-security.conf is a config file with similar requirements: + # writable only by root + # world-readable + # 3.3.9: introduced in /etc/amanda-security.conf + # 3.4.2: moved to /etc/amanda/amanda-security.conf + f=/etc/amanda/amanda-security.conf + chown root:root "${root}""${f}" || die + chmod u=rw,go=r "${root}""${f}" || die } src_install() { - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" + [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!" source ${TMPENVFILE} einfo "Doing stock install" @@ -316,18 +350,14 @@ src_install() { # Build the envdir file # Don't forget this.. - einfo "Building environment file" - ( - echo "# These settings are what was present in the environment when this" - echo "# Amanda was compiled. Changing anything below this comment will" - echo "# have no effect on your application, but it merely exists to" - echo "# preserve them for your next emerge of Amanda" - cat "${TMPENVFILE}" | sed "s,=\$,='',g" - ) >> "${MYFILESDIR}/${ENVDFILE}" - - # Env.d einfo "Installing environment config file" - doenvd "${MYFILESDIR}/${ENVDFILE}" + newenvd - "${ENVDFILE}" <<- _EOF_ + # These settings are what was present in the environment when this + # Amanda was compiled. Changing anything below this comment will + # have no effect on your application, but it merely exists to + # preserve them for your next emerge of Amanda + $(cat "${TMPENVFILE}" | sed "s,=\$,='',g") + _EOF_ einfo "Installing systemd service and socket files for Amanda" systemd_dounit "${FILESDIR}"/amanda.socket @@ -338,7 +368,7 @@ src_install() { # Installing Amanda Xinetd Services Definition einfo "Installing xinetd service file" insinto /etc/xinetd.d - if use minimal ; then + if use minimal; then newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda else newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda @@ -347,7 +377,7 @@ src_install() { if ! use minimal; then einfo "Installing Sample Daily Cron Job for Amanda" insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda + newins "${MYFILESDIR}"/amanda-cron amanda fi insinto /etc/amanda @@ -355,17 +385,17 @@ src_install() { doins "${T}/amandahosts" fperms 600 /etc/amanda/amandahosts - dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts" + dosym "${AMANDA_USER_HOMEDIR}/.amandahosts" /etc/amanda/amandahosts insinto "${AMANDA_USER_HOMEDIR}" einfo "Installing .profile for ${AMANDA_USER_NAME} user" - newins "${MYFILESDIR}/amanda-profile" .profile + newins "${MYFILESDIR}"/amanda-profile .profile insinto /etc/amanda - doins "${S}/example/amanda-client.conf" - if ! use minimal ; then + doins example/amanda-client.conf + if ! use minimal; then insinto "/etc/amanda/${AMANDA_CONFIG_NAME}" - doins "${S}/example/amanda.conf" - doins "${S}/example/disklist" + doins example/amanda.conf + doins example/disklist keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index" fi @@ -376,8 +406,7 @@ src_install() { use xfs && keepdir /var/xfsdump/inventory local i - for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ - "${AMANDA_TMPDIR}" /etc/amanda; do + for i in "${AMANDA_TMPDIR}" /etc/amanda; do einfo "Securing directory (${i})" fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i} done @@ -385,17 +414,17 @@ src_install() { fperms 0700 \ "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \ "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \ - "${AMANDA_USER_HOMEDIR}/amanda" \ - /etc/amanda + "${AMANDA_USER_HOMEDIR}/amanda" \ + /etc/amanda - if ! use minimal ; then + if ! use minimal; then fperms 0700 \ "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \ /etc/amanda/${AMANDA_CONFIG_NAME} fi einfo "Setting setuid permissions" - amanda_permissions_fix "${D}" + amanda_permissions_fix "${ED}" # Relax permissions again insopts -m0644 @@ -405,42 +434,41 @@ src_install() { dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING # our inetd sample einfo "Installing standard inetd sample" - newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample + newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.6.0_p2-r2 amanda-inetd.amanda.sample # Amanda example configs einfo "Installing example configurations" - rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die - mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die + rm "${ED}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die + mv "${ED}"/usr/share/amanda/example "${ED}"/usr/share/doc/${PF}/ || die docinto example1 - newdoc "${FILESDIR}/example_amanda.conf" amanda.conf - newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist - newdoc "${FILESDIR}/example_global.conf" global.conf + newdoc "${FILESDIR}"/example_amanda.conf amanda.conf + newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist + newdoc "${FILESDIR}"/example_global.conf global.conf einfo "Cleaning up dud .la files" perl_set_version - find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die + + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \ - TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}" - [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!" + [[ ! -f ${TMPENVFILE} && ${MERGE_TYPE} == "binary" ]] && TMPENVFILE="${EROOT}${ENVDIR}/${ENVDFILE}" + [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!" source "${TMPENVFILE}" # Migration of amandates from /etc to $localstatedir/amanda - if [ -f "${ROOT}/etc/amandates" -a \ - ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then + if [[ -f ${EROOT}/etc/amandates && ! -f ${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates ]]; then einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" einfo "A backup is also placed at /etc/amandates.orig" - cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die - mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die - cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die + cp -dp "${EROOT}"/etc/amandates "${EROOT}"/etc/amandates.orig || die + mkdir -p "${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die + cp -dp "${EROOT}"/etc/amandates "${EROOT}"/${AMANDA_USER_HOMEDIR}/amanda/amandates || die fi - if [ -f "${ROOT}/etc/amandates" ]; then + if [[ -f ${EROOT}/etc/amandates ]]; then einfo "If you have migrated safely, please delete /etc/amandates" fi einfo "Checking setuid permissions" - amanda_permissions_fix "${ROOT}" + amanda_permissions_fix "${EROOT}"/ elog "You should configure Amanda in /etc/amanda now." elog @@ -468,33 +496,3 @@ pkg_postinst() { elog "virtual/inetd, as it supports modes where an inetd is not needed" elog "(see bug #506028 for details)." } - -# We have had reports of amanda file permissions getting screwed up. -# Losing setuid, becoming too lax etc. -# ONLY root and users in the amanda group should be able to run these binaries! -amanda_permissions_fix() { - local root="$1" - [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" - local le="/usr/libexec/amanda" - local i - for i in "${le}"/calcsize "${le}"/killpgrp \ - "${le}"/rundump "${le}"/runtar ; do - [ -e "${root}"/${i} ] || continue - chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die - chmod u=srwx,g=rx,o= "${root}"/${i} || die - done - - # amanda-security.conf is a config file with similar requirements: - # writable only by root - # world-readable - # 3.3.9: introduced in /etc/amanda-security.conf - # 3.4.2: moved to /etc/amanda/amanda-security.conf - f=/etc/amanda/amanda-security.conf - chown root:root "${root}""${f}" || die - chmod u=rw,go=r "${root}""${f}" || die -} - -# We do not want the perl-module tests. -src_test() { - default_src_test -} diff --git a/app-backup/amanda/files/amanda-3.3.9-stuck.patch b/app-backup/amanda/files/amanda-3.3.9-stuck.patch deleted file mode 100644 index 88892e41be3b..000000000000 --- a/app-backup/amanda/files/amanda-3.3.9-stuck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/amanda/server-src/driver.c
-+++ b/amanda/server-src/driver.c
-@@ -3957,6 +3957,8 @@
- driver_debug(2, _("new_data: %lld\n"), (long long)new_data);
- driver_debug(2, _("data_free: %lld\n"), (long long)data_free);
- ;
-+ tapeq_size -= data_free;
-+ tapeq_size += new_data;
- driver_debug(2, _("tapeq_size: %lld\n"), (long long)tapeq_size);
-
- sched_size = runq_size + tapeq_size + dumpers_size;
\ No newline at end of file diff --git a/app-backup/amanda/files/amanda-3.4.1-labelstr.patch b/app-backup/amanda/files/amanda-3.4.1-labelstr.patch deleted file mode 100644 index b169c8ae6472..000000000000 --- a/app-backup/amanda/files/amanda-3.4.1-labelstr.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/installcheck/Amanda_Rest_Storages.pl b/installcheck/Amanda_Rest_Storages.pl -index f3c699b..3e4e889 100644 ---- a/installcheck/Amanda_Rest_Storages.pl -+++ b/installcheck/Amanda_Rest_Storages.pl -@@ -308,6 +308,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply), - 'inventory' => [ - {'current' => 1, - 'label' => "DISKFLAT-001", -+ 'label_match' => '1', - 'device_status' => '0', - 'reserved' => 0, - 'f_type' => '1', -@@ -467,6 +468,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply), - 'label' => 'DISKFLAT-001', - 'datestamp' => '20140509113436', - 'write_protected' => '', -+ 'label_match' => '1', - 'process' => 'Amanda::Rest::Storages', - 'running_on' => 'amanda-server', - 'component' => 'rest-server', -diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl -index 1a3527f..700c5a2 100644 ---- a/installcheck/amtape.pl -+++ b/installcheck/amtape.pl -@@ -177,13 +177,13 @@ like($Installcheck::Run::stderr, - ok(run('amtape', 'TESTCONF', 'show'), - "'amtape TESTCONF show'"); - like($Installcheck::Run::stderr, -- qr/slot +2:.*label MyTape\nslot +3/, -+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/, - "'amtape TESTCONF show' ..result correct"); - - ok(run('amtape', 'TESTCONF', 'show', '2'), - "'amtape TESTCONF show'"); - like($Installcheck::Run::stderr, -- qr/^slot +2:.*label MyTape$/, -+ qr/^slot +2:.*label MyTape \(label do not match labelstr\)$/, - "'amtape TESTCONF show 2' ..result correct"); - - ok(run('amtape', 'TESTCONF', 'show', '1,3'), -@@ -252,13 +252,13 @@ like(run_err('amtape', 'TESTCONF', 'update'), - ok(run('amtape', 'TESTCONF', 'show'), - "'amtape TESTCONF show'"); - like($Installcheck::Run::stderr, -- qr/slot +2:.*label MyTape\nslot +3/, -+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/, - "..result correct"); - - ok(run('amtape', 'TESTCONF', 'inventory'), - "'amtape TESTCONF inventory'"); - like($Installcheck::Run::stdout, -- qr/slot +1: blank\nslot +2: label MyTape \(current\)\nslot +3/, -+ qr/slot +1: blank\nslot +2: label MyTape \(current\) \(label do not match labelstr\)\nslot +3/, - "..result correct"); - - ok(run('amtape', 'TESTCONF', 'taper'), -diff --git a/perl/Amanda/Changer.pm b/perl/Amanda/Changer.pm -index 92ed9b6..4b4aad4 100644 ---- a/perl/Amanda/Changer.pm -+++ b/perl/Amanda/Changer.pm -@@ -60,9 +60,10 @@ sub local_message { - } elsif ($self->{'code'} == 1100014) { - return "$self->{'err'}"; - } elsif ($self->{'code'} == 1100015) { -- return sprintf("slot %3s: date %-14s label %s%s", $self->{'slot'}, -+ return sprintf("slot %3s: date %-14s label %s%s%s", $self->{'slot'}, - $self->{'datestamp'}, $self->{'label'}, -- $self->{'write_protected'}?" (Write protected)":""); -+ $self->{'write_protected'}?" (Write protected)":"", -+ $self->{'label_match'}?"":" (label do not match labelstr)"); - } elsif ($self->{'code'} == 1100016) { - return sprintf("slot %3s: unlabeled volume%s", $self->{'slot'}, - $self->{'write_protected'}?" (Write protected)":""); -@@ -2014,6 +2015,13 @@ sub show { - my $st = $dev->read_label(); - my $write_protected = !$dev->check_writable(); - if ($st == $DEVICE_STATUS_SUCCESS) { -+ my $label_match = match_labelstr( -+ $self->{'storage'}->{'labelstr'}, -+ $self->{'storage'}->{'autolabel'}, -+ $dev->volume_label(), -+ $res->{'barcode'}, -+ $res->{'meta'}, -+ $self->{'storage'}->{'storage_name'}); - $params{'user_msg'}->(Amanda::Changer::Message->new( - source_filename => __FILE__, - source_line => __LINE__, -@@ -2022,7 +2030,8 @@ sub show { - slot => $last_slot, - datestamp => $dev->volume_time(), - label => $dev->volume_label(), -- write_protected => $write_protected)); -+ write_protected => $write_protected, -+ label_match => $label_match)); - } elsif ($st == $DEVICE_STATUS_VOLUME_UNLABELED) { - $params{'user_msg'}->(Amanda::Changer::Message->new( - source_filename => __FILE__, -diff --git a/perl/Amanda/Rest/Storages.pm b/perl/Amanda/Rest/Storages.pm -index 680115b..b1b59d2 100644 ---- a/perl/Amanda/Rest/Storages.pm -+++ b/perl/Amanda/Rest/Storages.pm -@@ -436,6 +436,17 @@ sub inventory { - $inv->{'retention_type'} = $tl->get_retention_name($retention_type); - } - } -+ for my $inv (@$inventory) { -+ if ($inv->{label}) { -+ $inv->{'label_match'} = Amanda::Util::match_labelstr( -+ $storage->{'labelstr'}, -+ $storage->{'autolabel'}, -+ $inv->{'label'}, -+ $inv->{'barcode'}, -+ $inv->{'metae'}, -+ $storage->{'storage_name'}); -+ } -+ } - push @result_messages, Amanda::Changer::Message->new( - source_filename => __FILE__, - source_line => __LINE__, -diff --git a/server-src/amtape.pl b/server-src/amtape.pl -index b63607e..d06eefe 100644 ---- a/server-src/amtape.pl -+++ b/server-src/amtape.pl -@@ -30,7 +30,7 @@ use Text::Wrap; - use Amanda::Device qw( :constants ); - use Amanda::Debug qw( :logging ); - use Amanda::Config qw( :init :getconf config_dir_relative ); --use Amanda::Util qw( :constants ); -+use Amanda::Util qw( :constants match_labelstr ); - use Amanda::Storage; - use Amanda::Changer; - use Amanda::Constants; -@@ -219,6 +219,7 @@ sub { - for my $sl (@$inv) { - my $line = "slot $sl->{slot}:"; - my $tle; -+ my $meta; - if ($sl->{'state'} == Amanda::Changer::SLOT_EMPTY) { - $line .= " empty"; - } elsif (!defined($sl->{device_status}) && !defined($sl->{label})) { -@@ -230,6 +231,7 @@ sub { - if (defined $tle) { - if ($tle->{'meta'}) { - $line .= " ($tle->{'meta'})"; -+ $meta = $tle->{'meta'}; - } - } - } elsif ($sl->{'device_status'} == $DEVICE_STATUS_VOLUME_UNLABELED) { -@@ -263,6 +265,15 @@ sub { - $line .= " [device error]"; - } - } -+ if ($sl->{'label'}) { -+ if (!match_labelstr($storage->{'labelstr'}, -+ $storage->{'autolabel'}, -+ $sl->{label}, -+ $sl->{'barcode'}, $meta, -+ $storage->{'storage_name'})) { -+ $line .= " (label do not match labelstr)"; -+ } -+ } - if (defined $tle) { - my $retention_type = Amanda::Tapelist::get_retention_type($tle->{pool}, $tle->{label}); - $line .= " [" . $tl->get_retention_name($retention_type) . "]"; diff --git a/app-backup/amanda/files/amanda-3.4.1-slots.patch b/app-backup/amanda/files/amanda-3.4.1-slots.patch deleted file mode 100644 index 1e4e583ecc26..000000000000 --- a/app-backup/amanda/files/amanda-3.4.1-slots.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/perl/Amanda/Changer/aggregate.pm b/perl/Amanda/Changer/aggregate.pm -index a2bd962..ecf9d28 100644 ---- a/perl/Amanda/Changer/aggregate.pm -+++ b/perl/Amanda/Changer/aggregate.pm -@@ -391,7 +391,10 @@ sub info_key { - my $kid = 0; - for (@$kid_results) { - my ($err, %kid_info) = @$_; -- next unless exists($kid_info{'slots'}); -+ if (!exists($kid_info{'slots'})){ -+ $kid++; -+ next; -+ } - my $kid_slots = $kid_info{'slots'}; - push @slots, map "$kid:$_", @{$kid_slots}; - $kid++; diff --git a/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch b/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch new file mode 100644 index 000000000000..a95c8ed55aed --- /dev/null +++ b/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch @@ -0,0 +1,22 @@ +https://github.com/zmanda/amanda/pull/220 + +From 74610ac5522caa779b30323f1c731775083c5bbc Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 14 Apr 2023 15:45:16 +0200 +Subject: [PATCH] configure: Avoid an implicit int in the IPv6 test + +Otherwise, the test fails unconditionally with compilers that +do not support implicit ints (a language feature that was removed with +the C99 language revision). +--- a/config/amanda/ipv6.m4 ++++ b/config/amanda/ipv6.m4 +@@ -85,7 +85,7 @@ AC_DEFUN([AMANDA_CHECK_IPV6], + #include <sys/socket.h> + #include <errno.h> + +-main() ++int main(void) + { + int aa; + aa = socket(AF_INET6, SOCK_STREAM, 0); + diff --git a/app-backup/amanda/files/amanda-3.5.1-fno-common.patch b/app-backup/amanda/files/amanda-3.5.1-fno-common.patch new file mode 100644 index 000000000000..3f77c3a709c5 --- /dev/null +++ b/app-backup/amanda/files/amanda-3.5.1-fno-common.patch @@ -0,0 +1,13 @@ +diff --git a/common-src/testutils.h b/common-src/testutils.h +index 31f8973..3bb376f 100644 +--- a/common-src/testutils.h ++++ b/common-src/testutils.h +@@ -75,7 +75,7 @@ typedef struct TestUtilsTest { + #define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); } + + /* Is debugging enabled for this test run? (set internally) */ +-int tu_debugging_enabled; ++extern int tu_debugging_enabled; + + /* + * Main loop diff --git a/app-backup/amanda/files/amanda-3.5.1-tirpc.patch b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch new file mode 100644 index 000000000000..42472b59af3a --- /dev/null +++ b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/656340 +--- a/config/amanda/amanda_configure.m4 ++++ b/config/amanda/amanda_configure.m4 +@@ -257,6 +257,12 @@ AMANDA_CHECK_READLINE + AC_CHECK_LIB(m,modf) + AMANDA_CHECK_LIBDL + AMANDA_GLIBC_BACKTRACE ++PKG_CHECK_MODULES([TIRPC],[libtirpc],[ ++ CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS} -DHAVE_RPC_RPC_H" ++ LIBS="${LIBS} ${TIRPC_LIBS}" ++], [ ++ AC_MSG_ERROR([libtirpc requested but library not found]) ++]) + AC_SEARCH_LIBS([shm_open], [rt], [], [ + AC_MSG_ERROR([unable to find the shm_open() function]) + ]) diff --git a/app-backup/amanda/files/amanda.service-r1 b/app-backup/amanda/files/amanda.service-r1 deleted file mode 100644 index a605eb487bf0..000000000000 --- a/app-backup/amanda/files/amanda.service-r1 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Amanda Backup System -After=local-fs.target - -[Service] -User=amanda -Group=amanda -ExecStart=/usr/libexec/amanda/amandad -auth=bsdtcp amdump amindexd amidxtaped -StandardInput=socket -StandardOutput=socket diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml index 5846584c7a1f..8372298b14c7 100644 --- a/app-backup/amanda/metadata.xml +++ b/app-backup/amanda/metadata.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> <name>Robin H. Johnson</name> </maintainer> - <maintainer type="person"> - <email>lists@xunil.at</email> - <name>Stefan G. Weichinger</name> - </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>dustin@v.igoro.us</email> <description>Upstream. Please CC on bugs.</description> <name>Dustin J. Mitchell</name> diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest deleted file mode 100644 index d951d109dc8b..000000000000 --- a/app-backup/attic/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild deleted file mode 100644 index 4fa4def16abf..000000000000 --- a/app-backup/attic/attic-0.16-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/jborg/attic.git" - inherit git-r3 -else - SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Attic is a deduplicating backup program written in Python." -HOMEPAGE="https://attic-backup.org/" - -LICENSE="BSD" -SLOT="0" -IUSE="libressl" - -RDEPEND=" - dev-python/msgpack[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-python/llfuse[${PYTHON_USEDEP}]" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ${RDEPEND}" - -python_prepare_all() { - # allow use of new (renamed) msgpack - sed -i '/msgpack/d' setup.py || die - distutils-r1_python_prepare_all -} diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild deleted file mode 100644 index 4fa4def16abf..000000000000 --- a/app-backup/attic/attic-9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/jborg/attic.git" - inherit git-r3 -else - SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Attic is a deduplicating backup program written in Python." -HOMEPAGE="https://attic-backup.org/" - -LICENSE="BSD" -SLOT="0" -IUSE="libressl" - -RDEPEND=" - dev-python/msgpack[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-python/llfuse[${PYTHON_USEDEP}]" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ${RDEPEND}" - -python_prepare_all() { - # allow use of new (renamed) msgpack - sed -i '/msgpack/d' setup.py || die - distutils-r1_python_prepare_all -} diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml deleted file mode 100644 index 3cefbbec9038..000000000000 --- a/app-backup/attic/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <upstream> - <remote-id type="github">jborg/attic</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest index 558b875d3b7d..cdaa0118f8de 100644 --- a/app-backup/backintime/Manifest +++ b/app-backup/backintime/Manifest @@ -1 +1,2 @@ -DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e +DIST backintime-1.3.2.tar.gz 714459 BLAKE2B cc53bd5391155705016248511e30cdfa7bc25f0a7cb170dfeeffda397e8be1b22f8e335063289d8c192f94c469430655064899ac8059f22f3b7582e3af87d373 SHA512 19f756d03cc7533e02bb5172ae3f8c167206bf5e8d60c0f3af1f647e01297a4eeb7889bbb5b58e46636bc31392ee436249b276ddbfa41697a0538c542fa26cb8 +DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372 diff --git a/app-backup/backintime/backintime-1.2.1.ebuild b/app-backup/backintime/backintime-1.3.2-r1.ebuild index 754fca5ac5f6..6eb50a6b1a7d 100644 --- a/app-backup/backintime/backintime-1.2.1.ebuild +++ b/app-backup/backintime/backintime-1.3.2-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..10} ) inherit python-single-r1 xdg DESCRIPTION="Backup system inspired by TimeVault and FlyBack" @@ -20,51 +19,55 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/keyring[${PYTHON_MULTI_USEDEP}] - ') - net-misc/openssh - net-misc/rsync[xattr,acl] -" + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + ')" RDEPEND="${DEPEND} - qt5? ( dev-python/PyQt5[gui,widgets] ) -" + virtual/openssh + net-misc/rsync[xattr,acl] + qt5? ( dev-python/PyQt5[gui,widgets] )" +BDEPEND="sys-devel/gettext" -PATCHES=( "${FILESDIR}/${P}-no-compress-docs-examples.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" ) src_configure() { pushd common > /dev/null || die - ./configure --python3 --no-fuse-group || die + # Not autotools + ./configure --python3 --no-fuse-group || die popd > /dev/null || die + if use qt5 ; then pushd qt > /dev/null || die - ./configure --python3 || die + ./configure --python3 || die popd > /dev/null || die fi } src_compile() { pushd common > /dev/null || die - emake + emake popd > /dev/null || die + if use qt5 ; then pushd qt > /dev/null || die - emake + emake popd > /dev/null || die fi } src_install() { pushd common > /dev/null || die - emake DESTDIR="${D}" install + emake DESTDIR="${D}" install popd > /dev/null || die + if use qt5 ; then pushd qt > /dev/null || die - emake DESTDIR="${D}" install + emake DESTDIR="${D}" install popd > /dev/null || die fi einstalldocs + if use examples ; then docinto examples dodoc common/{config-example-local,config-example-ssh} diff --git a/app-backup/backintime/backintime-1.3.3-r1.ebuild b/app-backup/backintime/backintime-1.3.3-r1.ebuild new file mode 100644 index 000000000000..4168adaf8d16 --- /dev/null +++ b/app-backup/backintime/backintime-1.3.3-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 xdg + +DESCRIPTION="Backup system inspired by TimeVault and FlyBack" +HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/bit-team/backintime/" + inherit git-r3 +else + SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="amd64 x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples qt5 test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + ') +" +RDEPEND=" + ${DEPEND} + virtual/openssh + net-misc/rsync[xattr,acl] + qt5? ( dev-python/PyQt5[gui,widgets] ) +" +BDEPEND=" + sys-devel/gettext + test? ( + $(python_gen_cond_dep ' + dev-python/pyfakefs[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" ) + +src_prepare() { + default + + # Looks at host system too much, so too flaky + rm common/test/test_tools.py || die + # Fails with dbus/udev issue (likely sandbox) + rm common/test/test_snapshots.py || die +} + +src_configure() { + pushd common > /dev/null || die + # Not autotools + ./configure --python3 --no-fuse-group || die + popd > /dev/null || die + + if use qt5 ; then + pushd qt > /dev/null || die + ./configure --python3 || die + popd > /dev/null || die + fi +} + +src_compile() { + emake -C common + + if use qt5 ; then + emake -C qt + fi +} + +src_test() { + # pytest should work but it can't find the backintime binary, so + # use the unittest-based runner instead. + # https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#how-to-contribute-to-back-in-time + emake -C common test-v +} + +src_install() { + emake -C common DESTDIR="${D}" install + + if use qt5 ; then + emake -C qt DESTDIR="${D}" install + fi + + einstalldocs + + if use examples ; then + docinto examples + dodoc common/{config-example-local,config-example-ssh} + fi + + python_optimize "${D}" +} diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild index d243f64edfde..70b61fb635db 100644 --- a/app-backup/backintime/backintime-9999.ebuild +++ b/app-backup/backintime/backintime-9999.ebuild @@ -1,70 +1,99 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 git-r3 xdg +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 xdg DESCRIPTION="Backup system inspired by TimeVault and FlyBack" HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/" -EGIT_REPO_URI="https://github.com/bit-team/backintime/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/bit-team/backintime/" + inherit git-r3 +else + SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="examples qt5" +IUSE="examples qt5 test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS} +DEPEND=" + ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/keyring[${PYTHON_MULTI_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] ') - net-misc/openssh - net-misc/rsync[xattr,acl] " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} + virtual/openssh + net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] ) " +BDEPEND=" + sys-devel/gettext + test? ( + $(python_gen_cond_dep ' + dev-python/pyfakefs[${PYTHON_USEDEP}] + ') + ) +" PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" ) +src_prepare() { + default + + # Looks at host system too much, so too flaky + rm common/test/test_tools.py || die + # Fails with dbus/udev issue (likely sandbox) + rm common/test/test_snapshots.py || die +} + src_configure() { pushd common > /dev/null || die - ./configure --python3 --no-fuse-group || die + # Not autotools + ./configure --python3 --no-fuse-group || die popd > /dev/null || die + if use qt5 ; then pushd qt > /dev/null || die - ./configure --python3 || die + ./configure --python3 || die popd > /dev/null || die fi } src_compile() { - pushd common > /dev/null || die - emake - popd > /dev/null || die + emake -C common + if use qt5 ; then - pushd qt > /dev/null || die - emake - popd > /dev/null || die + emake -C qt fi } +src_test() { + # pytest should work but it can't find the backintime binary, so + # use the unittest-based runner instead. + # https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#how-to-contribute-to-back-in-time + emake -C common test-v +} + src_install() { - pushd common > /dev/null || die - emake DESTDIR="${D}" install - popd > /dev/null || die + emake -C common DESTDIR="${D}" install + if use qt5 ; then - pushd qt > /dev/null || die - emake DESTDIR="${D}" install - popd > /dev/null || die + emake -C qt DESTDIR="${D}" install fi einstalldocs + if use examples ; then docinto examples dodoc common/{config-example-local,config-example-ssh} diff --git a/app-backup/backintime/metadata.xml b/app-backup/backintime/metadata.xml index 6bbfe72c81c8..c90342e51d48 100644 --- a/app-backup/backintime/metadata.xml +++ b/app-backup/backintime/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> @@ -11,4 +11,8 @@ * What directories to backup * When backup should be done (manual, every hour, every day, every week, every month) </longdescription> + <stabilize-allarches/> + <upstream> + <remote-id type="github">bit-team/backintime</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild index 6142fd7c265c..753ea3d2ab16 100644 --- a/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild +++ b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils MY_P=Backup-Manager-${PV} DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux" @@ -11,7 +10,7 @@ SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="s3" DEPEND="dev-lang/perl:= @@ -35,6 +34,7 @@ src_prepare() { src_compile() { default + emake -C po backup-manager.pot emake -C po } diff --git a/app-backup/backup-manager/backup-manager-0.7.14.ebuild b/app-backup/backup-manager/backup-manager-0.7.14.ebuild deleted file mode 100644 index c6fc90f2cb0e..000000000000 --- a/app-backup/backup-manager/backup-manager-0.7.14.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils - -MY_P=Backup-Manager-${PV} -DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux" -HOMEPAGE="https://github.com/sukria/Backup-Manager" -SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="s3" - -DEPEND="dev-lang/perl:= - sys-devel/gettext" - -RDEPEND="${DEPEND} - s3? ( dev-perl/Net-Amazon-S3 - dev-perl/File-Slurp )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -e "/^PERL5DIR/s/sitelib/vendorlib/" \ - -e "/sed/s:=\$(DESTDIR)/:=:" \ - -i Makefile || die - - default -} - -src_compile() { - default - emake -C po -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - dodir /etc - cp -a "${D}"/usr/share/backup-manager/backup-manager.conf.tpl "${D}"/etc/backup-manager.conf || die - chmod 0600 "${D}"/etc/backup-manager.conf || die -} diff --git a/app-backup/backup-manager/metadata.xml b/app-backup/backup-manager/metadata.xml index 3226a9a10578..362b300ca5d6 100644 --- a/app-backup/backup-manager/metadata.xml +++ b/app-backup/backup-manager/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest index c2927f33982c..094a296a0c52 100644 --- a/app-backup/backupninja/Manifest +++ b/app-backup/backupninja/Manifest @@ -1,2 +1 @@ -DIST backupninja-1.0.1.tar.gz 167991 BLAKE2B 736ded9f562e894ec74e78afb9677f61889c18310b5aabe76dab7aafd550653281fc8641b416c022d49062261d67f8e6ed2aeef9c9b7054b3538c5be983bf424 SHA512 24b898526c1efa91cde6b1a0f0f7c0820c7db5b11ea36f458b45a91e94adfc77636421d7ad2245c196999886a06a3be43253e52654bc07423b1ac5571275c580 -DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87 +DIST backupninja-backupninja_upstream-1.2.2.tar.gz 187862 BLAKE2B cfc2c31a4e53179f9167874d1d5785a9dfdb4bc0e891ea353b5f5ff44dc5eb4f86358b210a96327de9701f7e6913f7afbf8fe104fea138f8006835e2bf04a7e6 SHA512 a11085998ff7342baa242e31a64ddc1d6e6cabd43572435b444ef0523ef8644ed9d362392bfb5c8ade06fbf046fecccf5c05ba2ae4345c65551dddcaa25a13a6 diff --git a/app-backup/backupninja/backupninja-1.0.1-r1.ebuild b/app-backup/backupninja/backupninja-1.0.1-r1.ebuild deleted file mode 100644 index 71f0667e0d7d..000000000000 --- a/app-backup/backupninja/backupninja-1.0.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -# This thing change with every release, how idiotic... -NODE_NUMBER=275 - -DESCRIPTION="lightweight, extensible meta-backup system" -HOMEPAGE="http://riseuplabs.org/backupninja/" -SRC_URI="https://labs.riseup.net/code/attachments/download/${NODE_NUMBER}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="dev-util/dialog" -DEPEND="" - -src_prepare() { - default - mv configure.in configure.ac - eautoreconf -} - -src_configure() { - econf --localstatedir=/var #578614 -} diff --git a/app-backup/backupninja/backupninja-1.1.0.ebuild b/app-backup/backupninja/backupninja-1.2.2.ebuild index 8e1721c97849..82d9fd8b5cd0 100644 --- a/app-backup/backupninja/backupninja-1.1.0.ebuild +++ b/app-backup/backupninja/backupninja-1.2.2.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="lightweight, extensible meta-backup system" -HOMEPAGE="https://0xacab.org/riseuplabs/backupninja" -SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz" +HOMEPAGE="https://0xacab.org/liberate/backupninja" +SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz" +S="${WORKDIR}/${PN}-${PN}_upstream-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="dev-util/dialog" -DEPEND="" - -S="${WORKDIR}/${PN}-${PN}_upstream-${PV}" src_configure() { econf --localstatedir=/var #578614 diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml index 435234188908..da20bb112a7c 100644 --- a/app-backup/backupninja/metadata.xml +++ b/app-backup/backupninja/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>bkohler@gentoo.org</email> diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest index f08fa93f29ea..81a72c05dff6 100644 --- a/app-backup/backuppc/Manifest +++ b/app-backup/backuppc/Manifest @@ -1 +1,2 @@ DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 +DIST BackupPC-4.4.0.tar.gz 657309 BLAKE2B db977b73b09e1b2a051e38ecc94567cb516e2b11eca79c23bb0c4eef508e78cbbc984aaee4c84dc4ecd0524d849195c14dfe395ff97f77b6c7cf8adff152d75e SHA512 0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418 diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild index 932f8a9640d5..3268596ed982 100644 --- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild +++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild @@ -1,84 +1,83 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit depend.apache eutils user systemd +EAPI=7 MY_P="BackupPC-${PV}" +inherit depend.apache systemd + DESCRIPTION="High-performance backups to a server's disk" -HOMEPAGE="http://backuppc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +HOMEPAGE="https://backuppc.github.io/backuppc/index.html" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 x86" - IUSE="rss samba" -# The CGI modules are handled in $RDEPEND. +DEPEND=" + acct-group/backuppc + acct-user/backuppc + app-admin/apache-tools + app-admin/makepasswd + dev-lang/perl +" + +# The CGI modules are handled in ${RDEPEND}. APACHE_MODULES="apache2_modules_alias," # RedirectMatch APACHE_MODULES+="apache2_modules_authn_core," # AuthType APACHE_MODULES+="apache2_modules_authz_core," # Require APACHE_MODULES+="apache2_modules_authz_host," # Require host APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user -DEPEND="dev-lang/perl - app-admin/apache-tools - app-admin/makepasswd" - -# Older versions of mod_perl think they're compatibile with apache-2.4, +# Older versions of mod_perl think they're compatible with apache-2.4, # so we require the new one explicitly. -RDEPEND="${DEPEND} - virtual/perl-IO-Compress +RDEPEND=" + ${DEPEND} + app-arch/par2cmdline dev-perl/Archive-Zip dev-perl/CGI + dev-perl/File-RsyncP dev-perl/libwww-perl - app-arch/tar - app-arch/par2cmdline - app-arch/gzip - app-arch/bzip2 virtual/mta - >=www-apache/mod_perl-2.0.9 + virtual/perl-IO-Compress + www-apache/mod_perl www-apache/mpm_itk - || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi] - >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid] - >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] ) - net-misc/rsync - dev-perl/File-RsyncP + || ( + >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi] + >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid] + >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] + ) rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba )" -need_apache2_4 - -SLOT="0" - -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/3.3.0/01-fix-configure.pl.patch" + "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch" + "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch" + "${FILESDIR}/3.2.0/04-add-docdir-marker.patch" + "${FILESDIR}/3.2.0/05-nicelevel.patch" + "${FILESDIR}"/${P}-perl522.patch #580254 + "${FILESDIR}"/${P}-perl526.patch #594128 +) CGIDIR="/usr/lib/backuppc/htdocs" CONFDIR="/etc/BackupPC" DATADIR="/var/lib/backuppc" DOCDIR="/usr/share/doc/${PF}" LOGDIR="/var/log/BackupPC" - -pkg_setup() { - enewgroup backuppc - enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc -} +need_apache2_4 src_prepare() { - epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch" - epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch" - epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch" - - epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch" - epatch "${FILESDIR}/3.2.0/05-nicelevel.patch" + default - epatch "${FILESDIR}"/${P}-perl522.patch #580254 - epatch "${FILESDIR}"/${P}-perl526.patch #594128 + # Fix initscript + sed -e 's/runscript/openrc-run/g' -i init.d/src/gentoo-backuppc || die # Fix docs location using the marker that we've patched in. - sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \ - || die "failed to sed the documentation location" + sed "s+__DOCDIR__+${DOCDIR}+" -i "lib/BackupPC/CGI/View.pm" || die } src_install() { @@ -106,7 +105,7 @@ src_install() { --data-dir "${DATADIR}" \ --hostname 127.0.0.1 \ --uid-ignore \ - --dest-dir "${D%/}" \ + --dest-dir "${D}" \ --html-dir "${CGIDIR}"/image \ --html-dir-url /image \ --cgi-dir "${CGIDIR}" \ @@ -163,13 +162,13 @@ pkg_postinst() { elog elog " # /etc/init.d/backuppc start" elog - elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add," + elog "- To enable the GUI, first edit ${ROOT}/etc/conf.d/apache2 and add," elog elog " \"-D BACKUPPC -D PERL -D MPM_ITK\"" elog elog " to the APACHE2_OPTS line." elog - elog " Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf" + elog " Then you must edit ${ROOT}/etc/apache2/modules.d/00_mpm_itk.conf" elog " and adjust the values of LimitUIDRange/LimitGIDRange to include" elog " the UID and GID of the backuppc user." elog diff --git a/app-backup/backuppc/backuppc-4.4.0-r1.ebuild b/app-backup/backuppc/backuppc-4.4.0-r1.ebuild new file mode 100644 index 000000000000..3d1f23482625 --- /dev/null +++ b/app-backup/backuppc/backuppc-4.4.0-r1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="BackupPC-${PV}" +MY_PN="BackupPC" + +inherit depend.apache systemd + +DESCRIPTION="High-performance backups to a server's disk" +HOMEPAGE="https://backuppc.github.io/backuppc/index.html" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="rss samba" + +DEPEND=" + acct-group/backuppc + acct-user/backuppc + app-admin/apache-tools + app-admin/makepasswd + dev-lang/perl +" + +# The CGI modules are handled in ${RDEPEND}. +APACHE_MODULES="apache2_modules_alias," # RedirectMatch +APACHE_MODULES+="apache2_modules_authn_core," # AuthType +APACHE_MODULES+="apache2_modules_authz_core," # Require +APACHE_MODULES+="apache2_modules_authz_host," # Require host +APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user + +# Older versions of mod_perl think they're compatible with apache-2.4, +# so we require the new one explicitly. +RDEPEND=" + ${DEPEND} + app-arch/par2cmdline + dev-perl/Archive-Zip + dev-perl/CGI + dev-perl/File-RsyncP + dev-perl/libwww-perl + dev-perl/BackupPC-XS + net-misc/rsync-bpc + virtual/mta + virtual/perl-IO-Compress + www-apache/mod_perl + www-apache/mpm_itk + || ( + >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi] + >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid] + ) + rss? ( dev-perl/XML-RSS ) + samba? ( net-fs/samba )" + +CGIDIR="${EROOT}/usr/lib/backuppc/htdocs" +CONFDIR="${EROOT}/etc/${MY_PN}" +DATADIR="${EROOT}/var/lib/backuppc" +DOCDIR="${EROOT}/usr/share/doc/${PF}" +LOGDIR="${EROOT}/var/log/BackupPC" +need_apache2_4 + +src_prepare() { + default + + # Fix docs location using the marker that we've patched in. + sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die +} + +src_install() { + local myconf + if use samba ; then + myconf=( + --bin-path smbclient=$(type -p smbclient) + --bin-path nmblookup=$(type -p nmblookup) + ) + fi + + /usr/bin/env perl ./configure.pl \ + --batch \ + --bin-path perl=$(type -p perl) \ + --bin-path tar=$(type -p tar) \ + --bin-path rsync=$(type -p rsync) \ + --bin-path ping=$(type -p ping) \ + --bin-path df=$(type -p df) \ + --bin-path ssh=$(type -p ssh) \ + --bin-path sendmail=$(type -p sendmail) \ + --bin-path hostname=$(type -p hostname) \ + --bin-path gzip=$(type -p gzip) \ + --bin-path bzip2=$(type -p bzip2) \ + --config-dir "${CONFDIR}" \ + --install-dir /usr \ + --data-dir "${DATADIR}" \ + --hostname 127.0.0.1 \ + --uid-ignore \ + --dest-dir "${D}" \ + --html-dir "${CGIDIR}"/image \ + --html-dir-url /image \ + --cgi-dir "${CGIDIR}" \ + --fhs \ + ${myconf[@]} || die "failed the configure.pl script" + + ebegin "Installing documentation" + + pod2man \ + -errors=none \ + --section=8 \ + --center="BackupPC manual" \ + "${S}"/doc/BackupPC.pod backuppc.8 \ + || die "failed to generate man page" + + doman backuppc.8 + + # Place the documentation in the correct location + dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.html" + dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.pod" + rm -rf "${ED}/usr/share/doc" || die + + eend 0 + + # Setup directories + dodir "${CONFDIR}/pc" + + keepdir "${CONFDIR}" + keepdir "${CONFDIR}/pc" + keepdir "${DATADIR}"/{trash,pool,pc,cpool} + keepdir "${LOGDIR}" + + ebegin "Setting up init.d/conf.d/systemd scripts" + newinitd "${S}"/systemd/init.d/gentoo-backuppc backuppc + newconfd "${S}"/systemd/init.d/gentoo-backuppc.conf backuppc + systemd_dounit "${FILESDIR}/${PN}.service" + + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}"/99_backuppc.conf + + # Make sure that the ownership is correct + chown -R backuppc:backuppc "${D}${CONFDIR}" || die + chown -R backuppc:backuppc "${D}${DATADIR}" || die + chown -R backuppc:backuppc "${D}${LOGDIR}" || die + + eend 0 +} + +pkg_postinst() { + elog "Installation finished, you may now start using BackupPC." + elog + elog "- Read the documentation in ${EROOT}/usr/share/doc/${PF}/BackupPC.html" + elog " Please pay special attention to the security section." + elog + elog "- You can launch backuppc by running:" + elog + elog " # /etc/init.d/backuppc start" + elog + elog "- To enable the GUI, first edit ${EROOT}/etc/conf.d/apache2 and add," + elog + elog " \"-D BACKUPPC -D PERL -D MPM_ITK\"" + elog + elog " to the APACHE2_OPTS line." + elog + elog " Then you must edit ${EROOT}/etc/apache2/modules.d/00_mpm_itk.conf" + elog " and adjust the values of LimitUIDRange/LimitGIDRange to include" + elog " the UID and GID of the backuppc user." + elog + elog " Finally, start apache:" + elog + elog " # /etc/init.d/apache2 start" + elog + elog " The web interface should now be running on," + elog + elog " http://127.0.0.1:8080/" + elog + + # Generate a new password if there's no auth file + if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then + adminuser="backuppc" + adminpass=$(makepasswd --chars=12) + htpasswd -bc "${CONFDIR}/users.htpasswd" ${adminuser} ${adminpass} + + elog "" + elog "- Created admin user ${adminuser} with password ${adminpass}" + elog " To add new users, run: " + elog "" + elog " # htpasswd ${CONFDIR}/users.htpasswd newUser" + fi +} diff --git a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch index 0355aedf04b7..d6a5a1c42991 100644 --- a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch +++ b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch @@ -1,5 +1,5 @@ ---- lib/BackupPC/CGI/View.pm.orig 2009-09-30 19:08:34.353577546 +0300 -+++ lib/BackupPC/CGI/View.pm 2009-09-30 19:16:01.982412712 +0300 +--- a/lib/BackupPC/CGI/View.pm.orig 2009-09-30 19:08:34.353577546 +0300 ++++ b/lib/BackupPC/CGI/View.pm 2009-09-30 19:16:01.982412712 +0300 @@ -86,7 +86,7 @@ $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; diff --git a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch index 50938f60bcdc..f6ecce98a7a8 100644 --- a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch +++ b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch @@ -1,5 +1,5 @@ ---- init.d/src/gentoo-backuppc.orig 2009-10-18 00:14:44.125346723 +0300 -+++ init.d/src/gentoo-backuppc 2009-10-18 00:15:37.101346981 +0300 +--- a/init.d/src/gentoo-backuppc.orig 2009-10-18 00:14:44.125346723 +0300 ++++ b/init.d/src/gentoo-backuppc 2009-10-18 00:15:37.101346981 +0300 @@ -21,7 +21,7 @@ start() { checkconfig || return 1 @@ -9,8 +9,8 @@ eend $? } ---- init.d/src/gentoo-backuppc.conf.orig 2009-10-18 00:14:52.513347638 +0300 -+++ init.d/src/gentoo-backuppc.conf 2009-10-18 00:16:03.457346630 +0300 +--- a/init.d/src/gentoo-backuppc.conf.orig 2009-10-18 00:14:52.513347638 +0300 ++++ b/init.d/src/gentoo-backuppc.conf 2009-10-18 00:16:03.457346630 +0300 @@ -3,3 +3,4 @@ PID_FILE=__LOGDIR__/BackupPC.pid EXEC=__INSTALLDIR__/bin/BackupPC diff --git a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch index c943fdce68b1..f27fccc154fe 100644 --- a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch +++ b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch @@ -1,5 +1,5 @@ ---- configure.pl.dist 2013-09-23 23:01:19.524743747 +0300 -+++ configure.pl 2013-09-23 23:01:37.344567459 +0300 +--- a/configure.pl.dist 2013-09-23 23:01:19.524743747 +0300 ++++ b/configure.pl 2013-09-23 23:01:37.344567459 +0300 @@ -158,7 +158,7 @@ # config file to get all the defaults. # diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch index 79ad6547fa6f..14a9600536d7 100644 --- a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch +++ b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch @@ -1,5 +1,5 @@ ---- conf/config.pl.dist 2013-09-23 23:05:50.332064754 +0300 -+++ conf/config.pl 2013-09-23 23:07:44.110943607 +0300 +--- a/conf/config.pl.dist 2013-09-23 23:05:50.332064754 +0300 ++++ b/conf/config.pl 2013-09-23 23:07:44.110943607 +0300 @@ -355,7 +355,7 @@ # needs to be a full path and you can't include shell syntax like # redirection and pipes; put that in a script if you need it. diff --git a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch index 8b54fc87b050..0dd85d3acad1 100644 --- a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch +++ b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch @@ -1,5 +1,5 @@ ---- conf/config.pl.formatted 2013-09-23 23:12:30.708129365 +0300 -+++ conf/config.pl 2013-09-23 23:12:39.448043656 +0300 +--- a/conf/config.pl.formatted 2013-09-23 23:12:30.708129365 +0300 ++++ b/conf/config.pl 2013-09-23 23:12:39.448043656 +0300 @@ -1305,7 +1305,7 @@ '--times', '--block-size=2048', diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch index fb7eeeef1e02..cb29e890d347 100644 --- a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch +++ b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch @@ -1,5 +1,5 @@ ---- lib/BackupPC/CGI/Browse.pm 2016-11-22 20:52:03.622509160 +0100 -+++ lib/BackupPC/CGI/Browse.pm 2016-11-22 20:50:35.871018400 +0100 +--- a/lib/BackupPC/CGI/Browse.pm 2016-11-22 20:52:03.622509160 +0100 ++++ b/lib/BackupPC/CGI/Browse.pm 2016-11-22 20:50:35.871018400 +0100 @@ -62,13 +62,13 @@ fix bug https://bugzilla.redhat.com/attachment.cgi?id=1104083 # my @Backups = $bpc->BackupInfoRead($host); diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch index 3a04f94835c3..0569e42a496f 100644 --- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch +++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch @@ -1,6 +1,6 @@ -diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm ---- BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm 2015-01-12 01:19:53.000000000 +0100 -+++ BackupPC-3.3.1/lib/BackupPC/Lib.pm 2017-07-08 00:31:52.100003197 +0200 +diff -ruN a/lib/BackupPC/Lib.pm a/lib/BackupPC/Lib.pm +--- a/lib/BackupPC/Lib.pm 2015-01-12 01:19:53.000000000 +0100 ++++ b/lib/BackupPC/Lib.pm 2017-07-08 00:31:52.100003197 +0200 @@ -1261,7 +1261,7 @@ # # Replace scalar variables first diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml index 13724624fa85..4d83df8d74ca 100644 --- a/app-backup/backuppc/metadata.xml +++ b/app-backup/backuppc/metadata.xml @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>kernlpanic@dennis-eisele.de</email> + <name>Dennis Eisele</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="sourceforge">backuppc</remote-id> + <remote-id type="github">backuppc/backuppc</remote-id> </upstream> </pkgmetadata> diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index b043eabf262c..79ac896cb237 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -1 +1,3 @@ -DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 +DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5 +DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a SHA512 5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812 +DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2 SHA512 71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3 diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild index d2d04673ea7d..952e13c53f82 100644 --- a/app-backup/bacula/bacula-9.6.5.ebuild +++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop libtool qmake-utils systemd @@ -10,17 +10,17 @@ MY_P=${PN}-${MY_PV} DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="https://www.bacula.org/" -SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +KEYWORDS="amd64 ~ppc ~sparc x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) + postgres? ( dev-db/postgresql:=[threads(+)] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) @@ -40,8 +40,7 @@ DEPEND=" sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) ) !static? ( @@ -50,11 +49,11 @@ DEPEND=" sys-libs/zlib acl? ( virtual/acl ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf " RDEPEND="${DEPEND} acct-user/bacula @@ -65,6 +64,7 @@ RDEPEND="${DEPEND} sys-block/mtx ) ) + selinux? ( sec-policy/selinux-bacula ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) " @@ -73,6 +73,13 @@ REQUIRED_USE=" static? ( bacula-clientonly ) " +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) + S=${WORKDIR}/${MY_P} pkg_setup() { @@ -119,20 +126,25 @@ src_prepare() { # bat needs to respect LDFLAGS and CFLAGS eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch + eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch + + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/fix_slibtool.patch" # do not strip binaries sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die eapply_user @@ -156,20 +168,21 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die - # fix handling of libressl version - # needs separate handling for <libressl-2.7 and >=libressl2.7 - # (see bug #655520) - if has_version "<dev-libs/libressl-2.7"; then - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch - fi + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die # Don't let program install man pages directly sed -i -e 's/ manpages//' Makefile.in || die # correct installation for plugins to mode 0755 (bug #725946) - sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. @@ -209,7 +222,6 @@ src_configure() { $(use_enable batch-insert) \ $(use_enable !readline conio) \ $(use_enable readline) \ - $(use_with readline readline /usr) \ $(use_with ssl openssl) \ $(use_enable ipv6) \ $(use_enable acl) \ @@ -245,6 +257,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" install doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die # install bat icon and desktop file when enabled # (for some reason ./configure doesn't pick this up) @@ -298,8 +314,8 @@ src_install() { if ! use qt5; then rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* if use bacula-clientonly || use bacula-nodir ; then rm -vf "${D}"/usr/libexec/bacula/create_*_database @@ -349,7 +365,7 @@ src_install() { cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - # now set the database dependancy for the director init script + # now set the database dependency for the director init script case "${script}" in bacula-dir) case "${mydbtype}" in @@ -425,4 +441,9 @@ pkg_postinst() { einfo einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." } diff --git a/app-backup/bacula/bacula-13.0.4.ebuild b/app-backup/bacula/bacula-13.0.4.ebuild new file mode 100644 index 000000000000..6a4d2259bb25 --- /dev/null +++ b/app-backup/bacula/bacula-13.0.4.ebuild @@ -0,0 +1,449 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop libtool qmake-utils systemd + +MY_PV=${PV/_beta/-b} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bacula.org/" +SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" + +DEPEND=" + !bacula-clientonly? ( + !bacula-nodir? ( virtual/mta ) + postgres? ( dev-db/postgresql:=[threads(+)] ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) + sqlite? ( dev-db/sqlite:3 ) + ) + dev-libs/gmp:0 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + x11-libs/qwt:6 + ) + logwatch? ( sys-apps/logwatch ) + readline? ( sys-libs/readline:0 ) + static? ( + dev-libs/lzo[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + acl? ( virtual/acl[static-libs(+)] ) + ssl? ( + dev-libs/openssl:0=[static-libs] + ) + ) + !static? ( + dev-libs/lzo + sys-libs/ncurses:= + sys-libs/zlib + acl? ( virtual/acl ) + ssl? ( + dev-libs/openssl:0= + ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf +" +RDEPEND="${DEPEND} + acct-user/bacula + acct-group/bacula + !bacula-clientonly? ( + !bacula-nosd? ( + app-arch/mt-st + sys-block/mtx + ) + ) + selinux? ( sec-policy/selinux-bacula ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +REQUIRED_USE=" + !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) + static? ( bacula-clientonly ) +" + +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + #XOR and !bacula-clientonly controlled by REQUIRED_USE + use mysql && export mydbtype="mysql" + use postgres && export mydbtype="postgresql" + use sqlite && export mydbtype="sqlite3" + + if use bacula-clientonly && use static && use qt5; then + ewarn + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." + ewarn + fi +} + +src_prepare() { + # adjusts default configuration files for several binaries + # to /etc/bacula/<config> instead of ./<config> + pushd src >&/dev/null || die + for f in console/console.c dird/dird.c filed/filed.c \ + stored/bcopy.c stored/bextract.c stored/bls.c \ + stored/bscan.c stored/btape.c stored/stored.c \ + qt-console/main.cpp; do + sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ + || die "sed on ${f} failed" + done + popd >&/dev/null || die + + # bug 466688 drop deprecated categories from Desktop file + sed -i -e 's/Application;//' scripts/bat.desktop.in || die + + # bug 466690 Use CXXFLAGS instead of CFLAGS + sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + + # drop automatic install of unneeded documentation (for bug 356499) + eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch + + # bug #310087 + eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch + + # bug #311161 + eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch + + # bat needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + + # bug #328701 + eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch + + eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch + + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" + + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/fix_slibtool.patch" + + # do not strip binaries + sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die + sed -i -e "s/strip /# strip /" src/console/Makefile.in || die + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + + eapply_user + + # Fix systemd unit files: + # bug 497748 + sed -i -e '/Requires/d' platforms/systemd/*.service.in || die + sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die + # bug 504370 + sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die + # bug 584442 and 504368 + sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die + + # build 'bat' for Qt5 + export QMAKE="$(qt5_get_bindir)"/qmake + + # adapt to >=Qt-5.9 (see bug #644566) + # qmake needs an existing target file to generate install instructions + sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ + src/qt-console/bat.pro.in || die + mkdir src/qt-console/.libs || die + touch src/qt-console/.libs/bat || die + chmod 755 src/qt-console/.libs/bat || die + + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die + + # Don't let program install man pages directly + sed -i -e 's/ manpages//' Makefile.in || die + + # correct installation for plugins to mode 0755 (bug #725946) + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die + + # fix bundled libtool (bug 466696) + # But first move directory with M4 macros out of the way. + # It is only needed by autoconf and gives errors during elibtoolize. + mv autoconf/libtool autoconf/libtool1 || die + elibtoolize +} + +src_configure() { + local myconf='' + + if use bacula-clientonly; then + myconf="${myconf} \ + $(use_enable bacula-clientonly client-only) \ + $(use_enable !static libtool) \ + $(use_enable static static-cons) \ + $(use_enable static static-fd)" + else + myconf="${myconf} \ + $(use_enable !bacula-nodir build-dird) \ + $(use_enable !bacula-nosd build-stored)" + # bug #311099 + # database support needed by dir-only *and* sd-only + # build as well (for building bscan, btape, etc.) + myconf="${myconf} + --with-${mydbtype}" + fi + + # do not build bat if 'static' clientonly + if ! use bacula-clientonly || ! use static; then + myconf="${myconf} \ + $(use_enable qt5 bat)" + fi + + myconf="${myconf} \ + $(use_with X x) \ + $(use_enable batch-insert) \ + $(use_enable !readline conio) \ + $(use_enable readline) \ + $(use_with ssl openssl) \ + $(use_enable ipv6) \ + $(use_enable acl) \ + $(use_with tcpd tcp-wrappers)" + + econf \ + --with-pid-dir=/var/run \ + --sysconfdir=/etc/bacula \ + --with-archivedir=/var/lib/bacula/tmp \ + --with-subsys-dir=/var/lock/subsys \ + --with-working-dir=/var/lib/bacula \ + --with-logdir=/var/lib/bacula \ + --with-scriptdir=/usr/libexec/bacula \ + --with-systemd=$(systemd_get_systemunitdir) \ + --with-dir-user=bacula \ + --with-dir-group=bacula \ + --with-sd-user=root \ + --with-sd-group=bacula \ + --with-fd-user=root \ + --with-fd-group=bacula \ + --enable-smartalloc \ + --disable-afs \ + --without-s3 \ + --host=${CHOST} \ + ${myconf} +} + +src_compile() { + # Make build log verbose (bug #447806) + emake NO_ECHO="" +} + +src_install() { + emake DESTDIR="${D}" install + doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die + + # install bat icon and desktop file when enabled + # (for some reason ./configure doesn't pick this up) + if use qt5 && ! use static ; then + doicon src/qt-console/images/bat_icon.png + domenu scripts/bat.desktop + fi + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} + + # rename statically linked apps + if use bacula-clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bacula-fd bacula-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use bacula-clientonly; then + # the database update scripts + diropts -m0750 + insinto /usr/libexec/bacula/updatedb + insopts -m0754 + doins "${S}"/updatedb/* + fperms 0640 /usr/libexec/bacula/updatedb/README + + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/scripts/logrotate bacula + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /etc/logwatch/conf/logfiles + dodir /etc/logwatch/conf/services + pushd "${S}"/scripts/logwatch >&/dev/null || die + emake DESTDIR="${D}" install + popd >&/dev/null || die + fi + fi + + # Install all man pages + doman "${S}"/manpages/*.[18] + + if ! use qt5; then + rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* + fi + + if use bacula-clientonly || use bacula-nodir ; then + rm -vf "${D}"/usr/libexec/bacula/create_*_database + rm -vf "${D}"/usr/libexec/bacula/drop_*_database + rm -vf "${D}"/usr/libexec/bacula/make_*_tables + rm -vf "${D}"/usr/libexec/bacula/update_*_tables + rm -vf "${D}"/usr/libexec/bacula/drop_*_tables + rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges + rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup + fi + if use bacula-clientonly || use bacula-nosd; then + rm -vf "${D}"/usr/libexec/bacula/disk-changer + rm -vf "${D}"/usr/libexec/bacula/mtx-changer + rm -vf "${D}"/usr/libexec/bacula/dvd-handler + fi + + # documentation + dodoc ChangeLog ReleaseNotes SUPPORT + + # install examples (bug #457504) + if use examples; then + docinto examples/ + dodoc -r examples/* + fi + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/bacula.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins scripts/filetype.vim bacula_ft.vim + fi + + # setup init scripts + myscripts="bacula-fd" + if ! use bacula-clientonly; then + if ! use bacula-nodir; then + myscripts="${myscripts} bacula-dir" + fi + if ! use bacula-nosd; then + myscripts="${myscripts} bacula-sd" + fi + fi + for script in ${myscripts}; do + # copy over init script and config to a temporary location + # so we can modify them as needed + cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" + cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" + + # now set the database dependency for the director init script + case "${script}" in + bacula-dir) + case "${mydbtype}" in + sqlite3) + # sqlite databases don't have a daemon + sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die + ;; + *) + # all other databases have daemons + sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die + ;; + esac + ;; + *) + ;; + esac + + # install init script and config + newinitd "${T}/${script}".initd "${script}" + newconfd "${T}/${script}".confd "${script}" + done + + systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bacula + + # make sure bacula group can execute bacula libexec scripts + fowners -R root:bacula /usr/libexec/bacula +} + +pkg_postinst() { + if use bacula-clientonly; then + fowners root:bacula /var/lib/bacula + else + fowners bacula:bacula /var/lib/bacula + fi + + einfo + einfo "A group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + einfo "A user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + + if ! use bacula-clientonly && ! use bacula-nodir; then + einfo + einfo "If this is a new install, you must create the ${mydbtype} databases with:" + einfo " /usr/libexec/bacula/create_${mydbtype}_database" + einfo " /usr/libexec/bacula/make_${mydbtype}_tables" + einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" + einfo + + ewarn "ATTENTION!" + ewarn "The format of the database may have changed." + ewarn "If you just upgraded from a version below 9.0.0 you must run" + ewarn "'update_bacula_tables' now." + ewarn "Make sure to have a backup of your catalog before." + ewarn + fi + + if use sqlite; then + einfo + einfo "Be aware that Bacula does not officially support SQLite database anymore." + einfo "Best use it only for a client-only installation. See Bug #445540." + einfo + fi + + einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" + einfo "you have to enable 'USE=qt5'." + einfo + einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" + einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." +} diff --git a/app-backup/bacula/bacula-15.0.2.ebuild b/app-backup/bacula/bacula-15.0.2.ebuild new file mode 100644 index 000000000000..d5c84855a449 --- /dev/null +++ b/app-backup/bacula/bacula-15.0.2.ebuild @@ -0,0 +1,449 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop libtool qmake-utils systemd + +MY_PV=${PV/_beta/-b} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bacula.org/" +SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz" + +S=${WORKDIR}/${MY_P} + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X" + +DEPEND=" + !bacula-clientonly? ( + !bacula-nodir? ( virtual/mta ) + postgres? ( dev-db/postgresql:=[threads(+)] ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) + sqlite? ( dev-db/sqlite:3 ) + ) + dev-libs/gmp:0 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + x11-libs/qwt:6 + ) + logwatch? ( sys-apps/logwatch ) + readline? ( sys-libs/readline:0 ) + static? ( + dev-libs/lzo[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + acl? ( virtual/acl[static-libs(+)] ) + ssl? ( + dev-libs/openssl:0=[static-libs] + ) + ) + !static? ( + dev-libs/lzo + sys-libs/ncurses:= + sys-libs/zlib + acl? ( virtual/acl ) + ssl? ( + dev-libs/openssl:0= + ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-util/patchelf +" +RDEPEND="${DEPEND} + acct-user/bacula + acct-group/bacula + !bacula-clientonly? ( + !bacula-nosd? ( + app-arch/mt-st + sys-block/mtx + ) + ) + selinux? ( sec-policy/selinux-bacula ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +REQUIRED_USE=" + !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) + static? ( bacula-clientonly ) +" + +# suppress warning wrt 'implicit function declaration' in config logs +# bug 900663 +QA_CONFIG_IMPL_DECL_SKIP=( + makedev # designed to check availability in + # used header file +) + +pkg_setup() { + #XOR and !bacula-clientonly controlled by REQUIRED_USE + use mysql && export mydbtype="mysql" + use postgres && export mydbtype="postgresql" + use sqlite && export mydbtype="sqlite3" + + if use bacula-clientonly && use static && use qt5; then + ewarn + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." + ewarn + fi +} + +src_prepare() { + # adjusts default configuration files for several binaries + # to /etc/bacula/<config> instead of ./<config> + pushd src >&/dev/null || die + for f in console/console.c dird/dird.c filed/filed.c \ + stored/bcopy.c stored/bextract.c stored/bls.c \ + stored/bscan.c stored/btape.c stored/stored.c \ + qt-console/main.cpp; do + sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ + || die "sed on ${f} failed" + done + popd >&/dev/null || die + + # bug 466688 drop deprecated categories from Desktop file + sed -i -e 's/Application;//' scripts/bat.desktop.in || die + + # bug 466690 Use CXXFLAGS instead of CFLAGS + sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + + # drop automatic install of unneeded documentation (for bug 356499) + eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch + + # bug #310087 + eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch + + # bug #311161 + eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch + + # bat needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + + # tray-monitor needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch + + # bug #328701 + eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch + + eapply -p0 "${FILESDIR}"/${PN}-15.0.2-fix-static.patch + + # fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 + eapply "${FILESDIR}/bacula-fix-sonames-new.patch" + + # correct library search path for slibtool usage (bug #914389) + eapply -p0 "${FILESDIR}/${PN}-15.0.2-fix_slibtool.patch" + + # do not strip binaries + sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die + sed -i -e "s/strip /# strip /" src/console/Makefile.in || die + sed -i -e "s/+= qt$/+= qt nostrip/" \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + + eapply_user + + # Fix systemd unit files: + # bug 497748 + sed -i -e '/Requires/d' platforms/systemd/*.service.in || die + sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die + # bug 504370 + sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die + # bug 584442 and 504368 + sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die + + # build 'bat' for Qt5 + export QMAKE="$(qt5_get_bindir)"/qmake + + # adapt to >=Qt-5.9 (see bug #644566) + # qmake needs an existing target file to generate install instructions + sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ + src/qt-console/bat.pro.in || die + mkdir src/qt-console/.libs || die + touch src/qt-console/.libs/bat || die + chmod 755 src/qt-console/.libs/bat || die + + # same for tray-monitor (bug #915605) + sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \ + src/qt-console/tray-monitor/tray-monitor.pro.in || die + mkdir src/qt-console/tray-monitor/.libs || die + touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die + + eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die + + # Don't let program install man pages directly + sed -i -e 's/ manpages//' Makefile.in || die + + # correct installation for plugins to mode 0755 (bug #725946) + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die + sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die + + # fix bundled libtool (bug 466696) + # But first move directory with M4 macros out of the way. + # It is only needed by autoconf and gives errors during elibtoolize. + mv autoconf/libtool autoconf/libtool1 || die + elibtoolize +} + +src_configure() { + local myconf='' + + if use bacula-clientonly; then + myconf="${myconf} \ + $(use_enable bacula-clientonly client-only) \ + $(use_enable !static libtool) \ + $(use_enable static static-cons) \ + $(use_enable static static-fd)" + else + myconf="${myconf} \ + $(use_enable !bacula-nodir build-dird) \ + $(use_enable !bacula-nosd build-stored)" + # bug #311099 + # database support needed by dir-only *and* sd-only + # build as well (for building bscan, btape, etc.) + myconf="${myconf} + --with-${mydbtype}" + fi + + # do not build bat if 'static' clientonly + if ! use bacula-clientonly || ! use static; then + myconf="${myconf} \ + $(use_enable qt5 bat)" + fi + + myconf="${myconf} \ + $(use_with X x) \ + $(use_enable batch-insert) \ + $(use_enable !readline conio) \ + $(use_enable readline) \ + $(use_with ssl openssl) \ + $(use_enable ipv6) \ + $(use_enable acl) \ + $(use_with tcpd tcp-wrappers)" + + econf \ + --with-pid-dir=/var/run \ + --sysconfdir=/etc/bacula \ + --with-archivedir=/var/lib/bacula/tmp \ + --with-subsys-dir=/var/lock/subsys \ + --with-working-dir=/var/lib/bacula \ + --with-logdir=/var/lib/bacula \ + --with-scriptdir=/usr/libexec/bacula \ + --with-systemd=$(systemd_get_systemunitdir) \ + --with-dir-user=bacula \ + --with-dir-group=bacula \ + --with-sd-user=root \ + --with-sd-group=bacula \ + --with-fd-user=root \ + --with-fd-group=bacula \ + --enable-smartalloc \ + --disable-afs \ + --without-s3 \ + --host=${CHOST} \ + ${myconf} +} + +src_compile() { + # Make build log verbose (bug #447806) + emake NO_ECHO="" +} + +src_install() { + emake DESTDIR="${D}" install + doicon scripts/bacula.png + keepdir /var/lib/bacula/tmp + + # remove not needed .la files #840957 + find "${ED}" -name '*.la' -delete || die + + # install bat icon and desktop file when enabled + # (for some reason ./configure doesn't pick this up) + if use qt5 && ! use static ; then + doicon src/qt-console/images/bat_icon.png + domenu scripts/bat.desktop + fi + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} + + # rename statically linked apps + if use bacula-clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bacula-fd bacula-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use bacula-clientonly; then + # the database update scripts + diropts -m0750 + insinto /usr/libexec/bacula/updatedb + insopts -m0754 + doins "${S}"/updatedb/* + fperms 0640 /usr/libexec/bacula/updatedb/README + + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/scripts/logrotate bacula + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /etc/logwatch/conf/logfiles + dodir /etc/logwatch/conf/services + pushd "${S}"/scripts/logwatch >&/dev/null || die + emake DESTDIR="${D}" install + popd >&/dev/null || die + fi + fi + + # Install all man pages + doman "${S}"/manpages/*.[18] + + if ! use qt5; then + rm -vf "${D}"/usr/share/man/man1/bat.1* + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* + fi + + if use bacula-clientonly || use bacula-nodir ; then + rm -vf "${D}"/usr/libexec/bacula/create_*_database + rm -vf "${D}"/usr/libexec/bacula/drop_*_database + rm -vf "${D}"/usr/libexec/bacula/make_*_tables + rm -vf "${D}"/usr/libexec/bacula/update_*_tables + rm -vf "${D}"/usr/libexec/bacula/drop_*_tables + rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges + rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup + fi + if use bacula-clientonly || use bacula-nosd; then + rm -vf "${D}"/usr/libexec/bacula/disk-changer + rm -vf "${D}"/usr/libexec/bacula/mtx-changer + rm -vf "${D}"/usr/libexec/bacula/dvd-handler + fi + + # documentation + dodoc ChangeLog ReleaseNotes SUPPORT + + # install examples (bug #457504) + if use examples; then + docinto examples/ + dodoc -r examples/* + fi + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/bacula.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins scripts/filetype.vim bacula_ft.vim + fi + + # setup init scripts + myscripts="bacula-fd" + if ! use bacula-clientonly; then + if ! use bacula-nodir; then + myscripts="${myscripts} bacula-dir" + fi + if ! use bacula-nosd; then + myscripts="${myscripts} bacula-sd" + fi + fi + for script in ${myscripts}; do + # copy over init script and config to a temporary location + # so we can modify them as needed + cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" + cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" + + # now set the database dependency for the director init script + case "${script}" in + bacula-dir) + case "${mydbtype}" in + sqlite3) + # sqlite databases don't have a daemon + sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die + ;; + *) + # all other databases have daemons + sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die + ;; + esac + ;; + *) + ;; + esac + + # install init script and config + newinitd "${T}/${script}".initd "${script}" + newconfd "${T}/${script}".confd "${script}" + done + + systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bacula + + # make sure bacula group can execute bacula libexec scripts + fowners -R root:bacula /usr/libexec/bacula +} + +pkg_postinst() { + if use bacula-clientonly; then + fowners root:bacula /var/lib/bacula + else + fowners bacula:bacula /var/lib/bacula + fi + + einfo + einfo "A group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + einfo "A user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + + if ! use bacula-clientonly && ! use bacula-nodir; then + einfo + einfo "If this is a new install, you must create the ${mydbtype} databases with:" + einfo " /usr/libexec/bacula/create_${mydbtype}_database" + einfo " /usr/libexec/bacula/make_${mydbtype}_tables" + einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" + einfo + + ewarn "ATTENTION!" + ewarn "The format of the database may have changed." + ewarn "If you just upgraded from a version below 9.0.0 you must run" + ewarn "'update_bacula_tables' now." + ewarn "Make sure to have a backup of your catalog before." + ewarn + fi + + if use sqlite; then + einfo + einfo "Be aware that Bacula does not officially support SQLite database anymore." + einfo "Best use it only for a client-only installation. See Bug #445540." + einfo + fi + + einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" + einfo "you have to enable 'USE=qt5'." + einfo + einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" + einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." + + einfo + einfo "If you adapt the port numbers for baculas components in the config files" + einfo "make sure to adapt the file names for the pidfile accordingly" + einfo "(see init.d scripts)." +} diff --git a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch deleted file mode 100644 index e076cd6478cc..000000000000 --- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch +++ /dev/null @@ -1,12 +0,0 @@ -# fix file not found error during make depend ---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 -+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 -@@ -194,7 +194,7 @@ - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile - @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -- @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile -+ @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ - else \ diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch deleted file mode 100644 index ea7fa0bb7a3d..000000000000 --- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 -+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 -@@ -195,7 +195,7 @@ - IMPLEMENT_ASN1_FUNCTIONS(SignatureData) - IMPLEMENT_ASN1_FUNCTIONS(CryptoData) - --#if defined(DEFINE_STACK_OF) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) - DEFINE_STACK_OF(SignerInfo); - DEFINE_STACK_OF(RecipientInfo); - #else ---- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600 -+++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600 -@@ -1,7 +1,7 @@ - #ifndef __OPENSSL_COPMAT__H__ - #define __OPENSSL_COPMAT__H__ - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) - { - CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); ---- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100 -+++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200 -@@ -116,7 +116,7 @@ - ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT)); - - /* Allocate our OpenSSL TLS Context */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */ - ctx->openssl = SSL_CTX_new(TLS_method()); - diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch deleted file mode 100644 index 3ce61be59252..000000000000 --- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 -+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 -@@ -195,7 +195,7 @@ - IMPLEMENT_ASN1_FUNCTIONS(SignatureData) - IMPLEMENT_ASN1_FUNCTIONS(CryptoData) - --#if defined(DEFINE_STACK_OF) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) - DEFINE_STACK_OF(SignerInfo); - DEFINE_STACK_OF(RecipientInfo); - #else diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch index 1f32cd224f01..f7ffccf0fe58 100644 --- a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch +++ b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch @@ -52,7 +52,7 @@ + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) diff --git a/app-backup/bacula/files/bacula-15.0.2-fix-static.patch b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch new file mode 100644 index 000000000000..57963a271bba --- /dev/null +++ b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch @@ -0,0 +1,63 @@ +--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200 ++++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200 +@@ -24,6 +24,7 @@ + CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ + CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@ + JSONOBJS = bbconsjson.o console_conf.o ++ZLIBS=@ZLIBS@ + + # these are the objects that are changed by the .configure process + EXTRAOBJS = @OBJLIST@ +@@ -50,18 +51,18 @@ + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + strip $@ + + +--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200 ++++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200 +@@ -69,19 +69,19 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS) + + bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) + strip $@ + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch new file mode 100644 index 000000000000..96eddbc5fb46 --- /dev/null +++ b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch @@ -0,0 +1,67 @@ +# slibtool creates library in .libs directory but need -L. to find them +# Bug #914389 +--- src/stored/Makefile.in.orig 2023-11-15 14:20:23.135630968 +0100 ++++ src/stored/Makefile.in 2023-11-15 14:22:35.771246680 +0100 +@@ -267,7 +267,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + btape: Makefile $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \ + $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + +@@ -277,7 +277,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcloud.o: bcloud.c +@@ -286,7 +286,7 @@ + -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $< + + bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS) + + bls.o: bls.c +@@ -296,7 +296,7 @@ + + bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bextract.o: bextract.c +@@ -306,7 +306,7 @@ + + bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bscan.o: bscan.c +@@ -316,7 +316,7 @@ + + bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcopy.o: bcopy.c +@@ -325,7 +325,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + cloud_parts_test: Makefile cloud_parts.c diff --git a/app-backup/bacula/files/bacula-fix-sonames-new.patch b/app-backup/bacula/files/bacula-fix-sonames-new.patch new file mode 100644 index 000000000000..9a3abedb7d66 --- /dev/null +++ b/app-backup/bacula/files/bacula-fix-sonames-new.patch @@ -0,0 +1,37 @@ +# Fix soname in libbaccat.so, see bugs #602952, #790140 and #845126 +# +# Actual libtool needs a patch to accept '-soname' command line switch, +# otherwise it will ignored. +# slibtool in contrast responds with error and is not easy to patch. +# +# Solution here drops the '-soname' switch and uses patchelf program to +# fix the SONAME after the library is build. +diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in +index d30cc75..9f87798 100644 +--- a/src/cats/Makefile.in ++++ b/src/cats/Makefile.in +@@ -135,17 +135,21 @@ libbaccats.la: Makefile cats_null.lo + libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) ++ $(MYSQL_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-mysql-$(LIBBACCATS_LT_RELEASE).so + + libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) ++ $(POSTGRESQL_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-postgresql-$(LIBBACCATS_LT_RELEASE).so + + libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ +- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) ++ $(SQLITE_LIBS) ++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-sqlite3-$(LIBBACCATS_LT_RELEASE).so ++ + #libbaccats-dbi.la: Makefile $(DBI_LOBJS) + # @echo "Making $@ ..." + # $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch deleted file mode 100644 index d05b2b9a37fb..000000000000 --- a/app-backup/bacula/files/bacula-fix-sonames.patch +++ /dev/null @@ -1,36 +0,0 @@ -=== modified file 'autoconf/ltmain.sh' ---- autoconf/ltmain.sh 2011-11-06 20:34:58 +0000 -+++ autoconf/ltmain.sh 2012-02-09 17:27:13 +0000 -@@ -2428,6 +2428,7 @@ - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension -+ -soname SONAME override the standard shared object name - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries -@@ -5422,6 +5423,11 @@ - prev= - continue - ;; -+ soname) -+ soname_spec="$arg" -+ prev= -+ continue -+ ;; - weak) - func_append weak_libs " $arg" - prev= -@@ -5741,6 +5747,11 @@ - continue - ;; - -+ -soname) -+ prev=soname -+ continue -+ ;; -+ - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - diff --git a/app-backup/bacula/files/fix_slibtool.patch b/app-backup/bacula/files/fix_slibtool.patch new file mode 100644 index 000000000000..e38448faa30c --- /dev/null +++ b/app-backup/bacula/files/fix_slibtool.patch @@ -0,0 +1,67 @@ +# slibtool creates library in .libs directory but need -L. to find them +# Bug #914389 +--- src/stored/Makefile.in.orig 2023-11-15 14:20:23.135630968 +0100 ++++ src/stored/Makefile.in 2023-11-15 14:22:35.771246680 +0100 +@@ -267,7 +267,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + btape: Makefile $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \ + $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + +@@ -277,7 +277,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcloud.o: bcloud.c +@@ -286,7 +286,7 @@ + -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $< + + bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS) + + bls.o: bls.c +@@ -296,7 +296,7 @@ + + bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bextract.o: bextract.c +@@ -306,7 +306,7 @@ + + bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Compiling $<" +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bscan.o: bscan.c +@@ -316,7 +316,7 @@ + + bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ + ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + bcopy.o: bcopy.c +@@ -325,7 +325,7 @@ + -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + + bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \ + $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + + cloud_parts_test: Makefile cloud_parts.c diff --git a/app-backup/bacula/files/fix_tray_monitor.patch b/app-backup/bacula/files/fix_tray_monitor.patch new file mode 100644 index 000000000000..1d3999c4f4f1 --- /dev/null +++ b/app-backup/bacula/files/fix_tray_monitor.patch @@ -0,0 +1,15 @@ +# original code calls 'qmake' and 'make clean' for tray-monitor configuration twice +# resuting in a Makefile without install rule for binary +# +# see bug #915605 +--- configure.orig 2023-11-14 12:01:38.738557240 +0000 ++++ configure 2023-11-14 12:02:13.845743964 +0000 +@@ -35067,8 +35067,6 @@ + rm -rf moc32 obj32 moc64 obj64 ui32 ui64 + $QMAKE + ${MAKE:-make} clean +- $QMAKE +- ${MAKE:-make} clean + cd ${BUILD_DIR} + fi + diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd index d717f07f7926..df76a70ca3ee 100644 --- a/app-backup/bacula/files/newscripts/bacula-dir.initd +++ b/app-backup/bacula/files/newscripts/bacula-dir.initd @@ -1,8 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + command=/usr/sbin/bacula-dir command_args="${DIR_OPTIONS}" +# make sure the following line matches the portnumber from bacula-dir.conf pidfile=/var/run/bacula-dir.9101.pid depend() { diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd index fe6a8815b9fd..5063df0f9198 100644 --- a/app-backup/bacula/files/newscripts/bacula-fd.initd +++ b/app-backup/bacula/files/newscripts/bacula-fd.initd @@ -1,9 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/bacula-fd command_args="${FD_OPTIONS}" +# make sure the following line matches the portnumber from bacula-fd.conf pidfile=/var/run/bacula-fd.9102.pid depend() { diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd index 07facefbb4a4..15aa6d1c6205 100644 --- a/app-backup/bacula/files/newscripts/bacula-sd.initd +++ b/app-backup/bacula/files/newscripts/bacula-sd.initd @@ -1,8 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + command=/usr/sbin/bacula-sd command_args="${SD_OPTIONS}" +# make sure the following line matches the portnumber from bacula-sd.conf pidfile=/var/run/bacula-sd.9103.pid depend() { diff --git a/app-backup/bacula/files/tray-monitor-pro.patch b/app-backup/bacula/files/tray-monitor-pro.patch new file mode 100644 index 000000000000..2781903cbb9f --- /dev/null +++ b/app-backup/bacula/files/tray-monitor-pro.patch @@ -0,0 +1,15 @@ +# Build of tray-monitor should respect LDFLAGS and CFLAGS +--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2023-11-16 16:25:31.840100695 +0100 ++++ src/qt-console/tray-monitor/tray-monitor.pro.in 2023-11-16 16:26:26.453913247 +0100 +@@ -41,8 +41,9 @@ + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor +-QMAKE_CXXFLAGS += -DTRAY_MONITOR +-QMAKE_CFLAGS += -DTRAY_MONITOR ++QMAKE_CXXFLAGS += @CXXFLAGS@ -DTRAY_MONITOR ++QMAKE_CFLAGS += @CFLAGS@ -DTRAY_MONITOR ++QMAKE_LFLAGS += @LDFLAGS@ + + INSTALLS = bins confs + diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml index ed8ab4a85425..35c444c8931f 100644 --- a/app-backup/bacula/metadata.xml +++ b/app-backup/bacula/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>tomjbe@gentoo.org</email> @@ -11,6 +11,7 @@ <flag name="bacula-nodir">Disable building of director</flag> <flag name="bacula-nosd">Disable building of storage daemon</flag> <flag name="batch-insert">Enable batch insert into data base</flag> + <flag name="ipv6">Support IPV6 protocol"</flag> <flag name="logwatch">Install support files for logwatch</flag> </use> <upstream> diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest index d0024070cfb3..084b9c1489f4 100644 --- a/app-backup/bareos/Manifest +++ b/app-backup/bareos/Manifest @@ -1,3 +1,6 @@ -DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2 -DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1 SHA512 f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934 -DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5 +DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311 SHA512 643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738 +DIST bareos-21.1.9.tar.gz 11670286 BLAKE2B 22486fdf2b80296fed4265afa8ea4f5c0708f7836172da6a0f081c3328eea84c2eaf7de62884c82aeb61ead38f5a872edc6718fce730c16d6e4e96ef520eff0e SHA512 337702bf5b38bdf6f96720748ec0ab154f698389d6ff535b59f0a9432783f021287b98ac446467a1da51614c6fd740b45b8a5363f56cb5bd855bfe333fc6cfac +DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327 +DIST bareos-22.1.4.tar.gz 14747141 BLAKE2B 1b155c35f22120b07151a54ef314c6f8f42ea14c3f194d787a58ece41f8de148f0b34d0cc6a54f578b1bb5c4d3ae2a7736829f6d2cd642d8e001f1797a18052a SHA512 4285f0f524c6f30ae8f7dd67e2a732cf983663f56b053968a7f10d753e38bc2ee1e2673d1fb6a9b516994b51b45215fac153e301b893c9cb31a164ebff0d4c85 +DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75 +DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29 diff --git a/app-backup/bareos/bareos-17.2.10.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild deleted file mode 100644 index f4a2b487a99f..000000000000 --- a/app-backup/bareos/bareos-17.2.10.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit desktop systemd - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="http://www.bareos.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="mirror" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl - logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto - sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax" -REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" - -DEPEND=" - !app-backup/bacula - acct-group/${PN} - cephfs? ( sys-cluster/ceph ) - rados? ( sys-cluster/ceph ) - rados-striper? ( >=sys-cluster/ceph-0.94.2 ) - glusterfs? ( sys-cluster/glusterfs ) - lmdb? ( dev-db/lmdb ) - dev-libs/gmp:0 - !clientonly? ( - acct-user/${PN} - postgres? ( dev-db/postgresql:*[threads] ) - mysql? ( dev-db/mysql-connector-c:0= ) - sqlite? ( dev-db/sqlite:3 ) - director? ( - virtual/mta - jansson? ( dev-libs/jansson ) - ) - ) - fastlz? ( dev-libs/bareos-fastlzlib ) - logwatch? ( sys-apps/logwatch ) - tcpd? ( sys-apps/tcp-wrappers ) - readline? ( sys-libs/readline:0 ) - static? ( - acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - gnutls? ( net-libs/gnutls[static-libs] ) - ) - ) - !static? ( - acl? ( virtual/acl ) - dev-libs/lzo - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - gnutls? ( net-libs/gnutls ) - ) - sys-libs/ncurses:= - sys-libs/zlib - ) - " -RDEPEND="${DEPEND} - !clientonly? ( - storage-daemon? ( - sys-block/mtx - app-arch/mt-st - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -REQUIRED_USE="static? ( clientonly )" - -S=${WORKDIR}/${PN}-Release-${PV} - -pkg_setup() { - use mysql && export mydbtypes+="mysql" - use postgres && export mydbtypes+=" postgresql" - use sqlite && export mydbtypes+=" sqlite" -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bareos/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # enables default database driver in catalog - pushd src/defaultconfigs/bareos-dir.d/catalog >&/dev/null || die - sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE/d' MyCatalog.conf.in \ - || die "sed on MyCatalog.conf.in failed" - popd >&/dev/null || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # do not strip binaries - for d in filed console dird stored; do - sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die - done - - eapply_user -} - -src_configure() { - local myconf='' - - addpredict /var/lib/logrotate.status - - if use clientonly; then - myconf="${myconf} \ - $(use_enable clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable acl) \ - $(use_enable ipv6) \ - $(use_enable ndmp) \ - $(use_enable readline) \ - $(use_enable !readline conio) \ - $(use_enable scsi-crypto) \ - $(use_enable sql-pooling) \ - $(use_with fastlz) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with readline) \ - $(use_with sqlite sqlite3) \ - $(use sqlite || echo "--without-sqlite3") \ - $(use_with ssl openssl) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable lmdb) \ - $(use_with glusterfs) \ - $(use_with rados) \ - $(use_with rados-striper) \ - $(use_with cephfs) \ - $(use_with jansson) \ - " - - econf \ - --without-python \ - --with-pid-dir=/run/bareos \ - --with-subsys-dir=/run/lock/subsys \ - --with-working-dir=/var/lib/bareos \ - --with-logdir=/var/log/bareos \ - --with-scriptdir=/usr/libexec/bareos \ - --with-plugindir=/usr/$(get_libdir)/${PN}/plugin \ - --with-backenddir=/usr/$(get_libdir)/${PN}/backend \ - --with-dir-user=bareos \ - --with-dir-group=bareos \ - --with-sd-user=root \ - --with-sd-group=bareos \ - --with-fd-user=root \ - --with-fd-group=bareos \ - --with-sbin-perm=0755 \ - --with-systemd \ - --with-db-password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` \ - --enable-dynamic-cats-backends \ - --enable-dynamic-storage-backends \ - --enable-batch-insert \ - --disable-afs \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - newicon src/images/bareos_logo_shadow.png bareos.png - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql} - rm -f "${D}"/usr/sbin/bareos - - # remove upstream init scripts - rm -f "${D}"/etc/init.d/bareos-* - - # rename statically linked apps - if use clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bareos-fd bareos-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use clientonly; then - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bareos - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /etc/log.d/scripts/services - dodir /etc/log.d/scripts/shared - dodir /etc/log.d/conf/logfiles - dodir /etc/log.d/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* - if use clientonly || ! use director; then - rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* - rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* - rm -vf "${D}"/usr/share/man/man1/bsmtp.1* - rm -vf "${D}"/usr/share/man/man8/bwild.8* - rm -vf "${D}"/usr/share/man/man8/bregex.8* - rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* - rm -vf "${D}"/usr/libexec/bareos/create_*_database - rm -vf "${D}"/usr/libexec/bareos/drop_*_database - rm -vf "${D}"/usr/libexec/bareos/make_*_tables - rm -vf "${D}"/usr/libexec/bareos/update_*_tables - rm -vf "${D}"/usr/libexec/bareos/drop_*_tables - rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges - rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup - fi - if use clientonly || ! use storage-daemon; then - rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* - rm -vf "${D}"/usr/share/man/man8/bcopy.8* - rm -vf "${D}"/usr/share/man/man8/bextract.8* - rm -vf "${D}"/usr/share/man/man8/bls.8* - rm -vf "${D}"/usr/share/man/man8/bscan.8* - rm -vf "${D}"/usr/share/man/man8/btape.8* - rm -vf "${D}"/usr/libexec/bareos/disk-changer - rm -vf "${D}"/usr/libexec/bareos/mtx-changer - rm -vf "${D}"/usr/libexec/bareos/dvd-handler - rm -vf "${D}"/etc/bareos/mtx-changer.conf - fi - if ! use scsi-crypto; then - rm -vf "${D}"/usr/share/man/man8/bscrypto.8* - fi - - # documentation - dodoc README.md - use ndmp && dodoc README.NDMP - use scsi-crypto && dodoc README.scsicrypto - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bareos.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bareos_ft.vim - fi - - # setup init scripts - myscripts="bareos-fd" - if ! use clientonly; then - if use director; then - myscripts="${myscripts} bareos-dir" - fi - if use storage-daemon; then - myscripts="${myscripts} bareos-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd-16 "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependency for the director init script - case "${script}" in - bareos-dir) - sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - # install systemd unit files - use director && systemd_dounit "${FILESDIR}"/bareos-dir.service - use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service - systemd_dounit "${FILESDIR}"/bareos-fd.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bareos - - # make sure bareos group can execute bareos libexec scripts - fowners -R root:bareos /usr/libexec/bareos -} - -pkg_postinst() { - if use clientonly; then - fowners root:bareos /var/lib/bareos - else - fowners bareos:bareos /var/lib/bareos - fi - - if ! use clientonly && use director; then - einfo - einfo "If this is a new install, you must create the database:" - if use postgres; then - einfo - einfo "For postgresql:" - einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'" - fi - if use mysql; then - einfo - einfo "For mysql:" - einfo - einfo " Make sure root has direct access to your mysql server. You may want to" - einfo " create a /root/.my.cnf file with" - einfo " [client]" - einfo " user=root" - einfo " password=YourPasswordForAccessingMysqlAsRoot" - einfo " before running:" - einfo " /usr/libexec/bareos/create_bareos_database mysql" - einfo " /usr/libexec/bareos/make_bareos_tables mysql" - einfo " /usr/libexec/bareos/grant_bareos_privileges mysql" - fi - einfo - fi - - if use sqlite; then - einfo - einfo "Be aware that Bareos does not officially support SQLite database." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - einfo "It is strongly recommended to use either postgresql or mysql as" - einfo "catalog database backend." - einfo - fi -} diff --git a/app-backup/bareos/bareos-19.2.8.ebuild b/app-backup/bareos/bareos-21.1.8-r1.ebuild index beb2d8324673..c1553eece5eb 100644 --- a/app-backup/bareos/bareos-19.2.8.ebuild +++ b/app-backup/bareos/bareos-21.1.8-r1.ebuild @@ -1,25 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) CMAKE_WARN_UNUSED_CLI=no #CMAKE_REMOVE_MODULES=yes -inherit python-any-r1 systemd cmake +inherit python-any-r1 systemd cmake tmpfiles DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="https://www.bareos.org/" SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="mirror" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl - logwatch mysql ndmp +postgres readline scsi-crypto - sqlite static +storage-daemon systemd tcpd vim-syntax xattr" +IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake DEPEND=" @@ -33,30 +39,28 @@ DEPEND=" dev-libs/gmp:0 !clientonly? ( acct-user/${PN} - postgres? ( dev-db/postgresql:*[threads] ) - mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) + dev-db/postgresql:*[threads(+)] director? ( virtual/mta - jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] + dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) + dev-libs/jansson:= dev-libs/lzo - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) @@ -70,52 +74,89 @@ RDEPEND="${DEPEND} ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) " -BDEPEND="${PYTHON_DEPS}" + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" REQUIRED_USE=" - !clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph ) " S=${WORKDIR}/${PN}-Release-${PV} -src_prepare() { - use mysql && export mydbtypes+=( mysql ) - use postgres && export mydbtypes+=( postgresql ) - use sqlite && export mydbtypes+=( sqlite ) +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" - # enables default database driver in catalog - pushd core/src/defaultconfigs >&/dev/null || die - sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \ - || die "sed on MyCatalog.conf.in failed" - popd >&/dev/null || die + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage - # fix gentoo version detection - eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch" + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix gentoo platform support + eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + eapply "${FILESDIR}/${PN}-21.1.2-werror.patch" + eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + eapply "${FILESDIR}/${PN}-21.1.8-gcc14-fixes.patch" # fix missing DESTDIR in symlink creation sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" - # disable dird and stored plugins, because of - # py2 dependency - cd "${S}/core/src/plugins" - cmake_comment_add_subdirectory dird - cmake_comment_add_subdirectory stored - cd - - - CMAKE_USE_DIR="$S/core" cmake_src_prepare } src_configure() { local mycmakeargs=() - CMAKE_USE_DIR="$S/core" - - pushd core/platforms >&/dev/null || die - cmake_comment_add_subdirectory '${DISTNAME}' - popd >&/dev/null || die + cmake_comment_add_subdirectory webui if use clientonly; then mycmakeargs+=( @@ -126,20 +167,19 @@ src_configure() { fi for useflag in acl ipv6 ndmp scsi-crypto \ - systemd mysql lmdb; do + systemd lmdb; do mycmakeargs+=( -D$useflag=$(usex $useflag) ) done mycmakeargs+=( -DHAVE_PYTHON=0 - -DDEFAULT_DB_TYPE=${mydbtypes[0]} -Darchivedir=/var/lib/bareos/storage -Dbackenddir=/usr/$(get_libdir)/${PN}/backend -Dbasename="`hostname -s`" -Dbatch-insert=yes -Dbsrdir=/var/lib/bareos/bsr -Dconfdir=/etc/bareos - -Dcoverage=yes + -Dcoverage=no -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` -Ddir-group=bareos -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" @@ -159,24 +199,25 @@ src_configure() { -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" - -Dmysql=$(usex mysql) -Dopenssl=yes -Dpiddir=/run/bareos -Dplugindir=/usr/$(get_libdir)/${PN}/plugin - -Dpostgresql=$(usex postgres) -Dsbin-perm=0755 -Dsbindir=/usr/sbin -Dscriptdir=/usr/libexec/bareos -Dsd-group=bareos -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" -Dsd-user=root - -Dsqlite3=$(usex sqlite) -Dsubsysdir=/run/lock/subsys -Dsysconfdir=/etc -Dworkingdir=/var/lib/bareos -Dx=$(usex X) ) + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + cmake_src_configure } @@ -184,11 +225,31 @@ src_install() { cmake_src_install # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql} + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} rm -f "${D}"/usr/sbin/bareos - # remove upstream init scripts - rm -f "${D}"/etc/init.d/bareos-* + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi # rename statically linked apps if use clientonly && use static ; then @@ -234,9 +295,6 @@ src_install() { rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* if use clientonly || ! use director; then - if use systemd; then - rm -vf "${D}"/lib/systemd/system/bareos-dir.service - fi rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* rm -vf "${D}"/usr/share/man/man1/bsmtp.1* @@ -252,9 +310,6 @@ src_install() { rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup fi if use clientonly || ! use storage-daemon; then - if use systemd; then - rm -vf "${D}"/lib/systemd/system/bareos-sd.service - fi rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* rm -vf "${D}"/usr/share/man/man8/bcopy.8* rm -vf "${D}"/usr/share/man/man8/bextract.8* @@ -296,32 +351,18 @@ src_install() { fi fi for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependency for the director init script - case "${script}" in - bareos-dir) - sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die - ;; - *) - ;; - esac - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" done # install systemd unit files if use systemd; then if ! use clientonly; then - use director && systemd_dounit core/platforms/systemd/bareos-dir.service - use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service fi - systemd_dounit core/platforms/systemd/bareos-fd.service + systemd_dounit "${FILESDIR}"/bareos-fd.service fi # make sure the working directory exists @@ -329,17 +370,21 @@ src_install() { keepdir /var/lib/bareos keepdir /var/lib/bareos/storage - diropts -m0755 + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi keepdir /var/log/bareos - insinto /usr/lib/tmpfiles.d - newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf # make sure bareos group can execute bareos libexec scripts fowners -R root:bareos /usr/libexec/bareos } pkg_postinst() { + tmpfiles_process bareos.conf + if use clientonly; then fowners root:bareos /var/lib/bareos else @@ -349,37 +394,21 @@ pkg_postinst() { if ! use clientonly && use director; then einfo einfo "If this is a new install, you must create the database:" - if use postgres; then - einfo - einfo "For postgresql:" - einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'" - fi - if use mysql; then - einfo - einfo "For mysql:" - einfo - einfo " Make sure root has direct access to your mysql server. You may want to" - einfo " create a /root/.my.cnf file with" - einfo " [client]" - einfo " user=root" - einfo " password=YourPasswordForAccessingMysqlAsRoot" - einfo " before running:" - einfo " /usr/libexec/bareos/create_bareos_database mysql" - einfo " /usr/libexec/bareos/make_bareos_tables mysql" - einfo " /usr/libexec/bareos/grant_bareos_privileges mysql" - fi einfo - fi - - if use sqlite; then + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" einfo - einfo "Be aware that Bareos does not officially support SQLite database." - einfo "Best use it only for a client-only installation. See Bug #445540." + einfo "or run" einfo - einfo "It is strongly recommended to use either postgresql or mysql as" - einfo "catalog database backend." + einfo " emerge --config app-backup/bareos" einfo + einfo "to do this" fi } + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-18.2.9.ebuild b/app-backup/bareos/bareos-21.1.9.ebuild index cf1622b6e1ad..ae6b1efd9be1 100644 --- a/app-backup/bareos/bareos-18.2.9.ebuild +++ b/app-backup/bareos/bareos-21.1.9.ebuild @@ -1,72 +1,66 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) CMAKE_WARN_UNUSED_CLI=no #CMAKE_REMOVE_MODULES=yes -inherit desktop systemd cmake +inherit python-any-r1 systemd cmake tmpfiles DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="http://www.bareos.org/" +HOMEPAGE="https://www.bareos.org/" SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="mirror" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl - logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto - sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax" -REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" +IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake DEPEND=" !app-backup/bacula acct-group/${PN} - cephfs? ( sys-cluster/ceph ) - rados? ( sys-cluster/ceph ) - rados-striper? ( >=sys-cluster/ceph-0.94.2 ) + !x86? ( + ceph? ( sys-cluster/ceph ) + ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/${PN} - postgres? ( dev-db/postgresql:*[threads] ) - mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) + dev-db/postgresql:*[threads(+)] director? ( virtual/mta - jansson? ( dev-libs/jansson ) ) ) - fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] + dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - gnutls? ( net-libs/gnutls[static-libs] ) - ) + sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) + dev-libs/jansson:= dev-libs/lzo - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - gnutls? ( net-libs/gnutls ) - ) + dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) @@ -78,132 +72,184 @@ RDEPEND="${DEPEND} app-arch/mt-st ) ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" -REQUIRED_USE="static? ( clientonly )" +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" S=${WORKDIR}/${PN}-Release-${PV} -src_prepare() { - use mysql && export mydbtypes+=( mysql ) - use postgres && export mydbtypes+=( postgresql ) - use sqlite && export mydbtypes+=( sqlite ) +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} - # enables default database driver in catalog - pushd core/src/defaultconfigs >&/dev/null || die - sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \ - || die "sed on MyCatalog.conf.in failed" - popd >&/dev/null || die +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" - eapply -p0 "${FILESDIR}/bareos-cmake-rados.patch" + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage - # fix gentoo version detection - eapply -p0 "${FILESDIR}/bareos-cmake-gentoo.patch" + default + cmake_src_test - # fix missing DESTDIR in symlink creation - eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch" + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} - # disable dird and stored plugins, because of - # py2 dependency - cd "${S}/core/src/plugins" - cmake_comment_add_subdirectory filed - cmake_comment_add_subdirectory dird - cmake_comment_add_subdirectory stored - cd - +src_prepare() { + # fix gentoo platform support + eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + eapply "${FILESDIR}/${PN}-21.1.2-werror.patch" + eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + eapply "${FILESDIR}/${PN}-21.1.8-gcc14-fixes.patch" - eapply_user + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" - CMAKE_USE_DIR="$S/core" cmake_src_prepare } src_configure() { local mycmakeargs=() - CMAKE_USE_DIR="$S/core" - - pushd core/platforms >&/dev/null || die - cmake_comment_add_subdirectory '${DISTNAME}' - popd >&/dev/null || die + cmake_comment_add_subdirectory webui if use clientonly; then mycmakeargs+=( - -Dclient-only=YES + -Dclient-only=ON -Dstatic-cons=$(usex static) -Dstatic-fd=$(usex static) ) fi - for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \ - systemd fastlz mysql lmdb glusterfs rados \ - rados-striper cephfs jansson; do - + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do mycmakeargs+=( -D$useflag=$(usex $useflag) ) done mycmakeargs+=( - -DDEFAULT_DB_TYPE=${mydbtypes[0]} - -Dx=$(usex X) - -Dpostgresql=$(usex postgres) - -Dmysql=$(usex mysql) - -Dsqlite3=$(usex sqlite) - -Dopenssl=$(usex ssl) - -Dtcp-wrapper=$(usex tcpd) - -Dlibdir=/usr/$(get_libdir) - -Dsbindir=/usr/sbin - -Dmandir=/usr/share/man - -Ddocdir=/usr/share/doc/${PF} - -Dhtmldir=/usr/share/doc/${PF}/html + -DHAVE_PYTHON=0 -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes -Dbsrdir=/var/lib/bareos/bsr - -Dpiddir=/run/bareos - -Dsysconfdir=/etc -Dconfdir=/etc/bareos - -Dsubsys-dir=/run/lock/subsys - -Dworkingdir=/var/lib/bareos - -Dlogdir=/var/log/bareos - -Dscriptdir=/usr/libexec/bareos - -Dplugindir=/usr/$(get_libdir)/${PN}/plugin - -Dbackenddir=/usr/$(get_libdir)/${PN}/backend - -Ddir-user=bareos - -Ddir-group=bareos - -Dsd-user=root - -Dsd-group=bareos - -Dfd-user=root - -Dfd-group=bareos - -Dsbin-perm=0755 + -Dcoverage=no -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} -Ddynamic-cats-backends=yes -Ddynamic-storage-backends=yes - -Dbatch-insert=yes - -Dhost=${CHOST} - -Dcoverage=yes - -Dpython=no - -Dsmartalloc=yes - -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-group=bareos -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" - -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" - -Dbasename="`hostname -s`" - -Dhostname="`hostname -s`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) ) + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + cmake_src_configure } src_install() { - #emake DESTDIR="${D}" install cmake_src_install - newicon core/src/images/bareos_logo_shadow.png bareos.png # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql} + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} rm -f "${D}"/usr/sbin/bareos - # remove upstream init scripts - rm -f "${D}"/etc/init.d/bareos-* + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi # rename statically linked apps if use clientonly && use static ; then @@ -249,9 +295,6 @@ src_install() { rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* if use clientonly || ! use director; then - if use systemd; then - rm -vf "${D}"/lib/systemd/system/bareos-dir.service - fi rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* rm -vf "${D}"/usr/share/man/man1/bsmtp.1* @@ -267,9 +310,6 @@ src_install() { rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup fi if use clientonly || ! use storage-daemon; then - if use systemd; then - rm -vf "${D}"/lib/systemd/system/bareos-sd.service - fi rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* rm -vf "${D}"/usr/share/man/man8/bcopy.8* rm -vf "${D}"/usr/share/man/man8/bextract.8* @@ -311,32 +351,18 @@ src_install() { fi fi for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependency for the director init script - case "${script}" in - bareos-dir) - sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die - ;; - *) - ;; - esac - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" done # install systemd unit files if use systemd; then if ! use clientonly; then - use director && systemd_dounit core/platforms/systemd/bareos-dir.service - use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service fi - systemd_dounit core/platforms/systemd/bareos-fd.service + systemd_dounit "${FILESDIR}"/bareos-fd.service fi # make sure the working directory exists @@ -344,14 +370,21 @@ src_install() { keepdir /var/lib/bareos keepdir /var/lib/bareos/storage - diropts -m0755 + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi keepdir /var/log/bareos + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + # make sure bareos group can execute bareos libexec scripts fowners -R root:bareos /usr/libexec/bareos } pkg_postinst() { + tmpfiles_process bareos.conf + if use clientonly; then fowners root:bareos /var/lib/bareos else @@ -361,37 +394,21 @@ pkg_postinst() { if ! use clientonly && use director; then einfo einfo "If this is a new install, you must create the database:" - if use postgres; then - einfo - einfo "For postgresql:" - einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'" - fi - if use mysql; then - einfo - einfo "For mysql:" - einfo - einfo " Make sure root has direct access to your mysql server. You may want to" - einfo " create a /root/.my.cnf file with" - einfo " [client]" - einfo " user=root" - einfo " password=YourPasswordForAccessingMysqlAsRoot" - einfo " before running:" - einfo " /usr/libexec/bareos/create_bareos_database mysql" - einfo " /usr/libexec/bareos/make_bareos_tables mysql" - einfo " /usr/libexec/bareos/grant_bareos_privileges mysql" - fi einfo - fi - - if use sqlite; then + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" einfo - einfo "Be aware that Bareos does not officially support SQLite database." - einfo "Best use it only for a client-only installation. See Bug #445540." + einfo "or run" einfo - einfo "It is strongly recommended to use either postgresql or mysql as" - einfo "catalog database backend." + einfo " emerge --config app-backup/bareos" einfo + einfo "to do this" fi } + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-22.1.2-r1.ebuild b/app-backup/bareos/bareos-22.1.2-r1.ebuild new file mode 100644 index 000000000000..d61de65c0fc7 --- /dev/null +++ b/app-backup/bareos/bareos-22.1.2-r1.ebuild @@ -0,0 +1,435 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +CMAKE_WARN_UNUSED_CLI=no + +inherit python-any-r1 systemd cmake tmpfiles + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${PN}-Release-${PV} +fi + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads(+)] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + X? ( + dev-qt/qtwidgets:5= + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +PATCHES=( + # fix gentoo platform support + "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + "${FILESDIR}/${PN}-22.0.2-werror.patch" + "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch" +) + +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-22.1.4.ebuild b/app-backup/bareos/bareos-22.1.4.ebuild new file mode 100644 index 000000000000..d0de880031c4 --- /dev/null +++ b/app-backup/bareos/bareos-22.1.4.ebuild @@ -0,0 +1,434 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +CMAKE_WARN_UNUSED_CLI=no + +inherit python-any-r1 systemd cmake tmpfiles + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${PN}-Release-${PV} +fi + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads(+)] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + X? ( + dev-qt/qtwidgets:5= + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +PATCHES=( + # fix gentoo platform support + "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + "${FILESDIR}/${PN}-22.0.2-werror.patch" + "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" +) + +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-23.0.1.ebuild b/app-backup/bareos/bareos-23.0.1.ebuild new file mode 100644 index 000000000000..24b7a4409e94 --- /dev/null +++ b/app-backup/bareos/bareos-23.0.1.ebuild @@ -0,0 +1,436 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +CMAKE_WARN_UNUSED_CLI=no + +inherit python-any-r1 systemd cmake tmpfiles flag-o-matic + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${PN}-Release-${PV} +fi + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads(+)] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + X? ( + dev-qt/qtwidgets:5= + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +PATCHES=( + "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + "${FILESDIR}/${PN}-22.0.2-werror.patch" + "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch" +) + +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX" + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-23.0.2.ebuild b/app-backup/bareos/bareos-23.0.2.ebuild new file mode 100644 index 000000000000..f88f46187fe6 --- /dev/null +++ b/app-backup/bareos/bareos-23.0.2.ebuild @@ -0,0 +1,435 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +CMAKE_WARN_UNUSED_CLI=no + +inherit python-any-r1 systemd cmake tmpfiles flag-o-matic + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${PN}-Release-${PV} +fi + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads(+)] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + X? ( + dev-qt/qtwidgets:5= + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +PATCHES=( + "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + "${FILESDIR}/${PN}-22.0.2-werror.patch" + "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" +) + +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX" + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/bareos-9999.ebuild b/app-backup/bareos/bareos-9999.ebuild new file mode 100644 index 000000000000..24b7a4409e94 --- /dev/null +++ b/app-backup/bareos/bareos-9999.ebuild @@ -0,0 +1,436 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +CMAKE_WARN_UNUSED_CLI=no + +inherit python-any-r1 systemd cmake tmpfiles flag-o-matic + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${PN}-Release-${PV} +fi + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads(+)] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + X? ( + dev-qt/qtwidgets:5= + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads(+)] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +PATCHES=( + "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + "${FILESDIR}/${PN}-22.0.2-werror.patch" + "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch" +) + +pkg_pretend() { + local active_removed_backend="" + if has_version "<app-backup/bareos-21[director,mysql]"; then + if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then + active_removed_backend=MySQL + fi + elif has_version "<app-backup/bareos-21[director,sqlite]"; then + if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then + active_removed_backend=SQLite + fi + fi + if [[ -n $active_removed_backend ]]; then + ewarn + ewarn "You are currently using bareos with the $active_removed_backend" + ewarn "catalog backend." + ewarn + ewarn "THIS IS NOT SUPPORTED ANYMORE" + ewarn + ewarn "Beginning with version 21.0.0 bareos has dropped support for" + ewarn "MySQL and SQLite catalog backends." + ewarn + ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX" + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/files/bareos-21-cmake-gentoo.patch b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch new file mode 100644 index 000000000000..e42bf91a91fd --- /dev/null +++ b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch @@ -0,0 +1,12 @@ +diff -ur bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt bareos-Release-21.0.0/core/platforms/CMakeLists.txt +--- bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt 2021-12-21 01:00:49.000000000 -1000 ++++ bareos-Release-21.0.0/core/platforms/CMakeLists.txt 2022-01-30 15:09:41.949529813 -1000 +@@ -30,6 +30,8 @@ + message(STATUS "adding subdirectories debian and univention") + add_subdirectory(debian) + add_subdirectory(univention) ++ elseif(${PLATFORM} STREQUAL gentoo) ++ message(STATUS "PLATFORM: " ${PLATFORM}) + elseif(${BAREOS_PLATFORM} STREQUAL hpux) + message(STATUS "BAREOS_PLATFORM: " ${BAREOS_PLATFORM}) + elseif(${BAREOS_PLATFORM} STREQUAL archlinux) diff --git a/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch new file mode 100644 index 000000000000..22cdc2a41c36 --- /dev/null +++ b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch @@ -0,0 +1,25 @@ +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -44,12 +44,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common) + + include(GNUInstallDirs) + +-find_program(CCACHE_FOUND ccache) +-if(CCACHE_FOUND) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +-endif(CCACHE_FOUND) +- + # switch on CXX 17 Support + # + set(CMAKE_CXX_STANDARD 17) +@@ -584,9 +578,6 @@ message(STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION}) + # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). But + # there are also two variables exactly for this purpose: + +-# wheter or not +-message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND}) +- + # Choose the type of build. Example: SET(CMAKE_BUILD_TYPE Debug) + message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE}) + diff --git a/app-backup/bareos/files/bareos-21.1.2-werror.patch b/app-backup/bareos/files/bareos-21.1.2-werror.patch new file mode 100644 index 000000000000..10de9f1415b6 --- /dev/null +++ b/app-backup/bareos/files/bareos-21.1.2-werror.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/841734 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -96,7 +96,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + -Werror=format-security compiler_error_format_security + ) + if(${compiler_error_format_security}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security") + endif() + endif() + +@@ -353,8 +353,8 @@ if(developer) + add_definitions("-DDEVELOPER=1") + endif() + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + + include(BareosSetVariableDefaults) + option(ENABLE_BCONSOLE "Build bconsole binary" ON) diff --git a/app-backup/bareos/files/bareos-22.0.2-werror.patch b/app-backup/bareos/files/bareos-22.0.2-werror.patch new file mode 100644 index 000000000000..43f2aa5ad7d9 --- /dev/null +++ b/app-backup/bareos/files/bareos-22.0.2-werror.patch @@ -0,0 +1,23 @@ +diff -urN bareos-Release-22.0.2.orig/core/CMakeLists.txt bareos-Release-22.0.2/core/CMakeLists.txt +--- bareos-Release-22.0.2.orig/core/CMakeLists.txt 2023-02-07 15:30:01.000000000 +0530 ++++ bareos-Release-22.0.2/core/CMakeLists.txt 2023-03-01 23:06:39.577048453 +0530 +@@ -104,7 +104,7 @@ + -Werror=format-security compiler_error_format_security + ) + if(${compiler_error_format_security}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security") + endif() + endif() + +@@ -394,8 +394,8 @@ + add_definitions("-DDEVELOPER=1") + endif() + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") + + include(BareosSetVariableDefaults) + option(ENABLE_BCONSOLE "Build bconsole binary" ON) diff --git a/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch b/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch new file mode 100644 index 000000000000..5f71576bc001 --- /dev/null +++ b/app-backup/bareos/files/bareos-22.1.2-include-algorithm.patch @@ -0,0 +1,41 @@ +From https://github.com/bareos/bareos/pull/1687/commits/3907be7ff9700d0328198b47c58885f5ec56546c +https://bugs.gentoo.org/920489 + +diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc +index b5d921c..150ebfc 100644 +--- a/core/src/cats/sql_get.cc ++++ b/core/src/cats/sql_get.cc +@@ -31,6 +31,7 @@ + */ + + #include "include/bareos.h" ++#include <algorithm> + + #if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI + +diff --git a/core/src/stored/append.cc b/core/src/stored/append.cc +index 05f6784..32234d4 100644 +--- a/core/src/stored/append.cc ++++ b/core/src/stored/append.cc +@@ -41,6 +41,8 @@ + #include "lib/berrno.h" + #include "lib/berrno.h" + ++#include <algorithm> ++ + namespace storagedaemon { + + /* Responses sent to the daemon */ +diff --git a/core/src/dird/ua_prune.cc b/core/src/dird/ua_prune.cc +index 9a0770c..15a0a56 100644 +--- a/core/src/dird/ua_prune.cc ++++ b/core/src/dird/ua_prune.cc +@@ -40,6 +40,8 @@ + #include "lib/edit.h" + #include "lib/parse_conf.h" + ++#include <algorithm> ++ + namespace directordaemon { + + /* Forward referenced functions */ diff --git a/app-backup/bareos/files/bareos-cmake-gentoo.patch b/app-backup/bareos/files/bareos-cmake-gentoo.patch deleted file mode 100644 index 0f67a9e5d9de..000000000000 --- a/app-backup/bareos/files/bareos-cmake-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- core/cmake/distname.sh.orig 2019-01-31 12:39:26.000000000 +0100 -+++ core/cmake/distname.sh 2019-02-05 10:26:43.258936535 +0100 -@@ -134,7 +134,7 @@ - elif test -f /etc/gentoo-release - then - DISTNAME=gentoo -- DISTVER=`awk '/version / { print $5 }' < /etc/gentoo-release` -+ DISTVER=`awk '/release / { print $5 }' < /etc/gentoo-release` - elif test -f /etc/debian_version - then - if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then diff --git a/app-backup/bareos/files/bareos-cmake-rados.patch b/app-backup/bareos/files/bareos-cmake-rados.patch deleted file mode 100644 index c9a0c176692e..000000000000 --- a/app-backup/bareos/files/bareos-cmake-rados.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- core/cmake/BareosCheckSymbols.cmake.orig 2018-12-05 23:39:37.307627387 +0100 -+++ core/cmake/BareosCheckSymbols.cmake 2018-12-05 23:40:00.999464771 +0100 -@@ -21,7 +21,7 @@ - - - CHECK_SYMBOL_EXISTS(__stub_lchmod features.h LCHMOD_IS_A_STUB1) --CHECK_SYMBOL_EXISTS(__stub___lchmod features_h LCHMOD_IS_A_STUB2) -+#CHECK_SYMBOL_EXISTS(__stub___lchmod features_h LCHMOD_IS_A_STUB2) - - - -@@ -43,7 +43,9 @@ - - cmake_push_check_state() - SET(CMAKE_REQUIRED_LIBRARIES ${RADOS_LIBRARIES}) -+if ("${HAVE_RADOS}") - CHECK_SYMBOL_EXISTS(rados_ioctx_set_namespace rados/librados.h HAVE_RADOS_NAMESPACES) - CHECK_SYMBOL_EXISTS(rados_nobjects_list_open rados/librados.h HAVE_RADOS_NOBJECTS_LIST) -+endif() - cmake_pop_check_state() - diff --git a/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch b/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch deleted file mode 100644 index 8c46fdf0dc86..000000000000 --- a/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- work/bareos-Release-18.2.5/core/cmake/bareos-symlink-default-db-backend.cmake.orig 2019-01-31 12:39:26.000000000 +0100 -+++ work/bareos-Release-18.2.5/core/cmake/bareos-symlink-default-db-backend.cmake 2019-02-05 11:00:24.559983661 +0100 -@@ -19,5 +19,5 @@ - MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}") - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} -- ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} -+ $ENV{DESTDIR}/${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} - ) diff --git a/app-backup/bareos/files/bareos-dir-21-r1.initd b/app-backup/bareos/files/bareos-dir-21-r1.initd new file mode 100644 index 000000000000..1363833e8962 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21-r1.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start_pre() { + checkpath --directory --owner root:root --mode 00755 /run/bareos +} + +command="/usr/sbin/bareos-dir" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-dir.9101.pid" diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir-21.confd index 6d755bf93344..4e2ee55d8924 100644 --- a/app-backup/bareos/files/bareos-dir.confd +++ b/app-backup/bareos/files/bareos-dir-21.confd @@ -1,15 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Config file for /etc/init.d/bareos-dir -# Bareos can use more than one catalog database and each one can -# be of any supported type. -# If a database server where you store a bareos catalog -# is on a different machine, you might want to remove the corresponding -# type from the rc_need variable. -rc_need="%databasetypes%" - # Options for the director daemon. # The director can be run as a non-root user, however # please ensure that this user has proper permissions to diff --git a/app-backup/bareos/files/bareos-dir-21.service b/app-backup/bareos/files/bareos-dir-21.service new file mode 100644 index 000000000000..2f156cf8aecc --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21.service @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos Director Daemon +# +[Unit] +Description=Bareos Director Daemon +Documentation=man:bareos-dir(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target postgresql.service +ConditionPathIsDirectory=/var/lib/bareos + +[Service] +# see bug #631598 +#Type=forking +Type=simple +User=bareos +Group=bareos +WorkingDirectory=/var/lib/bareos +#PIDFile=/run/bareos/bareos-dir.9101.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-dir -t -f +#ExecStart=/usr/sbin/bareos-dir +ExecStart=/usr/sbin/bareos-dir -f +SuccessExitStatus=0 1 15 +ExecReload=/usr/sbin/bareos-dir -t -f +ExecReload=/bin/kill -HUP $MAINPID +#Restart=on-failure + +[Install] +Alias=bareos-director.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/bareos-dir.confd-16 b/app-backup/bareos/files/bareos-dir.confd-16 deleted file mode 100644 index a11eba90a755..000000000000 --- a/app-backup/bareos/files/bareos-dir.confd-16 +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Config file for /etc/init.d/bareos-dir - -# Bareos can use more than one catalog database and each one can -# be of any supported type. -# If a database server where you store a bareos catalog -# is on a different machine, you might want to remove the corresponding -# type from the rc_need variable. -rc_need="%databasetypes%" - -# Options for the director daemon. -# The director can be run as a non-root user, however -# please ensure that this user has proper permissions to -# access your backup devices. -DIR_OPTIONS="-u root -g bareos" diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd deleted file mode 100644 index 826d27a829c9..000000000000 --- a/app-backup/bareos/files/bareos-dir.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns bareos-fd bareos-sd -} - -start() { - ebegin "Starting bareos director" - checkpath -d -m 0750 -o bareos:bareos /run/bareos - start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \ - -- ${DIR_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bareos director" - start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.*.pid - eend $? -} diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service deleted file mode 100644 index 440d3c3be98d..000000000000 --- a/app-backup/bareos/files/bareos-dir.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] - Description=Bareos Director - After=syslog.target network.target - Requires=bareos-sd.service bareos-fd.service - -[Install] - WantedBy=multi-user.target - -[Service] - Type=forking - User=root - ExecStartPre=-/bin/mkdir /run/bareos - ExecStart=/usr/sbin/bareos-dir diff --git a/app-backup/bareos/files/bareos-fd-21-r1.initd b/app-backup/bareos/files/bareos-fd-21-r1.initd new file mode 100644 index 000000000000..2b752085c764 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd-21-r1.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +command="/usr/sbin/bareos-fd" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-fd.9102.pid" diff --git a/app-backup/bareos/files/bareos-fd.confd b/app-backup/bareos/files/bareos-fd-21.confd index 5e429a6bd31c..407f2a8828eb 100644 --- a/app-backup/bareos/files/bareos-fd.confd +++ b/app-backup/bareos/files/bareos-fd-21.confd @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Config file for /etc/init.d/bareos-fd diff --git a/app-backup/bareos/files/bareos-fd.confd-16 b/app-backup/bareos/files/bareos-fd.confd-16 deleted file mode 100644 index e3b8a1f576fd..000000000000 --- a/app-backup/bareos/files/bareos-fd.confd-16 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Config file for /etc/init.d/bareos-fd - -# Options for the file daemon. -FD_OPTIONS="-u root -g bareos" diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd deleted file mode 100644 index e272daa88ecd..000000000000 --- a/app-backup/bareos/files/bareos-fd.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns -} - -start() { - ebegin "Starting bareos file daemon" - checkpath -d -m 0750 /run/bareos - start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \ - -- ${FD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bareos file daemon" - start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.*.pid - eend $? -} diff --git a/app-backup/bareos/files/bareos-fd.service b/app-backup/bareos/files/bareos-fd.service index 103286094250..e9b4b832afb1 100644 --- a/app-backup/bareos/files/bareos-fd.service +++ b/app-backup/bareos/files/bareos-fd.service @@ -1,12 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos File Daemon +# [Unit] - Description=Bareos File Daemon - After=syslog.target network.target - -[Install] - WantedBy=multi-user.target +Description=Bareos File Daemon +Documentation=man:bareos-fd(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target [Service] - Type=forking - User=root - ExecStartPre=-/bin/mkdir /run/bareos - ExecStart=/usr/sbin/bareos-fd +Type=forking +User=root +Group=bareos +WorkingDirectory=/var/lib/bareos +PIDFile=/run/bareos/bareos-fd.9102.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-fd -f -t +ExecStart=/usr/sbin/bareos-fd +SuccessExitStatus=0 15 +#Restart=on-failure + +[Install] +Alias=bareos-filedaemon.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/bareos-sd-21-r1.initd b/app-backup/bareos/files/bareos-sd-21-r1.initd new file mode 100644 index 000000000000..d6a5765a74a4 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd-21-r1.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start_pre() { + checkpath --directory --owner root:root --mode 00755 /run/bareos +} + +command="/usr/sbin/bareos-sd" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-sd.9103.pid" diff --git a/app-backup/bareos/files/bareos-sd.confd b/app-backup/bareos/files/bareos-sd-21.confd index d0153b2b30b5..2a67ae2b5523 100644 --- a/app-backup/bareos/files/bareos-sd.confd +++ b/app-backup/bareos/files/bareos-sd-21.confd @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Config file for /etc/init.d/bareos-sd diff --git a/app-backup/bareos/files/bareos-sd.confd-16 b/app-backup/bareos/files/bareos-sd.confd-16 deleted file mode 100644 index 5d377b978dd5..000000000000 --- a/app-backup/bareos/files/bareos-sd.confd-16 +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Config file for /etc/init.d/bareos-sd - -# Options for the storage daemon. -# The storage daemon can be run as a non-root user, however -# please ensure that this user has proper permissions to -# access your backup devices. -SD_OPTIONS="-u root -g bareos" diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd deleted file mode 100644 index f20be4ecf56e..000000000000 --- a/app-backup/bareos/files/bareos-sd.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns -} - -start() { - ebegin "Starting bareos storage daemon" - checkpath -d -m 0750 -o bareos:bareos /run/bareos - start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \ - -- ${SD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bareos storage daemon" - start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.*.pid - eend $? -} diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service index 6c617ec6a37f..acf8cb0156e1 100644 --- a/app-backup/bareos/files/bareos-sd.service +++ b/app-backup/bareos/files/bareos-sd.service @@ -1,12 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos Storage Daemon +# [Unit] - Description=Bareos Storage Daemon - After=syslog.target network-online.target - -[Install] - WantedBy=multi-user.target +Description=Bareos Storage Daemon +Documentation=man:bareos-sd(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target [Service] - Type=forking - User=root - ExecStartPre=-/bin/mkdir /run/bareos - ExecStart=/usr/sbin/bareos-sd +# see bug #631598 +#Type=forking +Type=simple +User=root +Group=bareos +WorkingDirectory=/var/lib/bareos +#PIDFile=/run/bareos/bareos-sd.9103.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-sd -t -f +#ExecStart=/usr/sbin/bareos-sd +ExecStart=/usr/sbin/bareos-sd -f +# enable this for scsicrypto-sd +# CapabilityBoundingSet=cap_sys_rawio+ep +SuccessExitStatus=0 15 +#Restart=on-failure + +[Install] +Alias=bareos-storage.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf b/app-backup/bareos/files/tmpfiles.d-bareos.conf index 6e2dacc41ad3..81c57569c455 100644 --- a/app-backup/bareos/files/tmpfiles.d-bareos.conf +++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf @@ -1 +1 @@ -d /run/bareos 0770 bareos bareos - +d /run/bareos 0750 root bareos - diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml index bc44d44732b3..bc08ba42ba52 100644 --- a/app-backup/bareos/metadata.xml +++ b/app-backup/bareos/metadata.xml @@ -1,27 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> <name>Marc Schiffbauer</name> </maintainer> <use> - <flag name="cephfs">Enable cephfs storage backend</flag> - <flag name="ceph">Enable ceph support</flag> + <flag name="ceph">Enable <pkg>sys-cluster/ceph</pkg> support</flag> <flag name="clientonly">Only install file-daemon (client)</flag> <flag name="director">Install director</flag> - <flag name="fastlz">Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag> - <flag name="glusterfs">Enable glusterfs storage backend</flag> - <flag name="gnutls">When ssl is enabled, use GnuTLS instead of OpenSSL</flag> - <flag name="jansson">JSON API support using JANSSON for director</flag> - <flag name="lmdb">enable build of LMDB support for faster accurate backup</flag> - <flag name="logwatch">Install support files for logwatch</flag> + <flag name="glusterfs">Enable <pkg>sys-cluster/glusterfs</pkg> storage backend</flag> + <flag name="lmdb">enable build of <pkg>dev-db/lmdb</pkg> support for faster accurate backup</flag> + <flag name="logwatch">Install support files for <pkg>sys-apps/logwatch</pkg></flag> <flag name="ndmp">Enable support for NDMP (Network Data Management Protocol)</flag> - <flag name="rados">Enable rados storage backend</flag> - <flag name="rados-striper">Enable use of rados-striper</flag> <flag name="scsi-crypto">Enable low level SCSI crypto support</flag> - <flag name="sql-pooling">Enable SQL pooling support</flag> <flag name="storage-daemon">Install storage daemon (bareos-sd)</flag> + <flag name="vmware">Enable bareos-fd VMware plugin</flag> </use> <upstream> <remote-id type="github">bareos/bareos</remote-id> diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest index 93272e226093..cec374466abc 100644 --- a/app-backup/borgbackup/Manifest +++ b/app-backup/borgbackup/Manifest @@ -1,2 +1 @@ -DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573 -DIST borgbackup-1.1.13.tar.gz 3754457 BLAKE2B 3d3dce66ad685fbde53cb78e288b4edc53af449ed54379e5f0b9ab3b10d8cf43ae983de5abeccb1874fbf1283f3e2796ac35ff9de349905d03d0b0c560f4fa93 SHA512 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84 +DIST borgbackup-1.2.8.tar.gz 4369117 BLAKE2B f230274189716e6ecb8f73d10caa13e683e63c9d9f50c5b6235fc666a0f64f3048421e76e5b57626144c37d37d28c4371b368f780f5e32055f62d5ff10954c19 SHA512 9a62e5eec894ebffe928a08c9a0cceebde084f16524d363a3c3be01d908a7eceaea8fa11eac422acc0fdb2534d79d1ee5ec5d9167e1086f334af6a28887616d5 diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild deleted file mode 100644 index cc59a1e188bb..000000000000 --- a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/borg.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" -HOMEPAGE="https://borgbackup.readthedocs.io/" - -LICENSE="BSD" -SLOT="0" -IUSE="libressl" - -# Unfortunately we have a file conflict with app-office/borg, bug #580402 -RDEPEND=" - !!app-office/borg - app-arch/lz4 - virtual/acl - dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -" - -DEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ${RDEPEND} -" - -src_install() { - distutils-r1_src_install - doman docs/man/* -} diff --git a/app-backup/borgbackup/borgbackup-1.1.13.ebuild b/app-backup/borgbackup/borgbackup-1.1.13.ebuild deleted file mode 100644 index 6b2cd5162b06..000000000000 --- a/app-backup/borgbackup/borgbackup-1.1.13.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/borg.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" -HOMEPAGE="https://borgbackup.readthedocs.io/" - -LICENSE="BSD" -SLOT="0" -IUSE="libressl" - -# Unfortunately we have a file conflict with app-office/borg, bug #580402 -RDEPEND=" - !!app-office/borg - app-arch/lz4 - virtual/acl - dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -" - -DEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ${RDEPEND} -" - -src_install() { - distutils-r1_src_install - doman docs/man/* -} diff --git a/app-backup/borgbackup/borgbackup-1.2.8.ebuild b/app-backup/borgbackup/borgbackup-1.2.8.ebuild new file mode 100644 index 000000000000..ac351d5e5724 --- /dev/null +++ b/app-backup/borgbackup/borgbackup-1.2.8.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 pypi + +DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" +HOMEPAGE="https://borgbackup.readthedocs.io/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" + +# "import file mismatch" when in S, "attempted relative import with no +# known parent package" when in BUILD_DIR/install/.../borg/testsuite. +# Needs work. +RESTRICT="test" + +DEPEND="app-arch/lz4 + app-arch/zstd + dev-libs/openssl:0= + >=dev-libs/xxhash-0.8.1 + virtual/acl" +# borgbackup is *very* picky about which msgpack it work with, +# check setup.py on bumps. +RDEPEND="${DEPEND} + ~dev-python/msgpack-1.0.8[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyfuse3[${PYTHON_USEDEP}]" + +BDEPEND="dev-python/cython[${PYTHON_USEDEP}] + dev-python/pkgconfig[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + doman docs/man/* + + dobashcomp scripts/shell_completions/bash/borg + + insinto /usr/share/zsh/site-functions + doins scripts/shell_completions/zsh/_borg + + insinto /usr/share/fish/vendor_completions.d + doins scripts/shell_completions/fish/borg.fish +} diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild deleted file mode 100644 index 72c65b1dd1b1..000000000000 --- a/app-backup/borgbackup/borgbackup-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/borg.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" -HOMEPAGE="https://borgbackup.readthedocs.io/" - -LICENSE="BSD" -SLOT="0" -IUSE="libressl" - -# Unfortunately we have a file conflict with app-office/borg, bug #580402 -RDEPEND=" - !!app-office/borg - app-arch/lz4 - virtual/acl - dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -" - -DEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - ${RDEPEND} -" - -src_install() { - distutils-r1_src_install - doman docs/man/* -} diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml index aacb2bc191d6..17284e4eaf25 100644 --- a/app-backup/borgbackup/metadata.xml +++ b/app-backup/borgbackup/metadata.xml @@ -1,13 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <upstream> <remote-id type="github">borgbackup/borg</remote-id> diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest index ad86159e7ac6..e84c5f79c33b 100644 --- a/app-backup/borgmatic/Manifest +++ b/app-backup/borgmatic/Manifest @@ -1,3 +1,3 @@ -DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79 -DIST borgmatic-1.5.8.tar.gz 71078 BLAKE2B 488a2d3a1689d16ac2e4e2e9e0f842fab51322a83b024f5bff742e31290d70e6acb683cfe74cc610b0bf0e3ff9d523bacd7faa309560f2ebb8b5b4820de54119 SHA512 25f38bbd48eb41ded8e315620fdcd929c10b38b89a3fc428db9e0053d4c1c46941962f6693018c5e26aa2187ed20bf366424b1b03f9c61cc56274c7008e824e9 -DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a +DIST borgmatic-1.8.10.tar.gz 599453 BLAKE2B 1ae994d452d29139d23940500d7c9f01e7fc1ddbd36254bf0c36d7f56064ccba7fb8434741dd0114d42271eb241098a12f8a07b83046447ae2225f7cd2ab12ae SHA512 10f5d962f6d25ef42ba4d076e238e1986dcfcd9832b3eea08560f367524824fdb0f80f42962ea6a471d711c6a0e293669b85abdc160475c20eed851ce7ad7f42 +DIST borgmatic-1.8.8.tar.gz 589575 BLAKE2B 09a3ca616bd1cf5fcc6c773d8066357d764b44230d691b7afa90bb1fdbce3aa3bfaac509e921adaa9086ba60310b24d1f2ba186849853c8f04e2a85c4b0ec94f SHA512 3984f6e34f8aed5c57df22799e60724903bfcec833e5c3215ad731977b7d376f36129fabd489c166f945d7103f272bcc132a9ea49010552001794b57f27fb5d5 +DIST borgmatic-1.8.9.tar.gz 592715 BLAKE2B 3586404985b8cc0d5575f570ba6679c406e95b83453a7c2414872049067b1736010b9f8498fa92e91d281b1cdf75882bc09e40d6d9e443bff33c399ee1392ff9 SHA512 05386f6321d78e304030ebb78c495aee53a1b6f17241f101e73a097aa4208ac641d6105b1e8161cf714b2eab7c34fe682e082e9e997dc4ac6a6a4207253e8421 diff --git a/app-backup/borgmatic/borgmatic-1.5.6.ebuild b/app-backup/borgmatic/borgmatic-1.5.6.ebuild deleted file mode 100644 index 81303b9f901e..000000000000 --- a/app-backup/borgmatic/borgmatic-1.5.6.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit distutils-r1 systemd - -DESCRIPTION="Automatically create, prune and verify backups with borgbackup" -HOMEPAGE="https://torsion.org/borgmatic/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" - -# borg is called as an external tool, hence no pythonic stuff -RDEPEND="app-backup/borgbackup - $(python_gen_cond_dep ' - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}] - ')" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/flexmock[${PYTHON_USEDEP}] - ') - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch - "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch -) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # Unlike the other two test files in integration/commands, which use the - # relevant modules' respective APIs, test_borgmatic.py tries to call the - # 'borgmatic' executable - which by the time we execute src_test will - # not have been created yet. distutils_install_for_testing would likely - # take care of this - but between the aforementioned behaviour inconsistency - # and the fact the only test run from this file as of version 1.5.1 is the - # parsing of contents of 'borgmatic --version', just skip it for now. - rm -f "${S}"/tests/integration/commands/test_borgmatic.py -} - -src_install() { - distutils-r1_src_install - systemd_dounit sample/systemd/borgmatic.{service,timer} - keepdir /etc/borgmatic -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To generate a sample configuration file, run:" - elog " generate-borgmatic-config" - fi - elog - elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units." -} diff --git a/app-backup/borgmatic/borgmatic-1.5.8.ebuild b/app-backup/borgmatic/borgmatic-1.5.8.ebuild deleted file mode 100644 index 80e8098f34d2..000000000000 --- a/app-backup/borgmatic/borgmatic-1.5.8.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..8} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit distutils-r1 systemd - -DESCRIPTION="Automatically create, prune and verify backups with borgbackup" -HOMEPAGE="https://torsion.org/borgmatic/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -# borg is called as an external tool, hence no pythonic stuff -RDEPEND="app-backup/borgbackup - $(python_gen_cond_dep ' - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}] - ')" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/flexmock[${PYTHON_USEDEP}] - ') - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch - "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch -) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # Unlike the other two test files in integration/commands, which use the - # relevant modules' respective APIs, test_borgmatic.py tries to call the - # 'borgmatic' executable - which by the time we execute src_test will - # not have been created yet. distutils_install_for_testing would likely - # take care of this - but between the aforementioned behaviour inconsistency - # and the fact the only test run from this file as of version 1.5.1 is the - # parsing of contents of 'borgmatic --version', just skip it for now. - rm -f "${S}"/tests/integration/commands/test_borgmatic.py -} - -src_install() { - distutils-r1_src_install - systemd_dounit sample/systemd/borgmatic.{service,timer} - keepdir /etc/borgmatic -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To generate a sample configuration file, run:" - elog " generate-borgmatic-config" - fi - elog - elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units." -} diff --git a/app-backup/borgmatic/borgmatic-1.5.9.ebuild b/app-backup/borgmatic/borgmatic-1.5.9.ebuild deleted file mode 100644 index 80e8098f34d2..000000000000 --- a/app-backup/borgmatic/borgmatic-1.5.9.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..8} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit distutils-r1 systemd - -DESCRIPTION="Automatically create, prune and verify backups with borgbackup" -HOMEPAGE="https://torsion.org/borgmatic/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -# borg is called as an external tool, hence no pythonic stuff -RDEPEND="app-backup/borgbackup - $(python_gen_cond_dep ' - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}] - ')" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/flexmock[${PYTHON_USEDEP}] - ') - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch - "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch -) - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # Unlike the other two test files in integration/commands, which use the - # relevant modules' respective APIs, test_borgmatic.py tries to call the - # 'borgmatic' executable - which by the time we execute src_test will - # not have been created yet. distutils_install_for_testing would likely - # take care of this - but between the aforementioned behaviour inconsistency - # and the fact the only test run from this file as of version 1.5.1 is the - # parsing of contents of 'borgmatic --version', just skip it for now. - rm -f "${S}"/tests/integration/commands/test_borgmatic.py -} - -src_install() { - distutils-r1_src_install - systemd_dounit sample/systemd/borgmatic.{service,timer} - keepdir /etc/borgmatic -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To generate a sample configuration file, run:" - elog " generate-borgmatic-config" - fi - elog - elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units." -} diff --git a/app-backup/borgmatic/borgmatic-1.8.10.ebuild b/app-backup/borgmatic/borgmatic-1.8.10.ebuild new file mode 100644 index 000000000000..09e09f4eea4c --- /dev/null +++ b/app-backup/borgmatic/borgmatic-1.8.10.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 systemd pypi + +DESCRIPTION="Automatically create, prune and verify backups with borgbackup" +HOMEPAGE="https://torsion.org/borgmatic/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" +IUSE="apprise" + +REQUIRED_USE="test? ( apprise )" + +# borg is called as an external tool, hence no pythonic stuff +RDEPEND="app-backup/borgbackup + $(python_gen_cond_dep ' + <dev-python/colorama-0.5[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + apprise? ( $(python_gen_cond_dep ' + dev-python/apprise[${PYTHON_USEDEP}] + ') )" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}] + ') + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch + "${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch +) + +# A fragile test whose only purpose is to make sure the NEWS file +# has been updated for the current version. +EPYTEST_DESELECT=( + tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version +) + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + systemd_dounit sample/systemd/borgmatic.{service,timer} + keepdir /etc/borgmatic +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To generate a sample configuration file, run:" + elog " ${PN} config generate" + else + local oldver + for oldver in ${REPLACING_VERSIONS}; do + if ver_test "${oldver}" -lt 1.8.0; then + ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes." + ewarn "For details, please see" + ewarn + ewarn " https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0" + ewarn + break + fi + done + fi + elog + elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units." +} diff --git a/app-backup/borgmatic/borgmatic-1.8.8.ebuild b/app-backup/borgmatic/borgmatic-1.8.8.ebuild new file mode 100644 index 000000000000..0155eb3b0714 --- /dev/null +++ b/app-backup/borgmatic/borgmatic-1.8.8.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 systemd pypi + +DESCRIPTION="Automatically create, prune and verify backups with borgbackup" +HOMEPAGE="https://torsion.org/borgmatic/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~riscv" +IUSE="apprise" + +REQUIRED_USE="test? ( apprise )" + +# borg is called as an external tool, hence no pythonic stuff +RDEPEND="app-backup/borgbackup + $(python_gen_cond_dep ' + <dev-python/colorama-0.5[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + apprise? ( $(python_gen_cond_dep ' + dev-python/apprise[${PYTHON_USEDEP}] + ') )" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}] + ') + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch + "${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch +) + +# A fragile test whose only purpose is to make sure the NEWS file +# has been updated for the current version. +EPYTEST_DESELECT=( + tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version +) + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + systemd_dounit sample/systemd/borgmatic.{service,timer} + keepdir /etc/borgmatic +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To generate a sample configuration file, run:" + elog " ${PN} config generate" + else + local oldver + for oldver in ${REPLACING_VERSIONS}; do + if ver_test "${oldver}" -lt 1.8.0; then + ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes." + ewarn "For details, please see" + ewarn + ewarn " https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0" + ewarn + break + fi + done + fi + elog + elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units." +} diff --git a/app-backup/borgmatic/borgmatic-1.8.9.ebuild b/app-backup/borgmatic/borgmatic-1.8.9.ebuild new file mode 100644 index 000000000000..0155eb3b0714 --- /dev/null +++ b/app-backup/borgmatic/borgmatic-1.8.9.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 systemd pypi + +DESCRIPTION="Automatically create, prune and verify backups with borgbackup" +HOMEPAGE="https://torsion.org/borgmatic/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~riscv" +IUSE="apprise" + +REQUIRED_USE="test? ( apprise )" + +# borg is called as an external tool, hence no pythonic stuff +RDEPEND="app-backup/borgbackup + $(python_gen_cond_dep ' + <dev-python/colorama-0.5[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + apprise? ( $(python_gen_cond_dep ' + dev-python/apprise[${PYTHON_USEDEP}] + ') )" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + >=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}] + ') + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch + "${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch +) + +# A fragile test whose only purpose is to make sure the NEWS file +# has been updated for the current version. +EPYTEST_DESELECT=( + tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version +) + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + systemd_dounit sample/systemd/borgmatic.{service,timer} + keepdir /etc/borgmatic +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To generate a sample configuration file, run:" + elog " ${PN} config generate" + else + local oldver + for oldver in ${REPLACING_VERSIONS}; do + if ver_test "${oldver}" -lt 1.8.0; then + ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes." + ewarn "For details, please see" + ewarn + ewarn " https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0" + ewarn + break + fi + done + fi + elog + elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units." +} diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch deleted file mode 100644 index 90e94ac1f558..000000000000 --- a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/sample/systemd/borgmatic.service -+++ b/sample/systemd/borgmatic.service -@@ -21,4 +21,4 @@ - - # Delay start to prevent backups running during boot. - ExecStartPre=sleep 1m --ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1 -+ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1 diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch index 28562398a407..a3c02598b724 100644 --- a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch +++ b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch @@ -6,6 +6,6 @@ testpaths = tests -addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end +addopts = --ignore=tests/end-to-end - filterwarnings = - ignore:Coverage disabled.*:pytest.PytestWarning + [flake8] + max-line-length = 100 diff --git a/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch new file mode 100644 index 000000000000..5e6f8b7482b5 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.7.14-systemd_service_bin_path.patch @@ -0,0 +1,8 @@ +--- a/sample/systemd/borgmatic.service ++++ b/sample/systemd/borgmatic.service +@@ -61,4 +61,4 @@ + # Delay start to prevent backups running during boot. Note that systemd-inhibit requires dbus and + # dbus-user-session to be installed. + ExecStartPre=sleep 1m +-ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -2 --syslog-verbosity 1 ++ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -2 --syslog-verbosity 1 diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml index e69f4b798a41..4365e7fa2b90 100644 --- a/app-backup/borgmatic/metadata.xml +++ b/app-backup/borgmatic/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> <upstream> - <remote-id type="github">witten/borgmatic</remote-id> + <remote-id type="github">borgmatic-collective/borgmatic</remote-id> <remote-id type="pypi">borgmatic</remote-id> </upstream> +<use> + <flag name="apprise">Allow backup monitoring to send notification to a wide variety + of services, using <pkg>dev-python/apprise</pkg></flag> +</use> </pkgmetadata> diff --git a/app-backup/borgweb/Manifest b/app-backup/borgweb/Manifest deleted file mode 100644 index 386fef65e528..000000000000 --- a/app-backup/borgweb/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0 -DIST borgweb-0.3.0.tar.gz 512052 BLAKE2B a783a4d0528b0d501918b958facbfbee131e95a8219bf9608572e402f6e6e3010f6716c64e76ef72858e949b505ef8c4eefd5f6512dd1b0ef767a32d2c493fc5 SHA512 90867338f3678732ade97f9b595579cc5aabf6ee824b0bd4dec986ae04db94304dee1d8ae1275331d93a2b3a89916ed11e834ace8a92cf196f4050178bf96625 diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild deleted file mode 100644 index 6568b820ce15..000000000000 --- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Browser-based user interface for BorgBackup" -HOMEPAGE="https://pypi.org/project/borgweb/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}]" diff --git a/app-backup/borgweb/borgweb-0.3.0.ebuild b/app-backup/borgweb/borgweb-0.3.0.ebuild deleted file mode 100644 index 6568b820ce15..000000000000 --- a/app-backup/borgweb/borgweb-0.3.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Browser-based user interface for BorgBackup" -HOMEPAGE="https://pypi.org/project/borgweb/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}]" diff --git a/app-backup/borgweb/metadata.xml b/app-backup/borgweb/metadata.xml deleted file mode 100644 index 87b7e668d559..000000000000 --- a/app-backup/borgweb/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <upstream> - <remote-id type="pypi">borgweb</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest index ca1a62dca2d1..b9bf643e7418 100644 --- a/app-backup/btrbk/Manifest +++ b/app-backup/btrbk/Manifest @@ -1,9 +1 @@ -DIST btrbk-0.27.0.tar.xz 86648 BLAKE2B bebb1c56b5c08e588829697df1d00e89366582d7c501ffc7c72baf8136ec62ac1f9b7aea300f1ba20c6060646e80916a52e2b83a85b383cb04289867d82b2a53 SHA512 2d65d32cecdd8598d5028a78a449559563bf38a172849e0a13ccfa8129189a044cb2d007561b5c7e611c8bbbe069fd9c1177085dca519c88d40233fb0d49db36 -DIST btrbk-0.27.1.tar.xz 86764 BLAKE2B a46514a94e6f49f83f92bba6f545738fe6a0b274a7eb39a132a41e1f89e0e6428ee8e29164ca2ba249bf98d2c7a5f682a81bb5c113a9cd5af12e4abf98669684 SHA512 b30be9fa2459d34d33ed0c2ef1b4f2e7010d1d7f9dc6e6e3236550307b7e2f2f517a61d21bcd2aca3ed0750ef64259bb51c32ff26abcc70008db92e1a66212bd -DIST btrbk-0.27.2.tar.xz 87012 BLAKE2B 7b25ce04e088b9c3df1f5d4f41ec3e6aef7e48bebb8fcd4c4a8365bb73d26dd09afdf1814985362b28958a93df2797dd62444475024f66bd027303955a160604 SHA512 497d1dd1d2de712d4de80d0bfcdf6995590fd5308b81d7198af7cebe81c45fd53c8940265c1451eb95339636cf0e4c2a9162befb7cdd48cc8d4142b4e9ca75f1 -DIST btrbk-0.28.0.tar.xz 99336 BLAKE2B 4becaac5a34029e57345baa3c8bb787032ddfdc523882f6334e7a0985a53194956342f792dd9022cb151aacbd64497b87aafee838b5811f716de4efc7eb54a10 SHA512 f4f3118daf55a80604dafec77087851860cfab8720d3f193ac4eec804ca39e60e3bb31d7feb45dd10c8b35b2844c680462a16f2ac0bdbd71731907f511bdc358 -DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87188a9a8f8c97cba1549cc2d3bcfff14b2bc2d20898c44bcc0fe50d74db2e16b213dde852d89704704b70ece SHA512 0e24908b3162b2ab67e0482a38fb966bf33b3c3ee5b2f62259673af14e9309bc4707bd049403579240ec416efae6643a8b5da73f4763e3dc01b3893047e92581 -DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae -DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849 -DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28 -DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e +DIST btrbk-0.32.6.tar.xz 111804 BLAKE2B f23e5f60e63bb1a9d5cc2f1339ac3e40a9cae5c0e3f626f1ad0e7396b8f9ebb00bce319835c9c708cdfe3c1cad3ef4e90985cb9c633be7091ffdbde93a10412c SHA512 5a21b3728aded1610ef9106d0460db12b07bbc6d62be199081baba92413b30ba0f7b4a77612d0bbb0910863be85f2c68eab3d02fabf1ea5a7f5fb22aeb1f7a38 diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild deleted file mode 100644 index a9edd2bb91d7..000000000000 --- a/app-backup/btrbk/btrbk-0.27.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="amd64 arm x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv" - -DEPEND=">=app-text/asciidoc-8.6.0 - app-text/xmlto" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-3.18.2" - -src_install() { - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild b/app-backup/btrbk/btrbk-0.27.1-r1.ebuild deleted file mode 100644 index 57a9fcb682a9..000000000000 --- a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-3.18.2" - -src_compile() { - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.27.1.ebuild b/app-backup/btrbk/btrbk-0.27.1.ebuild deleted file mode 100644 index 5781a69d01fc..000000000000 --- a/app-backup/btrbk/btrbk-0.27.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv" - -DEPEND=">=app-text/asciidoc-8.6.0 - app-text/xmlto" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-3.18.2" - -src_install() { - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.27.2.ebuild b/app-backup/btrbk/btrbk-0.27.2.ebuild deleted file mode 100644 index 327ff48d7a8d..000000000000 --- a/app-backup/btrbk/btrbk-0.27.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - use doc && emake -C doc COMPRESS=no -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake \ - COMPRESS=no \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.28.0.ebuild b/app-backup/btrbk/btrbk-0.28.0.ebuild deleted file mode 100644 index c649cd367ac8..000000000000 --- a/app-backup/btrbk/btrbk-0.28.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.28.1.ebuild b/app-backup/btrbk/btrbk-0.28.1.ebuild deleted file mode 100644 index c649cd367ac8..000000000000 --- a/app-backup/btrbk/btrbk-0.28.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.28.2.ebuild b/app-backup/btrbk/btrbk-0.28.2.ebuild deleted file mode 100644 index c649cd367ac8..000000000000 --- a/app-backup/btrbk/btrbk-0.28.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.28.3.ebuild b/app-backup/btrbk/btrbk-0.28.3.ebuild deleted file mode 100644 index c649cd367ac8..000000000000 --- a/app-backup/btrbk/btrbk-0.28.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+pv +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - pv? ( sys-apps/pv ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.29.0.ebuild b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild index f82156e37d50..03aa2217e2bf 100644 --- a/app-backup/btrbk/btrbk-0.29.0.ebuild +++ b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -11,19 +11,19 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 arm arm64 x86" fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" HOMEPAGE="https://digint.ch/btrbk/" LICENSE="GPL-3+" SLOT="0" -IUSE="+mbuffer +doc" +IUSE="+mbuffer +doc +lsbtr" DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" RDEPEND="dev-lang/perl - net-misc/openssh + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12" @@ -31,15 +31,18 @@ src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" + use lsbtr && targets="${targets} install-bin-links" emake \ DESTDIR="${D}" \ DOCDIR="/usr/share/doc/${PF}" \ SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -48,6 +51,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild index d824116df3a1..66e00dd28638 100644 --- a/app-backup/btrbk/btrbk-0.29.1.ebuild +++ b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -11,35 +11,51 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="amd64 arm ~arm64 x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" HOMEPAGE="https://digint.ch/btrbk/" + LICENSE="GPL-3+" SLOT="0" -IUSE="+mbuffer +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" +IUSE="+mbuffer +doc +lsbtr" -RDEPEND="dev-lang/perl - net-misc/openssh +RDEPEND=" + dev-lang/perl + >=sys-fs/btrfs-progs-4.12 + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" +" +BDEPEND=" + doc? ( + || ( + app-text/asciidoc + >=dev-ruby/asciidoctor-1.5.7 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-support-asciidoc.patch +) src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" + use lsbtr && targets="${targets} install-bin-links" emake \ DESTDIR="${D}" \ DOCDIR="/usr/share/doc/${PF}" \ SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -48,6 +64,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild index f82156e37d50..dfefb0fe16b4 100644 --- a/app-backup/btrbk/btrbk-9999.ebuild +++ b/app-backup/btrbk/btrbk-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -11,35 +11,47 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" HOMEPAGE="https://digint.ch/btrbk/" + LICENSE="GPL-3+" SLOT="0" -IUSE="+mbuffer +doc" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" +IUSE="+mbuffer +doc +lsbtr" -RDEPEND="dev-lang/perl - net-misc/openssh +RDEPEND=" + dev-lang/perl + >=sys-fs/btrfs-progs-4.12 + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" +" +BDEPEND=" + doc? ( + || ( + app-text/asciidoc + >=dev-ruby/asciidoctor-1.5.7 + ) + ) +" src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" + use lsbtr && targets="${targets} install-bin-links" emake \ DESTDIR="${D}" \ DOCDIR="/usr/share/doc/${PF}" \ SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -48,6 +60,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch b/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch new file mode 100644 index 000000000000..5de2a1168d9e --- /dev/null +++ b/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch @@ -0,0 +1,58 @@ +https://github.com/digint/btrbk/commit/9dfee7bc32f392a599164ae4c2a0c24d418751ef + +From 9dfee7bc32f392a599164ae4c2a0c24d418751ef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 8 Jul 2023 23:44:53 +0100 +Subject: [PATCH] doc: allow asciidoc again + +This effectively reverts 0e63843195eb35c26386863d18a70a764a3efd04 and +173319e7e1599ef9d08b985740e55020ebc2ea85. + +asciidoc has been revived (for a while now) and doesn't require Python 2. We +still prefer asciidoctor and fallback to asciidoc/a2x if it's not available. + +Comparing the asciidoc and asciidoctor man pages, everything looks OK. + +Python tends to be available more readily in distribution build environments +rather than the Ruby stack. Also, the pregenerated man pages are gone as of +f132c94c655afa930a73423e6c1abf88d412f49d. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -18,8 +18,19 @@ ifeq ($(COMPRESS), yes) + endif + + # convert using "asciidoctor": <https://asciidoctor.org> +-ASCIIDOCTOR_MANPAGE = asciidoctor -d manpage -b manpage +-ASCIIDOCTOR_HTML = asciidoctor -b html5 -d article ++# fallback to "a2x" from asciidoc package: <http://asciidoc.org> ++ifneq (, $(shell command -v asciidoctor 2> /dev/null)) ++ ASCIIDOC_MANPAGE = asciidoctor -d manpage -b manpage ++ ASCIIDOC_HTML = asciidoctor -b html5 -d article ++else ifneq (, $(shell command -v a2x 2> /dev/null)) ++ # NOTE: using -L (--no-xmllint), as xmllint is a separate package on many distros. ++ ASCIIDOC_MANPAGE = a2x -L -d manpage -f manpage ++ ASCIIDOC_HTML = asciidoc -b html -d article ++else ++ ASCIIDOC_ERR = $(error "please install either asciidoc or asciidoctor") ++ ASCIIDOC_MANPAGE = $(ASCIIDOC_ERR) ++ ASCIIDOC_HTML = $(ASCIIDOC_ERR) ++endif + + # reproducible builds: reference date is ":date:" attribute from asciidoc source + date_attr = $(shell sed -rn 's/:date:\s*//p' $(1)) +@@ -50,10 +61,10 @@ clean: + gzip -9 -n -c $< > $@ + + %.1 : %.1.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $< + + %.5 : %.5.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $< + + %.html : %.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_HTML) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_HTML) -o $@ $< diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml index 73a2d8bc134d..6a0e69059e4c 100644 --- a/app-backup/btrbk/metadata.xml +++ b/app-backup/btrbk/metadata.xml @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>axel@tty0.ch</email> <name>Axel Burri</name> </maintainer> - <longdescription lang="en"> - Tool for creating snapshots and remote backups of btrfs subvolumes - </longdescription> <upstream> <maintainer status="active"> <email>axel@tty0.ch</email> @@ -23,7 +20,7 @@ <remote-id type="github">digint/btrbk</remote-id> </upstream> <use> - <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag> - <flag name='mbuffer'>Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality</flag> + <flag name="mbuffer">Use <pkg>sys-block/mbuffer</pkg> to enable progress bar and buffering/limiting functionality</flag> + <flag name="lsbtr">Enable the lsbtr command-line tool</flag> </use> </pkgmetadata> diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest index 30083c4b933e..b6427e2bd489 100644 --- a/app-backup/burp/Manifest +++ b/app-backup/burp/Manifest @@ -1,2 +1 @@ -DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d -DIST burp-2.3.30.tar.gz 617064 BLAKE2B 62aa65da16155d2a321d4ef700a83000e9754eeee53ad7605b97c589a09e1168cd4cece3076d2c4660c098967f5b19056875b5aa4f226f135a17965fc099bb44 SHA512 c315c30c064073f864058d1ec9341b6e800964f308fa5ea298759e35a58ff27a198a3b6886cc04692bc259f1cfe5a5e077542fd45d3e89813541af2e4ca03533 +DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db diff --git a/app-backup/burp/burp-2.3.30.ebuild b/app-backup/burp/burp-2.3.30.ebuild deleted file mode 100644 index 34645f772590..000000000000 --- a/app-backup/burp/burp-2.3.30.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="Network backup and restore client and server for Unix and Windows" -HOMEPAGE="https://burp.grke.org/" -SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="acl ipv6 libressl test xattr" - -RESTRICT="!test? ( test )" - -CDEPEND=" acct-group/burp - acct-user/burp - dev-libs/uthash - net-libs/librsync - sys-libs/ncurses:0= - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - acl? ( sys-apps/acl ) - xattr? ( sys-apps/attr )" -DEPEND="${CDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" -RDEPEND="${CDEPEND} - virtual/logger" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch - "${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch - "${FILESDIR}"/${PN}-2.0.54-server_user.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir=/var - --sysconfdir=/etc/burp - --enable-largefile - $(use_enable acl) - $(use_enable ipv6) - $(use_enable xattr) - ) - # --runstatedir option will only work from autoconf-2.70 onwards - runstatedir='/run' \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/spool/burp - fowners -R root:${PN} /var/spool/burp - fperms 0770 /var/spool/burp - - emake DESTDIR="${D}" install-configs - fowners -R root:${PN} /etc/burp - fperms 0750 /etc/burp - fperms 0640 /etc/burp/burp-server.conf - fperms 0750 /etc/burp/clientconfdir - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - ewarn - ewarn "You are installing a development version of burp. These versions contain" - ewarn "new features but might have unexpected issues. It is recommended by upstream" - ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead." - ewarn - - elog "Burp ebuilds now support the autoupgrade mechanism in both" - elog "client and server mode. In both cases it is disabled by" - elog "default. You almost certainly do NOT want to enable it in" - elog "client mode because upgrades obtained this way will not be" - elog "managed by Portage." - - if [[ ! -e /etc/burp/CA/index.txt ]]; then - elog "" - elog "At first run burp server will generate DH parameters and SSL" - elog "certificates. You should adjust configuration before." - elog "Server configuration is located at" - elog "" - elog " /etc/burp/burp-server.conf" - elog "" - fi - - # According to PMS this can be a space-separated list of version - # numbers, even though in practice it is typically just one. - local oldver - for oldver in ${REPLACING_VERSIONS}; do - if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then - ewarn "Starting with version 2.0.54 we no longer patch bedup to use" - ewarn "the server config file by default. If you use bedup, please" - ewarn "update your scripts to invoke it as" - ewarn "" - ewarn " bedup -c /etc/burp/burp-server.conf" - ewarn "" - ewarn "Otherwise deduplication will not work!" - break - fi - done -} diff --git a/app-backup/burp/burp-2.2.18-r1.ebuild b/app-backup/burp/burp-3.1.4.ebuild index 7c633b85f4bf..8c7a5924016a 100644 --- a/app-backup/burp/burp-2.2.18-r1.ebuild +++ b/app-backup/burp/burp-3.1.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools systemd @@ -12,30 +12,32 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="acl ipv6 libressl test xattr" +IUSE="acl test xattr" RESTRICT="!test? ( test )" -CDEPEND=" acct-group/burp +COMMON_DEPEND="acct-group/burp acct-user/burp dev-libs/uthash - net-libs/librsync + dev-libs/openssl:0= + net-libs/librsync:= sys-libs/ncurses:0= + sys-libs/libcap sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr )" -DEPEND="${CDEPEND} - virtual/pkgconfig +DEPEND="${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( dev-libs/check )" -RDEPEND="${CDEPEND} +BDEPEND=">=dev-build/autoconf-2.71 + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} virtual/logger" PATCHES=( - "${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch - "${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch - "${FILESDIR}"/${PN}-2.0.54-server_user.patch + "${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch + "${FILESDIR}"/"${PN}"-2.0.54-server_user.patch ) src_prepare() { @@ -49,29 +51,34 @@ src_configure() { --localstatedir=/var --sysconfdir=/etc/burp --enable-largefile - $(use_enable acl) - $(use_enable ipv6) - $(use_enable xattr) + --runstatedir=/run + "$(use_enable acl)" + "$(use_enable xattr)" ) - # --runstatedir option will only work from autoconf-2.70 onwards - runstatedir='/run' \ - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" +} + +src_test() { + # See https://bugs.gentoo.org/915690 + local -x CK_DEFAULT_TIMEOUT=0 + local -x CK_TIMEOUT_MULTIPLIER=0 + default } src_install() { default keepdir /var/spool/burp - fowners -R root:${PN} /var/spool/burp + fowners -R root:"${PN}" /var/spool/burp fperms 0770 /var/spool/burp emake DESTDIR="${D}" install-configs - fowners -R root:${PN} /etc/burp + fowners -R root:"${PN}" /etc/burp fperms 0750 /etc/burp fperms 0640 /etc/burp/burp-server.conf fperms 0750 /etc/burp/clientconfdir - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service + newinitd "${FILESDIR}"/"${PN}".initd "${PN}" + systemd_dounit "${FILESDIR}"/"${PN}".service } pkg_postinst() { @@ -81,13 +88,13 @@ pkg_postinst() { elog "client mode because upgrades obtained this way will not be" elog "managed by Portage." - if [[ ! -e /etc/burp/CA/index.txt ]]; then + if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then elog "" elog "At first run burp server will generate DH parameters and SSL" elog "certificates. You should adjust configuration before." elog "Server configuration is located at" elog "" - elog " /etc/burp/burp-server.conf" + elog " ${EROOT}/etc/burp/burp-server.conf" elog "" fi @@ -95,12 +102,12 @@ pkg_postinst() { # numbers, even though in practice it is typically just one. local oldver for oldver in ${REPLACING_VERSIONS}; do - if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then + if [[ $(ver_cut 1 "${oldver}") -lt 2 ]]; then ewarn "Starting with version 2.0.54 we no longer patch bedup to use" ewarn "the server config file by default. If you use bedup, please" ewarn "update your scripts to invoke it as" ewarn "" - ewarn " bedup -c /etc/burp/burp-server.conf" + ewarn " bedup -c ${EROOT}/etc/burp/burp-server.conf" ewarn "" ewarn "Otherwise deduplication will not work!" break diff --git a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch deleted file mode 100644 index db9e9b6a9de5..000000000000 --- a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configs/client/burp.conf.in -+++ b/configs/client/burp.conf.in -@@ -10,7 +10,8 @@ - # 0 to decide automatically, 1 to force protocol1 mode (file level granularity - # with a pseudo mirrored storage on the server and optional rsync). 2 forces - # protocol2 mode (inline deduplication with variable length blocks). --# protocol = 0 -+# WARNING: as of September 2017 protocol2 is still considered experimental. -+protocol = 1 - pidfile = @runstatedir@/@name@.client.pid - syslog = 0 - stdout = 1 ---- a/configs/server/burp.conf.in -+++ b/configs/server/burp.conf.in -@@ -21,7 +21,8 @@ - # protocol2 mode (inline deduplication with variable length blocks). - # Like many other settings, this can be set per client in the clientconfdir - # files. --# protocol = 0 -+# WARNING: as of September 2017 protocol2 is still considered experimental. -+protocol = 1 - pidfile = @runstatedir@/@name@.server.pid - hardlinked_archive = 0 - working_dir_recovery_method = delete diff --git a/app-backup/burp/metadata.xml b/app-backup/burp/metadata.xml index 2887b871ddd0..86199d94118a 100644 --- a/app-backup/burp/metadata.xml +++ b/app-backup/burp/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> + <email>github@fischl-online.de</email> + <name>Anton Fischl</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> Burp is a network backup and restore program. It uses librsync in order diff --git a/app-backup/cachedir/Manifest b/app-backup/cachedir/Manifest deleted file mode 100644 index 3129cb786fb7..000000000000 --- a/app-backup/cachedir/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cachedir-1.4.tar.gz 16254 BLAKE2B f70fe693d614ab90c4b235c2979e9323eb41976ea8a97c4d3107af26f411553a86e0409b354483a6e3c9af956597c9a4114dc28829cc2ed55abe7c7dd3bb8a99 SHA512 dabeb36a4b99febafbfcc3bff4de625491eee6649cac6c03ef782415cfdd519d36911bed8ae6e7bb94b0afe6279b17fd99fcb87f0c2d2e37032a76fa516dd6c7 diff --git a/app-backup/cachedir/cachedir-1.4.ebuild b/app-backup/cachedir/cachedir-1.4.ebuild deleted file mode 100644 index 25a6664e3cc7..000000000000 --- a/app-backup/cachedir/cachedir-1.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Tag/untag cache directories" -HOMEPAGE="https://liw.fi/cachedir/" -SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" - -# test deps not supporting python 3 -RESTRICT="test" - -RDEPEND="dev-python/cliapp[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -# test? ( -# dev-util/cmdtest[${PYTHON_USEDEP}] -# ) -# " - -python_prepare_all() { - 2to3 -w setup.py || die - distutils-r1_python_prepare_all -} - -src_compile() { - addwrite /proc/self/comm - distutils-r1_src_compile -} - -src_test() { - addwrite /proc/self/comm - distutils-r1_src_test -} - -python_test() { - esetup.py check -} diff --git a/app-backup/cachedir/metadata.xml b/app-backup/cachedir/metadata.xml deleted file mode 100644 index 7a38bb900964..000000000000 --- a/app-backup/cachedir/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-backup/ccollect/ccollect-0.8.ebuild b/app-backup/ccollect/ccollect-0.8-r1.ebuild index f4da568241cd..442fc37d3d95 100644 --- a/app-backup/ccollect/ccollect-0.8.ebuild +++ b/app-backup/ccollect/ccollect-0.8-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync" HOMEPAGE="https://www.nico.schottelius.org/software/ccollect/" @@ -9,23 +9,22 @@ SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 hppa ppc ~sparc x86" +KEYWORDS="amd64 ~hppa ppc ~sparc x86" IUSE="doc examples" +# tests need ssh-access +RESTRICT="test" -DEPEND=" +RDEPEND="net-misc/rsync" +BDEPEND=" doc? ( >=app-text/asciidoc-8.1.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt )" -RDEPEND="net-misc/rsync" - -# tests need ssh-access -RESTRICT="test" src_compile() { - use doc && emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation + use doc && emake XSL="${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation } src_install() { @@ -64,15 +63,15 @@ src_install() { pkg_postinst() { ewarn "If you're upgrading from 0.6.x or less, you'll have to" ewarn "upgrade your existing configuration as follows:" - ewarn "1. Make the scripts in ${EROOT%/}/usr/share/ccollect/scripts executable" - ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT%/}/usr/share/ccollect/scripts" + ewarn "1. Make the scripts in ${EROOT}/usr/share/ccollect/scripts executable" + ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT}/usr/share/ccollect/scripts" ewarn " ascending order, where \$VER is greater or equal than the version" ewarn " you upgraded from." ewarn "Example:" ewarn " You upgraded from 0.5, thus you have to run:" - ewarn " ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh" - ewarn " ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh" + ewarn " ${EROOT}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh" + ewarn " ${EROOT}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh" - elog "Please note that many tools are now installed directly to ${EROOT%/}/usr/bin" + elog "Please note that many tools are now installed directly to ${EROOT}/usr/bin" elog "as recommended by upstream." } diff --git a/app-backup/ccollect/ccollect-0.8-r2.ebuild b/app-backup/ccollect/ccollect-0.8-r2.ebuild new file mode 100644 index 000000000000..1fb18a8011de --- /dev/null +++ b/app-backup/ccollect/ccollect-0.8-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit prefix + +DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync" +HOMEPAGE="https://www.nico.schottelius.org/software/ccollect/" +SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc ~sparc x86" +IUSE="doc examples" +# tests need ssh-access +RESTRICT="test" + +RDEPEND="net-misc/rsync" +BDEPEND=" + doc? ( + >=app-text/asciidoc-8.1.0 + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + )" + +src_compile() { + use doc && emake XSL="${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation +} + +src_install() { + hprefixify ccollect.sh + dobin ccollect.sh + dosym ccollect.sh /usr/bin/ccollect + + local i + for i in add_source analyse_logs archive_config check_config \ + delete_source list_intervals logwrapper stats; do + hprefixify tools/ccollect_${i}.sh + newbin tools/ccollect_${i}.sh ccollect_${i} + done + + insinto /usr/share/${PN}/tools + hprefixify tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh + doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh + + pushd doc/changes >/dev/null || die + for i in * ; do + newdoc ${i} NEWS-${i} + done + popd >/dev/null || die + + if use doc; then + doman doc/man/*.1 + + find doc/ \( -iname '*.1' -o -iname '*.text' \) -delete || die + HTML_DOCS=( doc/{*.htm{,l},man} ) + fi + einstalldocs + + if use examples ; then + docinto examples + dodoc -r conf/. + fi +} + +pkg_postinst() { + ewarn "If you're upgrading from 0.6.x or less, you'll have to" + ewarn "upgrade your existing configuration as follows:" + ewarn "1. Make the scripts in ${EROOT}/usr/share/ccollect/scripts executable" + ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT}/usr/share/ccollect/scripts" + ewarn " ascending order, where \$VER is greater or equal than the version" + ewarn " you upgraded from." + ewarn "Example:" + ewarn " You upgraded from 0.5, thus you have to run:" + ewarn " ${EROOT}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh" + ewarn " ${EROOT}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh" + + elog "Please note that many tools are now installed directly to ${EROOT}/usr/bin" + elog "as recommended by upstream." +} diff --git a/app-backup/ccollect/metadata.xml b/app-backup/ccollect/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/app-backup/ccollect/metadata.xml +++ b/app-backup/ccollect/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild deleted file mode 100644 index 184aa586db4c..000000000000 --- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s" -HOMEPAGE="http://www.muempf.de/index.html" -SRC_URI="http://www.muempf.de/down/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=app-cdr/cdrtools-1.11.28" -DEPEND="" - -src_prepare() { - sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \ - "${S}"/Makefile || die "sed Makefile failed" - default -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - dobin cdbackup cdrestore - doman cdbackup.1 cdrestore.1 - dodoc CHANGES CREDITS README -} diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild new file mode 100644 index 000000000000..84e00c74f339 --- /dev/null +++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s" +HOMEPAGE="https://www.muempf.de/index.html" +SRC_URI="https://www.muempf.de/down/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=app-cdr/cdrtools-1.11.28" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-u_char-musl.patch +) + +src_configure() { + tc-export CC +} + +src_install() { + dobin cdbackup cdrestore + doman cdbackup.1 cdrestore.1 + einstalldocs +} diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch new file mode 100644 index 000000000000..aac8e317ce5b --- /dev/null +++ b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch @@ -0,0 +1,32 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,5 @@ + # compiler selection and options +-CC = gcc +-CFLAGS = -g -O2 -Wall ++CFLAGS += -Wall + DEPFLAGS = -MM -MG + + # install location +@@ -18,19 +17,16 @@ + + all: $(TARGETS) + +-%.o: %.c +- $(CC) $(CFLAGS) -c $< -o $@ +- + $(DEPFILE): Makefile + @$(CC) $(DEPFLAGS) cdbackup.c cdrestore.c cdrom.c virtual.c misc.c > $@ + + include $(DEPFILE) + + cdbackup: cdbackup.o cdrom.o virtual.o virtual-backup.o misc.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + cdrestore: cdrestore.o cdrom.o virtual.o misc.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + strip: $(TARGETS) + strip $(TARGETS) diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch new file mode 100644 index 000000000000..06d0d2c485ca --- /dev/null +++ b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch @@ -0,0 +1,11 @@ +--- a/virtual.h ++++ b/virtual.h +@@ -42,7 +42,7 @@ + }; + + struct toc_entry { +- u_char track_no; /* track number */ ++ unsigned char track_no; /* track number */ + char is_data; /* 1 = data track */ + char is_cdbackup; /* was it created by CD-Backup? */ + int sec_start; /* start sector */ diff --git a/app-backup/cdbackup/metadata.xml b/app-backup/cdbackup/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-backup/cdbackup/metadata.xml +++ b/app-backup/cdbackup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild deleted file mode 100644 index 3c748f2a7b6a..000000000000 --- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs full/incremental backups of local/remote filesystems onto CD-R(W)s" -HOMEPAGE="http://cdbkup.sourceforge.net/" -SRC_URI="mirror://sourceforge/cdbkup/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="net-misc/openssh - virtual/cdrtools - virtual/eject -" -RDEPEND="${DEPEND} - !app-misc/cdcat -" - -src_prepare() { - default - sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die - sed -i -e 's/make /$(MAKE) /' Makefile.in || die -} - -src_configure() { - econf --with-snardir=/etc/cdbkup --with-dumpgrp=users -} - -src_install() { - default - dodoc COMPLIANCE -} diff --git a/app-backup/cdbkup/cdbkup-1.0-r5.ebuild b/app-backup/cdbkup/cdbkup-1.0-r5.ebuild new file mode 100644 index 000000000000..bf48412b036f --- /dev/null +++ b/app-backup/cdbkup/cdbkup-1.0-r5.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Performs full/incremental backups of local/remote filesystems onto CD-R(W)s" +HOMEPAGE="https://cdbkup.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/cdbkup/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +DEPEND=" + app-cdr/cdrtools + virtual/openssh + sys-apps/util-linux +" +RDEPEND="${DEPEND} + !app-misc/cdcat +" + +src_prepare() { + default + + sed -i \ + -e "s:doc/cdbkup:doc/${PF}:" \ + -e 's/make /$(MAKE) /' \ + Makefile.in || die +} + +src_configure() { + econf --with-snardir=/etc/cdbkup --with-dumpgrp=users +} + +src_install() { + default + dodoc COMPLIANCE +} diff --git a/app-backup/cdbkup/metadata.xml b/app-backup/cdbkup/metadata.xml index bce6888fa2f8..138e0bf1e75c 100644 --- a/app-backup/cdbkup/metadata.xml +++ b/app-backup/cdbkup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription>A backup application capable of full/incremental backups on diff --git a/app-backup/consul-backinator/Manifest b/app-backup/consul-backinator/Manifest index 4534f323f527..17fff41ff491 100644 --- a/app-backup/consul-backinator/Manifest +++ b/app-backup/consul-backinator/Manifest @@ -1,2 +1,2 @@ -DIST consul-backinator-1.6.5-vendor.tar.gz 3532654 BLAKE2B 826a873ee25e8cd89cc73bfa1c7d377da8d9227ec0a948cac0b8643542b37cae5412cb638c4fa2ce3490dcc69356b4dbbedbaefd9289e73ea8c3904db85be1b8 SHA512 f8ba7e93265dab3b44d09336f5c7ec0fdea88956d2945eeb039241ac80c39d678e4041221e681861b7cca9406d8a1ea5ce40e6f69cae6a8e89396b4be8fc007c -DIST consul-backinator-1.6.5.tar.gz 32298 BLAKE2B 19dcd3603e6e0a5cd19e186ec2f45270125d8a0369b0e6033f047927c82e58afd641a3c74ddcfb61ebeb11dc4cf33383ebd75c5fed10962578dd0c62b7b10ec1 SHA512 94a618bdbec1da209c1774cccd2942594dd0f60857c69a50cb42a0c70dea5af94f36010d59fa49bd2e534fcb0649b362674caa46ddb59595c2d21afa82d5ff7f +DIST consul-backinator-1.6.6-deps.tar.xz 122137280 BLAKE2B 6d84b45082ce151f730ae21071b58557adac169e7268f08a10be4e8d47197c22d215baa82cba6b633bde06dfd904b10ba076ab98dcb9419f373b8aae8a6bafaf SHA512 59f395d644a95320ff3fc16dd9deb76241da3d2afb9d02e8f8bfcd26751dbaf2be422cfaaec42e59352a39f63aaa15c287f77eade82cf92cb8b36e9c67f1c40e +DIST consul-backinator-1.6.6.tar.gz 38848 BLAKE2B 2bd3bca4e1986b5bfc229ca38724bd037c2bfcbfc940b7a87be6bb1703f4a8621b4f9cc921937063ef0927085b0d07790e52b6bf50fef9b21c94075a42720f17 SHA512 4ae9b29e335eb15b78fad64ad91462b3a3b1b6d6a4b0f6ba58c4f0871781ce106e9f1026272074c38c4b8ac035b80ac2c6d1671080795fd2943979087c2ee279 diff --git a/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild b/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild deleted file mode 100644 index d74bd040c727..000000000000 --- a/app-backup/consul-backinator/consul-backinator-1.6.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/myENA/consul-backinator -RESTRICT="strip" - -DESCRIPTION="consul backup and restore utility" -HOMEPAGE="https://github.com/myENA/consul-backinator" -SRC_URI="https://github.com/myENA/consul-backinator/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-lang/go:=" - -src_prepare() { - default - mv ../vendor . - echo module ${EGO_PN} > go.mod || die "Unable to create go.mod" -} - -src_compile() { - CGO_ENABLED=0 go build -mod vendor -o "${PN}" -v -x \ - -ldflags="-X main.appVersion=${PV} -s -w" || die -} - -src_install() { - dobin ${PN} - dodoc *.md -} diff --git a/app-backup/consul-backinator/consul-backinator-1.6.6.ebuild b/app-backup/consul-backinator/consul-backinator-1.6.6.ebuild new file mode 100644 index 000000000000..d3b78885c0fe --- /dev/null +++ b/app-backup/consul-backinator/consul-backinator-1.6.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +DESCRIPTION="consul backup and restore utility" +HOMEPAGE="https://github.com/myENA/consul-backinator" + +SRC_URI="https://github.com/myENA/consul-backinator/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +src_compile() { + CGO_ENABLED=0 ego build -o "${PN}" \ + -ldflags="-X main.appVersion=${PV}" . || die +} + +src_install() { + dobin ${PN} + dodoc *.md +} diff --git a/app-backup/consul-backinator/metadata.xml b/app-backup/consul-backinator/metadata.xml index c36c37139fad..5df036ade5f2 100644 --- a/app-backup/consul-backinator/metadata.xml +++ b/app-backup/consul-backinator/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">myENA/consul-backinator</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/cpdup/cpdup-1.18-r1.ebuild b/app-backup/cpdup/cpdup-1.18-r1.ebuild new file mode 100644 index 000000000000..1af7748bfda1 --- /dev/null +++ b/app-backup/cpdup/cpdup-1.18-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Comprehensive filesystem mirroring program" +HOMEPAGE="https://apollo.backplane.com/FreeSrc/" +SRC_URI="https://apollo.backplane.com/FreeSrc/${P}.tgz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/libbsd:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-portable.patch +) + +src_prepare() { + default + rm compat_linux.c || die +} + +src_configure() { + tc-export CC PKG_CONFIG +} + +src_install() { + dobin cpdup + doman cpdup.1 + dodoc -r scripts +} diff --git a/app-backup/cpdup/cpdup-1.18.ebuild b/app-backup/cpdup/cpdup-1.18.ebuild deleted file mode 100644 index 87a80a519dd7..000000000000 --- a/app-backup/cpdup/cpdup-1.18.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A comprehensive filesystem mirroring program" -HOMEPAGE="http://apollo.backplane.com/FreeSrc/" -SRC_URI="http://apollo.backplane.com/FreeSrc/${P}.tgz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="userland_GNU threads" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${PN}" -PATCHES=( "${FILESDIR}"/${PN}-1.11-unused.patch ) - -src_prepare() { - default - - if use userland_GNU; then - cp "${FILESDIR}"/Makefile.linux Makefile || die - # bits/stat.h has __unused too - sed -i 's/__unused/__cpdup_unused/' *.c || die - echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h || die - fi -} - -src_configure() { - tc-export CC - use threads || EXTRA_MAKE_OPTS="NOPTHREADS=1" -} - -src_compile() { - MAKE=make emake ${EXTRA_MAKE_OPTS} -} - -src_install() { - dobin cpdup - doman cpdup.1 - dodoc -r scripts -} diff --git a/app-backup/cpdup/files/Makefile.linux b/app-backup/cpdup/files/Makefile.linux deleted file mode 100644 index 3e18e4e0b218..000000000000 --- a/app-backup/cpdup/files/Makefile.linux +++ /dev/null @@ -1,13 +0,0 @@ -OBJS = cpdup.o fsmid.o hclink.o hcproto.o misc.o - -CFLAGS += -D__cpdup_unused="__attribute__ ((unused))" -D_GNU_SOURCE -D__USE_FILE_OFFSET64 -DNOMD5 - -ifndef NOPTHREADS -CFLAGS += -DUSE_PTHREADS=1 -pthread -endif - -all: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o cpdup - -.c.o: - $(CC) $(CFLAGS) -c -o $@ $< diff --git a/app-backup/cpdup/files/cpdup-1.11-unused.patch b/app-backup/cpdup/files/cpdup-1.11-unused.patch deleted file mode 100644 index 5544afbeddf9..000000000000 --- a/app-backup/cpdup/files/cpdup-1.11-unused.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/cpdup.c -+++ b/cpdup.c -@@ -1543,7 +1543,11 @@ - */ - - static int -+#ifdef _ST_FLAGS_PRESENT_ - xrename(const char *src, const char *dst, u_long flags) -+#else -+xrename(const char *src, const char *dst, u_long flags __unused) -+#endif - { - int r; - diff --git a/app-backup/cpdup/files/cpdup-1.18-makefile.patch b/app-backup/cpdup/files/cpdup-1.18-makefile.patch new file mode 100644 index 000000000000..173232fb3348 --- /dev/null +++ b/app-backup/cpdup/files/cpdup-1.18-makefile.patch @@ -0,0 +1,30 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,20 +1,9 @@ +-# $DragonFly: src/bin/cpdup/Makefile,v 1.7 2008/04/10 22:09:08 dillon Exp $ +-# ++OBJS = cpdup.o hcproto.o hclink.o misc.o fsmid.o + +-PROG= cpdup +-SRCS= cpdup.c hcproto.c hclink.c misc.c fsmid.c +- +-.if defined(.FreeBSD) +-CFLAGS += -D_ST_FLAGS_PRESENT_=1 +-WARNS?= 6 +-.endif +- +-.if !defined(NOMD5) +-SRCS+= md5.c +-.endif +- +-LDADD+= -lmd +-DPADD+= ${LIBMD} +- +-.include <bsd.prog.mk> ++CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNOMD5 -DUSE_PTHREADS=1 ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libbsd) ++CFLAGS += -pthread ++LIBS += $(shell $(PKG_CONFIG) --libs libbsd) + ++all: $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o cpdup $(LIBS) diff --git a/app-backup/cpdup/files/cpdup-1.18-portable.patch b/app-backup/cpdup/files/cpdup-1.18-portable.patch new file mode 100644 index 000000000000..90a82d98a6dc --- /dev/null +++ b/app-backup/cpdup/files/cpdup-1.18-portable.patch @@ -0,0 +1,128 @@ +--- a/compat_sun.h ++++ b/compat_sun.h +@@ -1,6 +1,3 @@ +-/* __unused is a gcc'ism. */ +-#define __unused +- + #include <stdio.h> + #include <stdarg.h> + +--- a/cpdup.c ++++ b/cpdup.c +@@ -127,8 +127,8 @@ + static void hltdelete(struct hlink *); + static void hltsetdino(struct hlink *, ino_t); + static int YesNo(const char *path); +-static int xrename(const char *src, const char *dst, u_long flags); +-static int xlink(const char *src, const char *dst, u_long flags); ++static int xrename(const char *src, const char *dst, unsigned long flags); ++static int xlink(const char *src, const char *dst, unsigned long flags); + static int xremove(struct HostConf *host, const char *path); + static int DoCopy(copy_info_t info, struct stat *stat1, int depth); + static int ScanDir(List *list, struct HostConf *host, const char *path, +@@ -1648,7 +1648,7 @@ + */ + + static int +-xrename(const char *src, const char *dst, u_long flags) ++xrename(const char *src, const char *dst, unsigned long flags) + { + int r; + +@@ -1663,7 +1663,7 @@ + } + + static int +-xlink(const char *src, const char *dst, u_long flags) ++xlink(const char *src, const char *dst, unsigned long flags) + { + int r; + #ifdef _ST_FLAGS_PRESENT_ +--- a/cpdup.h ++++ b/cpdup.h +@@ -39,7 +39,6 @@ + #define __printflike(a,b) + #define __printf0like(a,b) + #define __aligned(x) +-#define __unused + #endif + + void logstd(const char *ctl, ...) __printflike(1, 2); +--- a/hclink.c ++++ b/hclink.c +@@ -73,7 +73,7 @@ + } + + static int +-rc_badop(hctransaction_t trans __unused, struct HCHead *head) ++rc_badop(hctransaction_t trans, struct HCHead *head) + { + head->error = EOPNOTSUPP; + return(0); +--- a/hcproto.c ++++ b/hcproto.c +@@ -10,6 +10,8 @@ + #include "hclink.h" + #include "hcproto.h" + ++#include <bsd/string.h> ++ + static int hc_decode_stat(hctransaction_t trans, struct stat *, struct HCHead *); + static int hc_decode_stat_item(struct stat *st, struct HCLeaf *item); + static int rc_encode_stat(hctransaction_t trans, struct stat *); +@@ -1503,7 +1505,7 @@ + * CHFLAGS + */ + int +-hc_chflags(struct HostConf *hc, const char *path, u_long flags) ++hc_chflags(struct HostConf *hc, const char *path, unsigned long flags) + { + hctransaction_t trans; + struct HCHead *head; +@@ -1535,7 +1537,7 @@ + { + struct HCLeaf *item; + const char *path = NULL; +- u_long flags = 0; ++ unsigned long flags = 0; + int rc; + + FOR_EACH_ITEM(item, trans, head) { +@@ -1544,7 +1546,7 @@ + path = HCC_STRING(item); + break; + case LC_FILEFLAGS: +- flags = (u_long)HCC_INT64(item); ++ flags = (unsigned long)HCC_INT64(item); + break; + } + } +@@ -1846,7 +1848,7 @@ + } + + static int +-rc_geteuid(hctransaction_t trans, struct HCHead *head __unused) ++rc_geteuid(hctransaction_t trans, struct HCHead *head) + { + hcc_leaf_int32(trans, LC_UID, geteuid()); + return (0); +@@ -1920,7 +1922,7 @@ + } + + static int +-rc_getgroups(hctransaction_t trans, struct HCHead *head __unused) ++rc_getgroups(hctransaction_t trans, struct HCHead *head) + { + int count, i; + gid_t *gidlist; +--- a/hcproto.h ++++ b/hcproto.h +@@ -105,7 +105,7 @@ + int hc_chmod(struct HostConf *hc, const char *path, mode_t mode); + int hc_mknod(struct HostConf *hc, const char *path, mode_t mode, dev_t rdev); + int hc_link(struct HostConf *hc, const char *name1, const char *name2); +-int hc_chflags(struct HostConf *hc, const char *path, u_long flags); ++int hc_chflags(struct HostConf *hc, const char *path, unsigned long flags); + int hc_readlink(struct HostConf *hc, const char *path, char *buf, int bufsiz); + mode_t hc_umask(struct HostConf *hc, mode_t numask); + int hc_symlink(struct HostConf *hc, const char *name1, const char *name2); diff --git a/app-backup/cpdup/metadata.xml b/app-backup/cpdup/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-backup/cpdup/metadata.xml +++ b/app-backup/cpdup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest index 252c032ada59..06ab9425b9ea 100644 --- a/app-backup/dar/Manifest +++ b/app-backup/dar/Manifest @@ -1,5 +1 @@ -DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847 -DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69 -DIST dar-2.6.10.tar.gz 2140424 BLAKE2B 840a7a3d33825658be541157468a15bc3a3082083a35c426ecbab1cd2e8026e0a4d15671a33472068e1256878d1f60d414c2c069a3223ab5050756b13c887b69 SHA512 2fceafba6c6851c5dd11c0d1a3fda8aeddac16f39cf0051027b178703a5e821fb769c42624063d8722d80ea62bb735f3b0c6c39538c1c939234df49d6b757428 -DIST dar-2.6.5.tar.gz 2104866 BLAKE2B c31e06abb384d03d0180d3dd99067916de96286838a1aef8748ae6119651ac142388633c7946d0c7864f41a42c555ac79b0811af7594c5d6370fb9c30b975bc9 SHA512 e646ac51c5c140ca3e573a4e63ba47af6fcf19c0aeaa0d4791dd7e781478c8981cd31e1a2418d2f1fd8ab92f2c9812f3b712bc0fcbbcdfbd131c8937100a4790 -DIST dar-2.6.9.tar.gz 2137419 BLAKE2B 647dbd272832dabd8c6255ebc27040dceb428d7ea807146c5c4eabb7095eb7c57010a11a5bc3dfa73aa299c627e5230be9560ca5246b7591ed9705dac17181cd SHA512 9ee4624fa1cfa0e523653e3dca032a8b7ac200b3318ba21869c19a9102dd11a923c979e5186591011161a2ed07f3c7668b572620b3be197d4bfaea903c259151 +DIST dar-2.7.14.tar.gz 2443548 BLAKE2B a68ad06a2bf53b25a0b393f3e85eef5676382d63bfd86ba77696667786a688e326c118d937cd5dae6b1e78410e40295c67d8ba4677c37f7139bbdd2794c4efeb SHA512 0436c67e0dbd8f5e96e01a0db48a469d80fb81a7c7f37aed98308bd55d60d699b21c755d95fa83891690231fd2510eaa6c6652fb99a1bad9c8210084031391d4 diff --git a/app-backup/dar/dar-2.5.11.ebuild b/app-backup/dar/dar-2.5.11.ebuild deleted file mode 100644 index 39964eef0f09..000000000000 --- a/app-backup/dar/dar-2.5.11.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic ltprune - -DESCRIPTION="A full featured backup tool, aimed for disks" -HOMEPAGE="http://dar.linux.free.fr/" -SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux" -IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" - -RESTRICT="test" # need to be run as root - -RDEPEND=">=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND="${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) - gpg? ( - app-crypt/gpgme[static-libs] - dev-libs/libassuan[static-libs] - dev-libs/libgpg-error[static-libs] - ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) - nls? ( - sys-devel/gettext - virtual/libintl - ) - doc? ( app-doc/doxygen )" - -REQUIRED_USE="?? ( dar32 dar64 ) - gpg? ( gcrypt )" - -#PATCHES=( -#) - -src_configure() { - local myconf=( --disable-upx ) - - # Bug 103741 - filter-flags -fomit-frame-pointer - - # configure.ac is totally funked up regarding the AC_ARG_ENABLE - # logic. - # For example "--enable-dar-static" causes configure to DISABLE - # static builds of dar. - # Do _not_ use $(use_enable) until you have verified that the - # logic has been fixed by upstream. - use xattr || myconf+=( --disable-ea-support ) - use dar32 && myconf+=( --enable-mode=32 ) - use dar64 && myconf+=( --enable-mode=64 ) - use doc || myconf+=( --disable-build-html ) - # use examples && myconf+=( --enable-examples ) - use gcrypt || myconf+=( --disable-libgcrypt-linking ) - use gpg || myconf+=( --disable-gpgme-linking ) - use lzo || myconf+=( --disable-liblzo2-linking ) - use nls || myconf+=( --disable-nls ) - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - - econf ${myconf[@]} -} - -src_install() { - emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - einstalldocs - - if ! use static-libs ; then - prune_libtool_files --all - fi -} diff --git a/app-backup/dar/dar-2.5.18.ebuild b/app-backup/dar/dar-2.5.18.ebuild deleted file mode 100644 index a8385195092a..000000000000 --- a/app-backup/dar/dar-2.5.18.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="A full featured backup tool, aimed for disks" -HOMEPAGE="http://dar.linux.free.fr/" -SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" -IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" - -RESTRICT="test" # need to be run as root - -RDEPEND=">=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND="${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) - gpg? ( - app-crypt/gpgme[static-libs] - dev-libs/libassuan[static-libs] - dev-libs/libgpg-error[static-libs] - ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) - nls? ( - sys-devel/gettext - virtual/libintl - ) - doc? ( app-doc/doxygen )" - -REQUIRED_USE="?? ( dar32 dar64 ) - gpg? ( gcrypt )" - -#PATCHES=( -#) - -src_configure() { - # configure.ac is totally funked up regarding the AC_ARG_ENABLE - # logic. - # For example "--enable-dar-static" causes configure to DISABLE - # static builds of dar. - # Do _not_ use $(use_enable) until you have verified that the - # logic has been fixed by upstream. - local myconf=( - --disable-upx - $(usex dar32 --enable-mode=32 '') - $(usex dar64 --enable-mode=64 '') - $(usex doc '' --disable-build-html) - #$(usex examples --enable-examples '') - $(usex gcrypt '' --disable-libgcrypt-linking) - $(usex gpg '' --disable-gpgme-linking) - $(usex lzo '' --disable-liblzo2-linking) - $(usex nls '' --disable-nls) - $(usex xattr '' --disable-ea-support) - ) - - # Bug 103741 - filter-flags -fomit-frame-pointer - - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - - econf ${myconf[@]} -} - -src_install() { - emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - einstalldocs - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild deleted file mode 100644 index 607253da2b02..000000000000 --- a/app-backup/dar/dar-2.6.10.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="A full featured backup tool, aimed for disks" -HOMEPAGE="http://dar.linux.free.fr/" -SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" -IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" - -RESTRICT="test" # need to be run as root - -RDEPEND=">=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - curl? ( net-misc/curl ) - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND="${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - curl? ( net-misc/curl[static-libs] ) - gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) - gpg? ( - app-crypt/gpgme[static-libs] - dev-libs/libassuan[static-libs] - dev-libs/libgpg-error[static-libs] - ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) -" -BDEPEND=" - nls? ( - sys-devel/gettext - virtual/libintl - ) - doc? ( app-doc/doxygen ) -" - -REQUIRED_USE="?? ( dar32 dar64 ) - gpg? ( gcrypt )" - -#PATCHES=( -#) - -src_configure() { - # configure.ac is totally funked up regarding the AC_ARG_ENABLE - # logic. - # For example "--enable-dar-static" causes configure to DISABLE - # static builds of dar. - # Do _not_ use $(use_enable) until you have verified that the - # logic has been fixed by upstream. - local myconf=( - --disable-python-binding - --disable-upx - $(usex curl '' --disable-libcurl-linking) - $(usex dar32 --enable-mode=32 '') - $(usex dar64 --enable-mode=64 '') - $(usex doc '' --disable-build-html) - #$(usex examples --enable-examples '') - $(usex gcrypt '' --disable-libgcrypt-linking) - $(usex gpg '' --disable-gpgme-linking) - $(usex lzo '' --disable-liblzo2-linking) - $(usex nls '' --disable-nls) - #$(usex rsync '' --disable-librsync-linking) - $(usex xattr '' --disable-ea-support) - ) - - # Bug 103741 - filter-flags -fomit-frame-pointer - - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - - econf ${myconf[@]} -} - -src_install() { - emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - einstalldocs - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/app-backup/dar/dar-2.6.5.ebuild b/app-backup/dar/dar-2.6.5.ebuild deleted file mode 100644 index b348f760a97d..000000000000 --- a/app-backup/dar/dar-2.6.5.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="A full featured backup tool, aimed for disks" -HOMEPAGE="http://dar.linux.free.fr/" -SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" -IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" - -RESTRICT="test" # need to be run as root - -RDEPEND=">=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - curl? ( net-misc/curl ) - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND="${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - curl? ( net-misc/curl[static-libs] ) - gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) - gpg? ( - app-crypt/gpgme[static-libs] - dev-libs/libassuan[static-libs] - dev-libs/libgpg-error[static-libs] - ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) -" -BDEPEND=" - nls? ( - sys-devel/gettext - virtual/libintl - ) - doc? ( app-doc/doxygen ) -" - -REQUIRED_USE="?? ( dar32 dar64 ) - gpg? ( gcrypt )" - -#PATCHES=( -#) - -src_configure() { - # configure.ac is totally funked up regarding the AC_ARG_ENABLE - # logic. - # For example "--enable-dar-static" causes configure to DISABLE - # static builds of dar. - # Do _not_ use $(use_enable) until you have verified that the - # logic has been fixed by upstream. - local myconf=( - --disable-upx - $(usex curl '' --disable-libcurl-linking) - $(usex dar32 --enable-mode=32 '') - $(usex dar64 --enable-mode=64 '') - $(usex doc '' --disable-build-html) - #$(usex examples --enable-examples '') - $(usex gcrypt '' --disable-libgcrypt-linking) - $(usex gpg '' --disable-gpgme-linking) - $(usex lzo '' --disable-liblzo2-linking) - $(usex nls '' --disable-nls) - #$(usex rsync '' --disable-librsync-linking) - $(usex xattr '' --disable-ea-support) - ) - - # Bug 103741 - filter-flags -fomit-frame-pointer - - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - - econf ${myconf[@]} -} - -src_install() { - emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - einstalldocs - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/app-backup/dar/dar-2.6.9.ebuild b/app-backup/dar/dar-2.6.9.ebuild deleted file mode 100644 index 607253da2b02..000000000000 --- a/app-backup/dar/dar-2.6.9.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="A full featured backup tool, aimed for disks" -HOMEPAGE="http://dar.linux.free.fr/" -SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" -IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" - -RESTRICT="test" # need to be run as root - -RDEPEND=">=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - curl? ( net-misc/curl ) - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND="${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - curl? ( net-misc/curl[static-libs] ) - gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) - gpg? ( - app-crypt/gpgme[static-libs] - dev-libs/libassuan[static-libs] - dev-libs/libgpg-error[static-libs] - ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) -" -BDEPEND=" - nls? ( - sys-devel/gettext - virtual/libintl - ) - doc? ( app-doc/doxygen ) -" - -REQUIRED_USE="?? ( dar32 dar64 ) - gpg? ( gcrypt )" - -#PATCHES=( -#) - -src_configure() { - # configure.ac is totally funked up regarding the AC_ARG_ENABLE - # logic. - # For example "--enable-dar-static" causes configure to DISABLE - # static builds of dar. - # Do _not_ use $(use_enable) until you have verified that the - # logic has been fixed by upstream. - local myconf=( - --disable-python-binding - --disable-upx - $(usex curl '' --disable-libcurl-linking) - $(usex dar32 --enable-mode=32 '') - $(usex dar64 --enable-mode=64 '') - $(usex doc '' --disable-build-html) - #$(usex examples --enable-examples '') - $(usex gcrypt '' --disable-libgcrypt-linking) - $(usex gpg '' --disable-gpgme-linking) - $(usex lzo '' --disable-liblzo2-linking) - $(usex nls '' --disable-nls) - #$(usex rsync '' --disable-librsync-linking) - $(usex xattr '' --disable-ea-support) - ) - - # Bug 103741 - filter-flags -fomit-frame-pointer - - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - - econf ${myconf[@]} -} - -src_install() { - emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - einstalldocs - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/app-backup/dar/dar-2.7.14.ebuild b/app-backup/dar/dar-2.7.14.ebuild new file mode 100644 index 000000000000..88c8bb47d6cd --- /dev/null +++ b/app-backup/dar/dar-2.7.14.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="A full featured backup tool, aimed for disks" +HOMEPAGE="http://dar.linux.free.fr/" +SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86 ~amd64-linux" +IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr" + +REQUIRED_USE=" + ?? ( dar32 dar64 ) + gpg? ( gcrypt ) +" + +RESTRICT="test" # need to be run as root + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils + app-arch/zstd:= + dev-libs/libthreadar + sys-libs/libcap + >=sys-libs/zlib-1.2.3:= + argon2? ( app-crypt/argon2:= ) + curl? ( net-misc/curl ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + ) + gpg? ( + app-crypt/gpgme:= + dev-libs/libassuan + ) + lz4? ( app-arch/lz4:= ) + lzo? ( dev-libs/lzo:2 ) + nls? ( virtual/libintl ) + rsync? ( net-libs/librsync:= ) + xattr? ( sys-apps/attr ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + doc? ( app-text/doxygen ) + nls? ( sys-devel/gettext ) +" + +QA_PKGCONFIG_VERSION="" #862025 - upstream has a different numbering scheme for libdar + +src_configure() { + # configure.ac is totally funked up regarding the AC_ARG_ENABLE + # logic. + # For example "--enable-dar-static" causes configure to DISABLE + # static builds of dar. + # Do _not_ use $(use_enable) until you have verified that the + # logic has been fixed by upstream. + local myconf=( + --disable-dar-static + --disable-python-binding + --disable-upx + $(usev !argon2 --disable-libargon2-linking) + $(usev !curl --disable-libcurl-linking) + $(usev dar32 --enable-mode=32) + $(usev dar64 --enable-mode=64) + $(usev !doc --disable-build-html) + $(usev !gcrypt --disable-libgcrypt-linking) + $(usev !gpg --disable-gpgme-linking) + $(usev !lz4 --disable-liblz4-linking) + $(usev !lzo --disable-liblzo2-linking) + $(usev !nls --disable-nls) + $(usev !rsync --disable-librsync-linking) + $(usev !xattr --disable-ea-support) + ) + + # Bug 103741 + filter-flags -fomit-frame-pointer + + econf "${myconf[@]}" +} + +src_install() { + emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install + + einstalldocs + + find "${ED}" -name "*.la" -delete || die + + # Bug 729150 + rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die +} diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml index 31483fe9d2ff..6cdca97c7d73 100644 --- a/app-backup/dar/metadata.xml +++ b/app-backup/dar/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> <longdescription> Backup directory tree and files. Full featured archiver with support for differential backups, slices, @@ -9,14 +12,17 @@ compression, ATTR/ACL support. DAR also supports Pipes for remote operations, including with ssh. </longdescription> <use> + <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag> <flag name="dar32">Enables --enable-mode=32 option, which replace infinite by 32 bit integers</flag> <flag name="dar64">Enables --enable-mode=64 option, which replace infinite by 64 bit integers</flag> <flag name="gcrypt">Enables strong encryption support</flag> - <flag name="gpg">Enables usage of asymetric crypto algorithms</flag> + <flag name="gpg">Enables usage of asymmetric encryption algorithms</flag> + <flag name="rsync">Enables linking with <pkg>net-libs/librsync</pkg> for delta compression support</flag> </use> <upstream> <remote-id type="sourceforge">dar</remote-id> + <remote-id type="github">Edrusb/DAR</remote-id> </upstream> </pkgmetadata> diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest new file mode 100644 index 000000000000..c6a74d33b9a5 --- /dev/null +++ b/app-backup/deja-dup/Manifest @@ -0,0 +1 @@ +DIST deja-dup-44.2.tar.bz2 1010512 BLAKE2B b61eb474a4cc874ceea48a88f8f83e8a329b252248dc4630dd9dd7895ea4782b0e9b6751e795e208fc84127754da226d6a4257a783ffb23d88df59058e28576e SHA512 b1fae58d76aa5a2097bb94f6e5196ed5a3d5131562fe088a9f81155a3bb96ef9e726f83ae04ba8e361a671bce8aa2ea4b053f04f1e57a194fe88c2f06c3e6335 diff --git a/app-backup/deja-dup/deja-dup-44.2.ebuild b/app-backup/deja-dup/deja-dup-44.2.ebuild new file mode 100644 index 000000000000..35b9d7010635 --- /dev/null +++ b/app-backup/deja-dup/deja-dup-44.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson gnome2-utils vala xdg + +DESCRIPTION="Simple backup tool using duplicity back-end" +HOMEPAGE="https://wiki.gnome.org/Apps/DejaDup" +SRC_URI="https://gitlab.gnome.org/World/deja-dup/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + $(vala_depend) + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + test? ( dev-libs/appstream-glib ) +" + +DEPEND=" + >=gui-libs/libadwaita-1.0:1 + >=dev-libs/glib-2.70.0:2 + >=dev-libs/libgpg-error-1.33 + >=gui-libs/gtk-4.6:4 + >=dev-libs/json-glib-1.2 + >=dev-libs/glib-2.64:2[dbus] + >=app-crypt/libsecret-0.18.6[vala] + >=net-libs/libsoup-3.0:3.0 + >=app-backup/duplicity-0.8.21 +" + +RDEPEND="${DEPEND} + gnome-base/dconf + gnome-base/gvfs[fuse] +" + +src_prepare() { + default + vala_setup +} + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml new file mode 100644 index 000000000000..18848e836a82 --- /dev/null +++ b/app-backup/deja-dup/metadata.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <name>Oz Tiram</name> + <email>oz.tiram@gmail.com</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + Déjà Dup is a simple backup tool. It hides the complexity of backing up the + Right Way (encrypted, off-site, and regular) and uses + duplicity as the backend. + + Support for local, remote, or cloud backup locations such as Google Drive + Securely encrypts and compresses your data + Incrementally backs up, letting you restore from any particular backup + Schedules regular backups + Integrates well into your GNOME desktop + + Déjà Dup focuses on ease of use and personal, accidental data loss. + If you need a full system backup or an archival program, you may prefer other + backup apps. + </longdescription> + <upstream> + <bugs-to>https://gitlab.gnome.org/World/deja-dup/issues</bugs-to> + <remote-id type="gnome-gitlab">World/deja-dup</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-backup/dirvish/dirvish-1.2.1.ebuild b/app-backup/dirvish/dirvish-1.2.1-r1.ebuild index 13f3e8b769af..6319c1c91ebc 100644 --- a/app-backup/dirvish/dirvish-1.2.1.ebuild +++ b/app-backup/dirvish/dirvish-1.2.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Dirvish is a fast, disk based, rotating network backup system" HOMEPAGE="http://www.dirvish.org/" @@ -10,26 +10,27 @@ SRC_URI="http://dirvish.org/${P}.tgz" LICENSE="OSL-2.0" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND="app-arch/tar" -RDEPEND="dev-perl/Time-ParseDate +RDEPEND=" + dev-perl/Time-ParseDate dev-perl/Time-Period - >=net-misc/rsync-2.5.7" + net-misc/rsync +" +BDEPEND="app-arch/tar" src_prepare() { default - local f - for f in dirvish dirvish-runall dirvish-expire dirvish-locate; do - cat > $f <<-EOF || die - #!/usr/bin/perl + local file + for file in dirvish dirvish-runall dirvish-expire dirvish-locate; do + cat > ${file} <<-EOF || die + #!${EPREFIX}/usr/bin/perl - \$CONFDIR = "/etc/dirvish"; + \$CONFDIR = "${EPREFIX}/etc/dirvish"; EOF - cat $f.pl >> $f || die - cat loadconfig.pl >> $f || die + cat ${file}.pl >> ${file} || die + cat loadconfig.pl >> ${file} || die done } diff --git a/app-backup/dirvish/metadata.xml b/app-backup/dirvish/metadata.xml index 003cb2d2d730..be6d1337fe75 100644 --- a/app-backup/dirvish/metadata.xml +++ b/app-backup/dirvish/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en">Dirvish is a fast, disk based, rotating network diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest index cf9b876454eb..945214bd10d2 100644 --- a/app-backup/duplicity/Manifest +++ b/app-backup/duplicity/Manifest @@ -1,2 +1,3 @@ -DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951 -DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75 +DIST duplicity-2.1.1.tar.gz 1420132 BLAKE2B 35cfa7c6c2caa647f3b2046783185973203b5d838c0d1a1a8e24982f1c7f74a1d025e0b0740c0c7bc14d516c59d3e691a2712b19b30882e9dbb411cecb90f4be SHA512 fb19b1723e1e220ca72a41c3678ca29d889b2315c7fd043334d55cc2040d991e66480d71c6cc3f2ee5d17d9e1d9fb24ddc4c0ed771bbbefb6f1f6aa14cbe0347 +DIST duplicity-2.1.4.tar.gz 1556341 BLAKE2B d8302a7097519fd593fc05c8390101e615eaf11333e9d15e1ba7756b8ed9764709db80df41c741ee39eda0fa6de22c910b53db32d558c1ab09867c66724a056c SHA512 91804c6f4dc13d700cbe4747317f9611f530996de8a22a0907d714fb6f8a7fadc3371c270a2257c24324c0233bb4501a4b7d33aea7631862568c8530f7173ef1 +DIST duplicity-2.2.3.tar.gz 1978008 BLAKE2B 29a88eb059c3dd6faa7d08d52216cd0f9d96255eae1e613e2c5432bf8f36ad014484953e20b4a0dfaa2704dd6ac426a3285ff40a8cc82f287a8a89199df5a2c5 SHA512 b667092317899674c5e9d4b221815f24a7eae177d3d2b6d298f07d3e2d4a7badd6c976a6317331b7c6cea940a7885a3da397ab7197d5fd671d33278316f86916 diff --git a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild b/app-backup/duplicity/duplicity-2.1.1.ebuild index 9bbe98ffa27a..5912d6e8f64c 100644 --- a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild +++ b/app-backup/duplicity/duplicity-2.1.1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) +EAPI=8 +PYTHON_COMPAT=( python3_10 python3_11 ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Secure backup system using gnupg to encrypt data" -HOMEPAGE="http://www.nongnu.org/duplicity/" -SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz" +HOMEPAGE="https://duplicity.gitlab.io/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="s3 test" CDEPEND=" @@ -22,6 +23,7 @@ CDEPEND=" " DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( app-arch/par2cmdline dev-python/mock[${PYTHON_USEDEP}] @@ -30,8 +32,7 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - s3? ( dev-python/boto[${PYTHON_USEDEP}] ) + s3? ( dev-python/boto3[${PYTHON_USEDEP}] ) " RESTRICT="test" diff --git a/app-backup/duplicity/duplicity-0.8.13.ebuild b/app-backup/duplicity/duplicity-2.1.4.ebuild index afc6288b43a1..33edcac9bdf8 100644 --- a/app-backup/duplicity/duplicity-0.8.13.ebuild +++ b/app-backup/duplicity/duplicity-2.1.4.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) +EAPI=8 +PYTHON_COMPAT=( python3_10 python3_11 ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Secure backup system using gnupg to encrypt data" -HOMEPAGE="https://www.nongnu.org/duplicity/" -SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz" +HOMEPAGE="https://duplicity.gitlab.io/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="s3 test" CDEPEND=" @@ -22,7 +23,7 @@ CDEPEND=" " DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( app-arch/par2cmdline dev-python/mock[${PYTHON_USEDEP}] @@ -31,8 +32,7 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - s3? ( dev-python/boto[${PYTHON_USEDEP}] ) + s3? ( dev-python/boto3[${PYTHON_USEDEP}] ) " RESTRICT="test" diff --git a/app-backup/duplicity/duplicity-2.2.3.ebuild b/app-backup/duplicity/duplicity-2.2.3.ebuild new file mode 100644 index 000000000000..76475155c786 --- /dev/null +++ b/app-backup/duplicity/duplicity-2.2.3.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 + +inherit distutils-r1 pypi + +DESCRIPTION="Secure backup system using gnupg to encrypt data" +HOMEPAGE="https://duplicity.gitlab.io/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="s3 test" + +CDEPEND=" + net-libs/librsync + app-crypt/gnupg + dev-python/fasteners[${PYTHON_USEDEP}] +" +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( + app-arch/par2cmdline + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + ) +" +RDEPEND="${CDEPEND} + dev-python/paramiko[${PYTHON_USEDEP}] + s3? ( dev-python/boto3[${PYTHON_USEDEP}] ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-fix-docs-cmd.patch" +) + +python_test() { + esetup.py test +} + +pkg_postinst() { + elog "Duplicity has many optional dependencies to support various backends." + elog "Currently it's up to you to install them as necessary." +} diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch deleted file mode 100644 index 89cd583e6bff..000000000000 --- a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- duplicity-0.8.12.1612/setup.py 2020-05-07 12:07:21.571865871 -0400 -+++ duplicity-0.8.12.1612/setup.py 2020-05-07 12:08:29.617846122 -0400 -@@ -88,18 +88,6 @@ - u'bin/rdiffdir.1' - ] - ), -- (u'share/doc/duplicity-%s' % version_string, -- [ -- u'AUTHORS', -- u'CHANGELOG', -- u'Changelog.GNU', -- u'COPYING', -- u'README', -- u'README-LOG', -- u'README-REPO', -- u'README-TESTING', -- ], -- ), - ] - - if not os.environ.get(u'READTHEDOCS') == u'True': -@@ -265,7 +253,6 @@ - ], - test_suite=u"testing", - cmdclass={ -- u"build_scripts": BSCommand, - u"install": InstallCommand, - u"test": TestCommand, - }, diff --git a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch deleted file mode 100644 index 23b31e23fc07..000000000000 --- a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- duplicity-0.8.13/setup.py 2020-06-02 16:19:25.127576334 -0400 -+++ duplicity-0.8.13/setup.py 2020-06-02 16:20:33.730535892 -0400 -@@ -89,18 +89,6 @@ - u'bin/rdiffdir.1' - ] - ), -- (u'share/doc/duplicity-%s' % Version, -- [ -- u'AUTHORS', -- u'CHANGELOG', -- u'Changelog.GNU', -- u'COPYING', -- u'README', -- u'README-LOG', -- u'README-REPO', -- u'README-TESTING', -- ], -- ), - ] - - if not os.environ.get(u'READTHEDOCS') == u'True': -@@ -319,7 +307,6 @@ - ], - test_suite=u"testing", - cmdclass={ -- u"build_scripts": BSCommand, - u"install": InstallCommand, - u"sdist": SdistCommand, - u"test": TestCommand, diff --git a/app-backup/duplicity/files/duplicity-2.1.1-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-2.1.1-fix-docs-cmd.patch new file mode 100644 index 000000000000..bd8f96e6af79 --- /dev/null +++ b/app-backup/duplicity/files/duplicity-2.1.1-fix-docs-cmd.patch @@ -0,0 +1,20 @@ +--- duplicity-2.1.1/setup.py.orig 2023-09-14 08:33:42.698029208 -0400 ++++ duplicity-2.1.1/setup.py 2023-09-14 08:34:18.730539149 -0400 +@@ -92,17 +92,6 @@ + 'bin/duplicity.1', + ] + ), +- (f'share/doc/duplicity-{Version}', +- [ +- 'CHANGELOG.md', +- 'CONTRIBUTING.md', +- 'COPYING', +- 'README.md', +- 'README-LOG.md', +- 'README-REPO.md', +- 'README-TESTING.md', +- ], +- ), + ] + + # short circuit fot READTHEDOCS diff --git a/app-backup/duplicity/files/duplicity-2.1.4-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-2.1.4-fix-docs-cmd.patch new file mode 100644 index 000000000000..367f8e51c483 --- /dev/null +++ b/app-backup/duplicity/files/duplicity-2.1.4-fix-docs-cmd.patch @@ -0,0 +1,23 @@ +diff --git a/setup.py b/setup.py +index 6711c8a1..2bc0bd95 100755 +--- a/setup.py ++++ b/setup.py +@@ -108,18 +108,6 @@ def get_data_files(): + "bin/duplicity.1", + ], + ), +- ( +- f"share/doc/duplicity-{Version}", +- [ +- "CHANGELOG.md", +- "CONTRIBUTING.md", +- "COPYING", +- "README.md", +- "README-LOG.md", +- "README-REPO.md", +- "README-TESTING.md", +- ], +- ), + ] + + # short circuit fot READTHEDOCS diff --git a/app-backup/duplicity/files/duplicity-2.2.3-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-2.2.3-fix-docs-cmd.patch new file mode 100644 index 000000000000..13e4d909f46a --- /dev/null +++ b/app-backup/duplicity/files/duplicity-2.2.3-fix-docs-cmd.patch @@ -0,0 +1,21 @@ +--- a/setup.py 2024-03-29 07:04:27.847027200 -0400 ++++ b/setup.py 2024-03-29 07:05:03.924506321 -0400 +@@ -93,18 +93,6 @@ + "man/duplicity.1", + ], + ), +- ( +- f"share/doc/duplicity-{Version}", +- [ +- "CHANGELOG.md", +- "AUTHORS.md", +- "COPYING", +- "README.md", +- "README-LOG.md", +- "README-REPO.md", +- "README-TESTING.md", +- ], +- ), + ] + + # short circuit fot READTHEDOCS diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml index c94fa8002b08..eb86afd49320 100644 --- a/app-backup/duplicity/metadata.xml +++ b/app-backup/duplicity/metadata.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>rich0@gentoo.org</email> <name>Rich Freeman</name> </maintainer> - <maintainer type="person"> - <email>gentoo@seichter.de</email> - <name>Ralph Seichter</name> - </maintainer> <use> <flag name="s3">Support for backing up to the Amazon S3 system</flag> </use> + <upstream> + <remote-id type="pypi">duplicity</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest index 7a49c026d6f5..98f58088d814 100644 --- a/app-backup/duply/Manifest +++ b/app-backup/duply/Manifest @@ -1,7 +1 @@ -DIST duply_1.11.2.tgz 44094 BLAKE2B 0aa52f9654bbb873564aaa180b5762b4a5bae1cf0da85d79fedfa6e59d27ada48061d78481b550615452dfba2428535d7b0665ce421abfdd1902ede0e83f7110 SHA512 20833c774705f83ec7efc88a7605c925ea5e56536a2338c6bd3a65ae789ffa7fabb03206b396fd92fb8ccf13cf0d72dbecdf705780e345a2cb1804783623e420 -DIST duply_1.11.3.tgz 44198 BLAKE2B 368c8a5d145068da00fccb970188bc64574365517211d3eca253c34f820dd520777f56ebc0dfddeca2fc910558e73bf6a2adac6287422b47d5a5751d43a74b86 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457 -DIST duply_1.9.2.tgz 36222 BLAKE2B e1c028423eb8631598b662ad33f3cf24088f11e84ba2b28c818aa580eb69f069885af7cef5780fe457357066b88c7077e3b691ca5a87fc02f429fa416aa39f70 SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e -DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec -DIST duply_2.0.2.tgz 45406 BLAKE2B 46299930a2e05c5d3759e7a90a6bab8b41b28bdab95c945f1bbb5977d78cf5b72090edfb10bd69b2539c65b7c3804d45eb6b400866c6337fc4acdc283f8003e0 SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a -DIST duply_2.0.3.tgz 45542 BLAKE2B 101e19712546c71af16f5988f1d1a70139414b03fa6abcf9b82b8a656a9fd7385b4c9f524eb0e62e3af1b9d0b9a494e47505f2c829d39745c8b88ce56e6608a6 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1 -DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358 +DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8 diff --git a/app-backup/duply/duply-1.11.2.ebuild b/app-backup/duply/duply-1.11.2.ebuild deleted file mode 100644 index 4ac44196694c..000000000000 --- a/app-backup/duply/duply-1.11.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - dodoc CHANGELOG.txt - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-1.11.3.ebuild b/app-backup/duply/duply-1.11.3.ebuild deleted file mode 100644 index a68497432cd5..000000000000 --- a/app-backup/duply/duply-1.11.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - dodoc CHANGELOG.txt - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-1.9.2.ebuild b/app-backup/duply/duply-1.9.2.ebuild deleted file mode 100644 index 19baa7a47c0a..000000000000 --- a/app-backup/duply/duply-1.9.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-2.0.1.ebuild b/app-backup/duply/duply-2.0.1.ebuild deleted file mode 100644 index 9b784d8c149f..000000000000 --- a/app-backup/duply/duply-2.0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - dodoc CHANGELOG.txt - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-2.0.2.ebuild b/app-backup/duply/duply-2.0.2.ebuild deleted file mode 100644 index 8eddec6aefe9..000000000000 --- a/app-backup/duply/duply-2.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - dodoc CHANGELOG.txt - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-2.0.3.ebuild b/app-backup/duply/duply-2.0.3.ebuild deleted file mode 100644 index 8eddec6aefe9..000000000000 --- a/app-backup/duply/duply-2.0.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit readme.gentoo-r1 - -DESCRIPTION="A shell frontend for duplicity" -HOMEPAGE="http://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/txt2man" -RDEPEND="app-backup/duplicity" - -S=${WORKDIR}/${PN}_${PV} - -src_install() { - dobin ${PN} - ./${PN} txt2man > ${PN}.1 || die - doman ${PN}.1 - dodoc CHANGELOG.txt - readme.gentoo_create_doc -} diff --git a/app-backup/duply/duply-2.2.2.ebuild b/app-backup/duply/duply-2.3.1.ebuild index 59e8e9f1f657..0fbf1c602199 100644 --- a/app-backup/duply/duply-2.2.2.ebuild +++ b/app-backup/duply/duply-2.3.1.ebuild @@ -1,15 +1,15 @@ -# Copyright 2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A shell frontend for duplicity" HOMEPAGE="https://duply.net" -SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/${PN}_${PV}.tgz" +SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/$(ver_cut 1-2).x/${PN}_${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND="app-text/txt2man" RDEPEND="app-backup/duplicity" diff --git a/app-backup/duply/files/README.gentoo b/app-backup/duply/files/README.gentoo deleted file mode 100644 index 99d9a1320473..000000000000 --- a/app-backup/duply/files/README.gentoo +++ /dev/null @@ -1,4 +0,0 @@ -If you use duply at the first time please have a -look at the the usage help text "duply usage" -for further information." - diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml index 928760c70b3e..3c4d7b24b1c3 100644 --- a/app-backup/duply/metadata.xml +++ b/app-backup/duply/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">ftplicity</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="sourceforge">ftplicity</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/flexbackup/Manifest b/app-backup/flexbackup/Manifest deleted file mode 100644 index 911a0b667075..000000000000 --- a/app-backup/flexbackup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flexbackup-1.2.1.tar.gz 80158 BLAKE2B 0e54c275ddd218184195bb5bc873db10ab144409eed9d87410e5b7ba5ed09297fbdb58f3eb69b5d55c1ec727fe79f51b376914542ba5eae70ab4f87351b6dd4c SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch deleted file mode 100644 index bf5ea230c85c..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: flexbackup -=================================================================== ---- flexbackup (revision 808) -+++ flexbackup (working copy) -@@ -1155,7 +1155,7 @@ - $cmd .= "$::path{afio} -o "; - $cmd .= "$no_compress "; - $cmd .= "-z "; -- $cmd .= "-1 m "; -+ $cmd .= "-1 mC "; - $cmd .= "$::afio_z_flag "; - $cmd .= "$::afio_verb_flag "; - $cmd .= "$::afio_sparse_flag "; diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch deleted file mode 100644 index a9da86a8e135..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- flexbackup 2005-06-16 20:28:04.577086588 -0700 -+++ flexbackup 2005-06-16 22:21:14.787322560 -0700 -@@ -5396,10 +5396,10 @@ - my $shell = $1; - my $ver = $2; - if ($shell eq 'bash') { -- if ($ver =~ m/^2/) { -- $::shelltype{$host} = 'bash2'; -- } else { -+ if ($ver =~ m/^1/) { - $::shelltype{$host} = 'bash1'; -+ } else { -+ $::shelltype{$host} = 'bash2'; - } - } else { - $::shelltype{$host} = $shell; - - diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch deleted file mode 100644 index 95fa79ba606d..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- flexbackup 2003-10-10 15:12:09.000000000 +0100 -+++ flexbackup 2007-01-15 01:08:18.000000000 +0000 -@@ -687,6 +687,8 @@ - $filename .= ".zip"; - } elsif ($cfg::compress eq "compress") { - $filename .= ".Z"; -+ } elsif ($cfg::compress eq "lzma") { -+ $filename .= ".lzma"; - } - } elsif ($cfg::type eq "afio") { - # tag these a little different, the archive file itself isn't a -@@ -701,6 +703,8 @@ - $filename .= "-zip"; - } elsif ($cfg::compress eq "compress") { - $filename .= "-Z"; -+ } elsif ($cfg::compress eq "lzma") { -+ $filename .= "-lzma"; - } - } - -@@ -2700,7 +2704,7 @@ - # First check if things are defined in the config file - # Checks exist, true/false, or one of options - &checkvar(\$cfg::type,'type','dump afio cpio tar star pax zip ar shar lha copy rsync filelist','tar'); -- &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware','gzip'); -+ &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware lzma','gzip'); - &checkvar(\$cfg::compr_level,'compr_level','exist','4'); - &checkvar(\$cfg::verbose,'verbose','bool','true'); - &checkvar(\$cfg::sparse,'sparse','bool','true'); -@@ -3001,6 +3005,16 @@ - $::z = " | $::path{zip} -$cfg::compr_level - -"; - $::unz = "$::path{funzip} | "; - } -+ } elsif ($cfg::compress eq "lzma") { -+ $::path{'lzma'} = &checkinpath($cfg::compress); -+ push(@::remoteprogs, $::path{$cfg::compress}); -+ if ($cfg::compr_level !~ m/^[123456789]$/) { -+ push(@::errors,"\$compr_level must be set to 1-9"); -+ } else { -+ $::z = " | $::path{$cfg::compress} -$cfg::compr_level "; -+ } -+ $::unz = "$::path{$cfg::compress} -d | "; -+ - } else { - $::z = ""; - $::unz = ""; -@@ -3252,6 +3266,10 @@ - $::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z"; - $::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z"; - -+ } elsif ($cfg::compress eq "lzma") { -+ $::afio_z_flag = "-P $::path{$cfg::compress} -Q -$cfg::compr_level -Z"; -+ $::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Z"; -+ - } - $::unz = ""; # Reset & just use this for reading the archive file. - -@@ -3415,7 +3433,7 @@ - $::path{'lha'} = &checkinpath('lha'); - push(@::remoteprogs, $::path{'lha'}); - -- if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip)$/) { -+ if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip|lzma)$/) { - warn("Using type \"lha\" with compress=$cfg::compress makes no sense"); - warn("Setting compression to false"); - $::unz = ""; -@@ -3781,7 +3799,7 @@ - - # Try and guess file types and commpression scheme - # might as well since we are reading from a file in this case -- if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip)$/) { -+ if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip|lzma)$/) { - $cfg::type = $1; - $cfg::compress = $2; - $cfg::type =~ s/^a$/ar/; -@@ -3789,16 +3807,18 @@ - $cfg::compress =~ s/bz2/bzip2/; - $cfg::compress =~ s/lzo/lzop/; - $cfg::compress =~ s/Z/compress/; -+ $cfg::compress =~ s/lzma/lzma/; - &log("| Auto-set to type=$cfg::type compress=$cfg::compress"); - &optioncheck(); # redo to set a few variables over - -- } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip)$/) { -+ } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip|lzma)$/) { - $cfg::type = "afio"; - $cfg::compress = $1; - $cfg::compress =~ s/gz/gzip/; - $cfg::compress =~ s/bz2/bzip2/; - $cfg::compress =~ s/lzo/lzop/; - $cfg::compress =~ s/Z/compress/; -+ $cfg::compress =~ s/lzma/lzma/; - &log("| Auto-set to type=$cfg::type compress=$cfg::compress"); - &optioncheck(); # redo to set a few variables over - -@@ -5686,3 +5706,5 @@ - - return($spinner[$index]); - } -+ -+ ---- flexbackup.conf 2007-01-15 01:11:36.000000000 +0000 -+++ flexbackup.conf.new 2007-01-15 01:21:46.000000000 +0000 -@@ -33,8 +33,8 @@ - $prune{'/'} = "tmp proc"; - - # Compression --$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware --$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip) -+$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma -+$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip/lzma) - - # Buffering program - to help streaming - $buffer = 'false'; # one of false/buffer/mbuffer diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch deleted file mode 100644 index d22e40f24c26..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch +++ /dev/null @@ -1,130 +0,0 @@ -Common subdirectories: flexbackup-1.2.1-r3/contrib and flexbackup-1.2.1-r4/contrib -diff -ubB flexbackup-1.2.1-r3/flexbackup flexbackup-1.2.1-r4/flexbackup ---- flexbackup-1.2.1-r3/flexbackup 2007-04-14 17:03:34.000000000 -0400 -+++ flexbackup-1.2.1-r4/flexbackup 2007-04-14 17:09:48.000000000 -0400 -@@ -442,7 +442,7 @@ - # Get rid of trailing / - $dir = &nuke_trailing_slash($dir); - -- # If level is icremental for the set, each dir might -+ # If level is incremental for the set, each dir might - # have a different numeric level - if (!defined($::set_incremental)) { - $level = $::level; -@@ -3090,7 +3090,7 @@ - push(@::remoteprogs, $::path{'mbuffer'}); - - my $megs = $cfg::buffer_megs . "M"; -- my $bufcmd = "$::path{mbuffer} -q -m $megs -p $cfg::buffer_fill_pct $mbuffer_blk_flag "; -+ my $bufcmd = "$::path{mbuffer} -q -m $megs -P $cfg::buffer_fill_pct $mbuffer_blk_flag "; - - $::buffer_cmd = " | $bufcmd"; - $::write_cmd = "$bufcmd -f -o "; -@@ -4884,18 +4884,24 @@ - } - - if (defined(%{$::prune{$prunekey}})) { -+ my $rex; - # FreeBSD needs -E (above) and no backslashes around the (|) chars - if ($::uname =~ /FreeBSD/) { -- $cmd .= '-regex "\./('; -- $cmd .= join('|', keys %{$::prune{$prunekey}}); -- $cmd .= ')/.*" '; -- } else { -- $cmd .= '-regex "\./\('; -- $cmd .= join('\|', keys %{$::prune{$prunekey}}); -- $cmd .= '\)/.*" '; -- } -+ $rex = '-regex "\./('; -+ $rex .= join('|', keys %{$::prune{$prunekey}}); -+ $rex .= ')/.*" '; -+ } else { -+ $rex = '-regex "\./\('; -+ $rex .= join('\|', keys %{$::prune{$prunekey}}); -+ $rex .= '\)/.*" '; -+ } -+ # Show what the darn thing is constructing for prune expressions. -+ &log("| \"find\" regex for pruning is: $rex"); -+ $cmd .= $rex; - $cmd .= '-prune -o '; - } else { -+ # Show what the darn thing is constructing for prune expressions. -+ &log("| No pruning defined for this tree."); - # Can't use find -depth with -prune (see single unix spec etc) - # (not toally required anyway, only if you are archiving dirs you - # don't have permissions on and are running as non-root) -diff -ubB flexbackup-1.2.1-r3/flexbackup.conf flexbackup-1.2.1-r4/flexbackup.conf ---- flexbackup-1.2.1-r3/flexbackup.conf 2007-04-14 17:03:35.000000000 -0400 -+++ flexbackup-1.2.1-r4/flexbackup.conf 2007-04-14 17:09:48.000000000 -0400 -@@ -30,6 +30,45 @@ - # A space-separated list of directories to prune from each backup. - # Key is a filesystem or host:dir spec as outlined above - # regular expressions allowed (not shell-type wildcards!) -+# -+# Note: These directories are actually regular expressions and must -+# match "find" output relative to the path of the current backup set. This -+# means that different exclusions are needed for different backup sets. -+# This is a little tricky, so, read on. -+# -+# The regular expressions are processed by "find" but, before "find" is run, -+# FlexBackup changes into the base directory of the backup set in progress. -+# FlexBackup then runs "find" with a path of "." which means all output lines -+# start with "./". To be helpful, FlexBackup packages each space-separated -+# prune directory as follows. If you have a prune list like this -+# -+# $prune{'/somedir'} = "one two three"; -+# -+# then, the constructed -regex argument to "find" looks like this -+# -+# -regex "\./\(one\|two\|three\)/.*" -+# -+# The last thing you need to know is that FlexBackup only uses the prune -+# terms that match the current base directory in the set you're backing -+# up. For example, if your backup set definition looks like this -+# -+# $set{'daily'} = "/home /root /var /usr"; -+# -+# and you want to do some exclusions in "/home" and "/var" (but not the other -+# directories), you must set up a prune list for those two directories -+# separately. For example, to exclude bert's and ernie's home directories plus -+# /var/tmp, you would need the following: -+# -+# $prune{'/home'} = "bert ernie"; -+# $prune{'/var'} = "tmp"; -+# -+# In particular, combining these *does not* work. For example, this -+# -+# $prune{'/'} = "home/bert home/ernie var/tmp"; -+# -+# does not work, unless, of course, your backup set is backing up "/", -+# which our example is not. -+# - $prune{'/'} = "tmp proc"; - - # Compression -@@ -84,7 +123,8 @@ - # True to try and preserve file access times during backup, if the selected - # archive program can do so. Note that if this is true, -cnewer checks (file - # permission/status changes only, not content) are turned off when deciding --# which files to archive on the local system. -+# which files to archive on the local system. This is because preserving the -+# access time changes the permission/status change time in the filesystem. - $atime_preserve = 'false'; - - # Span across filesytems? ("dump" will ignore this option) -@@ -97,8 +137,13 @@ - # leading directories (the filesystem specs above or the "-dir" flag). - # Matches paths, not filenames, so put .* on the front/back as needed. - # Comment these out to exclude nothing. --$exclude_expr[0] = '.*/[Cc]ache/.*'; --$exclude_expr[1] = '.*~$'; -+# -+# Note: The first example line breaks portage in a restored backup because -+# "/usr/lib/portage/pym/cache" is not backed up. Way too general! The moral -+# of this story is, be very careful with global excludes. The second example -+# is probably okay. -+# $exclude_expr[0] = '.*/[Cc]ache/.*'; -+# $exclude_expr[1] = '.*~$'; - - # If true (default), and using a tape device, level zero "set" backups - # assume you want to erase and use a new tape for each set. If false, level diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch deleted file mode 100644 index 2976eab916f1..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- flexbackup.~1~ 2010-10-09 13:19:27.633694860 +0200 -+++ flexbackup 2010-10-09 13:21:52.396818511 +0200 -@@ -133,6 +133,9 @@ - # tar has a limit of this many chars in its volume label - $::tar_max_label = 99; - -+# Define the prune hash to avoid warnings with perl 5.12 -+use vars qw( %prune ); -+ - # Get commandline flags - %::opt = (); - if (! &::GetOptions(\%::opt, -@@ -1050,6 +1053,6 @@ - } else { - $prunekey = $dir; - } -- if (defined(%{$::prune{$prunekey}})) { -+ if (defined($prune{$prunekey})) { - &log("| NOTE: \$prune is ignored for type=dump"); - } -@@ -4885,7 +4885,7 @@ - $prunekey = $dir; - } - -- if (defined(%{$::prune{$prunekey}})) { -+ if (defined($prune{$prunekey})) { - my $rex; - # FreeBSD needs -E (above) and no backslashes around the (|) chars - if ($::uname =~ /FreeBSD/) { diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch deleted file mode 100644 index 285cf26313f9..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- flexbackup 2010-12-30 08:09:10.000000000 +0100 -+++ flexbackup 2013-12-24 15:44:25.000000000 +0100 -@@ -2688,7 +2688,7 @@ - } - - # Flag old config file -- if (defined(@cfg::filesystems) or defined($cfg::mt_var_blksize)) { -+ if (@cfg::filesystems or $cfg::mt_var_blksize) { - # so strict shuts up - my $junk = @cfg::filesystems; - $junk = $cfg::mt_var_blksize; diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch deleted file mode 100644 index 35081932e6f1..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -ub flexbackup-old/flexbackup flexbackup-new/flexbackup ---- flexbackup-old/flexbackup 2007-05-11 20:14:13.000000000 -0400 -+++ flexbackup-new/flexbackup 2007-05-11 20:22:36.000000000 -0400 -@@ -3085,7 +3085,6 @@ - $::read_cmd = "$bufcmd $read_flags"; - - } elsif ($cfg::buffer eq "mbuffer") { -- - $::path{'mbuffer'} = &checkinpath('mbuffer'); - push(@::remoteprogs, $::path{'mbuffer'}); - -@@ -3101,7 +3100,6 @@ - } - } - } else { -- - # If buffering disabled, use dd or cat depending on if blocking turned off on not - if ($cfg::blksize eq '0') { - $::buffer_cmd = ""; -@@ -4887,18 +4885,19 @@ - my $rex; - # FreeBSD needs -E (above) and no backslashes around the (|) chars - if ($::uname =~ /FreeBSD/) { -- $rex = '-regex "\./('; -+ $rex = '"\./('; - $rex .= join('|', keys %{$::prune{$prunekey}}); -- $rex .= ')/.*" '; -+ $rex .= ')"'; - } else { -- $rex = '-regex "\./\('; -+ $rex = '"\./\('; - $rex .= join('\|', keys %{$::prune{$prunekey}}); -- $rex .= '\)/.*" '; -+ $rex .= '\)"'; - } - # Show what the darn thing is constructing for prune expressions. -- &log("| \"find\" regex for pruning is: $rex"); -- $cmd .= $rex; -- $cmd .= '-prune -o '; -+ &log("| \"find\" regex for pruning is:"); -+ &log("| $rex"); -+ &line(); -+ $cmd .= '-regex ' . $rex . ' -prune -o '; - } else { - # Show what the darn thing is constructing for prune expressions. - &log("| No pruning defined for this tree."); -diff -ub flexbackup-old/flexbackup.1 flexbackup-new/flexbackup.1 ---- flexbackup-old/flexbackup.1 2007-05-11 20:14:13.000000000 -0400 -+++ flexbackup-new/flexbackup.1 2007-05-11 20:09:58.000000000 -0400 -@@ -48,7 +48,7 @@ - Extract (restore) the files listed in text file \(dqfilelist\(dq into your - current working directory. - .TP --\fBflexbackup\fR \fI-extract\fR \fI-flist\fR <\fIfilename\fR> -+\fBflexbackup\fR \fI-extract\fR \fI-onefile\fR <\fIfilename\fR> - Extract (restore) the single file named \(dqfilename\(dq into your current - working directory. - .TP -diff -ub flexbackup-old/flexbackup.conf flexbackup-new/flexbackup.conf ---- flexbackup-old/flexbackup.conf 2007-05-11 20:14:13.000000000 -0400 -+++ flexbackup-new/flexbackup.conf 2007-05-11 20:26:48.000000000 -0400 -@@ -28,10 +28,10 @@ - - # Subtree pruning - # A space-separated list of directories to prune from each backup. --# Key is a filesystem or host:dir spec as outlined above --# regular expressions allowed (not shell-type wildcards!) -+# Key is a filesystem or host:dir spec as outlined above. -+# Regular expressions are allowed (not shell-type wildcards!) - # --# Note: These directories are actually regular expressions and must -+# Note: These "directories" are actually regular expressions and must - # match "find" output relative to the path of the current backup set. This - # means that different exclusions are needed for different backup sets. - # This is a little tricky, so, read on. -@@ -46,9 +46,11 @@ - # - # then, the constructed -regex argument to "find" looks like this - # --# -regex "\./\(one\|two\|three\)/.*" -+# -regex "\./(one|two|three)" - # --# The last thing you need to know is that FlexBackup only uses the prune -+# (with characters escaped as necessary depending on your environment). -+# -+# Another thing you need to know is that FlexBackup only uses the prune - # terms that match the current base directory in the set you're backing - # up. For example, if your backup set definition looks like this - # -@@ -66,9 +68,16 @@ - # - # $prune{'/'} = "home/bert home/ernie var/tmp"; - # --# does not work, unless, of course, your backup set is backing up "/", -+# doesn't work, unless, of course, your backup set is backing up "/", - # which our example is not. - # -+# Many other complex and abstruse variations are possible. Here's one -+# interesting corner case. If you want to preserve a directory but none of its -+# contents, you can do it. Picking on ernie from our previous example, preserve -+# only his home directory: -+# -+# $prune{'/home'} = "ernie/.*"; -+# - $prune{'/'} = "tmp proc"; - - # Compression -@@ -138,10 +147,10 @@ - # Matches paths, not filenames, so put .* on the front/back as needed. - # Comment these out to exclude nothing. - # --# Note: The first example line breaks portage in a restored backup because --# "/usr/lib/portage/pym/cache" is not backed up. Way too general! The moral --# of this story is, be very careful with global excludes. The second example --# is probably okay. -+# Gentoo note: The first example line breaks portage in a restored backup -+# because "/usr/lib/portage/pym/cache" is not backed up. Way too general! -+# The moral of this story is, be very careful with global excludes. The -+# second example is probably okay. - # $exclude_expr[0] = '.*/[Cc]ache/.*'; - # $exclude_expr[1] = '.*~$'; - -diff -ub flexbackup-old/flexbackup.conf.5 flexbackup-new/flexbackup.conf.5 ---- flexbackup-old/flexbackup.conf.5 2007-05-11 20:14:13.000000000 -0400 -+++ flexbackup-new/flexbackup.conf.5 2007-05-11 20:09:58.000000000 -0400 -@@ -40,7 +40,9 @@ - \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR; - Configure subtree pruning. A space-separated list of directories to prune from - each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as --outlined above regular expressions allowed (not shell-type wildcards!). -+outlined above. Regular expressions allowed (not shell-type wildcards!). There -+is additional explanation (and a lot of examples) in the provided configuration -+file. - .TP - \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR; - .TQ diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch deleted file mode 100644 index 4d9ad8f4e4c7..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: flexbackup -=================================================================== ---- flexbackup (revision 814) -+++ flexbackup (revision 891) -@@ -2419,7 +2419,7 @@ - if (! -r "$configfile") { - die("config file $configfile: $OS_ERROR"); - } -- system("perl -c \"$configfile\""); -+ system("perl -c \"$configfile\" 2>&1"); - if ($CHILD_ERROR) { - die("syntax error in config file $configfile"); - } diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch deleted file mode 100644 index 3d473b9810ce..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch +++ /dev/null @@ -1,59 +0,0 @@ -Common subdirectories: flexbackup-1.2.1-r4/contrib and flexbackup-1.2.1-r5/contrib -diff -ubB flexbackup-1.2.1-r4/flexbackup flexbackup-1.2.1-r5/flexbackup ---- flexbackup-1.2.1-r4/flexbackup 2007-04-14 17:09:48.000000000 -0400 -+++ flexbackup-1.2.1-r5/flexbackup 2007-04-14 17:23:20.000000000 -0400 -@@ -5276,6 +5276,7 @@ - my $tmp_script = "$cfg::tmpdir/buftest.$host.$PROCESS_ID.sh"; - my $retval = 0; - my $pipecmd; -+ my $explicit_success; - - $buffer_cmd =~ s:^\s*\|\s*::; - $buffer_cmd =~ s:\s*\|\s*$::; -@@ -5290,7 +5291,7 @@ - print SCR "res=\$?\n"; - print SCR "out=\`cat \$tmp_err\`\n"; - print SCR "if [ \$res -eq 0 ]; then\n"; -- print SCR " echo successful\n"; -+ print SCR " echo \"successful\"\n"; - print SCR "else\n"; - print SCR " echo \"unsuccessful: exit code \$res: \$out\" \n"; - print SCR "fi\n"; -@@ -5302,13 +5303,19 @@ - $pipecmd = "sh $tmp_script "; - } else { - print $::msg "| Checking '$cfg::buffer' on host $host... "; -- $pipecmd = "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -f $tmp_script')"; -+ $pipecmd = "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')"; - } - - if (!defined($::debug)) { - - open(PIPE,"$pipecmd |") || die; -+ -+ $explicit_success = 0; - while (<PIPE>) { -+ if (/^successful$/) { -+ $explicit_success = 1; -+ last; -+ } - if (/^unsuccessful: exit code (\d+): (.*)/) { - $retval = $1; - my $out = $2; -@@ -5337,11 +5344,15 @@ - print $::msg "\n(debug) $pipecmd\n"; - } - -- if ($retval == 0) { -+ if ($explicit_success) { - print $::msg "Ok\n"; - } else { -+ if ($retval == 0) { -+ push(@::errors, "Unanticipated problems encountered testing '$cfg::buffer' on host '$host'."); -+ } else { - print $::msg "Failed!\n"; - } -+ } - unlink("$tmp_script"); - - return($retval); diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch deleted file mode 100644 index 9242f01efcfb..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/flexbackup 2003-10-10 07:12:09.000000000 -0700 -+++ b/flexbackup 2006-05-14 13:14:54.000000000 -0700 -@@ -269,6 +269,7 @@ - untie(%::index); - } - -+system ('rm', '-rf', $cfg::tmpdir); - exit(0); - - ###################################################################### -@@ -811,6 +812,11 @@ - ($remove, @cmds) = &backup_filelist($label, $localdir, $title, $level, $remote); - } - -+ if(defined($remote)) { -+ # create our temporary directory as first remote command -+ unshift(@cmds, &maybe_remote_cmd("$::path{mkdir} -p $cfg::tmpdir", $remote)); -+ } -+ - # Nuke any tmp files used in the above routines - if ($remove ne '') { - push(@cmds, &maybe_remote_cmd("$::path{rm} -f $remove", $remote)); -@@ -827,6 +833,11 @@ - push(@cmds, &maybe_remote_cmd("$::path{rm} -f $pkglist", $remote)); - } - } -+ -+ if(defined($remote)) { -+ # remove temporary directory as our last remote command -+ push(@cmds, &maybe_remote_cmd("$::path{rm} -rf $cfg::tmpdir", $remote)); -+ } - - # Strip multiple spaces - foreach my $cmd (@cmds) { -@@ -2750,8 +2761,9 @@ - $::path{'find'} = &checkinpath('find'); - $::path{'dd'} = &checkinpath('dd'); - $::path{'printf'} = &checkinpath('printf'); -+ $::path{'mkdir'} = &checkinpath('mkdir'); - -- push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'})); -+ push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'})); - - # Check device (or dir) - $::ftape = 0; -@@ -3442,6 +3454,15 @@ - push(@::errors,"\$tmpdir $cfg::tmpdir is not writable"); - } - -+ $cfg::hostname = `hostname`; -+ chomp($cfg::hostname); -+ -+ # Use a subdirectory of the user-specified directory as our tmpdir -+ # Also note that we make it closer to globally unique as we sometimes -+ # use this variable for remote systems, so PID isn't enough -+ $cfg::tmpdir = $cfg::tmpdir .'/flexbackup.'.$$.'.'.$cfg::hostname; -+ mkdir ($cfg::tmpdir) || die "Can't create temporary directory, $!"; -+ - # Levels - if (defined($::opt{'level'}) and - (defined($::opt{'incremental'}) or -@@ -5236,8 +5257,8 @@ - # Create a script which tests the buffer program - open(SCR,"> $tmp_script") || die; - print SCR "#!/bin/sh\n"; -- print SCR "tmp_data=/tmp/bufftest\$\$.txt\n"; -- print SCR "tmp_err=/tmp/bufftest\$\$.err\n"; -+ print SCR "tmp_data=\`tempfile\`\n"; -+ print SCR "tmp_err=\`tempfile\`\n"; - print SCR "echo testme > \$tmp_data\n"; - print SCR "$buffer_cmd > /dev/null 2> \$tmp_err < \$tmp_data\n"; - print SCR "res=\$?\n"; diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch deleted file mode 100644 index 1e9ea220ebf5..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch +++ /dev/null @@ -1,296 +0,0 @@ -Index: flexbackup -=================================================================== ---- flexbackup (.../tags/flexbackup-1.2.1-r5) (revision 784) -+++ flexbackup (.../trunk) (revision 784) -@@ -1301,8 +1301,8 @@ - $cmd .= "$::unz"; - } - $cmd .= "("; -- $cmd .= "mkdir -p $::device ; "; -- $cmd .= "cd $::device ; "; -+ $cmd .= "mkdir -p \"$::device\" ; "; -+ $cmd .= "cd \"$::device\" ; "; - $cmd .= "$::path{cpio} -i "; - $cmd .= "-m "; - $cmd .= "-d "; -@@ -1351,9 +1351,8 @@ - - # Have to take leading './' off to make rsync's include/exclude work right - $cmd .= " | $::path{sed} -e \"s/\\.\\///g\" | "; -- - $cmd .= "$::path{rsync} "; -- $cmd .= "--include-from=- --exclude=* "; -+ $cmd .= "--files-from=- "; - $cmd .= "--archive "; - $cmd .= "$::rsync_verb_flag "; - $cmd .= "--delete --delete-excluded "; -@@ -1368,7 +1367,7 @@ - $cmd .= "$remote:"; - } - } -- $cmd .= "$dir/ $::device"; -+ $cmd .= "\"$dir/\" \"$::device\""; - - push(@cmds, $cmd); - -@@ -1658,7 +1657,9 @@ - my $tmpfile = "$cfg::tmpdir/ar.$PROCESS_ID"; - my $remove = ''; - -- &log("| NOTE: ar archives will not descend directories"); -+ &log("| NOTE: ar archives will not recurse into subdirectories,"); -+ &log("| which makes them inappropriate for most backups."); -+ &log("| Be sure this is what you want."); - - if (defined($remote) and ($level != 0)) { - my $time = &get_last_date($label, $level, 'numeric'); -@@ -1682,11 +1683,13 @@ - $cmd = "cd \"$dir\" && "; - $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote, '-maxdepth 1 ! -type d'); - $cmd .= "> $filelist; "; -+ # Escape any spaces in filenames. -+ $cmd .= "$::path{sed} -i -e 's/ /\\\\ /g' $filelist; "; - - $cmd .= "$::path{ar} rc"; - $cmd .= "$::ar_verb_flag "; - $cmd .= "$tmpfile "; -- $cmd .= "`$::path{cat} $filelist`"; -+ $cmd .= "\@$filelist "; - $cmd .= "; $::path{cat} $tmpfile $::z"; - - # Buffer both sides if remote -@@ -1800,12 +1803,9 @@ - - $cmd = "cd \"$dir\" && "; - $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote); -- $cmd .= "> $filelist; "; -- -- $cmd .= "$::path{lha} a"; -+ $cmd .= " | $::path{lha} a"; - $cmd .= "$::lha_verb_flag "; - $cmd .= "$tmpfile "; -- $cmd .= "`$::path{cat} $filelist`"; - $cmd .= "; $::path{cat} $tmpfile $::z"; - - # Buffer both sides if remote -@@ -2766,6 +2766,7 @@ - $::path{'dd'} = &checkinpath('dd'); - $::path{'printf'} = &checkinpath('printf'); - $::path{'mkdir'} = &checkinpath('mkdir'); -+ $::path{'sed'} = &checkinpath('sed'); - - push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'})); - -@@ -4894,9 +4895,9 @@ - $rex .= '\)"'; - } - # Show what the darn thing is constructing for prune expressions. -- &log("| \"find\" regex for pruning is:"); -- &log("| $rex"); -- &line(); -+ (my $temp = $rex) =~ s/\\([()|])/$1/g; -+ &log("| \"find\" regex for pruning (shell escaping omitted for clarity) is:"); -+ &log("| $temp"); - $cmd .= '-regex ' . $rex . ' -prune -o '; - } else { - # Show what the darn thing is constructing for prune expressions. -@@ -4906,6 +4907,7 @@ - # don't have permissions on and are running as non-root) - $cmd .= "-depth "; - } -+ &line(); - - $cmd .= "$::mountpoint_flag "; - $cmd .= "! -type s "; -@@ -5301,12 +5303,14 @@ - print $::msg "| Checking '$cfg::buffer' on this machine... "; - $pipecmd = "sh $tmp_script "; - } else { -+ $pipecmd = -+ "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; " . -+ "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; " . -+ "sh $tmp_script; rm -rf $cfg::tmpdir')"; - print $::msg "| Checking '$cfg::buffer' on host $host... "; -- $pipecmd = "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')"; - } - - if (!defined($::debug)) { -- - open(PIPE,"$pipecmd |") || die; - - $explicit_success = 0; -Index: flexbackup.conf -=================================================================== ---- flexbackup.conf (.../tags/flexbackup-1.2.1-r5) (revision 784) -+++ flexbackup.conf (.../trunk) (revision 784) -@@ -12,19 +12,27 @@ - - # Configure backup "sets". - # Not needed if you use "-dir <dir>" to backup one tree at a time. --# Each set is a simple space-separated list of filesystems --# Remote filesystems should denoted as 'host:dir' --# You can use anything (other than 'all') as set names --# --# Example: --# $set{'set1'} = "/home /usr"; --# $set{'set2'} = "/dir3 machine2:/dir4 machine3:/dir5"; -+# Each set is a simple space-separated list of filesystems. Remote filesystems -+# should denoted as 'host:dir'. If the filesystem name (local or remote) -+# contains spaces, then it should be enclosed in its entirety in double quotes. -+# Multiple quoted filesystems included in a set should be space separated just -+# like unquoted filesystem. The Perl '.' string concatenation operator can be -+# used to split excessively long lines. -+# -+# You can use anything (other than 'all') as set names. -+# -+# Examples: -+# $set{'set1'} = '/home /usr'; -+# $set{'set2'} = '/dir3 machine2:/dir4 machine3:/dir5'; -+# $set{'set3'} = -+# '"/mnt/winmachine1/Documents and Settings" ' . -+# '"/mnt/winmachine1/Program Files"'; - # - # "-set all" will back up all defined sets. If you are doing a full backup - # using tapes, each "set" will go onto a different tape and you will be - # prompted for tape change in between. - # --$set{'backup'} = "/home"; -+$set{'backup'} = '/home'; - - # Subtree pruning - # A space-separated list of directories to prune from each backup. -@@ -42,7 +50,7 @@ - # start with "./". To be helpful, FlexBackup packages each space-separated - # prune directory as follows. If you have a prune list like this - # --# $prune{'/somedir'} = "one two three"; -+# $prune{'/somedir'} = 'one two three'; - # - # then, the constructed -regex argument to "find" looks like this - # -@@ -54,31 +62,38 @@ - # terms that match the current base directory in the set you're backing - # up. For example, if your backup set definition looks like this - # --# $set{'daily'} = "/home /root /var /usr"; -+# $set{'daily'} = '/home /root /var /usr'; - # - # and you want to do some exclusions in "/home" and "/var" (but not the other - # directories), you must set up a prune list for those two directories - # separately. For example, to exclude bert's and ernie's home directories plus - # /var/tmp, you would need the following: - # --# $prune{'/home'} = "bert ernie"; --# $prune{'/var'} = "tmp"; -+# $prune{'/home'} = 'bert ernie'; -+# $prune{'/var'} = 'tmp'; - # - # In particular, combining these *does not* work. For example, this - # --# $prune{'/'} = "home/bert home/ernie var/tmp"; -+# $prune{'/'} = 'home/bert home/ernie var/tmp'; - # - # doesn't work, unless, of course, your backup set is backing up "/", - # which our example is not. - # -+# Like the $set configuration item, special handling is required for -+# directories with spaces in them. Double quotes should surround pruning -+# targets but not the key. Example: -+# -+# $prune{'/mnt/winmachine1/Documents and Settings'} = -+# '"user1/Local Settings/Temp" user2'; -+# - # Many other complex and abstruse variations are possible. Here's one - # interesting corner case. If you want to preserve a directory but none of its - # contents, you can do it. Picking on ernie from our previous example, preserve - # only his home directory: - # --# $prune{'/home'} = "ernie/.*"; -+# $prune{'/home'} = 'ernie/.*'; - # --$prune{'/'} = "tmp proc"; -+$prune{'/'} = 'tmp proc'; - - # Compression - $compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma -Index: flexbackup.conf.5 -=================================================================== ---- flexbackup.conf.5 (.../tags/flexbackup-1.2.1-r5) (revision 784) -+++ flexbackup.conf.5 (.../trunk) (revision 784) -@@ -24,25 +24,51 @@ - .TP - \fB$set{\fI'tag'\fR}\fR = \fI'/dir'\fR; - Configure backup \(dqsets\(dq. Not needed if \(dq-dir <dir>\(dq is used to --backup one tree at a time. Each set is a simple space-separated list of --filesystems/directories. Remote filesystems should be denoted as --\(dqhost:directory\(dq. You can use anything (other than \fI'all'\fR) as set --names. Using \(dq-set all\(dq will back up all defined sets. If you are doing --a full backup using tapes, each \(dqset\(dq will go onto a different tape and --you will be prompted for tape change in between. Examples: -+backup one tree at a time. -+Each set is a simple space-separated list of filesystems/directories. -+Remote filesystems should be denoted as \(dqhost:directory\(dq. -+You can use anything (other than \fI'all'\fR) as set names. -+Using \(dq-set all\(dq will back up all defined sets. -+If you are doing a full backup using tapes, each \(dqset\(dq will go onto a -+different tape and you will be prompted for tape change in between. -+Examples: - .RS - .PP - \fB$set{\fI'set1'\fI}\fR = \fI'/home /usr'\fR; - .br - \fB$set{\fI'set2'\fI}\fR = \fI'/dir3 machine2:/dir4 machine3:/dir5'\fR; -+.br -+.PP -+Directories (local or remote) with spaces in their names should be enclosed in -+their entirety in double quotes. -+Multiple quoted directories included in a set should be space separated just -+like unquoted directories. -+The Perl '.' string concatenation operator can be used to split excessively -+long sets. -+Example: -+.PP -+\fB$set{\fI'set3'\fI}\fR = \fI -+ '\(dq/mnt/winmachine1/Documents and Settings\(dq ' . -+ '\(dq/mnt/winmachine1/Program Files\(dq';\fR - .RE - .TP - \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR; - Configure subtree pruning. A space-separated list of directories to prune from - each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as --outlined above. Regular expressions allowed (not shell-type wildcards!). There --is additional explanation (and a lot of examples) in the provided configuration --file. -+outlined above. Regular expressions allowed (not shell-type wildcards!). -+.RS -+.PP -+Like the \fB$set\fR configuration item, special handling is required for -+directories with spaces in them. Double quotes should surround pruning targets -+but not the key. Example: -+.PP -+\fB$prune{\fI'/mnt/winmachine1/Documents and Settings'\fI}\fR = -+ \fI'\(dquser1/Local Settings/Temp\(dq user2'\fR; -+.br -+.PP -+There are lots of examples and additional explanation in the provided sample -+configuration file. -+.RE - .TP - \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR; - .TQ -@@ -207,7 +233,7 @@ - .RS - .TP - If GNU \fBtar\fR is called \fB\(dqgtar\(dq\fR on your system: --\fB$path{'tar'} = 'gtar'; -+\fB$path{'tar'} = 'gtar';\fR - .TP - Or it can be used to \fB\(dqsudo\(dq\fR certain commands: - \fB$path{\fI'find'\fR}\fR = \fI'sudo find'\fR; -@@ -304,3 +330,6 @@ - Written by Edwin Huffstutler (edwinh@computer.org) - .SH "SEE ALSO" - \fBflexbackup\fR(1) -+.\" Local Variables: -+.\" mode: nroff -+.\" End: diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch deleted file mode 100644 index 211cf2067623..000000000000 --- a/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ubBr old/flexbackup new/flexbackup ---- old/flexbackup 2016-12-01 10:52:59.088767278 -0500 -+++ new/flexbackup 2016-12-01 10:54:18.006882216 -0500 -@@ -1408,10 +1408,10 @@ - - $cmd .= "$::path{tar} --create "; - $cmd .= "--null "; -+ $cmd .= "--no-recursion "; - $cmd .= "--files-from=- "; - $cmd .= "--ignore-failed-read "; - $cmd .= "--same-permissions "; -- $cmd .= "--no-recursion "; - $cmd .= "--totals "; - if ($cfg::label ne 'false') { - if (length($title) > $::tar_max_label) { diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild deleted file mode 100644 index 32d3b9f6aaee..000000000000 --- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="Flexible backup script using perl" -HOMEPAGE="http://flexbackup.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc x86" -IUSE="" - -RDEPEND="app-arch/mt-st" -DEPEND="${RDEPEND}" - -DOCS="CHANGES CREDITS README TODO" -HTML_DOCS="faq.html" - -src_prepare() { - # Patch from upstream adds optional lzma compression mode. - eapply -p0 "${FILESDIR}"/${P}-lzma.patch - - # Fix bug #116510: cannot back up remote machines after patch CAN-2005-2965 - eapply "${FILESDIR}"/${P}-secure-tempfile.patch - - # Fix bug #96334: incorrectly determines bash 3.x to be bash 1.x - eapply -p0 "${FILESDIR}"/${P}-bash.patch - - # Fix bug #171205: specifies wrong command line option for mbuffer / other small enhancements - eapply "${FILESDIR}"/${P}-mbuffer-switch.patch - - # Fix bug #173672: remote host buffer test is broken - eapply "${FILESDIR}"/${P}-remote-bufftest.patch - - # Fix bug #178126: subtle subtree pruning issue / other small issues - eapply "${FILESDIR}"/${P}-prune.patch - - # Fix bug #184560: fails to back up targets with spaces in their names in some modes - eapply -p0 "${FILESDIR}"/${P}-spaces-in-filenames.patch - - # Fix bug #190357: fails on very large files with afio back end - eapply -p0 "${FILESDIR}"/${P}-afio-large-files.patch - - # Fix bug #235416: prevent normal status message during conf file read from going to stderr - eapply -p0 "${FILESDIR}"/${P}-quieten.patch - - # Fix bug #331673: perl 5.12 deprecation warnings. - eapply -p0 "${FILESDIR}"/${P}-perl-5.12-deprecation-warning.patch - - # Fix bug #495232: perl 5.16 deprecation warnings. - eapply -p0 "${FILESDIR}"/${P}-perl-5.16-deprecation-warning.patch - - # Fix bug #601368: app-backup/flexbackup breaks with >=app-arch/tar-1.29 when making tar-based backups - eapply "${FILESDIR}"/${P}-tar-1.29.patch - - eapply_user - - sed -i \ - -e '/^\$type = /s:afio:tar:' \ - -e "/^\$buffer = /s:'buffer':'false':" \ - flexbackup.conf \ - || die "Failed to set modified configuration defaults." - - MY_PV=$(replace_all_version_separators '_') - sed -i \ - -e "/^[[:blank:]]*my \$ver = /s:${MY_PV}:&-${PR}:" \ - flexbackup \ - || die "Failed to apply ebuild revision to internal version string." -} - -src_install() { - dodir /etc /usr/bin /usr/share/man/man{1,5} - emake install \ - PREFIX="${D}"/usr \ - CONFFILE="${D}"/etc/flexbackup.conf - - einstalldocs -} - -pkg_postinst() { - elog "Please edit your /etc/flexbackup.conf file to suit your" - elog "needs. If you are using devfs, the tape device should" - elog "be set to /dev/tapes/tape0/mtn. If you need to use any" - elog "archiver other than tar, please emerge it separately." -} diff --git a/app-backup/flexbackup/metadata.xml b/app-backup/flexbackup/metadata.xml deleted file mode 100644 index ee448e7097ec..000000000000 --- a/app-backup/flexbackup/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="sourceforge">flexbackup</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest index 996e63a9f828..02c05d655e7e 100644 --- a/app-backup/fsarchiver/Manifest +++ b/app-backup/fsarchiver/Manifest @@ -1 +1 @@ -DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff +DIST fsarchiver-0.8.7.tar.gz 274350 BLAKE2B c7989a0323c1cebc7add9653d70b5b3d9f32130602ae469ec6fb00834a1af9a0b2af1fb21747d8785505068b2224fe7cd1cde9dfe9b6be4bce87f398b2a18ec7 SHA512 6f7099c9f961f78fc23e6cee57dfb109f0e2e00a707875175e37786ba0abb7a2e6330662f57a4122215c80dff63b8dc1b270690c0f8cc3bedbca83ab857c19b2 diff --git a/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.7.ebuild index 73aeeb7d1cd0..75ce3e9586da 100644 --- a/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild +++ b/app-backup/fsarchiver/fsarchiver-0.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="debug lz4 lzma lzo static zstd" +IUSE="debug lz4 lzma lzo static +zstd" CDEPEND="dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 @@ -23,12 +23,18 @@ CDEPEND="dev-libs/libgcrypt:0= " DEPEND="${CDEPEND} static? ( + app-arch/bzip2[static-libs] + dev-libs/libgcrypt:0=[static-libs] + dev-libs/libgpg-error[static-libs] + sys-apps/util-linux[static-libs] + >=sys-fs/e2fsprogs-1.41.4[static-libs] + sys-libs/zlib[static-libs] lz4? ( app-arch/lz4[static-libs] ) lzma? ( app-arch/xz-utils[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) zstd? ( app-arch/zstd[static-libs] ) )" -RDEPEND="${DDEPEND}" +RDEPEND="${DEPEND}" src_prepare() { default diff --git a/app-backup/fsarchiver/metadata.xml b/app-backup/fsarchiver/metadata.xml index aa5f1ad3b52d..1acd0f4d57f3 100644 --- a/app-backup/fsarchiver/metadata.xml +++ b/app-backup/fsarchiver/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> <upstream> <remote-id type="sourceforge">fsarchiver</remote-id> <remote-id type="github">fdupoux/fsarchiver</remote-id> diff --git a/app-backup/genbackupdata/Manifest b/app-backup/genbackupdata/Manifest deleted file mode 100644 index e9797d8c7591..000000000000 --- a/app-backup/genbackupdata/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST genbackupdata_1.9.orig.tar.xz 14112 BLAKE2B 0d0bb2c68ca473ce5af406547ae42e5a9bdc95a08f7cdb056e0fd1c6539f2485b92fbeca163eabf0c28c93ba787a8fe5e74d54b36a700c0f20798daf62350cf6 SHA512 341c9cfa60f79c5fec7d6b607b2e8080d0768fb9b73622baf48569c91294f537a015ed7a23a57eb0d027dabb6f6d736a8660067e9ef80373a9372d1898043673 diff --git a/app-backup/genbackupdata/genbackupdata-1.9.ebuild b/app-backup/genbackupdata/genbackupdata-1.9.ebuild deleted file mode 100644 index 47ed02014cfc..000000000000 --- a/app-backup/genbackupdata/genbackupdata-1.9.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit distutils-r1 - -DESCRIPTION="Generate test data for backup software testing." -HOMEPAGE="https://liw.fi/genbackupdata/" -#SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/$PN/snapshot/${P}.tar.gz" -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="${PYTHON_DEPS} - dev-python/cliapp[${PYTHON_USEDEP}] - >=dev-python/ttystatus-0.31[${PYTHON_USEDEP}] - " -RDEPEND="${DEPEND}" - -src_compile() { - addwrite /proc/self/comm - distutils-r1_src_compile - emake genbackupdata.1 -} diff --git a/app-backup/genbackupdata/metadata.xml b/app-backup/genbackupdata/metadata.xml deleted file mode 100644 index 4073267daf2a..000000000000 --- a/app-backup/genbackupdata/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>robbat2@gentoo.org</email> - <name>Robin H. Johnson</name> - </maintainer> -</pkgmetadata> diff --git a/app-backup/hdup/hdup-2.0.14.ebuild b/app-backup/hdup/hdup-2.0.14-r2.ebuild index 87d941b00336..ca5c1321e197 100644 --- a/app-backup/hdup/hdup-2.0.14.ebuild +++ b/app-backup/hdup/hdup-2.0.14-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Hdup is backup program using tar, find, gzip/bzip2, mcrypt and ssh" HOMEPAGE="http://www.miek.nl/projects/hdup2/index.html" @@ -12,30 +14,33 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="crypt" -CDEPEND=" +DEPEND=" app-arch/bzip2 app-arch/gzip app-arch/tar >=dev-libs/glib-2.0" RDEPEND=" - ${CDEPEND} - net-misc/openssh + ${DEPEND} + virtual/openssh sys-apps/coreutils sys-apps/findutils crypt? ( app-crypt/mcrypt )" -DEPEND=" - ${CDEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-build-system.patch ) +PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) + +src_prepare() { + default + eautoconf # bug 906003 +} src_install() { HTML_DOCS=( doc/FAQ.html ) default - dodoc Credits + dodoc -r Credits examples insinto /usr/share/${PN} - doins -r contrib examples + doins -r contrib } pkg_postinst() { diff --git a/app-backup/hdup/metadata.xml b/app-backup/hdup/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-backup/hdup/metadata.xml +++ b/app-backup/hdup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-backup/kfoldersync/Manifest b/app-backup/kfoldersync/Manifest deleted file mode 100644 index 20db9216ba82..000000000000 --- a/app-backup/kfoldersync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0 diff --git a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild deleted file mode 100644 index 252fea2b53ce..000000000000 --- a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm - -DESCRIPTION="Folder synchronization and backup tool based on KDE Frameworks" -HOMEPAGE="https://www.linux-apps.com/p/1127677/" -SRC_URI="https://dl.opendesktop.org/api/files/download/id/1485353737/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="amd64 ~arm x86" - -BDEPEND=" - sys-devel/gettext -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/app-backup/kfoldersync/metadata.xml b/app-backup/kfoldersync/metadata.xml deleted file mode 100644 index 14c1d660333e..000000000000 --- a/app-backup/kfoldersync/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <maintainer status="active"> - <email>vindex17@outlook.it</email> - <name>Lorenzo Porta</name> - </maintainer> - <changelog>https://build.opensuse.org/package/view_file/home:Vindex17:myapps/kfoldersync/kfoldersync.changes?expand=1</changelog> - </upstream> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest index b4f9bb767dcf..4f076b6f44c7 100644 --- a/app-backup/kup/Manifest +++ b/app-backup/kup/Manifest @@ -1 +1 @@ -DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8 +DIST kup-0.9.1.tar.xz 205740 BLAKE2B a3200f69e1cd4500b3d74b0ba4bfaa53d63e00c8de73155075c579c7665663fd9285ca4c31e1b8abec62981b6e2d93b93a5db68820727567de77ebcf3d32fda1 SHA512 8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33 diff --git a/app-backup/kup/kup-0.8.0.ebuild b/app-backup/kup/kup-0.9.1.ebuild index ab78240f7021..9227fd533cf8 100644 --- a/app-backup/kup/kup-0.8.0.ebuild +++ b/app-backup/kup/kup-0.9.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" inherit ecm kde.org DESCRIPTION="Backup scheduler for the Plasma desktop" -HOMEPAGE="https://www.linux-apps.com/p/1127689" +HOMEPAGE="https://apps.kde.org/kup/" SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="GPL-2+" @@ -34,8 +34,8 @@ DEPEND=" kde-frameworks/knotifications:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/plasma:5 kde-frameworks/solid:5 + kde-plasma/libplasma:5 " RDEPEND="${DEPEND} dev-qt/qtdeclarative:5 diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml index 2fdbf33d963d..29d54eb24219 100644 --- a/app-backup/kup/metadata.xml +++ b/app-backup/kup/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">system/kup</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/luckybackup/luckybackup-0.5.0.ebuild b/app-backup/luckybackup/luckybackup-0.5.0.ebuild index 038a6912eae7..1740aafb0409 100644 --- a/app-backup/luckybackup/luckybackup-0.5.0.ebuild +++ b/app-backup/luckybackup/luckybackup-0.5.0.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt" -HOMEPAGE="http://luckybackup.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://luckybackup.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" DEPEND=" dev-qt/qtcore:5 diff --git a/app-backup/luckybackup/metadata.xml b/app-backup/luckybackup/metadata.xml index 06fb30b44cd1..5213d130d742 100644 --- a/app-backup/luckybackup/metadata.xml +++ b/app-backup/luckybackup/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">luckybackup</remote-id> </upstream> diff --git a/app-backup/metadata.xml b/app-backup/metadata.xml index 291110abf582..d256fb627846 100644 --- a/app-backup/metadata.xml +++ b/app-backup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The app-backup category contains tools for performing backups of data, @@ -39,4 +39,3 @@ asà como respaldos realizados a otros medios (CD-R, cinta, etc.). </longdescription> </catmetadata> - diff --git a/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch b/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch new file mode 100644 index 000000000000..e9e824d9f019 --- /dev/null +++ b/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/854213 +--- a/mirdir.c ++++ b/mirdir.c +@@ -88,6 +88,7 @@ + #include <fcntl.h> + #include <dirent.h> + #include <time.h> ++#include <unistd.h> + + /* + #include <sys/types.h> diff --git a/app-backup/mirdir/metadata.xml b/app-backup/mirdir/metadata.xml index 5f01d58eb176..75925585e642 100644 --- a/app-backup/mirdir/metadata.xml +++ b/app-backup/mirdir/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/app-backup/mirdir/mirdir-2.1-r2.ebuild b/app-backup/mirdir/mirdir-2.1-r2.ebuild deleted file mode 100644 index 97c44d1b6321..000000000000 --- a/app-backup/mirdir/mirdir-2.1-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Synchronize two directory trees in a fast way" -HOMEPAGE="https://sourceforge.net/projects/mirdir/" -SRC_URI="mirror://sourceforge/${PN}/${P}-Unix.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${P}-UNIX" - -src_prepare() { - default - # Disable stripping, bug 239939 - sed -i -e 's:strip .*::' Makefile.in || die -} - -src_install() { - dobin "bin/${PN}" - doman "${PN}.1" - einstalldocs -} diff --git a/app-backup/mirdir/mirdir-2.1-r3.ebuild b/app-backup/mirdir/mirdir-2.1-r3.ebuild new file mode 100644 index 000000000000..7199a90b6797 --- /dev/null +++ b/app-backup/mirdir/mirdir-2.1-r3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Synchronize two directory trees in a fast way" +HOMEPAGE="https://sourceforge.net/projects/mirdir/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-Unix.tar.gz" +S="${WORKDIR}/${P}-UNIX" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1-implicit-function-decl.patch +) + +src_prepare() { + default + + # Disable stripping, bug #239939 + sed -i -e 's:strip .*::' Makefile.in || die +} + +src_configure() { + # Old autoconf gets this test wrong with -flto(!) and there's + # no source configure.in/.ac in the tarball. bug #854213 + export ac_cv_func_lutime=no + + econf +} + +src_install() { + dobin bin/${PN} + doman ${PN}.1 + + einstalldocs +} diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest index 5193f2f56394..1d734204de8c 100644 --- a/app-backup/mkstage4/Manifest +++ b/app-backup/mkstage4/Manifest @@ -1,3 +1,3 @@ -DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5 -DIST mkstage4-0.2.tar.gz 15998 BLAKE2B 47ce4335ea5dd9cc0defb2897912ce3169e1ef23d03435ed7500a33f26e5646b1b97aebcac286a93e631f11c491cb076831d62c7b565493458c0882e6f359b94 SHA512 31b77782e6b79db1cb1db7baf30a2bd96e828861a9085b257d554d0991ea16299c3cc9a6e3fa2af5738aeb3ffbd040f6627af3510ccb8fd744b59658acc2dd55 -DIST mkstage4-0.3.tar.gz 18648 BLAKE2B 3a881bc1ec14f5c9795d49306966b586c30a8b415542fb500b5a2af7735008832ebc64f0a166ea4e2fdb48a555bd789b352784f1b05118116ae3f634937beed6 SHA512 6971bf4b43a2fdef0b54802b010c99e95caf896c8e109c54f5a6beb4db1714ea5639e0859ba3f958eed92b9fc6a3bb613bb82de440729e71e53543d60549d2db +DIST mkstage4-0.4.2.tar.gz 19860 BLAKE2B d5ab8c0bfd79796ec0f5310a52ed3ba6290b6cc11272a3d69408617f84758981b912628c5f796c1db5129a23db26049e14bf289e6f63f95e2877ab983e568c87 SHA512 2b481950f443e8f62ba837fe3d4238db79299776f3a115696e999a484ff6bb664bc54c74e61d31ff8d827c8c9c1174225d613d39ab5d93e0106725889990bd6d +DIST mkstage4-0.4.3.tar.gz 20529 BLAKE2B 4d75765c0d8308443e26ab9f565e6e463a9e89dd820b659f18d596d1af428837cbc30fe7067979ab0340f5370e490c6c487b579ab5ece72b3b9b2f4f2eea818d SHA512 baf6b3d8a67020984805aa7b7d7d948e2b075cd258bb84c08e48c133e274fe2f4e26154e186f351163b188bbd1f89ee4476603f92035ba40dda0acdfafa962fd +DIST mkstage4-0.4.tar.gz 19769 BLAKE2B 833b343f8d8deba2914c24aad07b802f551102f598fa6b149ad2aa8df3b96d189b8a29be8904e510cc4200609b4a2a19d83c510c58745b734898a119ae259313 SHA512 13f867c45fe9891754e62f2204e35260ce9c6a756eddea807800cce5cb5d9e7a1b21c27dd0d5142a13bc8b88c441cf618ba5ce6827a0644f6468759062a9e34c diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml index 48c9ac6ebccd..d09e2f28fd89 100644 --- a/app-backup/mkstage4/metadata.xml +++ b/app-backup/mkstage4/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chr@chymera.eu</email> - <name>Horea Christian</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> This is a bash script which can create stage 4 tarballs either for the running system, or a system at a specified mount point. diff --git a/app-backup/mkstage4/mkstage4-0.3.ebuild b/app-backup/mkstage4/mkstage4-0.4.2.ebuild index 34da72a2c4b5..5430aad023b7 100644 --- a/app-backup/mkstage4/mkstage4-0.3.ebuild +++ b/app-backup/mkstage4/mkstage4-0.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs" HOMEPAGE="https://github.com/TheChymera/mkstage4" @@ -21,9 +21,10 @@ RDEPEND=" src_install() { newbin mkstage4.sh mkstage4 + newbin exstage4.sh exstage4 einstalldocs } src_test() { - bats tests/* || die + bats -r tests/* || die } diff --git a/app-backup/mkstage4/mkstage4-0.1.ebuild b/app-backup/mkstage4/mkstage4-0.4.3.ebuild index 10464eafc25b..690249b6cff2 100644 --- a/app-backup/mkstage4/mkstage4-0.1.ebuild +++ b/app-backup/mkstage4/mkstage4-0.4.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs" HOMEPAGE="https://github.com/TheChymera/mkstage4" @@ -9,13 +9,23 @@ SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="app-shells/bash - app-arch/tar" +DEPEND="test? ( dev-util/bats )" +RDEPEND=" + app-shells/bash + app-arch/tar +" src_install() { + newbin cpstage4.sh cpstage4 + newbin exstage4.sh exstage4 newbin mkstage4.sh mkstage4 + einstalldocs +} + +src_test() { + bats -r tests/* || die } diff --git a/app-backup/mkstage4/mkstage4-0.2.ebuild b/app-backup/mkstage4/mkstage4-0.4.ebuild index 76dbb21e5baf..5430aad023b7 100644 --- a/app-backup/mkstage4/mkstage4-0.2.ebuild +++ b/app-backup/mkstage4/mkstage4-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs" HOMEPAGE="https://github.com/TheChymera/mkstage4" @@ -10,13 +10,21 @@ SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" +DEPEND="test? ( dev-util/bats )" RDEPEND=" - app-arch/tar app-shells/bash + app-arch/tar " src_install() { newbin mkstage4.sh mkstage4 + newbin exstage4.sh exstage4 einstalldocs } + +src_test() { + bats -r tests/* || die +} diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild index cd989859f11f..d22f71fe4e1b 100644 --- a/app-backup/mkstage4/mkstage4-9999.ebuild +++ b/app-backup/mkstage4/mkstage4-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 @@ -15,10 +15,18 @@ KEYWORDS="" IUSE="" DEPEND="" -RDEPEND="app-shells/bash - app-arch/tar" +RDEPEND=" + app-shells/bash + app-arch/tar +" src_install() { + newbin cpstage4.sh cpstage4 + newbin exstage4.sh exstage4 newbin mkstage4.sh mkstage4 einstalldocs } + +src_test() { + bats -r tests/* || die +} diff --git a/app-backup/mylvmbackup/Manifest b/app-backup/mylvmbackup/Manifest index e4b66dfb2adc..864902189492 100644 --- a/app-backup/mylvmbackup/Manifest +++ b/app-backup/mylvmbackup/Manifest @@ -1 +1 @@ -DIST mylvmbackup-0.14.tar.gz 57338 BLAKE2B 2f3e85d73a08d8877f84c04e8a7368500fd10dd9ee5172110589175918c10d0e80dce17b842286aacb111d088c275138a87fcf46fb4b416d0697221735cc36b3 SHA512 e61f0c4e24b5482b2f7f4213e810a32776d1b39f589e27c309a4940943f3a9519041e53cf85a089a94100e2cc81715a033682bbe071220d755c14211b4177bfa +DIST mylvmbackup-0.16.tar.gz 58490 BLAKE2B 43f34e0e386c4cc4f8d30ce3fb3f9e93f4ce7c795d1b74a0e6c2bb74750c855b5eeb41a09d9c2f6e0532bb297d00519d99b356fa98dfb0fbc4fc8cfd25daa976 SHA512 c23dd47c7cb13883cddb161f12a1698a1108b65d01a0e6d6feafab2d92c98717e38d4bc4a23712cb2e23f624e8c4e6307a2b0f171024976b52a58a720fd01b8b diff --git a/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-build-system.patch b/app-backup/mylvmbackup/files/mylvmbackup-0.16-fix-build-system.patch index ebfeee6225e4..486f336e70c0 100644 --- a/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-build-system.patch +++ b/app-backup/mylvmbackup/files/mylvmbackup-0.16-fix-build-system.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -45,12 +45,12 @@ +@@ -58,7 +58,7 @@ README \ TODO CLEANFILES = $(NAME).spec $(NAME) $(MAN1) $(MAN1).html @@ -9,9 +9,3 @@ sysconfdir = /etc bindir = $(prefix)/bin datadir = $(prefix)/share/mylvmbackup - distdir = $(NAME)-$(VERSION) --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - man1dir = $(mandir)/man1 - - all: $(DISTFILES) $(MAN1) diff --git a/app-backup/mylvmbackup/files/mylvmbackup.conf b/app-backup/mylvmbackup/files/mylvmbackup.conf new file mode 100644 index 000000000000..555c4853a4b6 --- /dev/null +++ b/app-backup/mylvmbackup/files/mylvmbackup.conf @@ -0,0 +1,2 @@ +d /var/tmp/mylvmbackup/backup 0700 - - - - +d /var/tmp/mylvmbackup/mnt 0700 - - - - diff --git a/app-backup/mylvmbackup/metadata.xml b/app-backup/mylvmbackup/metadata.xml index 4073267daf2a..a19661a8bd04 100644 --- a/app-backup/mylvmbackup/metadata.xml +++ b/app-backup/mylvmbackup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild b/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild deleted file mode 100644 index 77f80942fdf2..000000000000 --- a/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Tool for creating backups of MySQL server's data files using LVM snapshots" -HOMEPAGE="http://lenzg.net/mylvmbackup/" -SRC_URI="http://lenzg.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - dev-perl/Config-IniFiles - dev-perl/DBD-mysql - dev-perl/TimeDate - >=sys-fs/lvm2-2.02.06 - virtual/mysql" - -PATCHES=( - "${FILESDIR}"/${PN}-0.14-fix-build-system.patch - "${FILESDIR}"/${PN}-0.14-fix-config.patch -) - -src_install() { - default - - keepdir /var/tmp/${PN}/{backup,mnt} - fperms 0700 /var/tmp/${PN}/ -} diff --git a/app-backup/mylvmbackup/mylvmbackup-0.16-r2.ebuild b/app-backup/mylvmbackup/mylvmbackup-0.16-r2.ebuild new file mode 100644 index 000000000000..105346616e08 --- /dev/null +++ b/app-backup/mylvmbackup/mylvmbackup-0.16-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tmpfiles + +DESCRIPTION="Tool for creating backups of MySQL server's data files using LVM snapshots" +HOMEPAGE="https://lenzg.net/mylvmbackup/" +SRC_URI="https://lenzg.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + dev-perl/Config-IniFiles + dev-perl/DBD-mysql + dev-perl/File-Copy-Recursive + dev-perl/TimeDate + sys-fs/lvm2 + virtual/mysql +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.16-fix-build-system.patch + "${FILESDIR}"/${PN}-0.14-fix-config.patch +) + +src_install() { + default + + dotmpfiles "${FILESDIR}/${PN}.conf" +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} diff --git a/app-backup/pdumpfs/files/pdumpfs-in.patch b/app-backup/pdumpfs/files/pdumpfs-in-r3.patch index cddfb995918a..b00f9bed5755 100644 --- a/app-backup/pdumpfs/files/pdumpfs-in.patch +++ b/app-backup/pdumpfs/files/pdumpfs-in-r3.patch @@ -1,7 +1,7 @@ patch by proxy maintainer, P. Healy, April 2015 # Bug 509960 ---- pdumpfs.in_orig 2004-12-21 02:43:12.000000000 +0000 -+++ pdumpfs.in 2015-04-01 10:58:22.671131947 +0100 +--- a/pdumpfs.in_orig 2004-12-21 02:43:12.000000000 +0000 ++++ b/pdumpfs.in 2015-04-01 10:58:22.671131947 +0100 @@ -48,7 +48,7 @@ # diff --git a/app-backup/pdumpfs/files/pdumpfs-test.patch b/app-backup/pdumpfs/files/pdumpfs-test-r3.patch index e81e8b0f2d8a..30cd0292dae7 100644 --- a/app-backup/pdumpfs/files/pdumpfs-test.patch +++ b/app-backup/pdumpfs/files/pdumpfs-test-r3.patch @@ -1,7 +1,7 @@ patch by proxy maintainer, P. Healy, April 2015 # Bug 509960 ---- tests/pdumpfs-test_orig 2004-08-10 07:54:28.000000000 +0100 -+++ tests/pdumpfs-test 2015-04-01 11:24:35.948633870 +0100 +--- a/tests/pdumpfs-test_orig 2004-08-10 07:54:28.000000000 +0100 ++++ b/tests/pdumpfs-test 2015-04-01 11:24:35.948633870 +0100 @@ -17,6 +17,7 @@ ../pdumpfs src dest > tmp.log || exit 1 diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml index 02211b3e08f7..1a1da7bdbfa1 100644 --- a/app-backup/pdumpfs/metadata.xml +++ b/app-backup/pdumpfs/metadata.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>lmiphay@gmail.com</email> <name>Paul Healy</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> -<longdescription> -pdumpfs is a simple daily backup system similar to Plan9's dumpfs which -preserves every daily snapshot. pdumpfs is written in Ruby. You can access -the past snapshots at any time for retrieving a certain day's file. Let's -backup your home directory with pdumpfs! -</longdescription> + <longdescription> + pdumpfs is a simple daily backup system similar to Plan9's dumpfs which + preserves every daily snapshot. pdumpfs is written in Ruby. You can access + the past snapshots at any time for retrieving a certain day's file. Let's + backup your home directory with pdumpfs! + </longdescription> </pkgmetadata> diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r3.ebuild index 527828394d33..38091aedbe11 100644 --- a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild +++ b/app-backup/pdumpfs/pdumpfs-1.3-r3.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=8 DESCRIPTION="A daily backup system similar to Plan9's dumpfs" HOMEPAGE="http://0xcc.net/pdumpfs/" @@ -14,13 +12,12 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="l10n_ja" -DEPEND=">=dev-lang/ruby-2.0.0_p598" +DEPEND=">=dev-lang/ruby-2.7.4" -src_prepare() { - # Bug #509960 - epatch "${FILESDIR}/${PN}-in.patch" \ - "${FILESDIR}/${PN}-test.patch" -} +PATCHES=( + "${FILESDIR}/${PN}-in-r3.patch" + "${FILESDIR}/${PN}-test-r3.patch" +) src_compile() { emake pdumpfs @@ -36,7 +33,7 @@ src_install() { dobin pdumpfs doman man/man8/pdumpfs.8 - dohtml -r doc/* + dodoc -r doc/* if use l10n_ja; then insinto /usr/share/man/ja/man8 diff --git a/app-backup/rdedup/metadata.xml b/app-backup/rdedup/metadata.xml index bec4631dc800..77ab7980cfe8 100644 --- a/app-backup/rdedup/metadata.xml +++ b/app-backup/rdedup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest index c8723d6327da..91a605ee5688 100644 --- a/app-backup/rdiff-backup/Manifest +++ b/app-backup/rdiff-backup/Manifest @@ -1,3 +1,2 @@ -DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec -DIST rdiff-backup-2.0.3.tar.gz 422823 BLAKE2B 0d4f3165abb8893dfe0619ae80f4c93e676012c4cc763c28cd1aac4eee84e6f8ae2717b5b9722c1b89a9599f3ce487580eac6780799e028f269ea1ce4a40deea SHA512 a4d517182ba1521195f46abde67e7963c7b44722b37d20a7f9afb446a1b90095deba1da9aaa940d174d5cf8dd01948619846d689e5675326b271141b355831fb DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd +DIST rdiff-backup-2.2.6.tar.gz 944414 BLAKE2B f30bc570f8e20d950e87654d195f29848b6ca39953fc418b9ff391da649fdd308bebcd0379b047a1875eb1fa9b85c294df6a0528f06d4ba27627df4e12a771a4 SHA512 7370dcbb71f087252f8c599b0fbf58260ec7e026e023648bfab63c39b062120862ab8b60173e2bf2352e16d404bb561c72fe19aa9aed9d49cff56225b91f5c63 diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch deleted file mode 100644 index bbac52538303..000000000000 --- a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur rdiff-backup-2.0.0.orig/setup.py rdiff-backup-2.0.0/setup.py ---- rdiff-backup-2.0.0.orig/setup.py 2020-03-15 08:25:32.000000000 +0100 -+++ rdiff-backup-2.0.0/setup.py 2020-03-18 20:36:48.579570457 +0100 -@@ -194,19 +194,6 @@ - scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"], - data_files=[ - ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]), -- ( -- "share/doc/rdiff-backup", -- [ -- "CHANGELOG", -- "COPYING", -- "README.md", -- "docs/FAQ.md", -- "docs/examples.md", -- "docs/DEVELOP.md", -- "docs/Windows-README.md", -- "docs/Windows-DEVELOP.md", -- ], -- ), - ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]), - ], - # options is a hash of hash with command -> option -> value diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch new file mode 100644 index 000000000000..87531ca7c4a6 --- /dev/null +++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch @@ -0,0 +1,42 @@ +From 5e5cc54b5a633d3c6c0469283b2f26dbdde7908f Mon Sep 17 00:00:00 2001 +From: Frank Crawford <frank@crawford.emu.id.au> +Date: Sun, 2 Jan 2022 18:44:57 +1100 +Subject: [PATCH] Added patch for Python3.11 as per bpo-39573. + +--- + src/_librsyncmodule.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c +index a46567fc4..158104d2e 100644 +--- a/src/_librsyncmodule.c ++++ b/src/_librsyncmodule.c +@@ -25,6 +25,16 @@ + #include <librsync.h> + #define RSM_JOB_BLOCKSIZE 65536 + ++/* ----------------------------------------------------------------------- * ++ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573. ++ * Compatibility macro for older Python versions. ++ * ----------------------------------------------------------------------- */ ++#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE) ++static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) ++{ ob->ob_type = type; } ++#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type) ++#endif ++ + static PyObject *librsyncError; + + /* Sets python error string from result */ +@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void) + { + PyObject *m, *d; + +- Py_TYPE(&_librsync_SigMakerType) = &PyType_Type; +- Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type; ++ /* Update for Python 3.11 - bpo-39573. */ ++ Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type); ++ Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type); + static struct PyModuleDef librsync_def = { + PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, }; + m = PyModule_Create(&librsync_def); diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml index 8c94752564ce..2da39cb8a8f0 100644 --- a/app-backup/rdiff-backup/metadata.xml +++ b/app-backup/rdiff-backup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> @@ -7,6 +7,6 @@ </maintainer> <upstream> <remote-id type="github">rdiff-backup/rdiff-backup</remote-id> + <remote-id type="pypi">rdiff-backup</remote-id> </upstream> </pkgmetadata> - diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild deleted file mode 100644 index 61297c203a58..000000000000 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit distutils-r1 - -DESCRIPTION="Local/remote mirroring+incremental backup" -HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" -SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" -RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.3-no-docs.patch" -) - -python_install_all() { - local DOCS=( docs/FAQ.md ) - use examples && DOCS+=( docs/examples.md ) - distutils-r1_python_install_all -} diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild index bde2048ab84e..735bab8e418e 100644 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="Local/remote mirroring+incremental backup" @@ -14,15 +15,18 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="examples" +# Tests use a tox environment and separate steps for test env preparation +RESTRICT="test" -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] +DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] >=net-libs/librsync-1.0:0=" RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] dev-python/pyxattr[${PYTHON_USEDEP}] >=net-libs/librsync-1.0:0=" PATCHES=( - "${FILESDIR}/${PN}-2.0.0-no-docs.patch" + "${FILESDIR}/${PN}-2.0.3-no-docs.patch" + "${FILESDIR}/${P}-py311.patch" ) python_install_all() { diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild deleted file mode 100644 index 61297c203a58..000000000000 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit distutils-r1 - -DESCRIPTION="Local/remote mirroring+incremental backup" -HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" -SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" -RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.3-no-docs.patch" -) - -python_install_all() { - local DOCS=( docs/FAQ.md ) - use examples && DOCS+=( docs/examples.md ) - distutils-r1_python_install_all -} diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild new file mode 100644 index 000000000000..259082ffc737 --- /dev/null +++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYPI_NO_NORMALIZE=1 +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Local/remote mirroring+incremental backup" +HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# Tests use a tox environment and separate steps for test env preparation +RESTRICT="test" + +RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] + dev-python/pyxattr[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=net-libs/librsync-1.0:0=" +DEPEND="${RDEPEND} + dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +src_prepare() { + sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die + default +} diff --git a/app-backup/rdumpfs/metadata.xml b/app-backup/rdumpfs/metadata.xml index 127cd97aeefe..4bfd1b8f5f50 100644 --- a/app-backup/rdumpfs/metadata.xml +++ b/app-backup/rdumpfs/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>junghans@gentoo.org</email> - <name>Christoph Junghans</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="github">chneukirchen/rdumpfs</remote-id> + <remote-id type="github">leahneukirchen/rdumpfs</remote-id> </upstream> </pkgmetadata> diff --git a/app-backup/rdumpfs/rdumpfs-0.1.ebuild b/app-backup/rdumpfs/rdumpfs-0.1.ebuild index 2b6b21577956..b67f01b5a3bb 100644 --- a/app-backup/rdumpfs/rdumpfs-0.1.ebuild +++ b/app-backup/rdumpfs/rdumpfs-0.1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit vcs-snapshot - -COMMIT="b7e8e7b0efd9d73344e022e204f2e99e6321136e" DESCRIPTION="a rsync-based dump file system backup tool" -HOMEPAGE="https://github.com/chneukirchen/rdumpfs" -SRC_URI="https://github.com/chneukirchen/rdumpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/leahneukirchen/rdumpfs" +SRC_URI="https://github.com/leahneukirchen/rdumpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="CC0-1.0" SLOT="0" KEYWORDS="~amd64" IUSE="+xattr" -DEPEND="" RDEPEND="net-misc/rsync[xattr?]" src_prepare() { + default use xattr || sed -i '/RDUMPFS_DEFAULT_ARGS:=/s/aHAX/aHA/' "${PN}" || die } diff --git a/app-backup/rdup/metadata.xml b/app-backup/rdup/metadata.xml index 9f9793a7335b..40761debbbc6 100644 --- a/app-backup/rdup/metadata.xml +++ b/app-backup/rdup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/app-backup/rdup/rdup-1.1.15.ebuild b/app-backup/rdup/rdup-1.1.15-r1.ebuild index ee7bf949b508..6fb0a41f335c 100644 --- a/app-backup/rdup/rdup-1.1.15.ebuild +++ b/app-backup/rdup/rdup-1.1.15-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils autotools +inherit autotools DESCRIPTION="Generate a file list suitable for full or incremental backups" HOMEPAGE="https://github.com/miekg/rdup/releases" @@ -13,18 +13,21 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug test" +# It's known to fail with USE=debug +REQUIRED_USE="test? ( !debug )" RESTRICT="!test? ( test )" RDEPEND=" app-arch/libarchive dev-libs/glib:2 dev-libs/libpcre - dev-libs/nettle" -DEPEND="${RDEPEND} - test? ( dev-util/dejagnu )" + dev-libs/nettle +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-util/dejagnu )" src_prepare() { - default_src_prepare + default sed -i -e 's/ -Werror//' GNUmakefile.in || die "Failed to fix Makefile" eautoreconf } @@ -32,11 +35,3 @@ src_prepare() { src_configure() { econf $(use_enable debug) } - -src_test() { - if use debug; then - ewarn "Test phase skipped, as it is known to fail with USE=\"debug\"." - else - default_src_test - fi -} diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest index c4971bdf9b46..aed693bdc563 100644 --- a/app-backup/rear/Manifest +++ b/app-backup/rear/Manifest @@ -1,4 +1,2 @@ -DIST rear-1.15.tar.gz 258153 BLAKE2B 1172806962df7d1a5f278d1aeb696e38d482f1710c6b13dba6b00f60f51fd3c02ba6d28c9c5e4b1a648468f9a6f5987b47ca1f819c8e66c9b6f209c75b0ba0b6 SHA512 dc953c33b82f221de6c2acd7ffbb26c34b86aebcd7f8a4d7d520a1d08c15c723fed75326b8e19614f5e09f6436d392091b362b350ffad06caf10c711eb97fcb2 -DIST rear-1.17.0.tar.gz 299444 BLAKE2B bbada2b5705a5ff0f82b97974f14de728a779847a6b410e0be71033404ae08f0ba6c4bd76c07aba0195aa677c174ebf016bbb6a17f3aa2698bed24bcb50618f3 SHA512 4b9991dc14138e6a2cd28c9fb9f1dcf46ea1a580454bb2c966024481657a102cc849baf6af5ebfa0793ac3f5ebff5b07abc87d1e4b02e1496a0f87b8cf79284e -DIST rear-1.17.1.tar.gz 303253 BLAKE2B 3c84a76b0aaf1ef72191a49976aa86ce4fcf7c9aee1c6c85af3d68d80e0c6a7ba0d16e109847c7753a626ef34df9ee05f2912b30df5e205303c194831bd5af77 SHA512 66595e962345c0e61c5152f11aee6745ec348acc02d0cbc717faaca8618c83211d8c45ec5e80a17ba9d8c8ad9c6d2ecb109f827d976eb0d126bfc44cf4b49afc -DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088 +DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c +DIST rear-2.7.tar.gz 852253 BLAKE2B 9652887c13fd91d4f7ca96d8ff851750045b837268bde70da8bfac32950039116a04b89d46f57dd40dd92f55e7ca284ce751b1b71340f1c96c0f5ec5496b3966 SHA512 9cabc6c5ddb01934740b73098a80bf1e0c03140ac1fce7c399752c1145bb743573033f6e34ae59a13e34fa873c8e992ce50316ee0260d23667614d5250daa087 diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch deleted file mode 100644 index 608685418676..000000000000 --- a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -index 6816f37..ec437e4 100644 ---- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -+++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then - else - Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]" - fi -+ elif [ -f /etc/gentoo-release ]; then -+ if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then -+ KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" -+ elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then -+ KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}" -+ else -+ Error "Could not find Gentoo kernel" -+ fi - else - Error "Could not find a matching kernel in /boot !" - fi diff --git a/app-backup/rear/files/rear-2.6-Makefile.patch b/app-backup/rear/files/rear-2.6-Makefile.patch new file mode 100644 index 000000000000..800dcf69cee3 --- /dev/null +++ b/app-backup/rear/files/rear-2.6-Makefile.patch @@ -0,0 +1,34 @@ +--- rear-2.6/Makefile.orig 2020-09-09 20:04:39.357666685 +0200 ++++ rear-2.6/Makefile 2020-09-09 20:06:12.537313922 +0200 +@@ -84,7 +84,7 @@ + clean: + rm -Rf dist build + rm -f build-stamp +- make -C doc clean ++ $(MAKE) -C doc clean + + ### You can call 'make validate' directly from your .git/hooks/pre-commit script + validate: +@@ -107,11 +107,11 @@ + + man: + @echo -e "\033[1m== Prepare manual ==\033[0;0m" +- make -C doc man ++ $(MAKE) -C doc man + + doc: + @echo -e "\033[1m== Prepare documentation ==\033[0;0m" +- make -C doc docs ++ $(MAKE) -C doc docs + + install-config: + @echo -e "\033[1m== Installing configuration ==\033[0;0m" +@@ -144,7 +144,7 @@ + + install-doc: + @echo -e "\033[1m== Installing documentation ==\033[0;0m" +- make -C doc install ++ $(MAKE) -C doc install + sed -i -e 's,/etc,$(sysconfdir),' \ + -e 's,/usr/sbin,$(sbindir),' \ + -e 's,/usr/share,$(datadir),' \ diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml index 5d24f38283d0..302de896cce3 100644 --- a/app-backup/rear/metadata.xml +++ b/app-backup/rear/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>martin.dummer@gmx.net</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription lang="en"> Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well. </longdescription> @@ -10,5 +17,6 @@ </use> <upstream> <remote-id type="sourceforge">rear</remote-id> + <remote-id type="github">rear/rear</remote-id> </upstream> </pkgmetadata> diff --git a/app-backup/rear/rear-1.15-r1.ebuild b/app-backup/rear/rear-1.15-r1.ebuild deleted file mode 100644 index 1ea1bebbf87b..000000000000 --- a/app-backup/rear/rear-1.15-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution" -HOMEPAGE="http://relax-and-recover.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="libressl udev" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-dialup/mingetty - net-fs/nfs-utils - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - virtual/cdrtools - udev? ( virtual/udev ) -" - -src_prepare() { - epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch" -} - -src_compile() { :; } - -src_install() { - # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB - # drive with the label 'REAR_000' is connected, which in turn is the - # default label when running the `rear format` command. - if use udev ; then - insinto /lib/udev/rules.d - doins etc/udev/rules.d/62-${PN}-usb.rules - fi - - # Copy main script-file and documentation. - dosbin usr/sbin/${PN} - doman doc/${PN}.8 - dodoc README - - # Copy configurations files. - insinto /etc - doins -r etc/${PN}/ - - insinto /usr/share/ - doins -r usr/share/${PN}/ -} diff --git a/app-backup/rear/rear-1.17.0.ebuild b/app-backup/rear/rear-1.17.0.ebuild deleted file mode 100644 index cb3a99906765..000000000000 --- a/app-backup/rear/rear-1.17.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution" -HOMEPAGE="http://relax-and-recover.org/" -MY_PV=${PV%.*} -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="libressl udev" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-dialup/mingetty - net-fs/nfs-utils - sys-apps/gawk - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - virtual/cdrtools - udev? ( virtual/udev ) -" - -src_compile() { :; } - -src_install() { - # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB - # drive with the label 'REAR_000' is connected, which in turn is the - # default label when running the `rear format` command. - if use udev ; then - insinto /lib/udev/rules.d - doins etc/udev/rules.d/62-${PN}-usb.rules - fi - - # Copy main script-file and documentation. - dosbin usr/sbin/${PN} - doman doc/${PN}.8 - dodoc README - - # Copy configurations files. - insinto /etc - doins -r etc/${PN}/ - - insinto /usr/share/ - doins -r usr/share/${PN}/ -} diff --git a/app-backup/rear/rear-1.17.1.ebuild b/app-backup/rear/rear-1.17.1.ebuild deleted file mode 100644 index cb3a99906765..000000000000 --- a/app-backup/rear/rear-1.17.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution" -HOMEPAGE="http://relax-and-recover.org/" -MY_PV=${PV%.*} -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="libressl udev" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-dialup/mingetty - net-fs/nfs-utils - sys-apps/gawk - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - virtual/cdrtools - udev? ( virtual/udev ) -" - -src_compile() { :; } - -src_install() { - # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB - # drive with the label 'REAR_000' is connected, which in turn is the - # default label when running the `rear format` command. - if use udev ; then - insinto /lib/udev/rules.d - doins etc/udev/rules.d/62-${PN}-usb.rules - fi - - # Copy main script-file and documentation. - dosbin usr/sbin/${PN} - doman doc/${PN}.8 - dodoc README - - # Copy configurations files. - insinto /etc - doins -r etc/${PN}/ - - insinto /usr/share/ - doins -r usr/share/${PN}/ -} diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild deleted file mode 100644 index 55b55d0c90cc..000000000000 --- a/app-backup/rear/rear-2.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution" -HOMEPAGE="http://relax-and-recover.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="libressl udev samba" - -RDEPEND=" - net-dialup/mingetty - net-fs/nfs-utils - sys-apps/gawk - sys-apps/iproute2 - sys-apps/lsb-release - sys-apps/sed - sys-apps/util-linux - sys-block/parted - sys-boot/syslinux - virtual/cdrtools - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - samba? ( net-fs/cifs-utils ) - udev? ( virtual/udev ) -" - -src_compile() { :; } - -src_install() { - emake DESTDIR="${D}" install - - keepdir /var/lib/rear - keepdir /var/log/rear -} diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild new file mode 100644 index 000000000000..aab95996cc8f --- /dev/null +++ b/app-backup/rear/rear-2.6.ebuild @@ -0,0 +1,60 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature udev + +DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution" +HOMEPAGE="http://relax-and-recover.org/ https://github.com/rear/rear/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="udev" + +RDEPEND=" + app-cdr/cdrtools + app-shells/bash + net-dialup/mingetty + net-fs/nfs-utils + sys-apps/gawk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/sed + sys-apps/util-linux + sys-block/parted + sys-boot/syslinux + udev? ( virtual/udev ) +" + +PATCHES=( + "${FILESDIR}/${P}-Makefile.patch" +) + +src_compile() { :; } + +src_install() { + emake DESTDIR="${D}" install + + if use udev ; then + einfo "Deploy udev USB rule and udev will autostart ReaR workflows in case a USB" + einfo "drive with the label 'REAR_000' is connected, which in turn is the" + einfo "default label when running the \`rear format\` command." + udev_dorules etc/udev/rules.d/62-${PN}-usb.rules + fi + + keepdir /etc/rear + keepdir /var/lib/rear + keepdir /var/log/rear +} + +pkg_postinst() { + if use udev ; then + udev_reload + fi + + optfeature "saving backups on smb/cifs servers" net-fs/cifs-utils + optfeature "encrypting backups" dev-libs/openssl +} diff --git a/app-backup/rear/rear-2.7.ebuild b/app-backup/rear/rear-2.7.ebuild new file mode 100644 index 000000000000..c50f3308f287 --- /dev/null +++ b/app-backup/rear/rear-2.7.ebuild @@ -0,0 +1,62 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature udev + +DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution" +HOMEPAGE="http://relax-and-recover.org/ https://github.com/rear/rear/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="udev" + +RDEPEND=" + app-cdr/cdrtools + app-shells/bash + net-dialup/mingetty + net-fs/nfs-utils + sys-apps/gawk + sys-apps/iproute2 + sys-apps/lsb-release + sys-apps/sed + sys-apps/util-linux + sys-block/parted + sys-boot/syslinux + udev? ( virtual/udev ) +" + +src_compile() { :; } + +src_install() { + emake DESTDIR="${D}" install + + if use udev ; then + einfo "Deploy udev USB rule and udev will autostart ReaR workflows in case a USB" + einfo "drive with the label 'REAR_000' is connected, which in turn is the" + einfo "default label when running the \`rear format\` command." + udev_dorules etc/udev/rules.d/62-${PN}-usb.rules + fi + + keepdir /etc/rear + keepdir /var/lib/rear + keepdir /var/log/rear +} + +pkg_postinst() { + if use udev; then + udev_reload + fi + + optfeature "saving backups on smb/cifs servers" net-fs/cifs-utils + optfeature "encrypting backups" dev-libs/openssl +} + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/app-backup/reoback/metadata.xml b/app-backup/reoback/metadata.xml index eb73d556efe4..6e5f087715ad 100644 --- a/app-backup/reoback/metadata.xml +++ b/app-backup/reoback/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-backup/reoback/reoback-1.0_p3-r1.ebuild b/app-backup/reoback/reoback-1.0_p3-r1.ebuild index 27b4e4caed43..b3021247973a 100644 --- a/app-backup/reoback/reoback-1.0_p3-r1.ebuild +++ b/app-backup/reoback/reoback-1.0_p3-r1.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils vcs-clean +inherit vcs-clean DESCRIPTION="Reoback Backup Solution" -HOMEPAGE="http://reoback.sourceforge.net/" -SRC_URI="mirror://sourceforge/reoback/reoback-${PV/_p/_r}.tar.gz" +HOMEPAGE="https://reoback.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/reoback/reoback-${PV/_p/_r}.tar.gz" +S="${WORKDIR}"/${PN}-${PV/_*} LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND=">=dev-lang/perl-5.6.1" DEPEND=">=app-arch/tar-1.13" -S=${WORKDIR}/${PN}-${PV/_*} - src_prepare() { + default + ecvs_clean + sed \ -e '/^config=/s:=.*:=/etc/reoback/settings.conf:' \ -e '/^reoback=/s:=.*:=/usr/sbin/reoback.pl:' \ @@ -29,15 +30,18 @@ src_prepare() { src_install() { dosbin reoback.pl + insinto /etc/reoback doins conf/* fperms o-x /usr/sbin/reoback.pl + insinto /etc/cron.daily newins run_reoback.sh reoback + dodoc docs/{BUGS,CHANGES,INSTALL,MANUALS,README,TODO} } pkg_postinst() { elog "Reoback can now be activated by simply configuring the files in" - elog "/etc/reoback and then doing: chmod +x /etc/cron.daily/reoback" + elog "${EROOT}/etc/reoback and then doing: chmod +x ${EROOT}/etc/cron.daily/reoback" } diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest index 843d171b0334..48c1d2e16b6e 100644 --- a/app-backup/restic/Manifest +++ b/app-backup/restic/Manifest @@ -1,3 +1,6 @@ -DIST restic-0.9.4.tar.gz 26211163 BLAKE2B 950a8da8217500a910f0e5966787b668417f1168e81365ecda70469ef42c24fed876e97b6a44ed9dda89c07760db4678d791960d78760d68c8f1846c827cf340 SHA512 8e75a1da6ee9a364c2bf53ce8f9b014549e7065eae349dc6baf68b0e8a8e9736f83c0495b822aac87480751f448bd42da34c440290b5f0967aea7becda5c448b -DIST restic-0.9.5.tar.gz 26933971 BLAKE2B 7e6cb87c7ce0f860ed884a631b791d0dc44e770ffabf298f20c60197b32961a2a78380e2933ce3851215ec2e32bee95da67566bf7d2d30c3bb0dddda2c6ca804 SHA512 2541b4d70d23d28360c4398427d65ed08a5eea8c171b93be7b7d54baa7b06099f5473ff2fbe3d6b3d6691592300062ba1b240cc03772868d2a0adb1217c8a85f -DIST restic-0.9.6.tar.gz 27008812 BLAKE2B 4c8982800d39bcd4c29067f2bad15df44b92758b009f5831efb16d211ea28cbb8cda94b9f6cc41a685942145fcfb71c59d0aa10fcb4bd1cd22d15ca812af4fd0 SHA512 f6f7797dc17644e8f0217d81f7194e8e6416f6e740bad0eb11bcf83ab72d1729025e59fd1b81eb9d57bdd60e98b3324026ddb2325c654eb1b51f8f30ed247089 +DIST restic-0.15.2-deps.tar.xz 159164476 BLAKE2B 652c5f880dc88ab9b4fcfb0168cf5bce19587f7c0195e379ac01ff227fd453bb5fc6ab72b7803d7070f92ea608a077aa0f79005f000b5626d7ea8841c9ec9643 SHA512 e4ef9ebfc09998e912128d84790081d16c05dad23e680f642e204974fc1ddd3a1f92ad2035227f6448f7661e24ba69379b1dc8198115d2d3d780ad0b0c7a475c +DIST restic-0.15.2.tar.gz 23924222 BLAKE2B d07f505a9d3a425c2fbad275f43a3a23e0b84b673e0ac77f52c45c2965266b483ae136fe99f0bc82903680ff0c5843edd1ed72e4864e5977c2ed2c85a703520c SHA512 8135f8a77c6f1264d962156f58fca4023da6581099cfd4a69379d8f1f137443c217c0207aeb7d41b603b341e78e9b3050c6bdad81323e0efd7b81805f33263bd +DIST restic-0.16.2-deps.tar.xz 171734268 BLAKE2B 76ad6bcfeabeb39b31a413ebdac3a24181bd958502e2a4720343c23e078200b5c038c21acfbf3b23ae1d8302bf1af8b8a4a97467e2ffe5929b8d91250ca59fa3 SHA512 a0ebcb0ea0f0346d38bfa3b84f1fc9600a8d6fd4acad1819f8a292f3f00991d1f06f39f3e51884a4508329bfedc8f77ec63b6a3de0eae7dc7b15d54f14e93088 +DIST restic-0.16.2.tar.gz 23981852 BLAKE2B a4feeb44a33d0a3291be04222dfb8939f0a9dbc74e72e10f1334994326ea9154351bc13825664956f0c288916c9455da3eac9a42483b49eb761a85faec67bced SHA512 319b0165def0a874b80314b8ff124a2460895660c55ebe5da260bfc92caeed0f0d886e9556043cfb3d83c1ca6b5f339ff5f74034989982f12c152505e347917c +DIST restic-0.16.4-deps.tar.xz 171826444 BLAKE2B 2b4adb002209bbdcd2884f0126b775762517e6f008e6d862f63a8b373cc52c71d6f197ba753d90277f6136b38e6243e776ef8d75ce7437d563ccfc7e20509003 SHA512 b0c82b861265c4a2d42fa8fd921ec8d07a3018ccd6a2363dcaaf2e7cb1d40eb0ebe7e77dd6a44a30bc28c4d958facf504d27d231d2ea73b14c1f9a1ef12b33d5 +DIST restic-0.16.4.tar.gz 23990246 BLAKE2B f8dff867ee5e0f9c16b3b22b7db7bfede6d38565558c99632e7239e9c6a19602cd7ea5c7761ac5d0103d6e07c68c0d20c64184317022799f19b9ac814c4b6ff4 SHA512 9f28f90466a30a3c1f32cd1951dddaa22d30ece8b1c18da1a907cc1dd0f98065c25529e855b56fc3d62801b052371d9fe117cd26f17e15276f6a9a309416e914 diff --git a/app-backup/restic/metadata.xml b/app-backup/restic/metadata.xml index d013f0a0c06a..e9f26e4b9e56 100644 --- a/app-backup/restic/metadata.xml +++ b/app-backup/restic/metadata.xml @@ -1,11 +1,15 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>davidroman96@gmail.com</email> <name>David Roman</name> </maintainer> - <maintainer type="project"> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/app-backup/restic/restic-0.9.4.ebuild b/app-backup/restic/restic-0.15.2.ebuild index 61ca3985ea6a..fe50eb0f746f 100644 --- a/app-backup/restic/restic-0.9.4.ebuild +++ b/app-backup/restic/restic-0.15.2.ebuild @@ -1,45 +1,38 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit bash-completion-r1 golang-vcs-snapshot +inherit bash-completion-r1 go-module DESCRIPTION="A backup program that is fast, efficient and secure" HOMEPAGE="https://restic.github.io/" SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGO_PN="github.com/restic/restic" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" -RESTRICT+=" !test? ( test )" +KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" RDEPEND="sys-fs/fuse:0" DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}/src/${EGO_PN}" - src_compile() { local mygoargs=( - -v - -work - -x -tags release -ldflags "-X main.version=${PV}" -asmflags "-trimpath=${S}" -gcflags "-trimpath=${S}" - -o restic ${EGO_PN}/cmd/restic ) - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go build "${mygoargs[@]}" || die + ego build "${mygoargs[@]}" -o restic ./cmd/restic } src_test() { - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die + addwrite /dev/fuse + # a number of the ./cmd/... tests fail + # ego test -timeout 30m ./cmd/... ./internal/... + ego test -timeout 30m ./internal/... } src_install() { diff --git a/app-backup/restic/restic-0.9.6.ebuild b/app-backup/restic/restic-0.16.2.ebuild index f3cbd14139e5..ccaf56cf50b6 100644 --- a/app-backup/restic/restic-0.9.6.ebuild +++ b/app-backup/restic/restic-0.16.2.ebuild @@ -1,53 +1,46 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit bash-completion-r1 golang-vcs-snapshot +inherit go-module shell-completion DESCRIPTION="A backup program that is fast, efficient and secure" HOMEPAGE="https://restic.github.io/" SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGO_PN="github.com/restic/restic" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="sys-fs/fuse:0" DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}/src/${EGO_PN}" - src_compile() { local mygoargs=( - -v - -work - -x -tags release -ldflags "-X main.version=${PV}" -asmflags "-trimpath=${S}" -gcflags "-trimpath=${S}" - -o restic ${EGO_PN}/cmd/restic ) - GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go build "${mygoargs[@]}" || die + ego build "${mygoargs[@]}" -o restic ./cmd/restic } src_test() { - GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die + addwrite /dev/fuse + # a number of the ./cmd/... tests fail + # ego test -timeout 30m ./cmd/... ./internal/... + RESTIC_TEST_FUSE=0 ego test -timeout 30m ./internal/... } src_install() { dobin restic newbashcomp doc/bash-completion.sh "${PN}" - - insinto /usr/share/zsh/site-functions - newins doc/zsh-completion.zsh _restic + newzshcomp doc/zsh-completion.zsh _restic + newfishcomp doc/fish-completion.fish "${PN}" doman doc/man/* dodoc doc/*.rst diff --git a/app-backup/restic/restic-0.9.5.ebuild b/app-backup/restic/restic-0.16.4.ebuild index 9c9a6edff6c4..a3221ce6633e 100644 --- a/app-backup/restic/restic-0.9.5.ebuild +++ b/app-backup/restic/restic-0.16.4.ebuild @@ -1,53 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit bash-completion-r1 golang-vcs-snapshot +inherit go-module shell-completion DESCRIPTION="A backup program that is fast, efficient and secure" HOMEPAGE="https://restic.github.io/" SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGO_PN="github.com/restic/restic" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" +KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" RDEPEND="sys-fs/fuse:0" DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}/src/${EGO_PN}" - src_compile() { local mygoargs=( - -v - -work - -x -tags release -ldflags "-X main.version=${PV}" -asmflags "-trimpath=${S}" -gcflags "-trimpath=${S}" - -o restic ${EGO_PN}/cmd/restic ) - GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go build "${mygoargs[@]}" || die + ego build "${mygoargs[@]}" -o restic ./cmd/restic } src_test() { - GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die + addwrite /dev/fuse + # a number of the ./cmd/... tests fail + # ego test -timeout 30m ./cmd/... ./internal/... + RESTIC_TEST_FUSE=0 ego test -timeout 30m ./internal/... } src_install() { dobin restic newbashcomp doc/bash-completion.sh "${PN}" - - insinto /usr/share/zsh/site-functions - newins doc/zsh-completion.zsh _restic + newzshcomp doc/zsh-completion.zsh _restic + newfishcomp doc/fish-completion.fish "${PN}" doman doc/man/* dodoc doc/*.rst diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest index ffdb814c3880..75493f31e8eb 100644 --- a/app-backup/rsnapshot/Manifest +++ b/app-backup/rsnapshot/Manifest @@ -1,2 +1,2 @@ -DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7fa5d240d9e844180d6a57bb4e14b4cf762aa0ed6bbdba8deda0436d77e6c5d281ca8b62eba1c3b6caf948ae9432 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0 -DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877aa483e2548b5ecb933c3f6e742046730a78b95fd83bfa6496a71f61dbce2a8bedc42562503bef753b0c72c40eba SHA512 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3 +DIST rsnapshot-1.4.4.tar.gz 374269 BLAKE2B 1e4a0c99d12d48cf4dacd3817b621f7e6b0ba32e9d9de87b61252875ae0bf735e8ce2c7d8bb60edb2f7d6345a06b183a2616bf1ac3dd7d1b5d3a3ef22a0ede6f SHA512 da45039457b9f3feb53b823f6ee36e8f7447d0689281d1bc857c6fedd450db2fdf8a98e66ba6e135a86654666888f7744ad9ff0aabbd605e1fc09dd5f1f7b838 +DIST rsnapshot-1.4.5.tar.gz 287731 BLAKE2B 2a668aa16991b2b4e611c6204cdcd0e8c9593e5f0af5ea89e787a578e73b6f5987514cd7d0252bb78aea1b157ef85aea947686111ca9e3befdb2a8cef0aa9ecd SHA512 6caa2d7c425d084d0bb393421a0ed1ba78fdd27f7d8cec4810bc4a9f88b3232aeff7e4682282178f7702e2adc7abc8e9201249bf2bcaa28faa16e30aaa62e18a diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml index 41d4a20db9c6..a3792ac00a78 100644 --- a/app-backup/rsnapshot/metadata.xml +++ b/app-backup/rsnapshot/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>Sergiy.Borodych@gmail.com</email> - <name>Sergiy Borodych</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <maintainer type="person" proxied="yes"> + <email>folajimi@post.com</email> + <name>Jimi Ayodele</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">app-backup/rsnapshot</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.4-r1.ebuild index 0342270d6a0b..7d9892a4c31b 100644 --- a/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild +++ b/app-backup/rsnapshot/rsnapshot-1.4.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A filesystem backup utility based on rsync" HOMEPAGE="https://www.rsnapshot.org" @@ -9,14 +9,15 @@ SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=">=dev-lang/perl-5.8.2 - dev-perl/Lchown - >=sys-apps/util-linux-2.12-r4 - >=sys-apps/coreutils-5.0.91-r4 - >=net-misc/openssh-3.7.1_p2-r1 - >=net-misc/rsync-2.6.0" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" + +RDEPEND=" + >=dev-lang/perl-5.8.2 + dev-perl/Lchown + >=sys-apps/util-linux-2.12-r4 + >=sys-apps/coreutils-5.0.91-r4 + virtual/openssh + >=net-misc/rsync-2.6.0" DEPEND="${RDEPEND}" src_prepare() { diff --git a/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.5-r1.ebuild index c070cf8c6b63..69014434a6bd 100644 --- a/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild +++ b/app-backup/rsnapshot/rsnapshot-1.4.5-r1.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A filesystem backup utility based on rsync" -HOMEPAGE="http://www.rsnapshot.org" -SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz" +HOMEPAGE="https://www.rsnapshot.org" +SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND=">=dev-lang/perl-5.8.2 - dev-perl/Lchown - >=sys-apps/util-linux-2.12-r4 - >=sys-apps/coreutils-5.0.91-r4 - >=net-misc/openssh-3.7.1_p2-r1 - >=net-misc/rsync-2.6.0" + dev-perl/Lchown + >=sys-apps/util-linux-2.12-r4 + >=sys-apps/coreutils-5.0.91-r4 + virtual/openssh + >=net-misc/rsync-2.6.0" DEPEND="${RDEPEND}" src_prepare() { @@ -25,6 +25,10 @@ src_prepare() { sed -i -e 's:/etc/rsnapshot.conf.default:rsnapshot.conf.default:' rsnapshot-program.pl || die } +src_test() { + emake test +} + src_install() { docompress -x "/usr/share/doc/${PF}/rsnapshot.conf.default" @@ -45,6 +49,6 @@ src_install() { pkg_postinst() { elog "The template configuration file has been installed as" - elog " /usr/share/doc/${PF}/rsnapshot.conf.default" - elog "Copy and edit the the above file as /etc/rsnapshot.conf" + elog " ${EROOT}/usr/share/doc/${PF}/rsnapshot.conf.default" + elog "Copy and edit the the above file as ${EROOT}/etc/rsnapshot.conf" } diff --git a/app-backup/sarab/metadata.xml b/app-backup/sarab/metadata.xml index 71ee597ed5ae..a9b88e952a8d 100644 --- a/app-backup/sarab/metadata.xml +++ b/app-backup/sarab/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>rich0@gentoo.org</email> </maintainer> <longdescription> -SaraB works with DAR (Disk ARchive) to schedule backups. SaraB provides a -powerful, automated rotation schedule which allows administrators to create a -custom rotation that fits the needs of their network. -</longdescription> + SaraB works with DAR (Disk ARchive) to schedule backups. SaraB provides a + powerful, automated rotation schedule which allows administrators to create a + custom rotation that fits the needs of their network. + </longdescription> <upstream> <remote-id type="sourceforge">sarab</remote-id> </upstream> diff --git a/app-backup/sarab/sarab-1.0.0.ebuild b/app-backup/sarab/sarab-1.0.0-r1.ebuild index 896edbcc95c8..47a928146804 100644 --- a/app-backup/sarab/sarab-1.0.0.ebuild +++ b/app-backup/sarab/sarab-1.0.0-r1.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit readme.gentoo-r1 +inherit prefix readme.gentoo-r1 DESCRIPTION="SaraB is a powerful and automated backup scheduling system based on DAR" -HOMEPAGE="http://sarab.sourceforge.net/" -SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz" +HOMEPAGE="https://sarab.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/sarab/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" RDEPEND=" app-backup/dar - virtual/mailx" + virtual/mailx +" PATCHES=( "${FILESDIR}"/${PV}-better-defaults-gentoo.patch ) src_install() { + hprefixify sarab.sh dobin sarab.sh einstalldocs diff --git a/app-backup/simplebackup/metadata.xml b/app-backup/simplebackup/metadata.xml index 59179617779e..23dcf486f5a0 100644 --- a/app-backup/simplebackup/metadata.xml +++ b/app-backup/simplebackup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild b/app-backup/simplebackup/simplebackup-1.8.1-r2.ebuild index 3c933c229773..1a14bd8d1ad0 100644 --- a/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild +++ b/app-backup/simplebackup/simplebackup-1.8.1-r2.ebuild @@ -1,28 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit prefix DESCRIPTION="Cross-platform backup program" -HOMEPAGE="http://migas-sbackup.sourceforge.net/" -SRC_URI="mirror://sourceforge/migas-sbackup/${P}.tar.gz" +HOMEPAGE="https://migas-sbackup.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/migas-sbackup/${P}.tar.gz" +S="${WORKDIR}/${P}/unix" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sasl" -DEPEND="" -RDEPEND="dev-lang/perl - sasl? ( dev-perl/Authen-SASL )" - -S="${WORKDIR}/${P}/unix" +RDEPEND=" + dev-lang/perl + sasl? ( dev-perl/Authen-SASL ) +" src_compile() { - return; + :; } src_install() { + hprefixify simplebackup.pl newbin simplebackup.pl simplebackup dodoc ../unix_readme.txt } diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 3162b303dc6b..dd6d2ce24c65 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,3 @@ -DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e -DIST snapper-0.8.6.tar.bz2 607016 BLAKE2B 3e496fa22b1ecce2079d79caeb530ca1538febcc6bdf04aa0256e5b43bb546ea66436e60eeaae6722bc869c60579bc47c556671c5878dd671c266102516f04bb SHA512 f01a309a8dcfff455bf480ff297108e8ec3603d469d50f08740176e22bc2b8dd211de678fa8ce12c1ccd828348a35c6d347ca51b829d7b8c30b3fbaba4e9e2d9 -DIST snapper-0.8.7.tar.bz2 622381 BLAKE2B 82d1a9c91beb309e87acfa914b55b2ff5900edc023a5ecd6f2bee6b1a15adb1336656f3f1fffea4a9971aa449b7825750e6c680806d4574faada5bba0a6d14f1 SHA512 6fa63c2453f93a724f0ac23d84ff2c5aafc654463e84a4f767bb8a75a0d4fb7ca7314811179d5fefddddce0df4441298c67b473596aa720d86eeefa43011b727 -DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d +DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e +DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8 +DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40 diff --git a/app-backup/snapper/files/snapper-0.10.1-testsuite.patch b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch new file mode 100644 index 000000000000..84ff2ce1978a --- /dev/null +++ b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch @@ -0,0 +1,84 @@ +diff --git a/configure.ac b/configure.ac +index 39def82..9b96a32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -174,6 +174,13 @@ if test "x$enable_coverage" = "xyes"; then + LDFLAGS="${LDFLAGS} --coverage" + fi + ++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), ++ [with_tests=$enableval],[with_tests=yes]) ++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) ++if test "x$with_tests" = "xyes"; then ++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) ++fi ++ + PKG_CHECK_MODULES(DBUS, dbus-1) + PKG_CHECK_MODULES(XML2, libxml-2.0) + PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) +diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +index 81104bf..9c29477 100644 +--- a/testsuite-cmp/Makefile.am ++++ b/testsuite-cmp/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-cmp + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) + AM_LDFLAGS = -lboost_system + +@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc + + EXTRA_DIST = $(noinst_SCRIPTS) + ++endif +diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +index a3bb2e3..c4e88f4 100644 +--- a/testsuite-real/Makefile.am ++++ b/testsuite-real/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-real + # + ++if ENABLE_TESTS + CXXFLAGS += -std=gnu++11 + + AM_CPPFLAGS = -I$(top_srcdir) +@@ -56,3 +57,4 @@ ascii_file_SOURCES = ascii-file.cc + + EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) + ++endif +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index ccb84d3..409e265 100644 +--- a/testsuite/Makefile.am ++++ b/testsuite/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + + LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework +@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la + range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la ++endif +diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +index 7b52e13..71cb545 100644 +--- a/zypp-plugin/testsuite/Makefile.am ++++ b/zypp-plugin/testsuite/Makefile.am +@@ -1,3 +1,5 @@ ++ ++if ENABLE_TESTS + if HAVE_ZYPP + TEST_LOG_DRIVER = $(SHELL) tap-driver.sh + +@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) + + EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh + endif ++endif diff --git a/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch new file mode 100644 index 000000000000..c1fc5c692c71 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/snapper-hourly b/scripts/snapper-hourly +index 36a41f5..f36d8ec 100755 +--- a/scripts/snapper-hourly ++++ b/scripts/snapper-hourly +@@ -9,10 +9,10 @@ export PATH + + + # +-# get information from /etc/sysconfig/snapper ++# get information from /etc/conf.d/snapper + # +-if [ -f /etc/sysconfig/snapper ] ; then +- . /etc/sysconfig/snapper ++if [ -f /etc/conf.d/snapper ] ; then ++ . /etc/conf.d/snapper + fi + + diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch deleted file mode 100644 index aa24330d7304..000000000000 --- a/app-backup/snapper/files/snapper-0.5.6-swap.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 -Author: Spencer Janssen <spencerjanssen@gmail.com> -Date: Mon Dec 3 17:33:49 2018 -0600 - - Work around btrfs v4.19 - - Addresses #459 - -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index cb9f7b3..c05557b 100644 ---- a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -41,6 +41,9 @@ - #include <btrfs/send.h> - #include <btrfs/send-stream.h> - #include <btrfs/send-utils.h> -+#ifdef swap -+#undef swap -+#endif - #include <boost/version.hpp> - #include <boost/thread.hpp> - #endif -diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc -index bada3f8..9edc325 100644 ---- a/snapper/BtrfsUtils.cc -+++ b/snapper/BtrfsUtils.cc -@@ -34,6 +34,9 @@ - #ifdef HAVE_LIBBTRFS - #include <btrfs/ioctl.h> - #include <btrfs/send-utils.h> -+#ifdef swap -+#undef swap -+#endif - #endif - #include <algorithm> - #include <functional> diff --git a/app-backup/snapper/files/snapper.bash b/app-backup/snapper/files/snapper.bash deleted file mode 100644 index e5ca4134342a..000000000000 --- a/app-backup/snapper/files/snapper.bash +++ /dev/null @@ -1,200 +0,0 @@ -_snapper() -{ - local configdir="/etc/snapper/configs" - local cur prev words cword - _init_completion || return - - local GLOGAL_SNAPPER_OPTIONS=' - -q --quiet - -v --verbose - --utc - --iso - -t --table-style - -c --config - -r --root - --no-dbus - --version - --help - ' - - # see if the user selected a command already - local COMMANDS=( - "list-configs" "create-config" "delete-config" "set-config" - "list" "ls" - "create" "modify" "delete" "remove" "rm" - "mount" "umount" - "status" "diff" "xadiff" - "undochange" "rollback" - "setup-quota" - "cleanup") - - local command i - for (( i=0; i < ${#words[@]}-1; i++ )); do - if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then - command=${words[i]} - break - fi - done - - case $prev in - --version|--help) - return 0 - ;; - esac - - # supported options per command - if [[ "$cur" == -* ]]; then - case $command in - create-config) - COMPREPLY=( $( compgen -W '--fstype -f - --templete -t' -- "$cur" ) ) - return 0 - ;; - list|ls) - COMPREPLY=( $( compgen -W '--type -t - --all-configs -a' -- "$cur" ) ) - return 0 - ;; - create) - COMPREPLY=( $( compgen -W '--type -t - --pre-number - --print-number -p - --description -d - --cleanup-algorithm -c - --userdata -u - --command' -- "$cur" ) ) - return 0 - ;; - modify) - COMPREPLY=( $( compgen -W '--description -d - --cleanup-algorithm -c - --userdata -u' -- "$cur" ) ) - return 0 - ;; - delete|remove|rm) - COMPREPLY=( $( compgen -W '--sync -s - ' -- "$cur" ) ) - return 0 - ;; - status) - COMPREPLY=( $( compgen -W '--output -o - ' -- "$cur" ) ) - return 0 - ;; - diff) - COMPREPLY=( $( compgen -W '--input -i - --diff-cmd - --extensions -x' -- "$cur" ) ) - return 0 - ;; - undochange) - COMPREPLY=( $( compgen -W '--input -i - ' -- "$cur" ) ) - return 0 - ;; - rollback) - COMPREPLY=( $( compgen -W '--print-number -p - --description -d - --cleanup-algorithm -c - --userdata -u' -- "$cur" ) ) - return 0 - ;; - *) - COMPREPLY=( $( compgen -W "$GLOGAL_SNAPPER_OPTIONS" -- "$cur" ) ) - return 0 - ;; - esac - fi - - # specific command arguments - if [[ -n $command ]]; then - case $command in - create-config) - case "$prev" in - --fstype|-f) - COMPREPLY=( $( compgen -W 'btrfs ext4 lvm(xfs) lvm(ext4) - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - list) - case "$prev" in - --type|-t) - COMPREPLY=( $( compgen -W 'all single pre-post - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - create) - case "$prev" in - --type|-t) - COMPREPLY=( $( compgen -W 'single pre post - ' -- "$cur" ) ) - ;; - --pre-number) - COMPREPLY=( $( compgen -W ' - ' -- "$cur" ) ) - ;; - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - modify) - case "$prev" in - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - status) - case "$prev" in - --output|-o) - COMPREPLY=( $( compgen -f -- "$cur" ) ) - ;; - esac - return 0 - ;; - cleanup) - case "$prev" in - empty-pre-post|timeline|number) - ;; - *) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - diff) - return 0 - ;; - undochange) - return 0 - ;; - rollback) - case "$prev" in - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - esac - fi - - # no command yet, show what commands we have - if [ "$command" = "" ]; then - COMPREPLY=( $( compgen -W '${COMMANDS[@]} ${GLOGAL_SNAPPER_OPTIONS[@]}' -- "$cur" ) ) - fi - - return 0 -} && -complete -F _snapper snapper diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml index 1aa9b1e774ab..f060368ca7fd 100644 --- a/app-backup/snapper/metadata.xml +++ b/app-backup/snapper/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <longdescription> Snapper is a command-line program for filesystem snapshot management. It can create, delete and compare snapshots and undo changes done between snapshots. It supports both btrfs and ext4. </longdescription> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>pastas4@gmail.com</email> <name>Dainius Masiliūnas (GreatEmerald)</name> </maintainer> @@ -14,7 +14,7 @@ <email>dlan@gentoo.org</email> <name>Yixun Lan</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.10.6.ebuild index 5a5593c28464..2adf8bcfcde5 100644 --- a/app-backup/snapper/snapper-0.8.9-r1.ebuild +++ b/app-backup/snapper/snapper-0.10.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" @@ -11,10 +11,17 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lvm pam xattr" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="lvm pam test systemd xattr" +RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= + dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl @@ -27,14 +34,11 @@ RDEPEND="dev-libs/boost:=[threads] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/cron-confd.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -50,13 +54,18 @@ src_configure() { # ext4 code does not work anymore # snapper does not build without btrfs local myeconfargs=( + --disable-silent-rules --with-conf="/etc/conf.d" - --disable-zypp + --enable-zypp --enable-rollback + --enable-btrfs-quota --disable-ext4 --enable-btrfs + --enable-doc $(use_enable lvm) $(use_enable pam) + $(use_enable test tests) + $(use_enable systemd) $(use_enable xattr xattrs) ) @@ -69,7 +78,6 @@ src_install() { keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -77,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.8.7.ebuild b/app-backup/snapper/snapper-0.10.7.ebuild index bcefeb713f17..9d04eeeb2e14 100644 --- a/app-backup/snapper/snapper-0.8.7.ebuild +++ b/app-backup/snapper/snapper-0.10.7.ebuild @@ -1,20 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" -SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" +SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lvm pam xattr" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="lvm pam test systemd xattr" +RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= + dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl @@ -27,12 +34,11 @@ RDEPEND="dev-libs/boost:=[threads] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/cron-confd.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -41,19 +47,25 @@ src_prepare() { sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ -i data/Makefile.* \ || die "Failed to fix systemd services and timers installation path" + eautoreconf } src_configure() { # ext4 code does not work anymore # snapper does not build without btrfs local myeconfargs=( + --disable-silent-rules --with-conf="/etc/conf.d" - --disable-zypp + --enable-zypp --enable-rollback + --enable-btrfs-quota --disable-ext4 --enable-btrfs + --enable-doc $(use_enable lvm) $(use_enable pam) + $(use_enable test tests) + $(use_enable systemd) $(use_enable xattr xattrs) ) @@ -66,7 +78,6 @@ src_install() { keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -74,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.8.6.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild index 1fcb91d42362..0e9331554272 100644 --- a/app-backup/snapper/snapper-0.8.6.ebuild +++ b/app-backup/snapper/snapper-0.11.0.ebuild @@ -1,20 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" -SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" +SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lvm pam xattr" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="lvm pam test systemd xattr" +RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= + dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl @@ -27,12 +34,11 @@ RDEPEND="dev-libs/boost:=[threads] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/cron-confd.patch + "${FILESDIR}"/${P}-cron-confd.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -41,19 +47,25 @@ src_prepare() { sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ -i data/Makefile.* \ || die "Failed to fix systemd services and timers installation path" + eautoreconf } src_configure() { # ext4 code does not work anymore # snapper does not build without btrfs local myeconfargs=( + --disable-silent-rules --with-conf="/etc/conf.d" - --disable-zypp + --enable-zypp --enable-rollback + --enable-btrfs-quota --disable-ext4 --enable-btrfs + --enable-doc $(use_enable lvm) $(use_enable pam) + $(use_enable test tests) + $(use_enable systemd) $(use_enable xattr xattrs) ) @@ -63,9 +75,9 @@ src_configure() { src_install() { default # Existing configuration file required to function + keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -73,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild deleted file mode 100644 index c6f5ffca2a55..000000000000 --- a/app-backup/snapper/snapper-0.5.6-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Command-line program for btrfs and lvm snapshot management" -HOMEPAGE="http://snapper.io/" -SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lvm pam xattr" - -RDEPEND="dev-libs/boost:=[threads] - dev-libs/libxml2 - dev-libs/icu:= - sys-apps/acl - sys-apps/dbus - sys-apps/util-linux - >=sys-fs/btrfs-progs-3.17.1 - sys-libs/zlib - virtual/libintl - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - xattr? ( sys-apps/attr )" - -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-swap.patch -) - -src_prepare() { - default - - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ - -i data/Makefile.* \ - || die "Failed to fix systemd services and timers installation path" -} - -src_configure() { - # ext4 code does not work anymore - # snapper does not build without btrfs - local myeconfargs=( - --with-conf="/etc/conf.d" - --disable-zypp - --enable-rollback - --disable-ext4 - --enable-btrfs - $(use_enable lvm) - $(use_enable pam) - $(use_enable xattr xattrs) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Existing configuration file required to function - newconfd data/sysconfig.snapper snapper - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "In order to use Snapper, you need to set up" - elog "at least one config first. To do this, run:" - elog "snapper create-config <subvolume>" - elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" -} diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml index bdf371a8df29..115e9d64a669 100644 --- a/app-backup/spideroak-bin/metadata.xml +++ b/app-backup/spideroak-bin/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>lucianposton@pm.me</email> - <name>Lucian Poston</name> -</maintainer> -<maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> -</maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r3.ebuild index bd12c7b9d6fd..d5e18a928843 100644 --- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild +++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r3.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit eutils unpacker +inherit desktop prefix unpacker DESCRIPTION="Secure free online backup, storage, and sharing system" HOMEPAGE="https://spideroak.com" SRC_URI_BASE="https://spideroak.com/release/spideroak" -SRC_URI="x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb ) - amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb )" +SRC_URI=" + x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb ) + amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb ) +" +S="${WORKDIR}" RESTRICT="mirror strip" LICENSE="spideroak" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="dbus X" +IUSE="X" -DEPEND="dev-util/patchelf" +BDEPEND="dev-util/patchelf" RDEPEND=" app-crypt/mit-krb5[keyutils] media-libs/libpng-compat:1.2 - dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 @@ -38,56 +40,55 @@ RDEPEND=" ) " -S=${WORKDIR} - QA_PREBUILT="*" src_prepare() { # Set RPATH for preserve-libs handling (bug #400979). cd "${S}/opt/SpiderOakONE/lib" || die local x - for x in `find` ; do + for x in $(find) ; do # Use \x7fELF header to separate ELF executables and libraries [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue patchelf --set-rpath '$ORIGIN' "${x}" || \ die "patchelf failed on ${x}" done - #Remove the libraries that break compatibility in modern systems - #SpiderOak will use the system libs instead - rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" - rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" - rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" - rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" + # Remove the libraries that break compatibility in modern systems + # SpiderOak will use the system libs instead + rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" || die + rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" || die + rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" || die + rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" || die eapply_user } src_install() { - #install the wrapper script + hprefixify usr/bin/SpiderOakONE + + # Install the wrapper script exeinto /usr/bin doexe usr/bin/SpiderOakONE # inotify_dir_watcher needs to be marked executable, bug #453266 #chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher - #install the executable + # Install the executable exeinto /opt/SpiderOakONE/lib doexe opt/SpiderOakONE/lib/SpiderOakONE doexe opt/SpiderOakONE/lib/inotify_dir_watcher - rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} + rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} || die - #install the prebundled libraries + # Install the prebundled libraries insinto /opt/SpiderOakONE doins -r opt/SpiderOakONE/lib - #install the config files - use dbus || rm -rf etc/dbus-1 insinto / doins -r etc - #install the manpage - doman usr/share/man/man1/SpiderOakONE.1.gz + # Install the manpage + gzip -d usr/share/man/man1/SpiderOakONE.1.gz || die + doman usr/share/man/man1/SpiderOakONE.1 if use X; then domenu usr/share/applications/SpiderOakONE.desktop diff --git a/app-backup/synology-cloud-station-backup/metadata.xml b/app-backup/synology-cloud-station-backup/metadata.xml index 020b40648ee8..572c7daf2ccf 100644 --- a/app-backup/synology-cloud-station-backup/metadata.xml +++ b/app-backup/synology-cloud-station-backup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>pacho@gentoo.org</email> diff --git a/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild b/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild index 9abae19231cc..f0fdbbe32bfb 100644 --- a/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild +++ b/app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,10 +18,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - RESTRICT="bindist mirror strip" QA_PREBUILT="*" diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest index 91b527b70c5c..ea0b05c8f381 100644 --- a/app-backup/tarsnap/Manifest +++ b/app-backup/tarsnap/Manifest @@ -1,3 +1,2 @@ -DIST tarsnap-autoconf-1.0.35.tgz 600115 BLAKE2B d2dc76a444e6095f00ba3742fa0aca5fd13263e5cc1ad666c222983ef5a5a9c9c72b5af18283ad33bef690328b9eab0c70fe908b33d87b286b1eacd55b664a4d SHA512 70f932b172717d7f0d6f96a357487b8f8ad13cb7332d73878f629c3abf0862da54a0621092d81ce8cd9eb8380cf5b4c32e89df4d890949429fc84737024dcb61 -DIST tarsnap-autoconf-1.0.37.tgz 629450 BLAKE2B 440858098c5c3f2be6fb6b1473ab4fade158203162c04fbc4c2e051f443c7ce3246ab0701e117bccb436b8f1f022e986ec67f653a3c34b9c36da99ca85d73bc8 SHA512 050053f2109b74cda16511cf35ab2c11e0470ba745c661d254b7c17efde9e629830d519896b343dbd4f48ee739dfef47b724eb5e2e78c3e7dbc4ae018a536a5f DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4 +DIST tarsnap-autoconf-1.0.40.tgz 723380 BLAKE2B a794bb9bae3637c36841ad4bb0fa1c0e1c39a78ac2dc92f18cbe7dfe1036aa861f5421751dd8a85948dcb101ecb81f2177e844609b289238abd9a8448ba1655a SHA512 a4910c5cbea4a71218638703ba3140e5536a2c9bb7f35007115a7ae4a87fcd07b1be91d88e49240ee8db39be326bac049c0893c1406f215123d55a13b7b57941 diff --git a/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch b/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch new file mode 100644 index 000000000000..f5a1115f161d --- /dev/null +++ b/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/721914 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -124,7 +124,7 @@ CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LIBRARIES = $(noinst_LIBRARIES) +-AR = ar ++AR := ar + ARFLAGS = cru + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) + diff --git a/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch b/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch new file mode 100644 index 000000000000..d168d99222e8 --- /dev/null +++ b/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch @@ -0,0 +1,158 @@ +https://github.com/Tarsnap/tarsnap/commit/ca40c06f290fb8298dc2e583303d45b58878f37b +https://github.com/Tarsnap/tarsnap/commit/4af6d8350ab53d0f1f3104ce3d9072c2d5f9ef7a + +From 4af6d8350ab53d0f1f3104ce3d9072c2d5f9ef7a Mon Sep 17 00:00:00 2001 +From: Graham Percival <gperciva@tarsnap.com> +Date: Fri, 1 Apr 2022 16:58:43 -0700 +Subject: [PATCH] scrypt: Fix strict aliasing + +The original scrypt code treated its data as blobs of bytes, accessing +them in whatever manner was convenient from time to time: + +* as 32-bit words or vectors thereof for the purpose of the Salsa20/8 core +* in machine-word-sized chunks (aka. size_t) for block copy and xor operations +* as 32-bit words for the Integerify function. + +This worked fine at the time, but newer compilers apply strict aliasing rules +which allow them to assume that e.g. data accessed as a uint32_t is not the +same as data accessed as a size_t, resulting in miscompilation. + +Note that in recent versions of scrypt (after 2015-07-18; versions 1.2.0 and +later) such miscompilation should be detected by the built-in runtime testing. + +To avoid aliasing problems, the generic scrypt code now operates on uint32_t +throughout while the SSE2-enabled scrypt code operates on __m128i throughout. + +Experimentally, we found that memcpy() speeds up blkcpy() in the plain C +case, but slowed it down in the _sse2.c case (probably because memcpy +can make use of vector instructions internally, but cannot assume that +it will always have a multiple of 16 bytes, as we do). +--- a/lib/crypto/crypto_scrypt_smix.c ++++ b/lib/crypto/crypto_scrypt_smix.c +@@ -27,39 +27,32 @@ + * online backup system. + */ + #include <stdint.h> ++#include <string.h> + + #include "sysendian.h" + + #include "crypto_scrypt_smix.h" + +-static void blkcpy(void *, const void *, size_t); +-static void blkxor(void *, const void *, size_t); ++static void blkcpy(uint32_t *, const uint32_t *, size_t); ++static void blkxor(uint32_t *, const uint32_t *, size_t); + static void salsa20_8(uint32_t[16]); + static void blockmix_salsa8(const uint32_t *, uint32_t *, uint32_t *, size_t); +-static uint64_t integerify(const void *, size_t); ++static uint64_t integerify(const uint32_t *, size_t); + + static void +-blkcpy(void * dest, const void * src, size_t len) ++blkcpy(uint32_t * dest, const uint32_t * src, size_t len) + { +- size_t * D = dest; +- const size_t * S = src; +- size_t L = len / sizeof(size_t); +- size_t i; + +- for (i = 0; i < L; i++) +- D[i] = S[i]; ++ memcpy(dest, src, len); + } + + static void +-blkxor(void * dest, const void * src, size_t len) ++blkxor(uint32_t * dest, const uint32_t * src, size_t len) + { +- size_t * D = dest; +- const size_t * S = src; +- size_t L = len / sizeof(size_t); + size_t i; + +- for (i = 0; i < L; i++) +- D[i] ^= S[i]; ++ for (i = 0; i < len / 4; i++) ++ dest[i] ^= src[i]; + } + + /** +@@ -145,9 +138,9 @@ blockmix_salsa8(const uint32_t * Bin, uint32_t * Bout, uint32_t * X, size_t r) + * Return the result of parsing B_{2r-1} as a little-endian integer. + */ + static uint64_t +-integerify(const void * B, size_t r) ++integerify(const uint32_t * B, size_t r) + { +- const uint32_t * X = (const void *)((uintptr_t)(B) + (2 * r - 1) * 64); ++ const uint32_t * X = B + (2 * r - 1) * 16; + + return (((uint64_t)(X[1]) << 32) + X[0]); + } +--- a/lib/crypto/crypto_scrypt_smix_sse2.c ++++ b/lib/crypto/crypto_scrypt_smix_sse2.c +@@ -36,34 +36,30 @@ + + #include "crypto_scrypt_smix_sse2.h" + +-static void blkcpy(void *, const void *, size_t); +-static void blkxor(void *, const void *, size_t); ++static void blkcpy(__m128i *, const __m128i *, size_t); ++static void blkxor(__m128i *, const __m128i *, size_t); + static void salsa20_8(__m128i[4]); + static void blockmix_salsa8(const __m128i *, __m128i *, __m128i *, size_t); +-static uint64_t integerify(const void *, size_t); ++static uint64_t integerify(const __m128i *, size_t); + + static void +-blkcpy(void * dest, const void * src, size_t len) ++blkcpy(__m128i * dest, const __m128i * src, size_t len) + { +- __m128i * D = dest; +- const __m128i * S = src; + size_t L = len / 16; + size_t i; + + for (i = 0; i < L; i++) +- D[i] = S[i]; ++ dest[i] = src[i]; + } + + static void +-blkxor(void * dest, const void * src, size_t len) ++blkxor(__m128i * dest, const __m128i * src, size_t len) + { +- __m128i * D = dest; +- const __m128i * S = src; + size_t L = len / 16; + size_t i; + + for (i = 0; i < L; i++) +- D[i] = _mm_xor_si128(D[i], S[i]); ++ dest[i] = _mm_xor_si128(dest[i], src[i]); + } + + /** +@@ -168,11 +164,18 @@ blockmix_salsa8(const __m128i * Bin, __m128i * Bout, __m128i * X, size_t r) + * Note that B's layout is permuted compared to the generic implementation. + */ + static uint64_t +-integerify(const void * B, size_t r) ++integerify(const __m128i * B, size_t r) + { +- const uint32_t * X = (const void *)((uintptr_t)(B) + (2 * r - 1) * 64); ++ const __m128i * X = B + (2*r - 1) * 4; ++ uint32_t X0, X13; + +- return (((uint64_t)(X[13]) << 32) + X[0]); ++ /* Get the first 32-bit element in X[0]. */ ++ X0 = (uint32_t)_mm_cvtsi128_si32(X[0]); ++ ++ /* Get the second 32-bit element in X[3]. */ ++ X13 = (uint32_t)_mm_cvtsi128_si32(_mm_srli_si128(X[3], 4)); ++ ++ return (((uint64_t)(X13) << 32) + X0); + } + + /** diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml index bf9dc03e0dec..57fe554037a4 100644 --- a/app-backup/tarsnap/metadata.xml +++ b/app-backup/tarsnap/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">Tarsnap/tarsnap</remote-id> + </upstream> </pkgmetadata> diff --git a/app-backup/tarsnap/tarsnap-1.0.35.ebuild b/app-backup/tarsnap/tarsnap-1.0.35.ebuild deleted file mode 100644 index 17f77b783b74..000000000000 --- a/app-backup/tarsnap/tarsnap-1.0.35.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Online backups for the truly paranoid" -HOMEPAGE="http://www.tarsnap.com/" -SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" - -LICENSE="tarsnap" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="acl bzip2 libressl lzma cpu_flags_x86_sse2 xattr" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/e2fsprogs-libs - sys-libs/zlib - acl? ( sys-apps/acl ) - bzip2? ( app-arch/bzip2 ) - lzma? ( app-arch/xz-utils ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - virtual/os-headers" # Required for "magic.h" - -S=${WORKDIR}/${PN}-autoconf-${PV} - -src_configure() { - econf \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable xattr) \ - $(use_enable acl) \ - $(use_with bzip2 bz2lib) \ - --without-lzmadec \ - $(use_with lzma) -} diff --git a/app-backup/tarsnap/tarsnap-1.0.37.ebuild b/app-backup/tarsnap/tarsnap-1.0.37.ebuild deleted file mode 100644 index 537b94cdf769..000000000000 --- a/app-backup/tarsnap/tarsnap-1.0.37.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -DESCRIPTION="Online backups for the truly paranoid" -HOMEPAGE="http://www.tarsnap.com/" -SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" - -LICENSE="tarsnap" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="acl bzip2 libressl lzma xattr" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/e2fsprogs-libs - sys-libs/zlib - acl? ( sys-apps/acl ) - bzip2? ( app-arch/bzip2 ) - lzma? ( app-arch/xz-utils ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - virtual/os-headers" # Required for "magic.h" - -S=${WORKDIR}/${PN}-autoconf-${PV} - -src_configure() { - econf \ - $(use_enable xattr) \ - $(use_enable acl) \ - $(use_with bzip2 bz2lib) \ - --without-lzmadec \ - $(use_with lzma) -} - -src_install() { - default - dobashcomp misc/bash_completion.d/* -} diff --git a/app-backup/tarsnap/tarsnap-1.0.39.ebuild b/app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild index 42bf7639963d..1945b8ea081f 100644 --- a/app-backup/tarsnap/tarsnap-1.0.39.ebuild +++ b/app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit bash-completion-r1 +inherit bash-completion-r1 toolchain-funcs DESCRIPTION="Online backups for the truly paranoid" HOMEPAGE="https://www.tarsnap.com/" @@ -11,13 +11,12 @@ SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" LICENSE="tarsnap" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="acl bzip2 libressl lzma xattr" +KEYWORDS="amd64 x86" +IUSE="acl bzip2 lzma xattr" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/e2fsprogs-libs + dev-libs/openssl:0= + sys-fs/e2fsprogs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) @@ -26,6 +25,8 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/os-headers" # Required for "magic.h" +PATCHES=( "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch ) + S=${WORKDIR}/${PN}-autoconf-${PV} src_configure() { @@ -37,6 +38,10 @@ src_configure() { $(use_with lzma) } +src_compile() { + emake AR="$(tc-getAR)" +} + src_install() { default dobashcomp misc/bash_completion.d/* diff --git a/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild b/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild new file mode 100644 index 000000000000..aeb7290bd2ce --- /dev/null +++ b/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 toolchain-funcs + +DESCRIPTION="Online backups for the truly paranoid" +HOMEPAGE="https://www.tarsnap.com/" +SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" +S="${WORKDIR}"/${PN}-autoconf-${PV} + +LICENSE="tarsnap" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="acl bzip2 lzma xattr" + +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:= + sys-fs/e2fsprogs + sys-libs/zlib + acl? ( sys-apps/acl ) + lzma? ( app-arch/xz-utils ) + xattr? ( sys-apps/attr ) +" +# Required for "magic.h" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch + "${FILESDIR}"/${P}-strict-aliasing-fix.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable xattr) + $(use_enable acl) + # The bundled libarchive (ancient copy) always builds + # the bzip2 bits. + --with-bz2lib + --without-lzmadec + $(use_with lzma) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + dobashcomp misc/bash_completion.d/* +} diff --git a/app-backup/tarsnap/tarsnap-1.0.40.ebuild b/app-backup/tarsnap/tarsnap-1.0.40.ebuild new file mode 100644 index 000000000000..ebf35c72ced2 --- /dev/null +++ b/app-backup/tarsnap/tarsnap-1.0.40.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 toolchain-funcs + +DESCRIPTION="Online backups for the truly paranoid" +HOMEPAGE="https://www.tarsnap.com/" +SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" +S="${WORKDIR}"/${PN}-autoconf-${PV} + +LICENSE="tarsnap" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="acl bzip2 lzma xattr" + +RDEPEND=" + dev-libs/openssl:= + sys-fs/e2fsprogs + sys-libs/zlib + acl? ( sys-apps/acl ) + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + xattr? ( sys-apps/attr ) +" +# Required for "magic.h" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable xattr) + $(use_enable acl) + $(use_with bzip2 bz2lib) + --without-lzmadec + $(use_with lzma) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + dobashcomp misc/bash_completion.d/* +} diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest index 6fcba5100fe5..5b1f5214da22 100644 --- a/app-backup/tsm/Manifest +++ b/app-backup/tsm/Manifest @@ -1,2 +1 @@ -DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9 -DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984 +DIST 8.1.22.0-TIV-TSMBAC-LinuxX86.tar 745175040 BLAKE2B 510ab45065f21e533bc776b886c6804021caa119d43b7693da4902f3d469d12deee71adc0cdd97d84c3cdaacb1b7ca878c6f6ee228f500651fbadd177def8f6f SHA512 b6c9ab9d9d33a060a6a69f5ecb62ba69df2d31506007e958313c7b62054e49735e8864fbe9f51876bf4398ef8f12c8fe27f3e0fec91def2c2ab016e3413f9e8b diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml index 249336c90817..f53678b60439 100644 --- a/app-backup/tsm/metadata.xml +++ b/app-backup/tsm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> @@ -7,5 +7,6 @@ <use> <flag name="tsm-cit">IBM Tivoli Common Inventory Technology</flag> <flag name="tsm-hw">Difference snapshot support for NetApp and N-Series file servers</flag> + <flag name="vmware">Install vmware data protection support</flag> </use> </pkgmetadata> diff --git a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild deleted file mode 100644 index 58c58485a2bf..000000000000 --- a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils - -DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API" -HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery" - -MY_PV_MAJOR=$(get_major_version) -MY_PV_MINOR=$(get_version_component_range 2) -MY_PV_TINY=$(get_version_component_range 3) -MY_PV_PATCH=$(get_version_component_range 4) - -MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}" -MY_PVR_ALLDOTS=${PV} - -if [[ ${MY_PV_PATCH} == 0 ]]; then - MY_RELEASE_PATH=maintenance -else - MY_RELEASE_PATH=patches -fi -BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/" -BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/" -BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/" -SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar" -SRC_URI="${BASE_URI}${SRC_TAR}" - -RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so -LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab - dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a - ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C - || ( BSD GPL-2+ ) gSOAP libpng tsm" - -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="acl java +tsm-cit +tsm-hw" -QA_PREBUILT="*" - -# not available (yet?) -#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP -# ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW" -MY_LANG_PV="${MY_PVR_ALLDOTS}-" -for lang in ${MY_LANGS}; do - IUSE="${IUSE} l10n_${lang%:*}" - SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \ -${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \ -${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )" -done -unset lang - -DEPEND=" - acct-group/tsm -" -RDEPEND=" - acct-group/tsm - dev-libs/expat - dev-libs/libxml2 - sys-fs/fuse:0 - acl? ( sys-apps/acl ) - java? ( >=virtual/jre-1.7 ) -" - -S="${WORKDIR}/bacli" - -pkg_setup() { - DOC_CONTENTS=" - Note that you have to be root to be able to use the Tivoli Storage Manager - client. The dsmtca trusted agent binary does not exist anymore. - - For information on how to give other users access, please see the following - URLs: - https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin - https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca - " -} - -src_unpack() { - local rpm rpms lang - mkdir bacli || die - cd bacli || die - unpack ${SRC_TAR} - - cd "${S}" - for rpm in *.rpm; do - case ${rpm} in - TIVsm-APIcit.*|TIVsm-BAcit.*) - use tsm-cit && rpms="${rpms} ./${rpm}" - ;; - TIVsm-BAhdw.*) - use tsm-hw && rpms="${rpms} ./${rpm}" - ;; - TIVsm-JBB.*|*-filepath-*) - # "journal based backup" for all filesystems - # requires a kernel module. - # "Linux Filepath source code" available - # by request from vendor - ;; - *) - rpms="${rpms} ./${rpm}" - ;; - esac - done - for rpm in ${A}; do - case ${rpm} in - *.rpm) - rpms="${rpms} ${rpm}" - ;; - esac - done - - rpm_unpack ${rpms} - - # Avoid strange error messages caused by read-only files - chmod -R u+w "${S}" || die -} - -src_install() { - cp -a opt "${D}" || die - cp -a usr "${D}" || die - - # The RPM files contain postinstall scripts which can be extracted - # e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 . - # Below we try to mimic the behaviour of these scripts. - # We don't deal with SELinux compliance (yet), though. - local RPM_INSTALL_PREFIX CLIENTDIR i - RPM_INSTALL_PREFIX=/opt - CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client - - # Create links for messages; this is spread over several postin scripts. - #for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do - # dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i} - # dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i} - #done - - # Mimic TIVsm-API64 postinstall script - for i in libgpfs.so libdmapi.so; do - dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i} - done - - # The TIVsm-BA postinstall script only does messages and ancient upgrades - - # The gscrypt64 postinstall script only deals with s390[x] SELinux - # and the symlink for the iccs library which we handle in the loop below. - - # Move stuff from /usr/local to /opt, #452332 - mv "${D}"/usr/local/ibm "${D}"/opt/ || die - rmdir "${D}"/usr/local || die - - # Mimic gskssl64 postinstall script - for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do - dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \ - /usr/lib64/libgsk8${i}_64.so - done - for i in capicmd ver; do - dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64 - done - - # Done with the postinstall scripts as the RPMs contain them. - # Now on to some more Gentoo-specific installation. - - [[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system" - - # Avoid "QA Notice: Found an absolute symlink in a library directory" - local target - find "${D}"usr/lib* -lname '/*' | while read i; do - target=$(readlink "${i}") - rm -v "${i}" || die - dosym "../..${target}" "${i#${D}}" - done - - keepdir /var/log/tsm - insinto /etc/logrotate.d - newins "${FILESDIR}/tsm.logrotate" tsm - - keepdir /etc/tivoli - - cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die - echo ' PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys - echo ' PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys - - # Added the hostname to be more friendly, the admin will need to edit this file anyway - echo ' NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys - echo ' ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys - echo ' SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys - dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys - - cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt" - dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt - - # Setup the env - dodir /etc/env.d - ENV_FILE="${D}/etc/env.d/80tivoli" - echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE} - echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} - echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE} - - echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" - - newconfd "${FILESDIR}/dsmc.conf.d" dsmc - newinitd "${FILESDIR}/dsmc.init.d" dsmc - newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad - - # Need this for hardened, otherwise a cryptic "connection to server lost" message appears - pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc" - - systemd_dounit "${FILESDIR}/dsmc.service" - systemd_dounit "${FILESDIR}/dsmcad.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - local i dirs - for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do - if [[ ! -e $i ]]; then - touch $i || die - chown :tsm $i || die - chmod 0660 $i || die - fi - done - - # Bug #375041: the log directory itself should not be world writable. - # Have to do this in postinst due to bug #141619 - chown root:tsm /var/log/tsm || die - chmod 0750 /var/log/tsm || die - - # Bug 508052: directories used to be too restrictive, have to widen perms. - dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) ) - chown root:root "${dirs[@]}" || die - chmod 0755 "${dirs[@]}" || die - - FORCE_PRINT_ELOG=1 - DISABLE_AUTOFORMATTING=1 - readme.gentoo_print_elog -} diff --git a/app-backup/tsm/tsm-8.1.6.0.ebuild b/app-backup/tsm/tsm-8.1.22.0.ebuild index 6671f616235f..de1a9b67bd7a 100644 --- a/app-backup/tsm/tsm-8.1.6.0.ebuild +++ b/app-backup/tsm/tsm-8.1.22.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils +inherit readme.gentoo-r1 rpm systemd pax-utils DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API" -HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery" +HOMEPAGE="https://www.ibm.com/docs/en/spectrum-protect" -MY_PV_MAJOR=$(get_major_version) -MY_PV_MINOR=$(get_version_component_range 2) -MY_PV_TINY=$(get_version_component_range 3) -MY_PV_PATCH=$(get_version_component_range 4) +MY_PV_MAJOR=$(ver_cut 1) +MY_PV_MINOR=$(ver_cut 2) +MY_PV_TINY=$(ver_cut 3) +MY_PV_PATCH=$(ver_cut 4) MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}" MY_PVR_ALLDOTS=${PV} @@ -21,7 +21,7 @@ if [[ ${MY_PV_PATCH} == 0 ]]; then else MY_RELEASE_PATH=patches fi -BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/" +BASE_URI="https://public.dhe.ibm.com/storage/tivoli-storage-management/" BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/" BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/" SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar" @@ -34,8 +34,8 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola || ( BSD GPL-2+ ) gSOAP libpng tsm" SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="acl java +tsm-cit +tsm-hw" +KEYWORDS="-* amd64" +IUSE="acl java vmware +tsm-cit +tsm-hw" QA_PREBUILT="*" # not available (yet?) @@ -50,6 +50,9 @@ ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )" done unset lang +BDEPEND=" + app-arch/xz-utils[extra-filters] +" DEPEND=" acct-group/tsm " @@ -59,7 +62,12 @@ RDEPEND=" dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) - java? ( >=virtual/jre-1.7 ) + java? ( virtual/jre:1.8 ) + vmware? ( x11-libs/libXft media-libs/alsa-lib ) + || ( + sys-libs/libxcrypt[compat] + sys-libs/glibc[crypt(-)] + ) " S="${WORKDIR}/bacli" @@ -117,8 +125,11 @@ src_unpack() { } src_install() { - cp -a opt "${D}" || die - cp -a usr "${D}" || die + if ! use vmware; then + rm -rf opt/tivoli/tsm/tdpvmware + fi + cp -a opt "${D}"/ || die + cp -a usr "${D}"/ || die # The RPM files contain postinstall scripts which can be extracted # e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 . @@ -126,17 +137,17 @@ src_install() { # We don't deal with SELinux compliance (yet), though. local RPM_INSTALL_PREFIX CLIENTDIR i RPM_INSTALL_PREFIX=/opt - CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client + CLIENTDIR=${RPM_INSTALL_PREFIX}/tivoli/tsm/client # Create links for messages; this is spread over several postin scripts. - #for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do + #for i in $(cd "${D}"/${CLIENTDIR}/lang; ls -1d ??_??); do # dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i} # dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i} #done # Mimic TIVsm-API64 postinstall script for i in libgpfs.so libdmapi.so; do - dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i} + dosym ../..${CLIENTDIR}/api/bin64/${i} /usr/lib64/${i} done # The TIVsm-BA postinstall script only does messages and ancient upgrades @@ -160,14 +171,15 @@ src_install() { # Done with the postinstall scripts as the RPMs contain them. # Now on to some more Gentoo-specific installation. - [[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system" + rm -rf "${D}/usr/lib/.build-id" &> /dev/null + [[ -d "${D}/usr/lib" ]] && rmdir "${D}/usr/lib" || die "Using 32bit lib dir in 64bit only system" # Avoid "QA Notice: Found an absolute symlink in a library directory" local target - find "${D}"usr/lib* -lname '/*' | while read i; do + find "${D}"/usr/lib* -lname '/*' | while read i; do target=$(readlink "${i}") rm -v "${i}" || die - dosym "../..${target}" "${i#${D}}" + dosym "../..${target}" "${i#${D}/}" done keepdir /var/log/tsm @@ -177,13 +189,13 @@ src_install() { keepdir /etc/tivoli cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die - echo ' PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys - echo ' PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys + echo ' PasswordDir "/etc/tivoli/"' >> "${D}"/etc/tivoli/dsm.sys + echo ' PasswordAccess generate' >> "${D}"/etc/tivoli/dsm.sys # Added the hostname to be more friendly, the admin will need to edit this file anyway - echo ' NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys - echo ' ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys - echo ' SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys + echo ' NodeName' `hostname` >> "${D}"/etc/tivoli/dsm.sys + echo ' ErrorLogName "/var/log/tsm/dsmerror.log"' >> "${D}"/etc/tivoli/dsm.sys + echo ' SchedLogName "/var/log/tsm/dsmsched.log"' >> "${D}"/etc/tivoli/dsm.sys dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt" @@ -195,7 +207,7 @@ src_install() { echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE} echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE} - echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} + # echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die insinto "/etc/revdep-rebuild" @@ -217,10 +229,10 @@ src_install() { pkg_postinst() { local i dirs for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do - if [[ ! -e $i ]]; then - touch $i || die - chown :tsm $i || die - chmod 0660 $i || die + if [[ ! -e ${i} ]]; then + touch ${i} || die + chown :tsm ${i} || die + chmod 0660 ${i} || die fi done diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest index 405cf47afece..5173f996f89a 100644 --- a/app-backup/untangle-https-backup/Manifest +++ b/app-backup/untangle-https-backup/Manifest @@ -1 +1 @@ -DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c +DIST untangle-https-backup-0.1.0.tar.gz 17211 BLAKE2B bbf8725e3198573b287624850cb854c5c5c5dffaefb4546e9295e21771f8e3d25652c94be497c9932caeed5afdf1afecb15aaad75f1ff2f53f6c4b92b3ddc23c SHA512 9874dbce881c419345b6e77a1e616b4c3e97f441606d7353b1a77c680bc48715d8f70f45680f8b57a447df44d9d9346d7aebf394de0793966734b3d9865bc18e diff --git a/app-backup/untangle-https-backup/metadata.xml b/app-backup/untangle-https-backup/metadata.xml index 45125b9b6e99..f2908ee10b59 100644 --- a/app-backup/untangle-https-backup/metadata.xml +++ b/app-backup/untangle-https-backup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r2.ebuild index 5f37599f5466..123e746bccf5 100644 --- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild +++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r2.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) PYTHON_REQ_USE="ssl(+)" -DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 DESCRIPTION="Back up Untangle configurations via the web admin UI" -HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml" -SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz" +HOMEPAGE="https://michael.orlitzky.com/code/untangle-https-backup.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" src_install() { distutils-r1_src_install diff --git a/app-backup/vzdump/files/vzdump-1.2-no-compress.patch b/app-backup/vzdump/files/vzdump-1.2-no-compress.patch new file mode 100644 index 000000000000..7c9ff3ed10d0 --- /dev/null +++ b/app-backup/vzdump/files/vzdump-1.2-no-compress.patch @@ -0,0 +1,45 @@ +--- a/Makefile ++++ b/Makefile +@@ -55,9 +55,9 @@ DISTFILES= \ + + PKGSOURCE= \ + vzdump \ +- vzdump.1.gz \ ++ vzdump.1 \ + vzrestore \ +- vzrestore.1.gz \ ++ vzrestore.1 \ + VZDump.pm \ + Plugin.pm \ + OpenVZ.pm \ +@@ -77,8 +77,8 @@ install: ${PKGSOURCE} + install -m 0755 vzdump ${DESTDIR}${SBINDIR} + install -m 0755 vzrestore ${DESTDIR}${SBINDIR} + install -d ${DESTDIR}${MAN1DIR} +- install -m 0644 vzdump.1.gz ${DESTDIR}${MAN1DIR} +- install -m 0644 vzrestore.1.gz ${DESTDIR}${MAN1DIR} ++ install -m 0644 vzdump.1 ${DESTDIR}${MAN1DIR} ++ install -m 0644 vzrestore.1 ${DESTDIR}${MAN1DIR} + install -d ${DESTDIR}${PERLLIBDIR} + install -m 0644 VZDump.pm ${DESTDIR}${PERLLIBDIR} + install -d ${DESTDIR}${PERLLIBDIR}/VZDump +@@ -104,9 +104,9 @@ deb ${DEB}: ${PKGSOURCE} ${DISTFILES} + rm -rf debian + lintian ${DEB} + +-%.1.gz: % +- rm -f $*.1.gz +- pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation" <$* |gzip -c9 >$*.1.gz ++%.1: % ++ rm -f $*.1 ++ pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation" <$* >$*.1 + + .PHONY: rpm + rpm ${RPM}: ${TGZ} ${PACKAGE}.spec +@@ -134,4 +134,4 @@ ${TGZ}: ${DISTFILES} + + .PHONY: clean + clean: +- rm -rf debian *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR} +\ No newline at end of file ++ rm -rf debian *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR} diff --git a/app-backup/vzdump/metadata.xml b/app-backup/vzdump/metadata.xml index da366eec9b75..5e05197b6d22 100644 --- a/app-backup/vzdump/metadata.xml +++ b/app-backup/vzdump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-backup/vzdump/vzdump-1.2.ebuild b/app-backup/vzdump/vzdump-1.2-r1.ebuild index e7b4d1b5be01..24171295d3e1 100644 --- a/app-backup/vzdump/vzdump-1.2.ebuild +++ b/app-backup/vzdump/vzdump-1.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit perl-functions @@ -12,7 +12,6 @@ SRC_URI="http://www.proxmox.com/cms_proxmox/cms/upload/vzdump/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-lang/perl:=" RDEPEND="${DEPEND} @@ -24,6 +23,10 @@ RDEPEND="${DEPEND} virtual/mta virtual/perl-Getopt-Long" +PATCHES=( + "${FILESDIR}"/${PN}-1.2-no-compress.patch +) + src_compile() { return } diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest deleted file mode 100644 index ba4f197aed27..000000000000 --- a/app-backup/zbackup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575 diff --git a/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch b/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch deleted file mode 100644 index 8f9f839a66fd..000000000000 --- a/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2017-02-24 09:22:39.360392521 +0200 -+++ b/CMakeLists.txt 2017-02-24 09:23:13.642390978 +0200 -@@ -51,4 +51,8 @@ - ${LIBLZO_LIBRARIES} - ) - -+if (BUILD_TARTOOL) -+ add_subdirectory(tartool) -+endif (BUILD_TARTOOL) -+ - install( TARGETS zbackup DESTINATION bin ) diff --git a/app-backup/zbackup/files/zbackup-9999-tartool.patch b/app-backup/zbackup/files/zbackup-9999-tartool.patch deleted file mode 100644 index 26052f97a485..000000000000 --- a/app-backup/zbackup/files/zbackup-9999-tartool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2017-02-24 09:22:39.360392521 +0200 -+++ b/CMakeLists.txt 2017-02-24 09:23:13.642390978 +0200 -@@ -51,4 +51,8 @@ - ${LIBLZO_LIBRARIES} - ) - -+if (BUILD_TARTOOL) -+ add_subdirectory(tools/tartool) -+endif (BUILD_TARTOOL) -+ - install( TARGETS zbackup DESTINATION bin ) diff --git a/app-backup/zbackup/metadata.xml b/app-backup/zbackup/metadata.xml deleted file mode 100644 index 65b656521136..000000000000 --- a/app-backup/zbackup/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>spiderx@spiderx.dp.ua</email> - <name>Vladimir Pavljuchenkov</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription> - zbackup is a globally-deduplicating backup tool. - The program has the following features: - Parallel LZMA or LZO compression of the stored data - Built-in AES encryption of the stored data - Possibility to delete old backup data - Use of a 64-bit rolling hash, keeping the amount of soft collisions to zero - </longdescription> - <use> - <flag name="tartool">Install tartool utility</flag> - </use> - <upstream> - <remote-id type="github">zbackup/zbackup</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-backup/zbackup/zbackup-1.4.4-r1.ebuild b/app-backup/zbackup/zbackup-1.4.4-r1.ebuild deleted file mode 100644 index 1371f7e56cf4..000000000000 --- a/app-backup/zbackup/zbackup-1.4.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A versatile deduplicating backup tool" -HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="libressl tartool" - -DEPEND="app-arch/lzma - dev-libs/lzo:2 - dev-libs/protobuf:0= - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND}" - -# Add tartool build -PATCHES=( "${FILESDIR}/${P}-tartool.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_TARTOOL="$(usex tartool)" - ) - - cmake-utils_src_configure -} diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild deleted file mode 100644 index 864251576a57..000000000000 --- a/app-backup/zbackup/zbackup-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils git-r3 - -DESCRIPTION="A versatile deduplicating backup tool" -HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup" -SRC_URI="" -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - -LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="" -SLOT="0" -IUSE="libressl tartool" - -DEPEND="app-arch/lzma - dev-libs/lzo:2 - dev-libs/protobuf:0= - sys-libs/libunwind:0 - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND}" - -# Add tartool build -PATCHES=( "${FILESDIR}/${P}-tartool.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_TARTOOL="$(usex tartool)" - ) - - cmake-utils_src_configure -} |