commit: 8ae2d6ffcdbd88a278ea7c7c6b75af21fb4adc41 Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Mon May 6 12:03:36 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Wed May 8 15:53:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae2d6ff
net-misc/sitecopy: Fix passing incompatible pointer type And update EAPI 7 -> 8 Closes: https://bugs.gentoo.org/921255 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36582 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> .../files/sitecopy-0.16.6-33-c99-build-fix.patch | 12 ++++ net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild | 64 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch new file mode 100644 index 000000000000..59b8e089b5a4 --- /dev/null +++ b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/921255 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *sess, const char *command) + char *a, *p; + int ret; + int listener; +- size_t alen; ++ socklen_t alen; + struct sockaddr_in addr; + + ret = ftp_open(sess); diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild new file mode 100644 index 000000000000..d309794b2639 --- /dev/null +++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +DESCRIPTION="Maintain remote web sites with ease" +HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/"; +SRC_URI="mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="expat nls rsh ssl webdav xml zlib" + +RDEPEND=" + rsh? ( net-misc/netkit-rsh ) + >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] + <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] + xml? ( >=net-libs/neon-0.24.6:=[-expat] ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # SiteCopy patches are being currently pulled & ported from + # http://ftp.debian.org/debian/pool/main/s/sitecopy/ + # Consider SiteCopy to be more or less being actively maintained by + # Debian maintainers, but GPL patches ported into Gentoo. + + eapply \ + "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ + "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ + "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ + "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ + "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ + "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ + "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ + "${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \ + "${FILESDIR}/sitecopy-0.16.6-33-c99-build-fix.patch" \ + "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + + # Source package uses incorrect '/usr/doc' for the doc folder. So use + # sed to correct this error. + sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ + Makefile.in || die "Documentation directory patching failed" + + mv configure.in configure.ac || die + eautoconf + eautomake +} + +src_configure() { + econf \ + $(use_with ssl ssl openssl) \ + $(use_enable webdav) \ + $(use_enable nls) \ + $(use_enable rsh) \ + $(use_with expat) \ + $(use_with xml libxml2 ) \ + --with-neon +}
