diff options
Diffstat (limited to 'app-backup')
18 files changed, 301 insertions, 78 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz Binary files differindex 9585ff792d38..bb14ff509063 100644 --- a/app-backup/Manifest.gz +++ b/app-backup/Manifest.gz diff --git a/app-backup/ccollect/Manifest b/app-backup/ccollect/Manifest index a8ea7866b7f9..3061782a0bf1 100644 --- a/app-backup/ccollect/Manifest +++ b/app-backup/ccollect/Manifest @@ -1,3 +1,3 @@ DIST ccollect-0.8.tar.bz2 60376 BLAKE2B e3580aa6d1438b106c372e5b4abc77b9e19a8e057b93cfbd5882b3e9a899d5fa02c31c030c933c6e3e254687423cc51d0d86787365d40e4f5635aab3aa6dd954 SHA512 dc4b2a8687c636938154f8a4a4048c3f0ef13f6d6e3f6e66d8dcc8f544f3a390a98a8dbfb3ba2ba9019decbec5d628f07461dd3f803e14b2203972936ebf96f3 -EBUILD ccollect-0.8.ebuild 2212 BLAKE2B 3d8f1fa55b5cb5f67ffed1fd23078f9fa860c5536b72be8511410b7ddd301739b77a0dbb64cbcb18c2c4b2f3f508732810464f4fc4dd20d7afd6d99186cb2db7 SHA512 c9b3cc3ded77b4c32367c58b8a8a26dbbafead1c2f278ecb0e3a2774d281a851c83ad6ee1c3ec7f4b5e7f211c34aad2437ac124301b874e3405731c592037e90 +EBUILD ccollect-0.8-r1.ebuild 2209 BLAKE2B c0fcc2f9e198064de9f2d60d53a5c92ca53abf81f08b22cb0f13d35e6169c547e8d1d645ee3aba64d85c13c5c3f3ad9bf8059fbcd6942c6cfe9a14bf9799b69d SHA512 0fb265043da59e9d03eafa6b67b35dea8c4cb35b71bd501a61c62b961030803a8a96f687cecc501eb3082d20fe91009e2e11cf96058f54b32064c90510b2143e MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-backup/ccollect/ccollect-0.8.ebuild b/app-backup/ccollect/ccollect-0.8-r1.ebuild index 4ece2b179dff..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/" @@ -11,21 +11,20 @@ LICENSE="GPL-3" SLOT="0" 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/cdbackup/Manifest b/app-backup/cdbackup/Manifest index 87a6c6796e97..fafed1f6aaa0 100644 --- a/app-backup/cdbackup/Manifest +++ b/app-backup/cdbackup/Manifest @@ -1,3 +1,5 @@ +AUX cdbackup-0.7.1-makefile.patch 686 BLAKE2B 2cb4dad8c11a8f8d8f4858a5ba9b66eb5852925bf0b2d5a1527695032af4e3424d9e3006234cbaf23f5fef476fc2fcd3fc0c055df6fea3cdfeb02d9dc1cab53c SHA512 d3ace496c1195969f4b2cea0185dba4ad1c7987ebab9805e3c4badc65311647d8835deddd1835817e8543556d5e8677fc83f523f7b65f6fffc4ef915a948b377 +AUX cdbackup-0.7.1-u_char-musl.patch 295 BLAKE2B 9b45c61cf65b9888712e2822a5d634a8437157d49a4e12da287dfc2197c307b3c967b3fb0db8fa6a9bdb9c370007e6ec0b26d10f06ba25fb2c903a30ecdbc8a2 SHA512 0ab371124c1924f02e54de8dee09cee4a6751cd21e0ab83ffc56fd9dcdd85e7be14c064d51e62b3c4f843e80fdf2a97be8f1a7d532fa2fb8619558f3dbf76699 DIST cdbackup-0.7.1.tar.gz 22710 BLAKE2B eb21cf8ebd0c0a5487a86fb1d8afe7743be070743bdf3245fd4131c06c8ffe97b4bb93096e8952fb8479fac0cf3d764375478437691386ab762607aa420f8540 SHA512 9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f -EBUILD cdbackup-0.7.1-r1.ebuild 730 BLAKE2B 60fac951df47218ba0173c7925517fe6e6b57300beca28c17080b885ba72fff4be38a2b29e490ac88e6c6cb43615b2eb0758bfcbf49d9491071e793e0a8d3659 SHA512 0c190a6d87e63ffccd66982053c82b9c628ce44f2cc0519ab9367c06ed0c9b9968d259dd3e09ac918a178c3cd42a393e1fdffdc9ae7b9a979301f9f91c807133 +EBUILD cdbackup-0.7.1-r2.ebuild 617 BLAKE2B f53b4c8c4d9dfa7ce5ac3076c521e0f17a4b95594cc568fb91b98f949f0e9e6be98d3390f32d5ae24a483cd34115173502b2ee83c79f19631d3b5e375cb25bec SHA512 2047408d77c3e7741c1ece1a9bc8cc79fbf601316c8ed56e5c46b18261c469dc2d3bc05c6b40e6f8e2f9469dc78b11bc3df83befc1ba34cdab47ecd0477c0244 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild index 184aa586db4c..89093287bfc2 100644 --- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild +++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.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 inherit toolchain-funcs @@ -12,23 +12,20 @@ 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 -} +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-u_char-musl.patch +) -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" +src_configure() { + tc-export CC } src_install() { dobin cdbackup cdrestore doman cdbackup.1 cdrestore.1 - dodoc CHANGES CREDITS README + 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/cpdup/Manifest b/app-backup/cpdup/Manifest index e4315649b44b..476bb7bd5f27 100644 --- a/app-backup/cpdup/Manifest +++ b/app-backup/cpdup/Manifest @@ -1,5 +1,5 @@ -AUX Makefile.linux 304 BLAKE2B afeb5a8233955b43ff84e8c79fbf0ab09cc85849b4c771a72dcae7834bc68da0ade3be52743fcad2dfa0a38a775037d9fd82cab8fe5da3a7e1726a045b67a538 SHA512 595d56d4b25168e2426176c36cece12edc5388c58251d3c235611c40349a16f098ab7a17e0ad55435a499ded1cdad9b328f6ad3193bf09eadf5bd6778710b0d8 -AUX cpdup-1.11-unused.patch 252 BLAKE2B b2b3b7f008921342ff35bed0256a9f9681e4a2eb9840398b21bd8347172b2a78e626569211c42a97b0f0b5340d037f0aa80f33cedc449fe63232f8adb836c2e2 SHA512 1041685c7762a113e38ac8420bfa961bad3987318432140092702847571ebad082a7bea0e485b3a08349eb1d2844d171caf4e17e69d273e4ada2aaf847c37ce7 +AUX cpdup-1.18-makefile.patch 729 BLAKE2B 23b9debbd16733e68459af41438c0cb22e7a5fe4ea9cf8bb7ff4f53067884a141788eacd90a1528601f1eb9460805b105e24db4b2ad5648932ff209a37fd14b1 SHA512 afc0863fbbc7c7ff0778ebcb9373f5b3340cd79412a769fa1ddddf6567c6d4bcd876a618d306011b1a6538fe73ca1c0a38d7d193e598a28f3692b5b3903cf2b3 +AUX cpdup-1.18-portable.patch 3652 BLAKE2B bbca984a31436d56b16e34fd4fc68af5aa304cd82563166ff97572bd7a53f0dd7ec053c75f6ee8a2e60064fcce3ec42b8c68ed0774ce6c4d0e68aaebe6706cc2 SHA512 579d3f2a3df106889c3393b9f682a9382a57a20ecbedce61cc75490b09df2ef404e0bcdef196c3d4a4932af65a1c8eb98f0c98dd40aeb6abe50be4d5f02aab20 DIST cpdup-1.18.tgz 42841 BLAKE2B ebf18fd13b465be8483b9aad7af5353343e89e6960da967ddf59e7186bd199604a0d2b2d637efbb4d4d4f57611a3c600c5586861ef9780342d0ebed5de1ca3c8 SHA512 5c57be20951005d731866629a601b6dae91e112067f103d6cfc3f668fbd88b3b7b65990d9fad55f18c0e8238c2642a7b85aea543a0787f21084bda35e0da0e26 -EBUILD cpdup-1.18.ebuild 795 BLAKE2B e30c4a6890ad033af51244687809ca3fd3a7e5f4c2c691f85260011f224b11f5d432d761eee63e9e2c6540ad0d27bbba4dcb003a275c000e3c6ceb52757fac07 SHA512 5d474624c3f2c014de8e5c910c67b9cf20abfc74d0ae6ab7b0c2e156be508fe1fc549b99a61cfb3d0a06fe782e67d70c327c89f9f82d99a331491f1310612203 +EBUILD cpdup-1.18-r1.ebuild 690 BLAKE2B 35b8822a80769167a3156767956e589defe89b547a090451a046ae2045fc4ea26c6c4da0853a1f1e1377bf7abfbf1f100030fd172b1baa017bbfbc6da3061538 SHA512 b27dce969e6989f110e1dd829738289e3dda3259d8a743f41f0247512b5cdb312b4e8c152f03b769e9511fe5df0250bff59cedd32e963a484908b38a3df1892b MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-backup/cpdup/cpdup-1.18.ebuild b/app-backup/cpdup/cpdup-1.18-r1.ebuild index 52be46bbfabb..5e6eccb3db93 100644 --- a/app-backup/cpdup/cpdup-1.18.ebuild +++ b/app-backup/cpdup/cpdup-1.18-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -13,22 +13,23 @@ S="${WORKDIR}/${PN}" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64" -IUSE="threads" -PATCHES=( "${FILESDIR}"/${PN}-1.11-unused.patch ) +RDEPEND="dev-libs/libbsd:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-portable.patch +) src_prepare() { default - - 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 + rm compat_linux.c || die } src_configure() { - tc-export CC - use threads || MAKEOPTS+=" NOPTHREADS=1" + tc-export CC PKG_CONFIG } src_install() { 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/hdup/Manifest b/app-backup/hdup/Manifest index ebbd7e0fb9f1..1646ac29af70 100644 --- a/app-backup/hdup/Manifest +++ b/app-backup/hdup/Manifest @@ -1,4 +1,4 @@ AUX hdup-2.0.14-fix-build-system.patch 1237 BLAKE2B 491b4138e237bf90d6fee8165e28c4281a2be9b76d790b8d531f7327b01f7c49ed228b851745a14a22f690e6b51de10348f1ef791c8094187f174129c2da1f19 SHA512 5caaec6fc990249a1198a05d50bdf18af9bb82a66dd9dac763f1414b908a183d7e78fc7bed4c779da6e9afd6a894daf9c04975188848c4d604fd5ff39a2344b2 DIST hdup-2.0.14.tar.bz2 87803 BLAKE2B 28e65596e4a278f3895986ef97f5557b875adb4bab5e22bae96d58caf64526e63fc2207fc920b59c915b35133f2c66d9280dfd44e5c81b01e87842ee1d19e86f SHA512 076876345d58bc6a1b987adc3ea10b1e82652504f52579d62c3f9f97c120fd56f3177deb4fe810b1579ab473061d2ab38b0ab97b83427ec84d5141f7043897f8 -EBUILD hdup-2.0.14-r1.ebuild 962 BLAKE2B 46ccc2572b065f583cee2dff3343884109f61a08833b69a9730b8dcbc5488fb2848045dd492316b8200b42c273b29226dd23443394544312832ad2d43e6179fd SHA512 8371e6b222ddfc97c67584782c69be74b5b2de68a685e36f9ff042482815215b049ba0852ded3e2082189d590f4fd894a82ef06941ea3d6aebc4e1881260c808 +EBUILD hdup-2.0.14-r2.ebuild 1013 BLAKE2B b9b8e60b431787379e7cdff0c5f42221825a8065aba2423685d453ed7d13fd1c0d9aee359b1371819901222454a66f31f3928112fbabedaeaa9e99bb16919448 SHA512 6a0dc2cd55a1cc7bd4d8730581ad3a418588df039b210d678f8944e0ca59b803844a4931e9aacae98691c4c81d979010bbbe11410ceda15f5630b8cb4325945b MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-backup/hdup/hdup-2.0.14-r1.ebuild b/app-backup/hdup/hdup-2.0.14-r2.ebuild index 57fb577b246c..ca5c1321e197 100644 --- a/app-backup/hdup/hdup-2.0.14-r1.ebuild +++ b/app-backup/hdup/hdup-2.0.14-r2.ebuild @@ -1,7 +1,9 @@ # 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} + ${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/mylvmbackup/Manifest b/app-backup/mylvmbackup/Manifest index 7d0d5c7fab86..766a13e19550 100644 --- a/app-backup/mylvmbackup/Manifest +++ b/app-backup/mylvmbackup/Manifest @@ -1,5 +1,8 @@ AUX mylvmbackup-0.14-fix-build-system.patch 381 BLAKE2B 02c0af3b1809145bec8c48b4dceee08c78691b97e3a8df0e260cb2ea16e263bf01c6cc5d9a59217b09daa3e9ab5a2ca14ccbe3e154dad73c35eca5dda49d0c97 SHA512 aff25a3828187de79ccaa3b43189a2d2d89381f1628d47bb2fb6b9fe347009e34f2e26697f57ec08c62083596b0fc49dd59c130b1ceb40bf60012608aa09d306 AUX mylvmbackup-0.14-fix-config.patch 160 BLAKE2B aa9fd816d76743131b59478acf6b7a0b0f1f735b5ec95c011fb0ff2f25452317766e780c0d051ac1c1b46a42e08342791c10748ed55d532e9adfb2f8c1dd37a8 SHA512 b79b0338563459e757ebf7a8b0cadb59847ab085d224904df3730d1c15827214b26246c27b05d098bfc2a0a8c0339cbcb69cf13407408e3befd5c25c26bdfd04 +AUX mylvmbackup-0.16-fix-build-system.patch 240 BLAKE2B 09c843cf402b698f2a2d06460b82c7e779fffa90b55a8ed4d4a622d3dbe728990e1ad96a2e9e00c411db7373bc4668492b6d18b685e4de954d71ee14bc799617 SHA512 5b56ce5924203d3146c49da492acfde1fa6c6c41d49e2d229e264c2fa55d85c7d738df2fd8eae225c85f2a29b8af02b94783f31134c5f799cac207723949a0a0 DIST mylvmbackup-0.14.tar.gz 57338 BLAKE2B 2f3e85d73a08d8877f84c04e8a7368500fd10dd9ee5172110589175918c10d0e80dce17b842286aacb111d088c275138a87fcf46fb4b416d0697221735cc36b3 SHA512 e61f0c4e24b5482b2f7f4213e810a32776d1b39f589e27c309a4940943f3a9519041e53cf85a089a94100e2cc81715a033682bbe071220d755c14211b4177bfa +DIST mylvmbackup-0.16.tar.gz 58490 BLAKE2B 43f34e0e386c4cc4f8d30ce3fb3f9e93f4ce7c795d1b74a0e6c2bb74750c855b5eeb41a09d9c2f6e0532bb297d00519d99b356fa98dfb0fbc4fc8cfd25daa976 SHA512 c23dd47c7cb13883cddb161f12a1698a1108b65d01a0e6d6feafab2d92c98717e38d4bc4a23712cb2e23f624e8c4e6307a2b0f171024976b52a58a720fd01b8b EBUILD mylvmbackup-0.14.ebuild 678 BLAKE2B b879f2a7701675784b211f3586f929246cdb45dcd2a205578a941f8b5a9f937cfdc39d6788ebc72e36ebef417a6fbffa6c07737dc981ab8659b85c424aa52d48 SHA512 0393f91e96ee75b9320e7b6ec4aa3d040b48a00542e3448f5a666d7a7bca512772b082d986f4796ee477baf2e99bc373c84aced40af433e28f1f45be7d8b3684 +EBUILD mylvmbackup-0.16.ebuild 647 BLAKE2B 32b97281096b91b0f6ec9d42c1ae75d909c63f68a816d2bed70d0097762b026a0ac9b0ee416c2dcbee5b53ee162895f9eb06335a59c6a61c7bf103857382c738 SHA512 8c3f5b3c60a390764877d070ad3492e95e339ba522d73745ecadfec01ee37649f1ca12f4576564d3005336b43fa52eca702cca8d54941bee4a55077cf9a1a2c4 MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491 diff --git a/app-backup/mylvmbackup/files/mylvmbackup-0.16-fix-build-system.patch b/app-backup/mylvmbackup/files/mylvmbackup-0.16-fix-build-system.patch new file mode 100644 index 000000000000..486f336e70c0 --- /dev/null +++ b/app-backup/mylvmbackup/files/mylvmbackup-0.16-fix-build-system.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,7 @@ + README \ + TODO + CLEANFILES = $(NAME).spec $(NAME) $(MAN1) $(MAN1).html +-prefix = /usr/local ++prefix = /usr + sysconfdir = /etc + bindir = $(prefix)/bin + datadir = $(prefix)/share/mylvmbackup diff --git a/app-backup/mylvmbackup/mylvmbackup-0.16.ebuild b/app-backup/mylvmbackup/mylvmbackup-0.16.ebuild new file mode 100644 index 000000000000..12b6e0aecc11 --- /dev/null +++ b/app-backup/mylvmbackup/mylvmbackup-0.16.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +RDEPEND=" + dev-perl/Config-IniFiles + dev-perl/DBD-mysql + 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 + + keepdir /var/tmp/${PN}/{backup,mnt} + fperms 0700 /var/tmp/${PN}/ +} |