diff options
Diffstat (limited to 'net-misc')
22 files changed, 466 insertions, 88 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex f1146b24ecdc..6994661cd2fd 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest index 344d5932cbe7..b1ead1a9b450 100644 --- a/net-misc/inetutils/Manifest +++ b/net-misc/inetutils/Manifest @@ -1,3 +1,3 @@ DIST inetutils-2.5.tar.xz 1670424 BLAKE2B 80ab4f4287328ceb75c33b8794ec21209ea95206a205ea60fbd8f1d7e7fa01eec228ea50d61c8bb37a88cd3144b58ecfecd0af440ba85d43d5ea19565d88a6d4 SHA512 dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c -EBUILD inetutils-2.5-r7.ebuild 3605 BLAKE2B 9a25a71436aa25cc4bf76c2bb8d3650ac27bfad32d300f00ccf6984b68f920d3bb27cfdeb622de880514d3b83a062a2ca5b2d2fd5919af950512da7f8845b7b0 SHA512 f7fba616061017fc04401f1e1f0ba4ae5389b0e11f98c6b35e31b70059c6d50edcdb2be8e8608f089a69f70ed6b1bf3bbf5a9f77dae5c52bf1a5c88ae708cf3e +EBUILD inetutils-2.5-r9.ebuild 3691 BLAKE2B 3faa9beb6335c70bac83579278c756e1d6008f744820812da145ba13fb340579ab413e32801acbc4fc8fa531b4b11c698c6e9358bf37d1fd1e4fe7e7f5173f66 SHA512 ef1813467539d04692be8f0eb2a48467dcea98feef2743d00ca36b5b085572622cf810bfa50b020201d67ae1cf3e2f53f7a69e76df85244812e3772e0ad870f6 MISC metadata.xml 1422 BLAKE2B 6c0495ebe25bd94963e3bca6ba9301997933a98cd70d310532ff381a8d4de0197f3f1e189c5de95da0907a3b6ff70e17f59ebcbeab4c2d91a3215c8b909799dc SHA512 00ff23fce79924f8eff1a1c17195b887460ce02015e375cd29144c35f5377b6dee6d61d4cced4125e4bb68c6421ea4242f116810f2a4d33ac4a152001680932a diff --git a/net-misc/inetutils/inetutils-2.5-r7.ebuild b/net-misc/inetutils/inetutils-2.5-r9.ebuild index 2c93c1329fc0..59ce5856d6d2 100644 --- a/net-misc/inetutils/inetutils-2.5-r7.ebuild +++ b/net-misc/inetutils/inetutils-2.5-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,9 +41,11 @@ RDEPEND="${DEPEND} rsh? ( !net-misc/netkit-rsh ) logger? ( !sys-apps/util-linux[logger(+)] ) syslogd? ( !app-admin/sysklogd ) + talkd? ( !net-misc/netkit-talk ) telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd ) telnetd? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd ) - tftp? ( !net-ftp/tftp-hpa ) + tftp? ( !net-ftp/tftp-hpa[client(+)] ) + tftpd? ( !net-ftp/tftp-hpa[server(+)] ) whois? ( !net-misc/whois ) ifconfig? ( !sys-apps/net-tools ) traceroute? ( !net-analyzer/traceroute ) diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest index edd61b0e6bc8..bbb3fa6718e1 100644 --- a/net-misc/netkit-talk/Manifest +++ b/net-misc/netkit-talk/Manifest @@ -2,5 +2,5 @@ AUX netkit-talk-0.17-ipv6.patch 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504 AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5 -EBUILD netkit-talk-0.17-r8.ebuild 1176 BLAKE2B b4e70e51f2e1e20be8394c5e250da7beba0c5341447d9bfa9d3f7e77b26873ce0837714b57d45726037d7a99b72b1eb7769c7e53e81ef0b0c3de7aeef03f039c SHA512 643fbc83e7c21bf529d43c529eb3cd16f05832463f96a262a89ae9fa1d81406270f5fbf9d495726d526e2e8fea6d9cda4907eb9afc7998b38398b3a92101b0ff +EBUILD netkit-talk-0.17-r9.ebuild 1207 BLAKE2B dc94c42cea7112c0fb314d09587555b5202b056bfeb338f31a11c5358eb7b9ec94288854a8916914ba35e0b78f001eec50ee41bf2d8f9953f968e3ca6944f9cf SHA512 fe79e76a05bff28c69e7dd11ea47d8dc48b58d11ed75f517fd21358048d51c252c77d7fc23b59551acc4a4a9a3e1c484d161fa525bd1481c5d5e79392f9f840a MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r9.ebuild index a2e19a4ed162..5c055ebc1a67 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,6 +21,7 @@ BDEPEND="virtual/pkgconfig" RDEPEND=" ${DEPEND} virtual/inetd + !net-misc/inetutils[talkd(+)] " PATCHES=( diff --git a/net-misc/portspoof/Manifest b/net-misc/portspoof/Manifest index 9f394b42c7ff..d22d8acc2687 100644 --- a/net-misc/portspoof/Manifest +++ b/net-misc/portspoof/Manifest @@ -1,4 +1,4 @@ DIST portspoof-1.3.tar.gz 401187 BLAKE2B 340e7003e3ad36afeb53981d0628d13ec48afd9260fdd9f17b76b904b3da58d82dc23b455da24567545d60b29f2f358b11f4a07e83ae2192470fa40099f93c1c SHA512 8d537ecf2ae5de8388c2b9b7210a2d38fe614e525a2ba286321fcf3b237f0888e59bb79a80056e49cf7f850be8ef274e87f04597a50dc1b86350bbc094e8be6e -EBUILD portspoof-1.3-r1.ebuild 1237 BLAKE2B 9e67ba387417395146137f03b24ee93153c2386ffea2e1ec2a1d3ac06101d71acd1508daa3ebe1b799681ee0459b5fcf1abbabce4719df685504abdbc7ff9542 SHA512 3d108b888c4fa1fa44a8113cd955a55fd17677140bcf6b23051b59c81468a979253e431e05359e4cc41330036f6e2b174b97164003b188a092251fd1614f8380 -EBUILD portspoof-9999.ebuild 1237 BLAKE2B 9e67ba387417395146137f03b24ee93153c2386ffea2e1ec2a1d3ac06101d71acd1508daa3ebe1b799681ee0459b5fcf1abbabce4719df685504abdbc7ff9542 SHA512 3d108b888c4fa1fa44a8113cd955a55fd17677140bcf6b23051b59c81468a979253e431e05359e4cc41330036f6e2b174b97164003b188a092251fd1614f8380 +EBUILD portspoof-1.3-r1.ebuild 1229 BLAKE2B 91fe32ff8fa6386e9d02411915705c60f9641a74c6b8f26d91203f848baf0b3522a2023165497c43dacdae5bfe1c81f2a88ce810a6f4b051467ec47dccc7fc6e SHA512 f4cf80948f9617a836a3cf6d266834340d3bc1a110e3596a77c38e7406487ac481d3f27abb2f7ed49f8378a1d4bccc3d890226159f8fde0dd04dba62a7de4a31 +EBUILD portspoof-9999.ebuild 1229 BLAKE2B 91fe32ff8fa6386e9d02411915705c60f9641a74c6b8f26d91203f848baf0b3522a2023165497c43dacdae5bfe1c81f2a88ce810a6f4b051467ec47dccc7fc6e SHA512 f4cf80948f9617a836a3cf6d266834340d3bc1a110e3596a77c38e7406487ac481d3f27abb2f7ed49f8378a1d4bccc3d890226159f8fde0dd04dba62a7de4a31 MISC metadata.xml 329 BLAKE2B 00d1a1cc9f6abc0a1932cb60a8a97ac7befa4f6d2a422611be7e9ea8af33f214fab5a48659b5361dd5b8a0314160fd15f1224f8df05353e4d7dfeb9f10e249b6 SHA512 3b3aca166a18f20c72a54060d249514003d5cd12a6240d34a9b5d0441b4f82604c4071cecfbd0fab90bb870652b21ee3beeb62773a916af0e8c59410a79bc593 diff --git a/net-misc/portspoof/portspoof-1.3-r1.ebuild b/net-misc/portspoof/portspoof-1.3-r1.ebuild index 4ec6ba0b6396..36c6d6861fd6 100644 --- a/net-misc/portspoof/portspoof-1.3-r1.ebuild +++ b/net-misc/portspoof/portspoof-1.3-r1.ebuild @@ -9,7 +9,6 @@ DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="https://drk1wi.github.io/portspoof/" LICENSE="GPL-2+" SLOT="0" -IUSE="" if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild index 4ec6ba0b6396..36c6d6861fd6 100644 --- a/net-misc/portspoof/portspoof-9999.ebuild +++ b/net-misc/portspoof/portspoof-9999.ebuild @@ -9,7 +9,6 @@ DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="https://drk1wi.github.io/portspoof/" LICENSE="GPL-2+" SLOT="0" -IUSE="" if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index 1e9df69481be..1140973abe39 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,5 +1,4 @@ -AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f -AUX seafile-client-8.0.6-select-qt5.patch 1092 BLAKE2B 887ea09f0fd4c21c8b1ec65444e19bbcb50675b47bcff3553e21ea39c2ba67bd574a781e84232aef6b7e23143a8b9dd8828b024234060c5ed881074353f8f752 SHA512 4bfd313bc09cd5ceefc583800f87736620e0f33fdf6a4fc4b420325c3c8e074cfc14d21586190cef208660a14c05a1e056f9fd90a9ceddd2c2c1e780461d7a0a -DIST seafile-client-9.0.3.tar.gz 11718581 BLAKE2B cb2cecc9b02df4edb7b7191fd609ee5bc3548849c68b3c0cd8f59641bd0716791c2272633c0ba0f4f7b374a1302fd81a8f1396736961cb4e6e4ef1dd8db82c85 SHA512 c2d77c5f9407fd6d4ce3dfd47044de83a3c3e0bbbd1b66f1566ad54a8aa5391f51f70c7e094f16216a653a5ef0e9b8de1025ee56ce56c496c31c87983fbee4d7 -EBUILD seafile-client-9.0.3.ebuild 1364 BLAKE2B f5c541e95fd8d13cf961a06447839954c585f6478271c99f056fe66d37fe63d39b6562ef6c11d3fb3f6489ff532e485d24e682a8b06257fb4428abc2becc64ba SHA512 3841baa589e6ea5a87c4070d34a8ec96ea76e75bc4508339bd289e0729b728c292cede48e1e06ae920c59e484f029cb4ab961773e44b0d2a5a582570eefee581 -MISC metadata.xml 346 BLAKE2B f662c458688ef44d176776cb81e6cd6b7f10aed1c384da1191669725c39a669ebf40cf30849762cd34fc1d47ca548a969eaef490c3aad24f0a9e376df322fc75 SHA512 142b5aa7e4824e3ab8a8c42f9c2d8456781423176c19662fe4652a79b35e9917da4e11d007ed1a504aaced86963f5c1a65b6fe649576edfd444eba2d2e6341de +AUX seafile-client-9.0.11-select-qt6.patch 1092 BLAKE2B b4b6bf5cc442fa3236726d9c00777b15dea6a9bc42cdf5a39806e3bab64be051ebc2dbea9ab1e94c9fff029e4b5b96d5bcbbf6b76dc63848925695ee451a870a SHA512 b22b236bf30c6a5d16f5ec286e854828e94039bf2d0f13529f2b44aa8dea5fb8d0827f978a02fa815ed8a6e0c840a2a20c22e480b57f08897f1183804ea9e7b4 +DIST seafile-client-9.0.11.tar.gz 11726726 BLAKE2B e8dab4ecb4d4ae3fe12a4083e286ca1232e5994faa835f917e35892d814cc31ca55deaef056396b446a8eb553c3b6ebdd2c29c60d86b6ac3221c56c42bd1f968 SHA512 b4ef94cbf30eb23f9fb127791f118fcaeadc38544d557bef028bc21daedea265c4c728ccb91b2412628d5ab540d2a3aea37a7ca4120d1c0d49d19715544a9443 +EBUILD seafile-client-9.0.11.ebuild 1187 BLAKE2B 5e032e878911e6605616df6647eb80c6704382816cab7adb9e97758d05256a294abb8764589645e1605f78f1e225135ce7fec1b41e8cf883a3f883ffed234a9d SHA512 7d19d5ad957c189a157665b1ef0ffffe2f77239ea8ac0ea54aaaa8ae39944571c167d8a6c11de357bbf4a41f72b90cf9bb44b1939c0e72e1b92be9b23aab7da2 +MISC metadata.xml 567 BLAKE2B cefa28638f37e4f58256bedd77d75be489da5c28d35d2bb502a8270dd31da03b312612286f175ae9647c001e062e3866be5af73dad2f1ebf7331897428459a56 SHA512 aafa7f08f955ffe7b73bf5195286411c26fb972eea0ac52507ac5b3b72fa0e581dce128833ca3bcf3472dc5c67428ae9056cb34a28fb92251bd9f4ca024a6759 diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch deleted file mode 100644 index ef9c2f7449b5..000000000000 --- a/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/haiwen/seafile-client/pull/1297 - -From 86ebea086c6b78738b3140c922c909331d2b9a94 Mon Sep 17 00:00:00 2001 -From: Joffrey <j-off@live.fr> -Date: Fri, 29 May 2020 15:59:11 +0000 -Subject: [PATCH] Fix build with Qt5 v5.15.0 - ---- - src/ui/events-list-view.cpp | 1 + - src/ui/private-share-dialog.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp -index b1d04abb..09536b9e 100644 ---- a/src/ui/events-list-view.cpp -+++ b/src/ui/events-list-view.cpp -@@ -1,4 +1,5 @@ - #include <QPainter> -+#include <QPainterPath> - #include <QApplication> - #include <QPixmap> - #include <QToolTip> -diff --git a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp -index 511d476b..284cc043 100644 ---- a/src/ui/private-share-dialog.cpp -+++ b/src/ui/private-share-dialog.cpp -@@ -2,6 +2,7 @@ - #include <QCompleter> - #include <QLineEdit> - #include <QPainter> -+#include <QPainterPath> - #include <QResizeEvent> - #include <QStringList> - #include <QStringListModel> --- -2.26.2 - diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-9.0.11-select-qt6.patch index 4d3a3d172644..00df67881c51 100644 --- a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch +++ b/net-misc/seafile-client/files/seafile-client-9.0.11-select-qt6.patch @@ -11,10 +11,10 @@ index 1c4a4447..5747df46 100644 - bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" - OUTPUT_VARIABLE DETECTED_QT_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) -+FIND_PACKAGE(Qt5Core) -+SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) ++FIND_PACKAGE(Qt6Core) ++SET(DETECTED_QT_VERSION ${Qt6Core_VERSION}) MESSAGE("Qt version: ${DETECTED_QT_VERSION}") -+GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION) ++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt6::qmake IMPORTED_LOCATION) EXECUTE_PROCESS(COMMAND - bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" + bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml index 1e23f1b9995c..fd75bca18d10 100644 --- a/net-misc/seafile-client/metadata.xml +++ b/net-misc/seafile-client/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>zhixu.liu@gmail.com</email> + <name>Z. Liu</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="shibboleth">Build support for Shibboleth single sign-on</flag> </use> diff --git a/net-misc/seafile-client/seafile-client-9.0.3.ebuild b/net-misc/seafile-client/seafile-client-9.0.11.ebuild index ddbff434657f..3b224d9778a1 100644 --- a/net-misc/seafile-client/seafile-client-9.0.3.ebuild +++ b/net-misc/seafile-client/seafile-client-9.0.11.ebuild @@ -1,53 +1,45 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="57aa79cf4d1175a39cde20a38167db4fd3e12293" +RELEASE_COMMIT="4088a6c394e7f2f785d2f5e175a4e916259bdb09" inherit xdg cmake DESCRIPTION="Seafile desktop client" HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" +KEYWORDS="~amd64" +IUSE="shibboleth" RDEPEND="dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[dbus,gui,network,widgets] + dev-qt/qtwebengine:6[widgets] + dev-qt/qt5compat:6 >=net-libs/libsearpc-3.2.0_p1 ~net-misc/seafile-${PV} sys-libs/zlib virtual/opengl - elibc_musl? ( sys-libs/fts-standalone ) - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" PATCHES=( - "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-9.0.11-select-qt6.patch" ) -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - src_configure() { local mycmakeargs=( -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" ) # 863554 use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest index 0e637c755280..e5d348dce0c9 100644 --- a/net-misc/seafile/Manifest +++ b/net-misc/seafile/Manifest @@ -1,3 +1,3 @@ -DIST seafile-9.0.3.tar.gz 752618 BLAKE2B fc03756934ed36bf6706250e8a41a8d069a4cf0d69fcb76a44acd3a134a80e0705e72cfa1b8e44d1d4cf01e7f94e5781da3e3af88fc9f2cc4cfccbc8ecc15e11 SHA512 07312e56d642de63a5621870d6fe5ff42a0545d5b7def020dabdd36c9a06500c86801a02138de9e3dc6ff16cfdda43b59d651a08395207e108692cfa61db027f -EBUILD seafile-9.0.3-r1.ebuild 1397 BLAKE2B d4af006d43997db378137e7923bffc7cbe603fb3e7ca8f37d1c61ef92c8f1d8d228bb4d86c2817419da4a745d734a8d2eb4e07d28afd15105c70985959ee0914 SHA512 72c3a60036d3297db3db45c32059a783cb7ff8625f20987f9053a8c064aad7fa2ba71744a14e160862ba0229e38cc3690746a00fe99f595af620af65305baf8a -MISC metadata.xml 247 BLAKE2B e8019de5cb49e8205e94e4fbeb5c2b0b749382ab9ddd30ec4ff03b38989c4bb2f29d398b484f4c22080701b3525af5409d8352e7064da1b50fcfe95272401f64 SHA512 a0cf18fc83f53bb80e5d074c28ab2ea89b699c7ec70513bfd642a74a7f3c9657a310f545ece2e1eb0e37a4af43cc516d0ef17e054cba5104cad1a57b725a5151 +DIST seafile-9.0.11.tar.gz 765322 BLAKE2B 7d82a919d64023b5d040e4a344da78b55568474900951c0e4ac4a7812436e501c09dd897d9746fa29b1a9b3deb737452258737b678f39a6d5c449770e0433258 SHA512 01f72387eed465a71d72b0a707d8edc1b2b4f758157e586d2c17bca9dc3001e7e9296d1addc2efaf0629ca318e233a2268e7cdf4b24de963e7030cb571d03a8e +EBUILD seafile-9.0.11.ebuild 1419 BLAKE2B 56a4181c967b046e06a30edd3ef6df6811916b742d20790287bf2499a807df7e96d00634c1358e4871bb3316665d1b4a3410733a8e50b3fb4cbf8245c8e8db43 SHA512 c1f6199ad3047ccc5cf79cd044c155eafb3d0d2169f04f069842adfab429b6fa65c0f75e4b7007165e6e76584052203f4fbbb052b184498e65002b82aaf0a5c5 +MISC metadata.xml 468 BLAKE2B 0f012f1a9041a2b10e2455d20526271cab380a64cebd451ec1a2cc9656837143964354b171fb40070b75fbb5c27bf99e4d98f5fcc2a5222c48949b092cd7c628 SHA512 6630f76e9f4a0bd07747f70f97989ed44db7bbf4dec02b9d8c838ea21c5020097c1ebf0aec923235ebdd32029ae92bba3a655199e6f7158cd8a7fdc8dc702041 diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml index 8864ea04f064..4d8d8a50d567 100644 --- a/net-misc/seafile/metadata.xml +++ b/net-misc/seafile/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>zhixu.liu@gmail.com</email> + <name>Z. Liu</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">haiwen/seafile</remote-id> </upstream> diff --git a/net-misc/seafile/seafile-9.0.3-r1.ebuild b/net-misc/seafile/seafile-9.0.11.ebuild index 056cad2cd87c..1547448662b8 100644 --- a/net-misc/seafile/seafile-9.0.3-r1.ebuild +++ b/net-misc/seafile/seafile-9.0.11.ebuild @@ -1,32 +1,34 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) # Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="90a2bc6e30a14ac4c91250da3957330f1051462e" +RELEASE_COMMIT="3a5ab2a38a1a751e559ce9e4c79ac330f966c8af" inherit autotools python-single-r1 vala DESCRIPTION="File syncing and sharing software with file encryption and group sharing" HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} + app-crypt/argon2:= dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-libs/libwebsockets[client] + net-libs/libwebsockets:=[client] net-misc/curl sys-apps/util-linux sys-libs/zlib @@ -35,8 +37,6 @@ DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} $(vala_depend)" -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - pkg_setup() { python-single-r1_pkg_setup vala_setup diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest index 17dfafbedd43..25f457225c36 100644 --- a/net-misc/zsync/Manifest +++ b/net-misc/zsync/Manifest @@ -1,6 +1,10 @@ +AUX zsync-0.6.2-c99.patch 3617 BLAKE2B 700ba9a58d46b857dc924b477bfd91e18935282f3632de08483277c5cfebfba25b32449de546644dd8e75121050ee6946274ec3205544f7764db4f7a16790f95 SHA512 0d529d3b62df494fc9df0a44198ee5d0aef95e4c53cce7d9cae1e77b9fd8395eeb730eb38eea9857c10ea7a44bd2dbc7d3850a68d5fc16a1d0660bb3912e0205 AUX zsync-0.6.2-musl-off_t-fix.patch 326 BLAKE2B 9907bac0ca55ebae23318555a0b150fb780049e8843070280158b7a4402c0b4c61befeeb457d1348b7bc0378007986e556c8129a0ec060589b72e40ccad0988f SHA512 f7d64eef956d6afb7018dbd368b4aeb63a0a14c7ba44a60153ce64a12a494463dc94c1325bdf8eac38ad2ac41166aaba80ea84f10ae4e68bf506b9c19407406d +AUX zsync-0.6.2-unbundle-zlib.patch 4249 BLAKE2B 7863b3c31eba4df750bef101a7d17ce23f5e84333635239eb16902e53cb5c989a72cbc2e09417d601d060a5623008bf8b4972a99b548dd99fcc6d486c3218ff4 SHA512 7ee8feee77d53b6c3bb1f45d889dc74e83f91f7e7a206d6ef98f0aa1e3b5684c8dfd3ccea6c61a52f7214f2a29fcd6f627873a8400bd0fbfb82624b9d2d90c04 +AUX zsync-0.6.2-warning-fixes.patch 6097 BLAKE2B ccc4818d4354304ae07f4ff98b68f5750884a47fc4c104ec7a23ae216a28ba0ee54533663b0966fd14afdea79a0edf1a868e92c5d393586f1611f73d74ecca27 SHA512 5691049dfd94fe14e4236fea00c99ddcce213d8d17238725614ef57a2d555cd6469584736e7a10556ee06e058ab1dea5bed7f56e7f8a5b022dc633130a9d9122 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d -EBUILD zsync-0.6.2-r3.ebuild 1139 BLAKE2B fade6f795770c982e95a019f85fd55326167a853399360f4a210604311e66e20c177a4a9f3c6f3232c26a22f51b18b83ee38ab0e921befcb934f6a8cc10adbca SHA512 ce00c18d12a9bee8a0a2373a43709c23269ac09c68d52896f01eb3715b445ba1ed37adf3fdb5865d566d483366af737f55e85d7f6ad38851d35cb0aa95b1f09c +EBUILD zsync-0.6.2-r4.ebuild 1176 BLAKE2B 0de612aa37eed227ca4707f732fba850d5d4d058350470aaacac769c8df90f8b720cc6d367823796f92e8ba116e925e3e6b61231334d40353bb0dbc02d55a0da SHA512 7708ec9e9e35a77334d5971c104b8a5569e22dc1f64e44175979eb21a59f175cdd69f438b0a6abb2f8272e4d87a726698c8cda84e2253e040b593216a5880d53 +EBUILD zsync-0.6.2-r5.ebuild 810 BLAKE2B 696ced50019603a417350bbbbc745cc93f72f33167e13f509f518c1a43ec65d4c7096a1d15a4140a54350775eee7c9f7f1364c399bcb8c42b6e30b97e68753a2 SHA512 e8f605b585ee2854da1e4b687442815d03e9ab3003274c869947c7ed6e78861a45a120b602cc6811a5850e2893729d30e182e51d6a319f26cbadbfc1d2d564a6 MISC metadata.xml 1324 BLAKE2B 6a0cf68e98964abcd423f9d5d9e293c5d4c152b1ed2fc98ab805927d2f0dcdda6a07e2a16bbe590bbbe23590e1fae99e4c618680d4db3864d7cec20b175a6656 SHA512 99151fb2267583e7f3174087a2758aebfcfbcb81196af87c7d4f84c847806f08ad35a361fbc3ade104a60fcd555b5110712b8569a9993bbfd0574992eb36704c diff --git a/net-misc/zsync/files/zsync-0.6.2-c99.patch b/net-misc/zsync/files/zsync-0.6.2-c99.patch new file mode 100644 index 000000000000..f71453129d35 --- /dev/null +++ b/net-misc/zsync/files/zsync-0.6.2-c99.patch @@ -0,0 +1,82 @@ +https://bugs.gentoo.org/921150 +https://sources.debian.org/data/main/z/zsync/0.6.2-7/debian/patches/fix-build-with-gcc-14.patch + +Description: Fix build with GCC-14 +Author: Marcos Talau <talau@debian.org> +Bug-Debian: https://bugs.debian.org/1075710 +Forwarded: https://github.com/cph6/zsync/issues/20 +Last-Update: 2024-08-16 + +--- a/client.c ++++ b/client.c +@@ -392,7 +392,7 @@ int fetch_remaining_blocks_http(struct z + */ + int fetch_remaining_blocks(struct zsync_state *zs) { + int n, utype; +- const char *const *url = zsync_get_urls(zs, &n, &utype); ++ char **url = zsync_get_urls(zs, &n, &utype); + int *status; /* keep status for each URL - 0 means no error */ + int ok_urls = n; + +@@ -452,7 +452,7 @@ extern long global_offset; + int main(int argc, char **argv) { + struct zsync_state *zs; + char *temp_file = NULL; +- char **seedfiles = NULL; ++ void **seedfiles = NULL; + int nseedfiles = 0; + char *filename = NULL; + long long local_used; +--- a/libzsync/zmap.c ++++ b/libzsync/zmap.c +@@ -333,7 +333,7 @@ int zmap_search(const struct zmap* zm, l + * and in the order that it returned them, this condition is satisfied. + */ + void configure_zstream_for_zdata(const struct zmap *zm, z_stream * zs, +- long zoffset, long long *poutoffset) { ++ long zoffset, off_t *poutoffset) { + /* Find the zmap entry corresponding to this offset */ + int i = zmap_search(zm, zoffset); + +--- a/libzsync/zmap.h ++++ b/libzsync/zmap.h +@@ -29,7 +29,7 @@ struct zmap* zmap_make(const struct gzbl + void zmap_free(struct zmap*); + + off_t* zmap_to_compressed_ranges(const struct zmap* zm, off_t* byterange, int nrange, int* num); +-void configure_zstream_for_zdata(const struct zmap* zm, struct z_stream_s* zs, long zoffset, long long* poutoffset); ++void configure_zstream_for_zdata(const struct zmap* zm, struct z_stream_s* zs, long zoffset, off_t* poutoffset); + + /* gzip flag byte */ + #define GZ_ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +--- a/libzsync/zsync.c ++++ b/libzsync/zsync.c +@@ -436,7 +436,7 @@ void zsync_progress(const struct zsync_s + * Note that these URLs could be for encoded versions of the target; a 'type' + * is returned in *type which tells libzsync in later calls what version of the + * target is being retrieved. */ +-const char *const *zsync_get_urls(struct zsync_state *zs, int *n, int *t) { ++char **zsync_get_urls(struct zsync_state *zs, int *n, int *t) { + if (zs->zmap && zs->nzurl) { + *n = zs->nzurl; + *t = 1; +@@ -768,7 +768,7 @@ char *zsync_end(struct zsync_state *zs) + */ + void zsync_configure_zstream_for_zdata(const struct zsync_state *zs, + struct z_stream_s *zstrm, +- long zoffset, long long *poutoffset) { ++ long zoffset, off_t *poutoffset) { + configure_zstream_for_zdata(zs->zmap, zstrm, zoffset, poutoffset); + { /* Load in prev 32k sliding window for backreferences */ + long long pos = *poutoffset; +--- a/libzsync/zsync.h ++++ b/libzsync/zsync.h +@@ -58,7 +58,7 @@ int zsync_submit_source_file(struct zsyn + * (the URL pointers are still referenced by the library, and are valid only until zsync_end). + */ + +-const char * const * zsync_get_urls(struct zsync_state* zs, int* n, int* t); ++char ** zsync_get_urls(struct zsync_state* zs, int* n, int* t); + + /* zsync_needed_byte_ranges - get the byte ranges needed from a URL. + * Returns the number of ranges in *num, and a malloc'd array (to be freed diff --git a/net-misc/zsync/files/zsync-0.6.2-unbundle-zlib.patch b/net-misc/zsync/files/zsync-0.6.2-unbundle-zlib.patch new file mode 100644 index 000000000000..4b78ba85683d --- /dev/null +++ b/net-misc/zsync/files/zsync-0.6.2-unbundle-zlib.patch @@ -0,0 +1,124 @@ +https://sources.debian.org/data/main/z/zsync/0.6.2-7/debian/patches/devendor-zlib.patch + +Description: De-vendor zlib + Use the zlib as it is in the archive, not an embedded copy +Author: Simon Quigley <tsimonq2@debian.org> +Origin: vendor +Forwarded: not-needed +Last-Update: 2025-02-26 +--- a/configure.ac ++++ b/configure.ac +@@ -38,6 +38,9 @@ X_DECL_H_ERRNO + dnl Solaris needs -lsocket - and we need this for the getaddrinfo test + AC_CHECK_LIB(socket,socket) + ++AC_CHECK_LIB([z], [inflate], [], [AC_MSG_ERROR([zlib library not found])]) ++AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([zlib headers not found])]) ++ + AC_REPLACE_FUNCS(getaddrinfo) + + dnl - Large file support if available +@@ -65,6 +68,6 @@ X_C_COMPILE_FLAGS($ZS_CFLAGS -g -Wall -W + dnl --- output + AC_SUBST(ac_aux_dir) + AC_CONFIG_HEADERS([config.h]) +-AC_CONFIG_FILES([Makefile librcksum/Makefile zlib/Makefile libzsync/Makefile doc/Makefile]) ++AC_CONFIG_FILES([Makefile librcksum/Makefile libzsync/Makefile doc/Makefile]) + AC_OUTPUT + +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,15 +2,15 @@ + AUTOMAKE_OPTIONS = check-news + ACLOCAL_AMFLAGS = -I autotools + +-SUBDIRS = librcksum zlib libzsync doc ++SUBDIRS = librcksum libzsync doc + + bin_PROGRAMS = zsyncmake zsync + + zsyncmake_SOURCES = make.c makegz.c makegz.h format_string.h +-zsyncmake_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a zlib/libdeflate.a -lm ++zsyncmake_LDADD = libzsync/libzsync.a librcksum/librcksum.a -lz -lm + + zsync_SOURCES = client.c http.c http.h url.c url.h progress.c progress.h base64.c format_string.h zsglobal.h +-zsync_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a $(LIBOBJS) ++zsync_LDADD = libzsync/libzsync.a librcksum/librcksum.a -lz $(LIBOBJS) + + EXTRA_zsync_SOURCES = getaddrinfo.h + +--- a/Makefile.in ++++ b/Makefile.in +@@ -61,11 +61,10 @@ am_zsync_OBJECTS = client.$(OBJEXT) http + progress.$(OBJEXT) base64.$(OBJEXT) + zsync_OBJECTS = $(am_zsync_OBJECTS) + zsync_DEPENDENCIES = libzsync/libzsync.a librcksum/librcksum.a \ +- zlib/libinflate.a $(LIBOBJS) ++ $(LIBOBJS) + am_zsyncmake_OBJECTS = make.$(OBJEXT) makegz.$(OBJEXT) + zsyncmake_OBJECTS = $(am_zsyncmake_OBJECTS) +-zsyncmake_DEPENDENCIES = libzsync/libzsync.a librcksum/librcksum.a \ +- zlib/libinflate.a zlib/libdeflate.a ++zsyncmake_DEPENDENCIES = libzsync/libzsync.a librcksum/librcksum.a + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp + am__depfiles_maybe = depfiles +@@ -252,11 +251,11 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = check-news + ACLOCAL_AMFLAGS = -I autotools +-SUBDIRS = librcksum zlib libzsync doc ++SUBDIRS = librcksum libzsync doc + zsyncmake_SOURCES = make.c makegz.c makegz.h format_string.h +-zsyncmake_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a zlib/libdeflate.a -lm ++zsyncmake_LDADD = libzsync/libzsync.a librcksum/librcksum.a -lz -lm + zsync_SOURCES = client.c http.c http.h url.c url.h progress.c progress.h base64.c format_string.h zsglobal.h +-zsync_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a $(LIBOBJS) ++zsync_LDADD = libzsync/libzsync.a librcksum/librcksum.a -lz $(LIBOBJS) + EXTRA_zsync_SOURCES = getaddrinfo.h + + # From "GNU autoconf, automake and libtool" Vaughan, Elliston, +--- a/libzsync/zmap.c ++++ b/libzsync/zmap.c +@@ -287,7 +287,7 @@ off_t *zmap_to_compressed_ranges(const s + return consolidate_byteranges(zbyterange, num); + } + +-#include "zlib/zlib.h" ++#include <zlib.h> + /* zmap_search(self, offset) + * Find this offset in the Z-Map */ + int zmap_search(const struct zmap* zm, long zoffset) { +--- a/libzsync/zsync.c ++++ b/libzsync/zsync.c +@@ -48,7 +48,7 @@ + # include <dmalloc.h> + #endif + +-#include "zlib/zlib.h" ++#include <zlib.h> + + #include "librcksum/rcksum.h" + #include "zsync.h" +--- a/make.c ++++ b/make.c +@@ -43,7 +43,7 @@ + #include "librcksum/rcksum.h" + #include "libzsync/zmap.h" + #include "libzsync/sha1.h" +-#include "zlib/zlib.h" ++#include <zlib.h> + #include "format_string.h" + + /* We're only doing one file per run, so these are global state for the current +--- a/makegz.c ++++ b/makegz.c +@@ -20,7 +20,7 @@ + #include <unistd.h> + #include <stdlib.h> + +-#include "zlib/zlib.h" ++#include <zlib.h> + + #include <sys/types.h> + #include <sys/stat.h> diff --git a/net-misc/zsync/files/zsync-0.6.2-warning-fixes.patch b/net-misc/zsync/files/zsync-0.6.2-warning-fixes.patch new file mode 100644 index 000000000000..c15783604010 --- /dev/null +++ b/net-misc/zsync/files/zsync-0.6.2-warning-fixes.patch @@ -0,0 +1,157 @@ +(Note that despite the Debian description, it really seems largely about +warning fixes instead with one zlib modernisation fix as well.) + +https://sources.debian.org/data/main/z/zsync/0.6.2-7/debian/patches/update-zlib-functions.patch + +Description: Update functions for zlib de-vendoring +Author: Simon Quigley <tsimonq2@debian.org> +Origin: vendor +Forwarded: not-needed +Last-Update: 2025-02-26 +--- a/libzsync/zsync.c ++++ b/libzsync/zsync.c +@@ -151,7 +151,7 @@ struct zsync_state *zsync_begin(FILE * f + char *safelines = NULL; + + /* Allocate memory for the object */ +- struct zsync_state *zs = calloc(sizeof *zs, 1); ++ struct zsync_state *zs = calloc(1, sizeof *zs); + + if (!zs) + return NULL; +@@ -210,7 +210,7 @@ struct zsync_state *zsync_begin(FILE * f + } + else if (!strcmp(buf, "Blocksize")) { + zs->blocksize = atol(p); +- if (zs->blocksize < 0 || (zs->blocksize & (zs->blocksize - 1))) { ++ if (zs->blocksize & (zs->blocksize - 1)) { + fprintf(stderr, "nonsensical blocksize %ld\n", zs->blocksize); + free(zs); + return NULL; +@@ -240,7 +240,8 @@ struct zsync_state *zsync_begin(FILE * f + + zblock = malloc(nzblocks * sizeof *zblock); + if (zblock) { +- if (fread(zblock, sizeof *zblock, nzblocks, f) < nzblocks) { ++ size_t nread = fread(zblock, sizeof *zblock, nzblocks, f); ++ if (nread < (size_t)nzblocks) { + fprintf(stderr, "premature EOF after Z-Map\n"); + free(zs); + return NULL; +@@ -701,7 +702,8 @@ static int zsync_recompress(struct zsync + p = skip_zhead(buf); + skip = 0; + } +- if (fwrite(p, 1, r - (p - buf), zout) != r - (p - buf)) { ++ size_t out_len = r - (p - buf); ++ if (fwrite(p, 1, out_len, zout) != out_len) { + perror("fwrite"); + rc = -1; + goto leave_it; +@@ -714,8 +716,8 @@ static int zsync_recompress(struct zsync + rc = -1; + } + } +- if (fclose(g) != 0) { +- perror("close"); ++ if (pclose(g) == -1) { ++ perror("pclose failed"); + rc = -1; + } + +@@ -782,7 +784,7 @@ void zsync_configure_zstream_for_zdata(c + /* Fake an output buffer of 32k filled with data to zlib */ + zstrm->next_out = wbuf + lookback; + zstrm->avail_out = 0; +- updatewindow(zstrm, lookback); ++ inflateSetDictionary(zstrm, wbuf, lookback); + } + } + +@@ -922,10 +924,10 @@ static int zsync_receive_data_compressed + return 0; + + /* Now set up for the downloaded block */ +- zr->strm.next_in = buf; ++ zr->strm.next_in = (Bytef *)buf; + zr->strm.avail_in = len; + +- if (zr->strm.total_in == 0 || offset != zr->strm.total_in) { ++ if (zr->strm.total_in == 0 || (uLong)offset != zr->strm.total_in) { + zsync_configure_zstream_for_zdata(zr->zs, &(zr->strm), offset, + &(zr->outoffset)); + +@@ -939,7 +941,7 @@ static int zsync_receive_data_compressed + "data didn't align with block boundary in compressed stream\n"); + return 1; + } +- zr->strm.next_in = buf; ++ zr->strm.next_in = (Bytef *)buf; + zr->strm.avail_in = len; + } + +@@ -952,6 +954,7 @@ static int zsync_receive_data_compressed + switch (rc) { + case Z_STREAM_END: + eoz = 1; ++ [[fallthrough]]; + case Z_BUF_ERROR: + case Z_OK: + if (zr->strm.avail_out == 0 || eoz) { +--- a/libzsync/zmap.c ++++ b/libzsync/zmap.c +@@ -359,5 +359,8 @@ void configure_zstream_for_zdata(const s + *poutoffset = zm->e[i].outbytes; + + /* Align with the bitstream */ +- inflate_advance(zs, zoffset, zm->e[i].inbits % 8, !zm->e[i].blockcount); ++ int ret; ++ do { ++ ret = inflate(zs, Z_SYNC_FLUSH); ++ } while (ret == Z_OK); + } +--- a/make.c ++++ b/make.c +@@ -316,7 +316,7 @@ void do_zstream(FILE * fin, FILE * fout, + /* If we passed a block boundary in the uncompressed data, record the + * next available point at which we could stop or start decompression. + * Write a zmap delta with the 1st when we see the 2nd, etc */ +- if (want_zdelta && inflateSafePoint(&zs)) { ++ if (want_zdelta && inflateSyncPoint(&zs)) { + long long cur_in = header_bits + in_position(&zs); + if (midblock_in) { + write_zmap_delta(&prev_in, &prev_out, midblock_in, +@@ -718,7 +718,7 @@ int main(int argc, char **argv) { + read_stream_write_blocksums(instream, tf); + + { /* Decide how long a rsum hash and checksum hash per block we need for this file */ +- seq_matches = len > blocksize ? 2 : 1; ++ seq_matches = ((off_t)len > (off_t)blocksize) ? 2 : 1; + rsum_len = ceil(((log(len) + log(blocksize)) / log(2) - 8.6) / seq_matches / 8); + + /* min and max lengths of rsums to store */ +@@ -836,7 +836,7 @@ int main(int argc, char **argv) { + fprintf(fout, "MTime: %s\n", buf); + } + else { +- fprintf(stderr, "error converting %d to struct tm\n", mtime); ++ fprintf(stderr, "error converting %ld to struct tm\n", (long)mtime); + } + } + } +--- a/http.c ++++ b/http.c +@@ -554,9 +554,10 @@ static int range_fetch_set_url(struct ra + if (rf->authh) free(rf->authh); + + /* Get host:port for Host: header */ +- if (strcmp(cport, "http") != 0) +- snprintf(rf->hosth, sizeof(rf->hosth), "%s:%s", hostn, cport); +- else ++ if (strcmp(cport, "http") != 0) { ++ strncpy(rf->hosth, hostn, sizeof(rf->hosth) - 1); ++ rf->hosth[sizeof(rf->hosth) - 1] = '\0'; ++ } else + snprintf(rf->hosth, sizeof(rf->hosth), "%s", hostn); + + if (proxy) { diff --git a/net-misc/zsync/zsync-0.6.2-r3.ebuild b/net-misc/zsync/zsync-0.6.2-r4.ebuild index 798fb552ab27..f878a449a366 100644 --- a/net-misc/zsync/zsync-0.6.2-r3.ebuild +++ b/net-misc/zsync/zsync-0.6.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86" PATCHES=( "${FILESDIR}"/${PN}-0.6.2-musl-off_t-fix.patch + "${FILESDIR}"/${PN}-0.6.2-c99.patch ) src_prepare() { diff --git a/net-misc/zsync/zsync-0.6.2-r5.ebuild b/net-misc/zsync/zsync-0.6.2-r5.ebuild new file mode 100644 index 000000000000..9e28818bb6ce --- /dev/null +++ b/net-misc/zsync/zsync-0.6.2-r5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm" +HOMEPAGE="http://zsync.moria.org.uk/" +SRC_URI=" + http://zsync.moria.org.uk/download/${P}.tar.bz2 +" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2-musl-off_t-fix.patch + "${FILESDIR}"/${PN}-0.6.2-c99.patch + "${FILESDIR}"/${PN}-0.6.2-unbundle-zlib.patch + "${FILESDIR}"/${PN}-0.6.2-warning-fixes.patch +) + +src_prepare() { + default + + # Drop bundled zlib + rm -r zlib || die + + eautoreconf +} + +src_install() { + dobin zsync zsyncmake + dodoc NEWS README + doman doc/zsync.1 doc/zsyncmake.1 +} |