* [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/
@ 2016-03-22 11:00 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-03-22 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 18442b46d92ef15528a84be181712231199ecb25
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 09:58:59 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 10:46:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18442b46
app-arch/torrentzip: Fix SRC_URI. Bump to EAPI 6. Bump to version 0.9
Also assign package to Alexander Miller <alex.miller <AT> gmx.de>.
Gentoo-Bug: https://bugs.gentoo.org/575338
Package-Manager: portage-2.2.26
app-arch/torrentzip/Manifest | 4 +--
.../files/torrentzip-0.2-fix-perms.patch | 11 ++++++
app-arch/torrentzip/metadata.xml | 11 +++++-
app-arch/torrentzip/torrentzip-0.2-r2.ebuild | 42 ----------------------
...tzip-0.2-r3.ebuild => torrentzip-0.2-r4.ebuild} | 9 ++---
...rentzip-0.2-r3.ebuild => torrentzip-0.9.ebuild} | 23 ++++++------
6 files changed, 39 insertions(+), 61 deletions(-)
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index e167253..91c231b 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,2 +1,2 @@
-DIST torrentzip-0.2.tar.gz 46971 SHA256 9e55f378ef5c75c452b3f52728a7503ca76e147e0ab2395b8c41de8c20995efd SHA512 802dd1bf55e0a31df75d8195c9d2d5610be8cb7f14d14278eba72b580aff3ad415711999db05a5425303380ebfc82a68896e276319e0ead5635d0a07615ba700 WHIRLPOOL 79c96f51a0b547b2651625a3b3aee6b7a769955e10b092654086a1d91a494d08f8dd732eee45b432ca97f4f6314af0f76907fa81b422ef94676e6d729994a61d
-DIST torrentzip-0.2.zip 69200 SHA256 3aa58e839743eebd97071e36585bb14cab0bddd22db646eb0765e1ae3ef2c749 SHA512 a6d6452940ab9070b96d598c7db306657afa34c3630160943260e6687e65985aa5aa8ad0b1319ee6470912207d6ef369fdb1168d5d528e8efd7405dc7722b1b8 WHIRLPOOL 0cad9f83e2d27795014be51b912d34350a59ad9c824f66237e1f15641daad812c92a7d5c6357e8d6a2517f08a381705f4eb057dc855700b007b99f3210046a1c
+DIST torrentzip-0.9.tar.gz 59007 SHA256 89059002613e3e9f06861ae90047e3d4ea6cc1b2cc4ef21bd75cb51cecb2bff6 SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d WHIRLPOOL 0e172c0797d2577afd632d9d53d09a2cb25d05e78037984963996999a719aaf7295dc264554794f0b1f2eba8bb162c2ecc9d584a058c241b6f84849c0ab47e7b
+DIST trrntzip_v02_src.tar.gz 46971 SHA256 9e55f378ef5c75c452b3f52728a7503ca76e147e0ab2395b8c41de8c20995efd SHA512 802dd1bf55e0a31df75d8195c9d2d5610be8cb7f14d14278eba72b580aff3ad415711999db05a5425303380ebfc82a68896e276319e0ead5635d0a07615ba700 WHIRLPOOL 79c96f51a0b547b2651625a3b3aee6b7a769955e10b092654086a1d91a494d08f8dd732eee45b432ca97f4f6314af0f76907fa81b422ef94676e6d729994a61d
diff --git a/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch b/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch
new file mode 100644
index 0000000..79df2ef
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch
@@ -0,0 +1,11 @@
+--- a/src/trrntzip.c
++++ b/src/trrntzip.c
+@@ -782,7 +782,7 @@
+
+ if (strstr (szTmpBuf, ".zip\0") && !(istat.st_mode & S_IWUSR))
+ {
+- chmod (direntp->d_name, S_IWUSR);
++ chmod (direntp->d_name, S_IWUSR | S_IRUSR);
+ mig.cEncounteredZips++;
+
+ if (!mig.fProcessLog)
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index 23d7bdd..c8b37f1 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>alex.miller@gmx.de</email>
+ <name>Alexander Miller</name>
+ <description>Proxied maintainer</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+
<longdescription>
TorrentZip is a replacement for MameZip. The goal of the program is to
use standard values when creating zips to create identical files over
diff --git a/app-arch/torrentzip/torrentzip-0.2-r2.ebuild b/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
deleted file mode 100644
index e3cfa1a..0000000
--- a/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools
-
-MY_PN="trrntzip"
-MY_PV="code-9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Advanced archiver to create identical files over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-SRC_URI="http://sourceforge.net/code-snapshots/svn/t/tr/${MY_PN}/code/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-DEPEND="sys-libs/zlib"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-function-declarations.patch"
-)
-
-src_prepare() {
- # Source-code from sf.net snapshots has CRLF...
- EPATCH_OPTS="--binary"
-
- epatch "${PATCHES[@]}"
-
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- nonfatal dodoc README AUTHORS
-}
diff --git a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild b/app-arch/torrentzip/torrentzip-0.2-r4.ebuild
similarity index 81%
copy from app-arch/torrentzip/torrentzip-0.2-r3.ebuild
copy to app-arch/torrentzip/torrentzip-0.2-r4.ebuild
index a921e91..376bb43 100644
--- a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild
+++ b/app-arch/torrentzip/torrentzip-0.2-r4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
inherit eutils autotools
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/trrntzip"
MY_PN="trrntzip"
MY_P="${MY_PN}_v${PV/.}"
-SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -22,11 +22,12 @@ RDEPEND="$DEPEND"
S="${WORKDIR}/${MY_PN}"
DOCS=(README AUTHORS)
+PATCHES=("${FILESDIR}/${P}-fix-perms.patch")
src_prepare() {
- export CPPFLAGS+=" -DOF\\(args\\)=args"
+ default
- epatch_user
+ export CPPFLAGS+=" -DOF\\(args\\)=args"
eautoreconf
}
diff --git a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild b/app-arch/torrentzip/torrentzip-0.9.ebuild
similarity index 63%
rename from app-arch/torrentzip/torrentzip-0.2-r3.ebuild
rename to app-arch/torrentzip/torrentzip-0.9.ebuild
index a921e91..9539cad 100644
--- a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild
+++ b/app-arch/torrentzip/torrentzip-0.9.ebuild
@@ -2,31 +2,30 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI=6
-inherit eutils autotools
+inherit autotools
DESCRIPTION="Create identical zip archives over multiple systems"
HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-MY_PN="trrntzip"
-MY_P="${MY_PN}_v${PV/.}"
-
-SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="sys-libs/zlib"
-RDEPEND="$DEPEND"
-S="${WORKDIR}/${MY_PN}"
+RDEPEND="
+ sys-libs/zlib"
+
+DEPEND="
+ ${RDEPEND}
+ app-arch/unzip"
+
DOCS=(README AUTHORS)
src_prepare() {
+ default
export CPPFLAGS+=" -DOF\\(args\\)=args"
-
- epatch_user
-
eautoreconf
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/
@ 2016-07-03 11:57 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-07-03 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 1efc8155af1c312040185f9fed0313d0ecc8e22d
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 11:20:14 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 11:28:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efc8155
app-arch/torrentzip: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy.
Package-Manager: portage-2.2.28
.../torrentzip-0.2-fix-function-declarations.patch | 23 ----------------------
app-arch/torrentzip/torrentzip-0.9.ebuild | 2 +-
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch b/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch
deleted file mode 100644
index c8ab8fc..0000000
--- a/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac 2005-04-05 18:12:49.000000000 +0200
-+++ configure.ac 2016-01-17 22:58:57.203979927 +0100
-@@ -1,7 +1,7 @@
- AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
-
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(config.h)
-+#AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
-
- AC_PROG_CC
-@@ -11,6 +11,11 @@
- AC_CHECK_LIB([m], [fmod], [], [AC_MSG_ERROR("Need libm to build TorrentZip")])
- AC_CHECK_LIB([z], [zlibVersion], [], [AC_MSG_ERROR("Need libz to build TorrentZip")])
-
-+AC_CHECK_DECL(OF, [],
-+ [AC_CHECK_DECL(_Z_OF, [AC_DEFINE([OF(args)], [_Z_OF(args)])],
-+ [AC_MSG_ERROR("Unsupported zlib version")], [#include "zlib.h"])],
-+ [#include "zlib.h"])
-+
- AC_CONFIG_FILES([Makefile src/Makefile torrentzip.spec])
-
- AC_OUTPUT
diff --git a/app-arch/torrentzip/torrentzip-0.9.ebuild b/app-arch/torrentzip/torrentzip-0.9.ebuild
index 9539cad..4dae2bb 100644
--- a/app-arch/torrentzip/torrentzip-0.9.ebuild
+++ b/app-arch/torrentzip/torrentzip-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/
@ 2020-11-19 10:22 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-11-19 10:22 UTC (permalink / raw
To: gentoo-commits
commit: 4f3811aa431fa66e4baa15faa5242e3a9e0858c2
Author: Alexander Miller <alex.miller <AT> gmx <DOT> de>
AuthorDate: Wed Nov 11 15:08:49 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 10:21:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3811aa
app-arch/torrentzip: Fix building with autoconf-2.70
* EAPI=7
* Drop leftover dependency on app-arch/unzip.
* Add a patch that fixes underquoting in configure.ac which
caused aclocal to fail with recent autoconf-2.70 betas.
Closes: https://bugs.gentoo.org/751235
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexander Miller <alex.miller <AT> gmx.de>
Closes: https://github.com/gentoo/gentoo/pull/18225
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/torrentzip-0.9-autoconf-quote.patch | 8 ++++++
app-arch/torrentzip/torrentzip-0.9-r1.ebuild | 29 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
new file mode 100644
index 00000000000..c71542f4c7d
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
@@ -0,0 +1,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
++AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])
+
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
new file mode 100644
index 00000000000..bf160c6743f
--- /dev/null
+++ b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Create identical zip archives over multiple systems"
+HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+DOCS=(README AUTHORS)
+
+PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch")
+
+src_prepare() {
+ default
+ export CPPFLAGS+=" -DOF\\(args\\)=args"
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/
@ 2024-03-16 0:31 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2024-03-16 0:31 UTC (permalink / raw
To: gentoo-commits
commit: c1ec2a01707d90ca867310347ec12a14679043e5
Author: Alexander Miller <alex.miller <AT> gmx <DOT> de>
AuthorDate: Tue Mar 5 20:24:41 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 00:30:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ec2a01
app-arch/torrentzip: Fix 1.2 regression
TorrentZip 1.2 skips files although their checksum comment
doesn't match or is entirely missing, which is a serious
problem.
Pick the patch from upstream git main that fixes the issue.
See: https://github.com/0-wiz-0/trrntzip/pull/3#issuecomment-1975326415
Closes: https://github.com/gentoo/gentoo/pull/35634
Signed-off-by: Alexander Miller <alex.miller <AT> gmx.de>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/torrentzip-1.2-checksum-detection.patch | 51 ++++++++++++++++++++++
...rentzip-1.2.ebuild => torrentzip-1.2-r1.ebuild} | 3 ++
2 files changed, 54 insertions(+)
diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
new file mode 100644
index 000000000000..ac1ae14cbe03
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
@@ -0,0 +1,51 @@
+From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Mon, 4 Mar 2024 19:26:21 +0100
+Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-...
+ comment
+
+The commit listed below introduces a regression where in MigrateZip(),
+variable rc would be clobbered when its value is still needed. That
+completely breaks handling of zips that should be re-zipped because
+of missing or out of date TORRENTZIPPED-... comment.
+
+Rewrite the offending code such that it no longer touches the variable.
+
+Fixes: cf11c900079e ("Check for more errors while reading zip entries")
+---
+ src/trrntzip.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/trrntzip.c b/src/trrntzip.c
+index e55d217..49f796e 100644
+--- a/src/trrntzip.c
++++ b/src/trrntzip.c
+@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
+
+ CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
+ // Get the filelist from the zip file in original order in ws->FileNameArray
+- rc = GetFileList(UnZipHandle, ws);
+- if (rc != TZ_OK) {
++ switch (GetFileList(UnZipHandle, ws)) {
++ case TZ_OK:
++ break;
++ case TZ_CRITICAL:
+ logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
+- rc == TZ_CRITICAL
+- ? "Error allocating memory!\n"
+- : "Could not list contents of \"%s\". File is corrupted or "
+- "contains entries with bad names.\n",
+- szZipFileName);
++ "Error allocating memory!\n");
++ unzClose(UnZipHandle);
++ return TZ_CRITICAL;
++ default:
++ logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
++ "Could not list contents of \"%s\". File is corrupted or "
++ "contains entries with bad names.\n", szZipFileName);
+ unzClose(UnZipHandle);
+- return rc;
++ return TZ_ERR;
+ }
+ CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
+
diff --git a/app-arch/torrentzip/torrentzip-1.2.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
similarity index 90%
rename from app-arch/torrentzip/torrentzip-1.2.ebuild
rename to app-arch/torrentzip/torrentzip-1.2-r1.ebuild
index beb03c69a832..7dfb7fbdde2b 100644
--- a/app-arch/torrentzip/torrentzip-1.2.ebuild
+++ b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
@@ -23,3 +23,6 @@ DEPEND="
"
DOCS=(AUTHORS NEWS.md README.md)
+PATCHES=(
+ "${FILESDIR}-${P}-checksum-detection.patch"
+)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/
@ 2024-06-02 7:00 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-06-02 7:00 UTC (permalink / raw
To: gentoo-commits
commit: dda8854fe9fdffee3e166d6548534f93980107e4
Author: Alexander Miller <alex.miller <AT> gmx <DOT> de>
AuthorDate: Tue Apr 16 11:56:31 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 07:00:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda8854f
app-arch/torrentzip: drop 0.9-r1, 1.2-r1
Closes: https://bugs.gentoo.org/920358
Closes: https://github.com/gentoo/gentoo/pull/36279
Signed-off-by: Alexander Miller <alex.miller <AT> gmx.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-arch/torrentzip/Manifest | 2 -
.../files/torrentzip-0.9-autoconf-quote.patch | 8 ----
.../files/torrentzip-1.2-checksum-detection.patch | 51 ----------------------
app-arch/torrentzip/torrentzip-0.9-r1.ebuild | 27 ------------
app-arch/torrentzip/torrentzip-1.2-r1.ebuild | 28 ------------
5 files changed, 116 deletions(-)
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index 08aa339c1310..387677f363eb 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,3 +1 @@
-DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
-DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712d6ea911da2848cc8db15cbdf712967b9fcc1414513c1a18eef160108f5f7b03aefd8f8f18c4d04907a16c17 SHA512 90c853efde1d077c741206362bc14fe779627f1b20571246e99ed29980840e78c0377110431c59c35596a0d209e612f6fe77b385707eb4bdb1ea47bb797c9272
DIST trrntzip-1.3.tar.gz 67297 BLAKE2B c77fd134cfd3ab30f46b66f4b3dd36b899ee6267b17100b1ad15bdf5c6beddaea94fe22d23f1a81de85522768d76401f0192d0deac2ff75edc816510c8069e2c SHA512 c21ed6ac4dacd652e2a67b700741d70dd9da699259bd299ca177c741111f92e70eef0b3ad2ced54b5635780cab2b4c46b3f9c258dfa18bdde24e2718c38339be
diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
deleted file mode 100644
index f1f15ced173e..000000000000
--- a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
-+AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])
-
- AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
deleted file mode 100644
index ac1ae14cbe03..000000000000
--- a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Mon, 4 Mar 2024 19:26:21 +0100
-Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-...
- comment
-
-The commit listed below introduces a regression where in MigrateZip(),
-variable rc would be clobbered when its value is still needed. That
-completely breaks handling of zips that should be re-zipped because
-of missing or out of date TORRENTZIPPED-... comment.
-
-Rewrite the offending code such that it no longer touches the variable.
-
-Fixes: cf11c900079e ("Check for more errors while reading zip entries")
----
- src/trrntzip.c | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/trrntzip.c b/src/trrntzip.c
-index e55d217..49f796e 100644
---- a/src/trrntzip.c
-+++ b/src/trrntzip.c
-@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
-
- CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
- // Get the filelist from the zip file in original order in ws->FileNameArray
-- rc = GetFileList(UnZipHandle, ws);
-- if (rc != TZ_OK) {
-+ switch (GetFileList(UnZipHandle, ws)) {
-+ case TZ_OK:
-+ break;
-+ case TZ_CRITICAL:
- logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
-- rc == TZ_CRITICAL
-- ? "Error allocating memory!\n"
-- : "Could not list contents of \"%s\". File is corrupted or "
-- "contains entries with bad names.\n",
-- szZipFileName);
-+ "Error allocating memory!\n");
-+ unzClose(UnZipHandle);
-+ return TZ_CRITICAL;
-+ default:
-+ logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
-+ "Could not list contents of \"%s\". File is corrupted or "
-+ "contains entries with bad names.\n", szZipFileName);
- unzClose(UnZipHandle);
-- return rc;
-+ return TZ_ERR;
- }
- CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
-
diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
deleted file mode 100644
index ad564eefcc4c..000000000000
--- a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=(README AUTHORS)
-
-PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch")
-
-src_prepare() {
- default
- export CPPFLAGS+=" -DOF\\(args\\)=args"
- eautoreconf
-}
diff --git a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
deleted file mode 100644
index d526e0b88c10..000000000000
--- a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="trrntzip-${PV}"
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://github.com/0-wiz-0/trrntzip"
-SRC_URI="https://github.com/0-wiz-0/trrntzip/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- sys-libs/zlib:=
-"
-DEPEND="
- ${RDEPEND}
-"
-
-DOCS=(AUTHORS NEWS.md README.md)
-PATCHES=(
- "${FILESDIR}/${P}-checksum-detection.patch"
-)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-02 7:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-03 11:57 [gentoo-commits] repo/gentoo:master commit in: app-arch/torrentzip/files/, app-arch/torrentzip/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2024-06-02 7:00 Joonas Niilola
2024-03-16 0:31 Yixun Lan
2020-11-19 10:22 Joonas Niilola
2016-03-22 11:00 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox