commit: 17f8df42593b37136f6fb31be5d57a25015d88a1 Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Wed Jun 4 19:12:49 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 4 22:26:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f8df42
app-admin/analog: add 6.0.18, add myself as a maintainer * Depend on ```dev-libs/libpcre2``` * Unbundle libjpeg, libpcre2, libpng, libz and most of libgd * Fix c23/clang stricter compilation Bug: https://bugs.gentoo.org/249140 Bug: https://bugs.gentoo.org/881867 Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/42447 Closes: https://github.com/gentoo/gentoo/pull/42447 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/analog/Manifest | 1 + app-admin/analog/analog-6.0.18.ebuild | 65 +++ .../analog/files/analog-6.0.18-Makefile.patch | 113 +++++ app-admin/analog/files/analog-6.0.18-c23.patch | 512 +++++++++++++++++++++ app-admin/analog/metadata.xml | 15 +- 5 files changed, 702 insertions(+), 4 deletions(-) diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest index ea2806b0a1e6..828fa590804f 100644 --- a/app-admin/analog/Manifest +++ b/app-admin/analog/Manifest @@ -1 +1,2 @@ DIST analog-6.0.17.tar.gz 1593749 BLAKE2B 88a36128e9965ff99131c73025652be5585a77a5400df61526832e52c9faa6d81d89b16646678fee11680f4268380c54988186c7d82db3db66ded3530008551d SHA512 d4e324d4297069765896b877ce3190370ce85b6f06fd164887652aea1862cc8c3f40eb15b0964bc4435481b9ec61d50dd49961e1e75346414daf5dc979bddf32 +DIST analog-6.0.18.tar.gz 4088952 BLAKE2B ef1a300cebc976ed425e5938ea077f638fa7affcfc8e0c8d07c315bdcec9c87c368112fc509b173ab830ab8513525f1c3e6314e7d9b7eaf343c12574b9898152 SHA512 4bb51c72fae757cc213e6f7c1c6eecc8a334efae5005212d86fd8046d6cdb2815ec8347cafd2bbd85ad7a82b8c99404d8f6975852b384cd585ddf09edc81a402 diff --git a/app-admin/analog/analog-6.0.18.ebuild b/app-admin/analog/analog-6.0.18.ebuild new file mode 100644 index 000000000000..b69735e1e467 --- /dev/null +++ b/app-admin/analog/analog-6.0.18.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Multi-purpose, multi-platform log file analyser" +HOMEPAGE=" + https://www.c-amie.co.uk/software/analog/ + https://github.com/c-amie/analog-ce"; +SRC_URI="https://github.com/c-amie/${PN}-ce/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-ce-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +DEPEND=" + app-arch/bzip2 + dev-libs/libpcre2 + >=media-libs/gd-1.8.4-r2[jpeg,png] + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.1-gentoo.diff + "${FILESDIR}"/${PN}-6.0-undefined-macro.patch + "${FILESDIR}"/${PN}-6.0.18-Makefile.patch + "${FILESDIR}"/${PN}-6.0.18-c23.patch +) + +src_prepare() { + default + sed -i src/Makefile \ + -e 's| -o | $(LDFLAGS)&|g' \ + || die "sed Makefile" +} + +src_compile() { + tc-export CC + # emake in main dir just executes "cd src && make", + # i.e. MAKEOPTS are ignored + emake -C src +} + +src_install() { + newman analog.man analog.1 + + dodoc README.txt Licence.txt ${PN}.cfg-sample + dodoc -r examples + docinto html + dodoc docs/*.{html,gif,css,ico} + dodoc -r how-to + docinto cgi + dodoc anlgform.pl + + insinto /usr/share/analog/images ; doins images/* + insinto /usr/share/analog/lang ; doins lang/* + dodir /var/log/analog + dosym ../../../usr/share/analog/images /var/log/analog/images + insinto /etc/analog ; doins "${FILESDIR}/analog.cfg" + dobin analog +} diff --git a/app-admin/analog/files/analog-6.0.18-Makefile.patch b/app-admin/analog/files/analog-6.0.18-Makefile.patch new file mode 100644 index 000000000000..b9d8b723deb5 --- /dev/null +++ b/app-admin/analog/files/analog-6.0.18-Makefile.patch @@ -0,0 +1,113 @@ +Use system bzip2 library. Get CC and CFLAGS from environment. - jer +Unbundle libjpeg, libpcre2, libpng, libz and most of libgd. - [email protected] + +Bug: https://bugs.gentoo.org/249140 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,17 +1,17 @@ + # Makefile for analog 6.0 +-# Please read docs/Readme.html, or http://www.analog.cx/ ++# Please read docs/Readme.html + # This is a general Unix-like Makefile: Makefiles for other OS's can be found + # in the "build" directory. +-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different ++# CC is set in the environment. + # compilers need different CFLAGS, e.g., -O instead of -O2. + MAKE = make # which "make" to use +-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. ++# CFLAGS is set in the environment. + # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB. + # HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10) + # BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib + # BS2000/OSD needs CFLAGS = -XLLML -XLLMK + # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp +-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ... ++DEFS = -DHAVE_GD -DHAVE_PCRE2 -DHAVE_ZLIB -DHAVE_BZLIB + # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... + # ... -DEBCDIC -DUSE_PLAIN_SETJMP ... + # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ... +@@ -30,7 +30,7 @@ + # + OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS + # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390 +-LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS) ++LIBS = -lgd -lpng -ljpeg -lz -lbz2 -lpcre2-8 -lm + # need -lm LAST + # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz + # if you defined HAVE_ZLIB above you also need -lz +@@ -53,42 +53,10 @@ + OBJS = alias.o analog.o cache.o dates.o globals.o hash.o init.o init2.o \ + input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \ + outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \ +- tree.o utils.o win32.o +-SUBDIRS = bzip2 libgd libpng pcre2 unzip zlib +-SUBDIROBJS = libgd/gd.o libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \ +- libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \ +- libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \ +- libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o \ +- libpng/pngwtran.o libpng/pngwutil.o \ +- pcre2/src/libpcre2_8_la-pcre2_auto_possess.o \ +- pcre2/src/libpcre2_8_la-pcre2_chartables.o \ +- pcre2/src/libpcre2_8_la-pcre2_chkdint.o \ +- pcre2/src/libpcre2_8_la-pcre2_compile.o \ +- pcre2/src/libpcre2_8_la-pcre2_context.o \ +- pcre2/src/libpcre2_8_la-pcre2_convert.o \ +- pcre2/src/libpcre2_8_la-pcre2_extuni.o \ +- pcre2/src/libpcre2_8_la-pcre2_find_bracket.o \ +- pcre2/src/libpcre2_8_la-pcre2_match.o \ +- pcre2/src/libpcre2_8_la-pcre2_match_data.o \ +- pcre2/src/libpcre2_8_la-pcre2_newline.o \ +- pcre2/src/libpcre2_8_la-pcre2_ord2utf.o \ +- pcre2/src/libpcre2_8_la-pcre2_pattern_info.o \ +- pcre2/src/libpcre2_8_la-pcre2_script_run.o \ +- pcre2/src/libpcre2_8_la-pcre2_string_utils.o \ +- pcre2/src/libpcre2_8_la-pcre2_study.o \ +- pcre2/src/libpcre2_8_la-pcre2_tables.o \ +- pcre2/src/libpcre2_8_la-pcre2_ucd.o \ +- pcre2/src/libpcre2_8_la-pcre2_valid_utf.o \ +- pcre2/src/libpcre2_8_la-pcre2_xclass.o \ +- zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \ +- zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \ +- zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ +- zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \ +- bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \ +- bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o +-HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \ +- pcre2/src/pcre2.h.generic libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \ +- zlib/zlib.h bzip2/bzlib.h ++ tree.o utils.o win32.o libgd/gdfontf.o ++SUBDIRS = unzip ++SUBDIROBJS = unzip/ioapi.o unzip/unzip.o ++HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h unzip/unzip.h + ALLCFLAGS = $(CFLAGS) $(DEFS) -D$(OS) + ALLOBJS = $(OBJS) $(SUBDIROBJS) + +@@ -97,27 +65,12 @@ + + # There doesn't seem to be a good way to write all these rules in a generic + # form that works for all "make" programs +-bzip2: ALWAYS +- cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' +- + libgd: ALWAYS + cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' + +-libpng: ALWAYS +- cd libpng && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' +- +-pcre2: ALWAYS +- chmod 755 pcre2/132html pcre2/ar-lib pcre2/CheckMan pcre2/CleanTxt pcre2/compile pcre2/config.guess pcre2/config.sub pcre2/configure pcre2/depcomp pcre2/Detrail pcre2/install-sh pcre2/missing pcre2/perltest.sh pcre2/PrepareRelease pcre2/RunGrepTest pcre2/RunTest pcre2/test-driver +- chmod 755 pcre2/cmake pcre2/doc pcre2/m4 pcre2/src pcre2/testdata pcre2/vms +- chmod 755 pcre2/src/sljit pcre2/src/sljit/allocator_src/ +- cd pcre2 && ./configure && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' +- + unzip: ALWAYS + cd unzip && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' + +-zlib: ALWAYS +- cd zlib && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' +- + alias.o: alias.c $(HEADERS) Makefile + $(CC) $(ALLCFLAGS) -c alias.c + diff --git a/app-admin/analog/files/analog-6.0.18-c23.patch b/app-admin/analog/files/analog-6.0.18-c23.patch new file mode 100644 index 000000000000..13c1de9104e9 --- /dev/null +++ b/app-admin/analog/files/analog-6.0.18-c23.patch @@ -0,0 +1,512 @@ +Bug: https://bugs.gentoo.org/881867 + +--- a/src/unzip/ioapi.c ++++ b/src/unzip/ioapi.c +@@ -65,10 +65,7 @@ + voidpf stream)); + + +-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) +- voidpf opaque; +- const char* filename; +- int mode; ++voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) + { + FILE* file = NULL; + const char* mode_fopen = NULL; +@@ -87,11 +84,7 @@ + } + + +-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) +- voidpf opaque; +- voidpf stream; +- void* buf; +- uLong size; ++uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) + { + uLong ret; + ret = fread(buf, 1, (size_t)size, (FILE *)stream); +@@ -99,31 +92,21 @@ + } + + +-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) +- voidpf opaque; +- voidpf stream; +- const void* buf; +- uLong size; ++uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) + { + uLong ret; + ret = fwrite(buf, 1, (size_t)size, (FILE *)stream); + return ret; + } + +-long ZCALLBACK ftell_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) + { + long ret; + ret = ftell((FILE *)stream); + return ret; + } + +-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) +- voidpf opaque; +- voidpf stream; +- uLong offset; +- int origin; ++long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) + { + int fseek_origin=0; + long ret; +@@ -145,26 +128,21 @@ + return ret; + } + +-int ZCALLBACK fclose_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) + { + int ret; + ret = fclose((FILE *)stream); + return ret; + } + +-int ZCALLBACK ferror_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) + { + int ret; + ret = ferror((FILE *)stream); + return ret; + } + +-void fill_fopen_filefunc (pzlib_filefunc_def) +- zlib_filefunc_def* pzlib_filefunc_def; ++void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def) + { + pzlib_filefunc_def->zopen_file = fopen_file_func; + pzlib_filefunc_def->zread_file = fread_file_func; +--- a/src/unzip/unzip.c ++++ b/src/unzip/unzip.c +@@ -168,10 +168,7 @@ + voidpf filestream, + int *pi)); + +-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- int *pi; ++local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, int *pi) + { + unsigned char c; + int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); +@@ -198,10 +195,7 @@ + voidpf filestream, + uLong *pX)); + +-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- uLong *pX; ++local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong *pX) + { + uLong x ; + int i; +@@ -226,10 +220,7 @@ + voidpf filestream, + uLong *pX)); + +-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- uLong *pX; ++local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong *pX) + { + uLong x ; + int i; +@@ -259,9 +250,7 @@ + + + /* My own strcmpi / strcasecmp */ +-local int strcmpcasenosensitive_internal (fileName1,fileName2) +- const char* fileName1; +- const char* fileName2; ++local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2) + { + for (;;) + { +@@ -302,10 +291,7 @@ + (like 1 on Unix, 2 on Windows) + + */ +-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) +- const char* fileName1; +- const char* fileName2; +- int iCaseSensitivity; ++extern int ZEXPORT unzStringFileNameCompare (const char* fileName1, const char* fileName2, int iCaseSensitivity) + { + if (iCaseSensitivity==0) + iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; +@@ -328,9 +314,7 @@ + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + +-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; ++local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream) + { + unsigned char* buf; + uLong uSizeFile; +@@ -394,9 +378,7 @@ + Else, the return value is a unzFile Handle, usable with other function + of this unzip package. + */ +-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) +- const char *path; +- zlib_filefunc_def* pzlib_filefunc_def; ++extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc_def) + { + unz_s us; + unz_s *s; +@@ -497,8 +479,7 @@ + } + + +-extern unzFile ZEXPORT unzOpen (path) +- const char *path; ++extern unzFile ZEXPORT unzOpen (const char *path) + { + return unzOpen2(path, NULL); + } +@@ -508,8 +489,7 @@ + If there is files inside the .Zip opened with unzipOpenCurrentFile (see later), + these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + return UNZ_OK if there is no problem. */ +-extern int ZEXPORT unzClose (file) +- unzFile file; ++extern int ZEXPORT unzClose (unzFile file) + { + unz_s* s; + if (file==NULL) +@@ -529,9 +509,7 @@ + Write info about the ZipFile in the *pglobal_info structure. + No preparation of the structure is needed + return UNZ_OK if there is no problem. */ +-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) +- unzFile file; +- unz_global_info *pglobal_info; ++extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info *pglobal_info) + { + unz_s* s; + if (file==NULL) +@@ -545,9 +523,7 @@ + /* + Translate date/time from Dos format to tm_unz (readable more easilty) + */ +-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm) +- uLong ulDosDate; +- tm_unz* ptm; ++local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm) + { + uLong uDate; + uDate = (uLong)(ulDosDate>>16); +@@ -574,21 +550,12 @@ + char *szComment, + uLong commentBufferSize)); + +-local int unzlocal_GetCurrentFileInfoInternal (file, +- pfile_info, +- pfile_info_internal, +- szFileName, fileNameBufferSize, +- extraField, extraFieldBufferSize, +- szComment, commentBufferSize) +- unzFile file; +- unz_file_info *pfile_info; +- unz_file_info_internal *pfile_info_internal; +- char *szFileName; +- uLong fileNameBufferSize; +- void *extraField; +- uLong extraFieldBufferSize; +- char *szComment; +- uLong commentBufferSize; ++local int unzlocal_GetCurrentFileInfoInternal (unzFile file, ++ unz_file_info *pfile_info, ++ unz_file_info_internal *pfile_info_internal, ++ char *szFileName, uLong fileNameBufferSize, ++ void *extraField, uLong extraFieldBufferSize, ++ char *szComment, uLong commentBufferSize) + { + unz_s* s; + unz_file_info file_info; +@@ -608,10 +575,12 @@ + + /* we check the magic */ + if (err==UNZ_OK) ++ { + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x02014b50) + err=UNZ_BADZIPFILE; ++ } + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) + err=UNZ_ERRNO; +@@ -688,10 +657,12 @@ + uSizeRead = extraFieldBufferSize; + + if (lSeek!=0) ++ { + if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; ++ } + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; +@@ -713,10 +684,12 @@ + uSizeRead = commentBufferSize; + + if (lSeek!=0) ++ { + if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; ++ } + if ((file_info.size_file_comment>0) && (commentBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; +@@ -741,19 +714,11 @@ + No preparation of the structure is needed + return UNZ_OK if there is no problem. + */ +-extern int ZEXPORT unzGetCurrentFileInfo (file, +- pfile_info, +- szFileName, fileNameBufferSize, +- extraField, extraFieldBufferSize, +- szComment, commentBufferSize) +- unzFile file; +- unz_file_info *pfile_info; +- char *szFileName; +- uLong fileNameBufferSize; +- void *extraField; +- uLong extraFieldBufferSize; +- char *szComment; +- uLong commentBufferSize; ++extern int ZEXPORT unzGetCurrentFileInfo (unzFile file, ++ unz_file_info *pfile_info, ++ char *szFileName, uLong fileNameBufferSize, ++ void *extraField, uLong extraFieldBufferSize, ++ char *szComment, uLong commentBufferSize) + { + return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, + szFileName,fileNameBufferSize, +@@ -765,8 +730,7 @@ + Set the current file of the zipfile to the first file. + return UNZ_OK if there is no problem + */ +-extern int ZEXPORT unzGoToFirstFile (file) +- unzFile file; ++extern int ZEXPORT unzGoToFirstFile (unzFile file) + { + int err=UNZ_OK; + unz_s* s; +@@ -787,8 +751,7 @@ + return UNZ_OK if there is no problem + return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. + */ +-extern int ZEXPORT unzGoToNextFile (file) +- unzFile file; ++extern int ZEXPORT unzGoToNextFile (unzFile file) + { + unz_s* s; + int err; +@@ -820,10 +783,7 @@ + UNZ_OK if the file is found. It becomes the current file. + UNZ_END_OF_LIST_OF_FILE if the file is not found + */ +-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) +- unzFile file; +- const char *szFileName; +- int iCaseSensitivity; ++extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity) + { + unz_s* s; + int err; +@@ -899,9 +859,7 @@ + } unz_file_pos; + */ + +-extern int ZEXPORT unzGetFilePos(file, file_pos) +- unzFile file; +- unz_file_pos* file_pos; ++extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos) + { + unz_s* s; + +@@ -917,9 +875,7 @@ + return UNZ_OK; + } + +-extern int ZEXPORT unzGoToFilePos(file, file_pos) +- unzFile file; +- unz_file_pos* file_pos; ++extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos* file_pos) + { + unz_s* s; + int err; +@@ -953,13 +909,9 @@ + store in *piSizeVar the size of extra info in local header + (filename and size of extra field data) + */ +-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, +- poffset_local_extrafield, +- psize_local_extrafield) +- unz_s* s; +- uInt* piSizeVar; +- uLong *poffset_local_extrafield; +- uInt *psize_local_extrafield; ++local int unzlocal_CheckCurrentFileCoherencyHeader (unz_s* s, uInt* piSizeVar, ++ uLong *poffset_local_extrafield, ++ uInt *psize_local_extrafield) + { + uLong uMagic,uData,uFlags; + uLong size_filename; +@@ -976,10 +928,12 @@ + + + if (err==UNZ_OK) ++ { + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x04034b50) + err=UNZ_BADZIPFILE; ++ } + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) + err=UNZ_ERRNO; +@@ -1043,12 +997,7 @@ + Open for reading data the current file in the zipfile. + If there is no error and the file is opened, the return value is UNZ_OK. + */ +-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) +- unzFile file; +- int* method; +- int* level; +- int raw; +- const char* password; ++extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, int* level, int raw, const char* password) + { + int err=UNZ_OK; + uInt iSizeVar; +@@ -1185,24 +1134,17 @@ + return UNZ_OK; + } + +-extern int ZEXPORT unzOpenCurrentFile (file) +- unzFile file; ++extern int ZEXPORT unzOpenCurrentFile (unzFile file) + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); + } + +-extern int ZEXPORT unzOpenCurrentFilePassword (file, password) +- unzFile file; +- const char* password; ++extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password) + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, password); + } + +-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) +- unzFile file; +- int* method; +- int* level; +- int raw; ++extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw) + { + return unzOpenCurrentFile3(file, method, level, raw, NULL); + } +@@ -1217,10 +1159,7 @@ + return <0 with error code if there is an error + (UNZ_ERRNO for IO error, or zLib error for uncompress error) + */ +-extern int ZEXPORT unzReadCurrentFile (file, buf, len) +- unzFile file; +- voidp buf; +- unsigned len; ++extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) + { + int err=UNZ_OK; + uInt iRead = 0; +@@ -1235,7 +1174,7 @@ + return UNZ_PARAMERROR; + + +- if ((pfile_in_zip_read_info->read_buffer == NULL)) ++ if (pfile_in_zip_read_info->read_buffer == NULL) + return UNZ_END_OF_LIST_OF_FILE; + if (len==0) + return 0; +@@ -1367,8 +1306,7 @@ + /* + Give the current position in uncompressed data + */ +-extern z_off_t ZEXPORT unztell (file) +- unzFile file; ++extern z_off_t ZEXPORT unztell (unzFile file) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1387,8 +1325,7 @@ + /* + return 1 if the end of file was reached, 0 elsewhere + */ +-extern int ZEXPORT unzeof (file) +- unzFile file; ++extern int ZEXPORT unzeof (unzFile file) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1420,10 +1357,7 @@ + the return value is the number of bytes copied in buf, or (if <0) + the error code + */ +-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) +- unzFile file; +- voidp buf; +- unsigned len; ++extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1471,8 +1405,7 @@ + Close the file in zip opened with unzipOpenCurrentFile + Return UNZ_CRCERROR if all the file was read but the CRC is not good + */ +-extern int ZEXPORT unzCloseCurrentFile (file) +- unzFile file; ++extern int ZEXPORT unzCloseCurrentFile (unzFile file) + { + int err=UNZ_OK; + +@@ -1514,10 +1447,7 @@ + uSizeBuf is the size of the szComment buffer. + return the number of byte copied or an error code <0 + */ +-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) +- unzFile file; +- char *szComment; +- uLong uSizeBuf; ++extern int ZEXPORT unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf) + { + int err=UNZ_OK; + unz_s* s; diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml index ecc93bc3122d..5da1c6a5d196 100644 --- a/app-admin/analog/metadata.xml +++ b/app-admin/analog/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<!-- maintainer-needed --> -<upstream> - <remote-id type="github">c-amie/analog-ce</remote-id> -</upstream> + <maintainer type="person" proxied="yes"> + <email>[email protected]</email> + <name>Cristian Othón Martínez Vera</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>[email protected]</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">c-amie/analog-ce</remote-id> + </upstream> </pkgmetadata>
