[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 8fde4fe7121c761c221ae02005af9737365845b3 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Mar 27 18:17:49 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Apr 5 15:26:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fde4fe7 app-arch/zoo: add missing remote-id Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Arthur Zamarin gentoo.org> app-arch/zoo/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-arch/zoo/metadata.xml b/app-arch/zoo/metadata.xml index 85e4ed814fa2..24fb120f7590 100644 --- a/app-arch/zoo/metadata.xml +++ b/app-arch/zoo/metadata.xml @@ -1,5 +1,8 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + + +jduerstock/zoo +
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: c3c276b147b5f7e674e6f0dbc280156b856ef3d4 Author: Sam James gentoo org> AuthorDate: Tue Jan 23 16:39:21 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 16:39:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c276b1 app-arch/zoo: Stabilize 2.10-r6 ppc, #922667 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index f04b7a046f34..596ed3ada797 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 86dec5c8e1fb0922e6ca2a685907f2ee00034f6c Author: Sam James gentoo org> AuthorDate: Tue Jan 23 15:06:01 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 15:06:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86dec5c8 app-arch/zoo: Stabilize 2.10-r6 ppc64, #922667 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index d3c22a5bb573..f04b7a046f34 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 5c1abbbd45635ec45a39569775c56254ef36456a Author: Sam James gentoo org> AuthorDate: Tue Jan 23 06:13:24 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 06:13:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1abbbd app-arch/zoo: Stabilize 2.10-r6 x86, #922667 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index e9f76511be6d..d3c22a5bb573 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 9de1cb25bbd2d8f3dcc2e2b9b4705ec9f5c56dfa Author: Sam James gentoo org> AuthorDate: Tue Jan 23 04:16:11 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 04:16:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de1cb25 app-arch/zoo: Stabilize 2.10-r6 amd64, #922667 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index 32f919284d68..e9f76511be6d 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: c0c376243df0b4c1918c58a1b2c2d9bc779ece9a Author: Sam James gentoo org> AuthorDate: Tue Jan 23 04:16:09 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 04:16:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c37624 app-arch/zoo: Stabilize 2.10-r6 sparc, #922667 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index f40e6975641e..32f919284d68 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: cc12e1fbac155620b97e4d244b5db62b6c163909 Author: Sam James gentoo org> AuthorDate: Thu Dec 14 04:13:09 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 14 04:13:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc12e1fb app-arch/zoo: Keyword 2.10-r6 arm64, #919747 Signed-off-by: Sam James gentoo.org> app-arch/zoo/zoo-2.10-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild index af94cc9c6c89..f40e6975641e 100644 --- a/app-arch/zoo/zoo-2.10-r6.ebuild +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" PATCHES=( "${WORKDIR}"/debian/patches/.
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
commit: 8e7cf5cc7b1aef4dfe9ba1598483acf14d1785af Author: Pascal Jäger leimstift de> AuthorDate: Tue Sep 19 11:43:01 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Dec 11 13:03:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7cf5cc app-arch/zoo: revbump, fix implicit ints Closes: https://bugs.gentoo.org/878611 Signed-off-by: Pascal Jäger leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/32923 Signed-off-by: Joonas Niilola gentoo.org> app-arch/zoo/files/zoo-2.10-implicit-int.patch | 75 ++ app-arch/zoo/zoo-2.10-r6.ebuild| 36 + 2 files changed, 111 insertions(+) diff --git a/app-arch/zoo/files/zoo-2.10-implicit-int.patch b/app-arch/zoo/files/zoo-2.10-implicit-int.patch new file mode 100644 index ..e29f3dff8f1f --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-implicit-int.patch @@ -0,0 +1,75 @@ +Clang 16 will not allow implicit int function defitions by default. +This patch gives all functions a proper definitons. + +See also: https://wiki.gentoo.org/wiki/Modern_C_porting + +Bug: https://bugs.gentoo.org/878611 +Upstream PR: https://github.com/jduerstock/zoo/pull/1 + +--- a/fiz.c b/fiz.c +@@ -24,6 +24,7 @@ file by supplying the offset of the file. + void prtctrl (); + void prtch (); + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/mstime.i b/mstime.i +@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2.2 88/01/24 12:47:58"; + Function mstime() converts time in seconds since January 1 of BASEYEAR + to MS-DOS format date and time. + */ ++void + mstime(longtime, date, time) + long longtime; /* input: seconds since Jan 1, BASEYEAR */ + int *date, *time;/* output: MS-DOS format date and time */ +--- a/zoo.c b/zoo.c +@@ -44,6 +44,7 @@ int next_arg = FIRST_ARG; /* filenames start at this position */ + int arg_count; /* count of arguments supplied to program */ + char **arg_vector; /* vector of arguments supplied to program */ + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/zoofilt.c b/zoofilt.c +@@ -41,8 +41,10 @@ char *option; + unsigned int filetag; /* tag stored in input */ + int stat1, stat2, stat3; /* status codes */ + int use_lzh = 0; /* use lzh instead */ +- extern lzc(), lzh_encode(); /* possible encoders */ +- extern lzd(), lzh_decode(); /* and decoders */ ++ extern int lzc(); /* possible encoders */ ++ extern int lzh_encode(); ++ extern int lzd(); /* and decoders */ ++ extern int lzh_decode(); + + while (*++option) { + switch (*option) { +--- a/nixtime.i b/nixtime.i +@@ -20,7 +20,7 @@ + Function gettime() gets the date and time of the file handle supplied. + Date and time is in MSDOS format. + */ +-int gettime (file, date, time) ++void gettime (file, date, time) + ZOOFILE file; + unsigned *date, *time; + { +--- a/zoofns.h b/zoofns.h +@@ -46,7 +46,7 @@ + int exists PARMS ((char *)); + int getfile PARMS ((ZOOFILE, ZOOFILE, long, int)); + int getutime PARMS ((char *, unsigned *, unsigned *)); +-int gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); ++void gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); + T_SIGNAL handle_break PARMS ((int)); + + #ifdef USE_ASCII diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild new file mode 100644 index ..af94cc9c6c89 --- /dev/null +++ b/app-arch/zoo/zoo-2.10-r6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Manipulate archives of files in compressed form" +HOMEPAGE="https://github.com/jduerstock/zoo; +SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz; +S="${WORKDIR}"/${P}.orig + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${WORKDIR}"/debian/patches/. + "${FILESDIR}"/${P}-gentoo-fbsd-r1.patch + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-implicit-int.patch +) + +src_configure() { + tc-export CC +} + +src_compile() { + emake linux +} + +src_install() { + dobin zoo fiz + doman zoo.1 fiz.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
commit: 4047c3d29b22672dbe829c8440617c0ab53bb6b5 Author: Jakov Smolic sartura hr> AuthorDate: Thu Apr 29 21:46:09 2021 + Commit: Sam James gentoo org> CommitDate: Tue May 4 22:17:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4047c3d2 app-arch/zoo: Port to EAPI 7, fix CFLAGS, tc-directly Closes: https://bugs.gentoo.org/726376 Closes: https://bugs.gentoo.org/721888 Closes: https://bugs.gentoo.org/729126 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Sam James gentoo.org> app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 10 app-arch/zoo/files/zoo-2.10-makefile.patch | 32 app-arch/zoo/zoo-2.10-r5.ebuild | 21 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch index ba7d31e4a47..b1e598359f6 100644 --- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch +++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch @@ -1,5 +1,5 @@ a/sysv.c 2007-06-16 15:01:53 +0200 -+++ b/sysv.c.new 2007-06-16 14:38:38 +0200 +--- a/sysv.c b/sysv.c @@ -63,8 +63,8 @@ return (fname); /* default is no-op */ } @@ -11,8 +11,8 @@ struct tm *localtime (); /* Function gettz(), returns the offset from GMT in seconds of the a/zoo.h2007-06-16 15:01:53 +0200 -+++ /zoo.h.new 2007-06-16 14:57:58 +0200 +--- a/zoo.h b/zoo.h @@ -95,6 +95,9 @@ #endif @@ -22,4 +22,4 @@ +typedef unsigned short ushort; /* WARNING: Static initialization in zooadd.c or zooext.c depends on the -order of fields in struct zoo_header */ \ No newline at end of file +order of fields in struct zoo_header */ diff --git a/app-arch/zoo/files/zoo-2.10-makefile.patch b/app-arch/zoo/files/zoo-2.10-makefile.patch new file mode 100644 index 000..89269b48045 --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-makefile.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/726376 +https://bugs.gentoo.org/721888 +https://bugs.gentoo.org/729126 +--- a/makefile b/makefile +@@ -18,15 +18,12 @@ + + MAKE = make # needed for some systems e.g. older BSD + +-CC = cc +-CFLAGS = + MODEL = + EXTRA = -DBIG_MEM -DNDEBUG + LINTFLAGS = -DLINT +-OPTIM = `dpkg-buildflags --get CFLAGS` ++OPTIM = $(CFLAGS) + OPTIM += -Wall +-OPTIM += `dpkg-buildflags --get CPPFLAGS` +-LDFLAGS = `dpkg-buildflags --get LDFLAGS` ++OPTIM += $(CPPFLAGS) + + DESTDIR = /usr/local/bin + +@@ -102,7 +99,7 @@ bsd: + + # Linux + linux: +- $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) ++ $(MAKE) CC="$(CC)" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) + + # Linux64 + linux64: diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 6c1f749c178..0cda3159c24 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -9,23 +9,24 @@ DESCRIPTION="Manipulate archives of files in compressed form" HOMEPAGE="https://packages.debian.org/sid/utils/zoo; SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz; +S="${WORKDIR}"/${P}.orig LICENSE="public-domain" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="" -S="${WORKDIR}/${P}.orig" +PATCHES=( + "${WORKDIR}"/debian/patches/. + "${FILESDIR}"/${P}-gentoo-fbsd-r1.patch + "${FILESDIR}"/${P}-makefile.patch +) -PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" ) - -src_prepare() { - eapply "${WORKDIR}"/debian/patches/*.patch - default +src_configure() { + tc-export CC } src_compile() { - emake CC="$(tc-getCC)" linux + emake linux } src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 9b0968cd7f82e1a86b1ccee6a6b4ed81c36293a8 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 27 13:34:18 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 27 13:34:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0968cd app-arch/zoo: drop ppc-aix m68k-mint Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 610c3c25162..bfa45941cdb 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="" S="${WORKDIR}/${P}.orig"
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
commit: 2e4814f45754dda7687601cd881f829bf7f3c600 Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 7 12:30:46 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 7 12:31:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4814f4 app-arch/zoo: remove 2.10-r4 Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-arch/zoo/Manifest | 2 - app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch| 36 --- app-arch/zoo/files/zoo-2.10-febz-183426.patch | 16 - app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch | 25 app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch | 71 -- .../zoo/files/zoo-2.10-security_pathsize.patch | 23 --- app-arch/zoo/zoo-2.10-r4.ebuild| 36 --- 7 files changed, 209 deletions(-) diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest index 0a70f675c04..3182726ed62 100644 --- a/app-arch/zoo/Manifest +++ b/app-arch/zoo/Manifest @@ -1,4 +1,2 @@ -DIST zoo-2.10-gcc-issues-fix.patch 19467 SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b SHA512 a5b5e857b3d38633224ca8a28717cb529a11a2e66ca974fb9b7e326d18443657439b88b4af4867492399813845496dc0812a7e07885b01116e0163416562ce3c WHIRLPOOL dcf18afbfb097e4edf35dd0b9a10f8253c949d0017ad4c26b7bf3f0acfaa090bc32a3d06e5fa55960073baa06b6d4a8721674a355a060d31ee6acf32c13ec247 -DIST zoo-2.10pl1.tar.gz 172096 SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 SHA512 cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82449c50f4c5000571a5be284452f5e7801d134e1581f8f9e871fbef65518dc9c69a77fb536f2c12 WHIRLPOOL 430fe2bd185dc1845afd36426966d0c29a2df5495d6c5c8e3092de5da48a77b781430cf95c93467826da03b646ab4641b881c5bacd4e6e763cb409dcbcf11762 DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893 DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005 diff --git a/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch b/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch deleted file mode 100644 index 3752728c8e5..000 --- a/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch +++ /dev/null @@ -1,36 +0,0 @@ -Taken from Fedora - portable.c -+++ portable.c -@@ -364,6 +364,31 @@ - show_dir(direntry); -} - #endif -+ char *p; -+ /* take off '../' */ -+ while ((p = strstr( direntry->dirname, "../" )) != NULL) { -+ while (*(p+3) != '\0') { -+*p = *(p + 3); -+p++; -+ } -+ *p = *(p+3); /* move last null */ -+ //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); -+ } -+ /* take off '/' */ -+ if ( direntry->dirname[0] == '/' ) { -+ p = direntry->dirname; -+ while (*p != '\0') { -+*p = *(p + 1); -+p++; -+ } -+ *p = *(p+1); /* move last null */ -+ //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); -+ } -+ /* take off '..' */ -+ if(!strcmp(direntry->dirname, "..")) -+ direntry->dirname[0] = '\0'; -+ /* direntry->dirlen = strlen(direntry->dirname); */ -+ -return (0); - } - diff --git a/app-arch/zoo/files/zoo-2.10-febz-183426.patch b/app-arch/zoo/files/zoo-2.10-febz-183426.patch deleted file mode 100644 index d8e34d62809..000 --- a/app-arch/zoo/files/zoo-2.10-febz-183426.patch +++ /dev/null @@ -1,16 +0,0 @@ -Taken from Fedora - -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426 -http://bugs.gentoo.org/125622 - zoo/parse.c -+++ zoo/parse.c -@@ -39,7 +39,7 @@ -char *namep; /* points to relevant part of tempname */ - -char *p; -- strcpy (tempname, fname); -+ strncpy(tempname, fname, LFNAMESIZE); - - #ifdef DEBUG - printf ("parse: supplied name is [%s].\n", tempname); diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch deleted file mode 100644 index 64eabaf4058..000 --- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch +++ /dev/null @@ -1,25 +0,0 @@ sysv.c 2007-06-16 15:01:53 +0200 -+++ sysv.c.new 2007-06-16 14:38:38 +0200 -@@ -63,8 +63,8 @@ -return (fname); /* default is no-op */ - } - --extern long timezone; /* defined by library routine */ --long time (); -+/*extern long timezone;defined by library routine */
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 33081f0df8eee6545aa496009279d1b0b9dac422 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Oct 7 11:25:41 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Oct 7 11:25:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33081f0d app-arch/zoo: stable 2.10-r5 for ppc/ppc64, bug #617678 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc ppc64" app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 8ee61c157ac..a9c59e5e178 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="" S="${WORKDIR}/${P}.orig"
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 0c514ef4ad82051ca0d607571b7bcafaf932a62c Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Oct 5 13:14:45 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Oct 5 13:15:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c514ef4 app-arch/zoo: stable 2.10-r5 for hppa/sparc, bug #617678 (thanks to Rolf Eike Beer) Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="hppa sparc" app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 8ee56c48f88..8ee61c157ac 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="" S="${WORKDIR}/${P}.orig"
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 2cc2dd8f22c635946d75a36e79bfbadf1e5ba1fa Author: Michael Palimaka gentoo org> AuthorDate: Mon Aug 7 13:33:19 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Aug 7 13:33:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc2dd8f app-arch/zoo: x86 stable Arch testing by Myckel Habets. Gentoo-bug: 617678 Package-Manager: Portage-2.3.6, Repoman-2.3.3 app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 817d9f5aae8..ed54e36675f 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="" S="${WORKDIR}/${P}.orig"
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/
commit: 573e3f9bd7e4a81197d5ed478bba57f78a9e9985 Author: Tobias Klausmann gentoo org> AuthorDate: Wed Jul 19 17:30:42 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Jul 19 18:05:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573e3f9b app-arch/zoo-2.10-r5: amd64 stable Gentoo-Bug: 617678 app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild index 68ba0e6602c..817d9f5aae8 100644 --- a/app-arch/zoo/zoo-2.10-r5.ebuild +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="" S="${WORKDIR}/${P}.orig"
[gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/, app-arch/zoo/files/
commit: 305688418b25a4e94d102fc1d0dc1fcdbf74c86d Author: Michael Orlitzky gentoo org> AuthorDate: Sat May 6 23:48:42 2017 + Commit: Michael Orlitzky gentoo org> CommitDate: Sat May 6 23:49:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30568841 app-arch/zoo: new EAPI=6 revision to fix two bugs. This new revision updates to EAPI=6 and switches our upstream to Debian. Doing so obsoletes most of our custom patches, and fixes the build with -Werror=format-security. The LICENSE variable has also been updated to "public-domain", since the author released it as such to Debian in an email. That means the "zoo" license will soon be unused. Two things may come back to bite me: * I omitted the "gcc fixes" patch, because there is no indication of what it's supposed to fix. The thing builds fine here. * I switched the "make" command back to "emake", because that's how it should be. If it still causes problems with BSD systems, I guess we can put it back. The program is still announcing that it's copyrighted, but that will have to be patched out. Gentoo-Bug: 520476 Gentoo-Bug: 614674 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-arch/zoo/Manifest| 2 ++ app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 25 + app-arch/zoo/zoo-2.10-r5.ebuild | 34 3 files changed, 61 insertions(+) diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest index 7024a3ea8c5..0a70f675c04 100644 --- a/app-arch/zoo/Manifest +++ b/app-arch/zoo/Manifest @@ -1,2 +1,4 @@ DIST zoo-2.10-gcc-issues-fix.patch 19467 SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b SHA512 a5b5e857b3d38633224ca8a28717cb529a11a2e66ca974fb9b7e326d18443657439b88b4af4867492399813845496dc0812a7e07885b01116e0163416562ce3c WHIRLPOOL dcf18afbfb097e4edf35dd0b9a10f8253c949d0017ad4c26b7bf3f0acfaa090bc32a3d06e5fa55960073baa06b6d4a8721674a355a060d31ee6acf32c13ec247 DIST zoo-2.10pl1.tar.gz 172096 SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 SHA512 cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82449c50f4c5000571a5be284452f5e7801d134e1581f8f9e871fbef65518dc9c69a77fb536f2c12 WHIRLPOOL 430fe2bd185dc1845afd36426966d0c29a2df5495d6c5c8e3092de5da48a77b781430cf95c93467826da03b646ab4641b881c5bacd4e6e763cb409dcbcf11762 +DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893 +DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005 diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch new file mode 100644 index 000..ba7d31e4a47 --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch @@ -0,0 +1,25 @@ +--- a/sysv.c 2007-06-16 15:01:53 +0200 b/sysv.c.new 2007-06-16 14:38:38 +0200 +@@ -63,8 +63,8 @@ +return (fname); /* default is no-op */ + } + +-extern long timezone; /* defined by library routine */ +-long time (); ++/*extern long timezone;defined by library routine */ ++/* long time (); */ + struct tm *localtime (); + + /* Function gettz(), returns the offset from GMT in seconds of the +--- a/zoo.h2007-06-16 15:01:53 +0200 /zoo.h.new 2007-06-16 14:57:58 +0200 +@@ -95,6 +95,9 @@ + #endif + + typedef unsigned char uchar; ++typedef unsigned int uint; ++typedef unsigned long ulong; ++typedef unsigned short ushort; + + /* WARNING: Static initialization in zooadd.c or zooext.c depends on the +order of fields in struct zoo_header */ \ No newline at end of file diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild new file mode 100644 index 000..68ba0e6602c --- /dev/null +++ b/app-arch/zoo/zoo-2.10-r5.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Manipulate archives of files in compressed form" +HOMEPAGE="https://packages.debian.org/sid/utils/zoo; +SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz; + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux