[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/, net-misc/sitecopy/files/
commit: 8ae2d6ffcdbd88a278ea7c7c6b75af21fb4adc41
Author: Brahmajit Das gmail com>
AuthorDate: Mon May 6 12:03:36 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed May 8 15:53:58 2024 +
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 gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36582
Signed-off-by: Arthur Zamarin 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 ..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 ..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.[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
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/files/, net-misc/sitecopy/
commit: 319c826564666c44565d635bdcad297abb30a701
Author: Sam James gentoo org>
AuthorDate: Sun Sep 26 17:08:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 26 17:09:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319c8265
net-misc/sitecopy: really fix neon compatibility
Closes: https://bugs.gentoo.org/779847
Signed-off-by: Sam James gentoo.org>
...tecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch | 4 ++--
net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 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
index 0b53e2e4e39..cc40b5b6e92 100644
---
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
@@ -10,8 +10,8 @@ diff -urNad sitecopy~/configure.in sitecopy/configure.in
-# Support neon 0.24 through 0.28
-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.30
-+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30])
++# 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-r2.ebuild
b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
index 3b63980075a..5238f148719 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
@@ -17,7 +17,7 @@ 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.30.[zlib?,ssl?,expat?]
+ <=net-libs/neon-0.32.[zlib?,ssl?,expat?]
xml? ( >=net-libs/neon-0.24.6[-expat] )
"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/
commit: cd8f1d2e334ffd33184ac254e4ea3f4889c41a4a
Author: Sam James gentoo org>
AuthorDate: Sat Sep 25 18:17:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 25 18:17:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8f1d2e
net-misc/sitecopy: revbump for RDEPEND change
Closes: https://bugs.gentoo.org/779847
Signed-off-by: Sam James gentoo.org>
.../sitecopy/{sitecopy-0.16.6-r1.ebuild => sitecopy-0.16.6-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
similarity index 100%
rename from net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
rename to net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/files/, net-misc/sitecopy/
commit: 2df1ea56a6e652d459e19c2cae51a6408ad68623
Author: Sam James gentoo org>
AuthorDate: Fri Sep 24 23:48:06 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 24 23:48:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df1ea56
net-misc/sitecopy: add neon-0.31 patch
Closes: https://bugs.gentoo.org/779847
Signed-off-by: Sam James gentoo.org>
net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch | 13 +
net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild| 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch
b/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch
new file mode 100644
index 000..c07c5085a34
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/sitecopy/1:0.16.6-9/32_neon-0.31.patch/
+https://bugs.gentoo.org/779847
+--- a/src/ftp.c
b/src/ftp.c
+@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *
+ char *a, *p;
+ int ret;
+ int listener;
+-ksize_t alen;
++size_t alen;
+ struct sockaddr_in addr;
+
+ ret = ftp_open(sess);
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
index 94aa7118251..3b63980075a 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,6 +38,7 @@ src_prepare() {
"${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" \
"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
# Source package uses incorrect '/usr/doc' for the doc folder. So use
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/
commit: 9b9835f15ae2c2c444069c4502fea5ad6f08912a
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Oct 20 10:45:50 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Oct 20 11:38:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9835f1
net-misc/sitecopy: Update sources and ebuild
Closes: https://bugs.gentoo.org/628664
Signed-off-by: Pacho Ramos gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild | 77 ++---
1 file changed, 26 insertions(+), 51 deletions(-)
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
index 90a94c1f611..94aa7118251 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
@@ -1,87 +1,62 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
-DESCRIPTION="Maintain remote web sites with ease"
-SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz
-
https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch;
HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/;
-# Removed all Debian related stuff. If you want more patches, they can be
ported from
-# http://ftp.debian.org/debian/pool/main/s/sitecopy/
-# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches.
-# This SiteCopy now builds using the original sources.
+SRC_URI="mirror://gentoo/${P}.tar.gz
+
https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch;
+DESCRIPTION="Maintain remote web sites with ease"
KEYWORDS="amd64 x86"
LICENSE="GPL-2"
SLOT="0"
IUSE="expat nls rsh ssl webdav xml zlib"
-# TODO: Depends copied over from old ebuild file, ensure they're still correct!
-DEPEND="rsh? ( net-misc/netkit-rsh )
+RDEPEND="
+ rsh? ( net-misc/netkit-rsh )
>=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
<=net-libs/neon-0.30.[zlib?,ssl?,expat?]
- xml? ( >=net-libs/neon-0.24.6[-expat] )"
-RDEPEND="${DEPEND}"
+ xml? ( >=net-libs/neon-0.24.6[-expat] )
+"
+DEPEND="${RDEPEND}"
src_prepare() {
- # NOTE: Insert patches here.
+ 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.
- # NOTE: epatch is provided by 'inherit eutils'
- # Patch File Naming Format
- # files/package_name - package_version - patch_order - patch_description
-
- epatch "${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" \
- "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+ 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" \
+ "${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"
- # NOTE: eautoconf/eautomake is provided by 'inherit autotools'
- # Need to recreate the source package provided configure script,
- # because the package provided configure script only supports
- # autoconf-2.13
- # per Bug #426262 automake-1.14 compatibility
- # Should check first, autoconf-2.13 is still in the tree requiring
configure.in!
- # mv configure.in configure.ac || die
-
+ mv configure.in configure.ac || die
eautoconf
eautomake
}
src_configure() {
- # TODO: USE functions copied over from old
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/
commit: 4ce4350c77fc940670b74f69b9dbef5b076717f6 Author: Jonas Stein gentoo org> AuthorDate: Thu Jun 14 20:35:05 2018 + Commit: Jonas Stein gentoo org> CommitDate: Thu Jun 14 20:35:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce4350c net-misc/sitecopy: Maintainer retired Maintainer retired due to inactivity. Closes: https://bugs.gentoo.org/633244 Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-misc/sitecopy/metadata.xml | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml index a29e9691ddb..4c6d13fbd69 100644 --- a/net-misc/sitecopy/metadata.xml +++ b/net-misc/sitecopy/metadata.xml @@ -1,16 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - rogerx@gmail.com - Roger Zauner - - - proxy-ma...@gentoo.org - Proxy Maintainers - + This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred. Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support. +
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/
commit: 8df4cbfe541f2591378721672872bc4bf6a99c79 Author: David Seifert gentoo org> AuthorDate: Sun Nov 26 12:48:24 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 26 23:22:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df4cbfe net-misc/sitecopy: [QA] Consistent whitespace in metadata.xml net-misc/sitecopy/metadata.xml | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml index b03b823d129..01ac751452b 100644 --- a/net-misc/sitecopy/metadata.xml +++ b/net-misc/sitecopy/metadata.xml @@ -1,17 +1,17 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - rogerx@gmail.com - Roger Zauner - Maintainer. Assign bugs to him - - -proxy-ma...@gentoo.org -Proxy Maintainers - - -This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred. -Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support. - + + rogerx@gmail.com + Roger Zauner + Maintainer. Assign bugs to him + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred. + Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support. +
[gentoo-commits] repo/gentoo:master commit in: net-misc/sitecopy/
commit: f0f8f43991d0c843db256da2f75c26ed73e607bb
Author: Felix Janda posteo de>
AuthorDate: Fri Aug 5 16:19:50 2016 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Aug 6 16:47:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f8f439
net-misc/sitecopy: whitespace
net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
index 639b385..df28411 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -49,7 +49,7 @@ src_prepare() {
# 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"
+ Makefile.in || die "Documentation directory patching failed"
# NOTE: eautoconf/eautomake is provided by 'inherit autotools'
# Need to recreate the source package provided configure script,
