* [gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/, net-misc/sitecopy/files/
@ 2024-05-08 15:54 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2024-05-08 15:54 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/, net-misc/sitecopy/files/
@ 2025-03-04 13:04 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-03-04 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 7df9f485e85d9d46be0ee975b7ccae7787a13d35
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 4 12:58:23 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Mar 4 13:04:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df9f485
net-misc/sitecopy: enable support for neon 33 and 34
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
...y-0.16.6-20-neon-compatibility-up-to-0.34.patch | 19 ++++++
net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild | 72 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-20-neon-compatibility-up-to-0.34.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-20-neon-compatibility-up-to-0.34.patch
new file mode 100644
index 000000000000..28cf0d042a4e
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-20-neon-compatibility-up-to-0.34.patch
@@ -0,0 +1,19 @@
+From: Sandro Tosi <morph@debian.org>
+Subject: Add support for libneon 0.29.0 and 0.30.0
+
+Updated by hand from sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
+
+diff -urNad sitecopy~/configure.in sitecopy/configure.in
+--- sitecopy~/configure.in 2008-07-20 18:21:15.000000000 +0200
++++ sitecopy/configure.in 2009-10-05 23:44:00.764858219 +0200
+@@ -112,8 +112,8 @@
+ AC_LIBOBJ(lib/fnmatch)
+ fi
+
+-# Support neon 0.24 through 0.28
+-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
++# Support neon 0.24 through 0.34
++NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30 31 32 33 34])
+
+ dnl But we don't use zlib or ACL support
+ NEON_WITHOUT_ZLIB
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild
new file mode 100644
index 000000000000..0333e04264ad
--- /dev/null
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 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/${P}-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.35[zlib?,ssl?,expat?]
+ xml? ( >=net-libs/neon-0.24.6:=[-expat] )
+"
+DEPEND="${RDEPEND}"
+
+# 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.
+# Update 2024-10-13: There appears to be a (new?) upstream repository,
+# see metadata.xml remote-id.
+PATCHES=(
+ "${FILESDIR}/${P}-01-remote-dynamic-rc.patch"
+ "${FILESDIR}/${P}-02-french-po-fix.patch"
+ "${FILESDIR}/${P}-03-wrong-memory-397155.patch"
+ "${FILESDIR}/${P}-06-sftpdriver.c-fix-for-new-openssh.patch"
+ "${FILESDIR}/${P}-10-bts410703-preserve-storage-files-sigint.patch"
+ "${FILESDIR}/${P}-20-neon-compatibility-up-to-0.34.patch"
+ "${FILESDIR}/${P}-30-bts320586-manpage-document-sftp.patch"
+ "${FILESDIR}/${P}-32-neon-0.31.patch"
+ "${FILESDIR}/${P}-33-c99-build-fix.patch"
+
+ "${DISTDIR}/${P}-04-manpages-addition-fixes.patch"
+)
+
+src_prepare() {
+ default
+
+ # 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() {
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable rsh)
+ $(use_enable webdav)
+ $(use_with expat)
+ $(use_with ssl ssl openssl)
+ $(use_with xml libxml2 )
+ --with-neon
+ )
+ econf "${myconf[@]}"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/, net-misc/sitecopy/files/
@ 2025-07-23 13:21 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-07-23 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 637f9049e34ab44e2617086b9a6d206d702972a7
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 13:02:11 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 13:19:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637f9049
net-misc/sitecopy: drop 0.16.6-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
...s549721-add-compatibility-for-neon-0.29.0.patch | 17 ------
net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild | 66 ----------------------
2 files changed, 83 deletions(-)
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
deleted file mode 100644
index cc40b5b6e92a..000000000000
--- a/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Sandro Tosi <morph@debian.org>
-Subject: Add support for libneon 0.29.0 and 0.30.0
-
-diff -urNad sitecopy~/configure.in sitecopy/configure.in
---- sitecopy~/configure.in 2008-07-20 18:21:15.000000000 +0200
-+++ sitecopy/configure.in 2009-10-05 23:44:00.764858219 +0200
-@@ -112,8 +112,8 @@
- AC_LIBOBJ(lib/fnmatch)
- fi
-
--# Support neon 0.24 through 0.28
--NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.32
-+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30 31 32])
-
- dnl But we don't use zlib or ACL support
- NEON_WITHOUT_ZLIB
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
deleted file mode 100644
index c5ba8a62f6b6..000000000000
--- a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.
- # Update 2024-10-13: There appears to be a (new?) upstream repository,
- # see metadata.xml remote-id.
-
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-23 13:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-08 15:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/, net-misc/sitecopy/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2025-03-04 13:04 Petr Vaněk
2025-07-23 13:21 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox