From dmichelsen at users.sourceforge.net Thu Jul 4 11:12:51 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2019 09:12:51 +0000 Subject: SF.net SVN: gar:[26545] csw/mgar/pkg/nginx/trunk Message-ID: <1562231571.283392.12037@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26545 http://sourceforge.net/p/gar/code/26545 Author: dmichelsen Date: 2019-07-04 09:12:39 +0000 (Thu, 04 Jul 2019) Log Message: ----------- nginx/trunk: Update to 1.17.1 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2019-06-28 07:24:57 UTC (rev 26544) +++ csw/mgar/pkg/nginx/trunk/Makefile 2019-07-04 09:12:39 UTC (rev 26545) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.13.8 +VERSION = 1.17.1 GARTYPE = v2 DESCRIPTION = HTTP server and mail proxy server Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2019-06-28 07:24:57 UTC (rev 26544) +++ csw/mgar/pkg/nginx/trunk/checksums 2019-07-04 09:12:39 UTC (rev 26545) @@ -1 +1 @@ -df4be9294365782dc1349ca33ce8c4ac nginx-1.13.8.tar.gz +51021f3e8204a5fc809f5e695a4508db nginx-1.17.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 4 12:11:06 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2019 10:11:06 +0000 Subject: SF.net SVN: gar:[26546] csw/mgar/pkg/gzip/trunk Message-ID: <1562235066.646556.18650@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26546 http://sourceforge.net/p/gar/code/26546 Author: dmichelsen Date: 2019-07-04 10:10:50 +0000 (Thu, 04 Jul 2019) Log Message: ----------- gzip/trunk: Update to 1.10, general rework Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2019-07-04 09:12:39 UTC (rev 26545) +++ csw/mgar/pkg/gzip/trunk/Makefile 2019-07-04 10:10:50 UTC (rev 26546) @@ -3,7 +3,8 @@ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16876 NAME = gzip -VERSION = 1.6 +#VERSION = 1.6 +VERSION = 1.10 GARTYPE = v2 DESCRIPTION = GNU zip @@ -15,9 +16,9 @@ decompression code. endef -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz -#PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch +MASTER_SITES += $(GNU_MIRROR) +MASTER_SITES += http://meyering.net/gzip/ +DISTFILES = $(NAME)-$(VERSION).tar.xz # From TODO: # - Add a block size (-b) option to improve error recovery in case of @@ -27,13 +28,10 @@ # For one possible approach to this, please see: # http://www.samba.org/netfilter/diary/gzip.rsync.patch -# Reformatted version of debian_patches_rsyncable.diff -PATCHFILES += 0001-Debian-patch-for-rsyncable.patch - PACKAGES += CSWgzip CATALOGNAME_CSWgzip = gzip SPKG_DESC_CSWgzip = GNU zip -PKGFILES_CSWgzip = $(bindir)/gzip +PKGFILES_CSWgzip += $(bindir)/gzip PKGFILES_CSWgzip += $(bindir)/gunzip PKGFILES_CSWgzip += $(bindir)/uncompress PKGFILES_CSWgzip += $(mandir)/man1/gzip\.1 @@ -44,11 +42,17 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgzip-extras += CSWgzip RUNTIME_DEP_PKGS_CSWgzip-extras += CSWggrep +CHECKPKG_OVERRIDES_CSWgzip-extras += surplus-dependency|CSWggrep +CHECKPKG_OVERRIDES_CSWgzip-extras += surplus-dependency|CSWgzip + OBSOLETED_BY_CSWgzip-extras = CSWgzipextras CATALOGNAME_CSWgzipextras = gzip_extras_stub EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +# We want a grep which understands -E +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + # The 'z'-prefix commands now belong to zutils whereas the gzip-commands are prefixed with 'gz' instead: # http://lists.nongnu.org/archive/html/zutils-bug/2012-10/msg00002.html EXTRA_CONFIGURE_ARGS += --program-transform-name='s/^z/gz/' Modified: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums 2019-07-04 09:12:39 UTC (rev 26545) +++ csw/mgar/pkg/gzip/trunk/checksums 2019-07-04 10:10:50 UTC (rev 26546) @@ -1 +1 @@ -38603cb2843bf5681ff41aab3bcd6a20 gzip-1.6.tar.gz +691b1221694c3394f1c537df4eee39d3 gzip-1.10.tar.xz Deleted: csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch 2019-07-04 09:12:39 UTC (rev 26545) +++ csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch 2019-07-04 10:10:50 UTC (rev 26546) @@ -1,332 +0,0 @@ -From aa32d7c565dd4aa13c5fa0f12e93f9851be6cc20 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 25 Feb 2014 10:21:27 +0100 -Subject: [PATCH] Debian patch for rsyncable - ---- - deflate.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - doc/gzip.texi | 25 +++++++++++++++ - gzip.1 | 11 +++++++ - gzip.c | 11 +++++-- - gzip.h | 1 + - 5 files changed, 138 insertions(+), 8 deletions(-) - -diff --git a/deflate.c b/deflate.c -index f0f2394..8e539d2 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -131,6 +131,14 @@ - #endif - /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -+#ifndef RSYNC_WIN -+# define RSYNC_WIN 8192 -+#endif -+/* Size of rsync window, must be < MAX_DIST */ -+ -+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) -+/* Whether window sum matches magic value */ -+ - /* =========================================================================== - * Local data used by the "longest match" routines. - */ -@@ -212,6 +220,8 @@ local int compr_level; - unsigned good_match; - /* Use a faster search when the previous match is longer than this */ - -+local ulg rsync_sum; /* rolling sum of rsync window */ -+local ulg rsync_chunk_end; /* next rsync sequence point */ - - /* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to -@@ -314,6 +324,10 @@ void lm_init (pack_level, flags) - #endif - /* prev will be initialized on the fly */ - -+ /* rsync params */ -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ rsync_sum = 0; -+ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -331,6 +345,7 @@ void lm_init (pack_level, flags) - - strstart = 0; - block_start = 0L; -+ rsync_chunk_end = 0xFFFFFFFFUL; - #ifdef ASMV - match_init(); /* initialize the asm code */ - #endif -@@ -550,6 +565,8 @@ local void fill_window() - memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); - match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ -+ if (rsync_chunk_end != 0xFFFFFFFFUL) -+ rsync_chunk_end -= WSIZE; - - block_start -= (long) WSIZE; - -@@ -579,6 +596,39 @@ local void fill_window() - } - } - -+local void rsync_roll(start, num) -+ unsigned start; -+ unsigned num; -+{ -+ unsigned i; -+ -+ if (start < RSYNC_WIN) { -+ /* before window fills. */ -+ for (i = start; i < RSYNC_WIN; i++) { -+ if (i == start + num) return; -+ rsync_sum += (ulg)window[i]; -+ } -+ num -= (RSYNC_WIN - start); -+ start = RSYNC_WIN; -+ } -+ -+ /* buffer after window full */ -+ for (i = start; i < start+num; i++) { -+ /* New character in */ -+ rsync_sum += (ulg)window[i]; -+ /* Old character out */ -+ rsync_sum -= (ulg)window[i - RSYNC_WIN]; -+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) -+ rsync_chunk_end = i; -+ } -+} -+ -+/* =========================================================================== -+ * Set rsync_chunk_end if window sum matches magic value. -+ */ -+#define RSYNC_ROLL(s, n) \ -+ do { if (rsync) rsync_roll((s), (n)); } while(0) -+ - /* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. -@@ -626,7 +676,8 @@ local off_t deflate_fast() - - lookahead -= match_length; - -- /* Insert new strings in the hash table only if the match length -+ RSYNC_ROLL(strstart, match_length); -+ /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ - if (match_length <= max_insert_length) { -@@ -654,9 +705,18 @@ local off_t deflate_fast() - /* No match, output a literal byte */ - Tracevv((stderr,"%c",window[strstart])); - flush = ct_tally (0, window[strstart]); -+ RSYNC_ROLL(strstart, 1); - lookahead--; - strstart++; - } -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ flush = 1; -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ } - if (flush) FLUSH_BLOCK(0), block_start = strstart; - - /* Make sure that we always have enough lookahead, except -@@ -730,6 +790,7 @@ off_t deflate() - */ - lookahead -= prev_length-1; - prev_length -= 2; -+ RSYNC_ROLL(strstart, prev_length+1); - do { - strstart++; - INSERT_STRING(strstart, hash_head); -@@ -742,24 +803,51 @@ off_t deflate() - match_available = 0; - match_length = MIN_MATCH-1; - strstart++; -- if (flush) FLUSH_BLOCK(0), block_start = strstart; - -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; - } else if (match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c",window[strstart-1])); -- if (ct_tally (0, window[strstart-1])) { -- FLUSH_BLOCK(0), block_start = strstart; -- } -+ flush = ct_tally (0, window[strstart-1]); -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ FLUSH_BLOCK(0), block_start = strstart; -+ } - match_available = 1; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } -diff --git a/doc/gzip.texi b/doc/gzip.texi -index 3de3063..7ff37ad 100644 ---- a/doc/gzip.texi -+++ b/doc/gzip.texi -@@ -208,6 +208,7 @@ Mandatory arguments to long options are mandatory for short options too. - -V, --version display version number - -1, --fast compress faster - -9, --best compress better -+ --rsyncable Make rsync-friendly archive - - With no FILE, or when FILE is -, read standard input. - -@@ -358,6 +359,30 @@ specified on the command line are directories, @command{gzip} will descend - into the directory and compress all the files it finds there (or - decompress them in the case of @command{gunzip}). - -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This can reduce the compression slightly in some cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on -+the input. This increases size by less than 1 percent most -+cases, but means that the @command{rsync} program can much more efficiently -+synchronize files compressed with this flag. @command{gunzip} -+cannot tell the difference between a compressed file created -+with this option, and one created without it. -+ -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This can reduce the compression slightly in some cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ - @item --suffix @var{suf} - @itemx -S @var{suf} - Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be -diff --git a/gzip.1 b/gzip.1 -index 71e097c..faee860 100644 ---- a/gzip.1 -+++ b/gzip.1 -@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files - .ll +8 - .B gzip - .RB [ " \-acdfhklLnNrtvV19 " ] -+.RB [ --rsyncable ] - .RB [ \-S\ suffix ] - [ - .I "name \&..." -@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there - .I gunzip - ). - .TP -+.B --rsyncable -+While compressing, synchronize the output occasionally based on the input. -+This increases size by less than 1 percent most cases, but means that the -+.BR rsync (1) -+program can take advantage of similarities in the uncompressed input -+when syncronizing two files compressed with this flag. -+.I gunzip -+cannot tell the difference between a compressed file created with this option, -+and one created without it. -+.TP - .B \-S .suf --suffix .suf - When compressing, use suffix .suf instead of .gz. - Any non-empty suffix can be given, but suffixes -diff --git a/gzip.c b/gzip.c -index 93cc738..971d3f0 100644 ---- a/gzip.c -+++ b/gzip.c -@@ -215,6 +215,7 @@ int ofd; /* output file descriptor */ - unsigned insize; /* valid bytes in inbuf */ - unsigned inptr; /* index of next byte to be processed in inbuf */ - unsigned outcnt; /* bytes in output buffer */ -+int rsync = 0; /* make ryncable chunks */ - - static int handled_sig[] = - { -@@ -275,7 +276,7 @@ static const struct option longopts[] = - {"best", 0, 0, '9'}, /* compress better */ - {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ - {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ -- -+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ - { 0, 0, 0, 0 } - }; - -@@ -359,6 +360,7 @@ local void help() - " -Z, --lzw produce output compatible with old compress", - " -b, --bits=BITS max number of bits per code (implies -Z)", - #endif -+ " --rsyncable Make rsync-friendly archive", - "", - "With no FILE, or when FILE is -, read standard input.", - "", -@@ -489,8 +491,11 @@ int main (int argc, char **argv) - #else - recursive = 1; - #endif -- break; -- case 'S': -+ break; -+ case 'R': -+ rsync = 1; break; -+ -+ case 'S': - #ifdef NO_MULTIPLE_DOTS - if (*optarg == '.') optarg++; - #endif -diff --git a/gzip.h b/gzip.h -index 648073e..70ccaa9 100644 ---- a/gzip.h -+++ b/gzip.h -@@ -140,6 +140,7 @@ EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ - extern unsigned insize; /* valid bytes in inbuf */ - extern unsigned inptr; /* index of next byte to be processed in inbuf */ - extern unsigned outcnt; /* bytes in output buffer */ -+extern int rsync; /* deflate into rsyncable chunks */ - - extern off_t bytes_in; /* number of input bytes */ - extern off_t bytes_out; /* number of output bytes */ --- -1.8.4.1 - Deleted: csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch 2019-07-04 09:12:39 UTC (rev 26545) +++ csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch 2019-07-04 10:10:50 UTC (rev 26546) @@ -1,25 +0,0 @@ -From 1cfa061d805fa9b65113df02030a1460b62b90e5 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 25 Jan 2010 13:33:28 +0100 -Subject: [PATCH] Force ggrep as Solaris grep doesn't understand the flags - ---- - zgrep.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/zgrep.in b/zgrep.in -index a828bbc..94d04da 100644 ---- a/zgrep.in -+++ b/zgrep.in -@@ -26,7 +26,7 @@ case $1 in - esac - PATH=$bindir:$PATH - --grep='${GREP-grep}' -+grep='${GREP-/opt/csw/bin/ggrep}' - - version='zgrep (gzip) @VERSION@ - Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. --- -1.6.6 - Deleted: csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff =================================================================== --- csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff 2019-07-04 09:12:39 UTC (rev 26545) +++ csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff 2019-07-04 10:10:50 UTC (rev 26546) @@ -1,311 +0,0 @@ -diff -u -r gzip-1.5/deflate.c /home/bdale/debian/gzip/deflate.c ---- gzip-1.5/deflate.c 2012-04-24 10:25:28.000000000 -0600 -+++ /home/bdale/debian/gzip/deflate.c 2012-06-19 14:01:41.885498670 -0600 -@@ -131,6 +131,14 @@ - #endif - /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -+#ifndef RSYNC_WIN -+# define RSYNC_WIN 8192 -+#endif -+/* Size of rsync window, must be < MAX_DIST */ -+ -+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) -+/* Whether window sum matches magic value */ -+ - /* =========================================================================== - * Local data used by the "longest match" routines. - */ -@@ -212,6 +220,8 @@ - unsigned good_match; - /* Use a faster search when the previous match is longer than this */ - -+local ulg rsync_sum; /* rolling sum of rsync window */ -+local ulg rsync_chunk_end; /* next rsync sequence point */ - - /* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to -@@ -314,6 +324,10 @@ - #endif - /* prev will be initialized on the fly */ - -+ /* rsync params */ -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ rsync_sum = 0; -+ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -331,6 +345,7 @@ - - strstart = 0; - block_start = 0L; -+ rsync_chunk_end = 0xFFFFFFFFUL; - #ifdef ASMV - match_init(); /* initialize the asm code */ - #endif -@@ -550,6 +565,8 @@ - memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); - match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ -+ if (rsync_chunk_end != 0xFFFFFFFFUL) -+ rsync_chunk_end -= WSIZE; - - block_start -= (long) WSIZE; - -@@ -579,6 +596,39 @@ - } - } - -+local void rsync_roll(start, num) -+ unsigned start; -+ unsigned num; -+{ -+ unsigned i; -+ -+ if (start < RSYNC_WIN) { -+ /* before window fills. */ -+ for (i = start; i < RSYNC_WIN; i++) { -+ if (i == start + num) return; -+ rsync_sum += (ulg)window[i]; -+ } -+ num -= (RSYNC_WIN - start); -+ start = RSYNC_WIN; -+ } -+ -+ /* buffer after window full */ -+ for (i = start; i < start+num; i++) { -+ /* New character in */ -+ rsync_sum += (ulg)window[i]; -+ /* Old character out */ -+ rsync_sum -= (ulg)window[i - RSYNC_WIN]; -+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) -+ rsync_chunk_end = i; -+ } -+} -+ -+/* =========================================================================== -+ * Set rsync_chunk_end if window sum matches magic value. -+ */ -+#define RSYNC_ROLL(s, n) \ -+ do { if (rsync) rsync_roll((s), (n)); } while(0) -+ - /* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. -@@ -626,7 +676,8 @@ - - lookahead -= match_length; - -- /* Insert new strings in the hash table only if the match length -+ RSYNC_ROLL(strstart, match_length); -+ /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ - if (match_length <= max_insert_length) { -@@ -654,9 +705,18 @@ - /* No match, output a literal byte */ - Tracevv((stderr,"%c",window[strstart])); - flush = ct_tally (0, window[strstart]); -+ RSYNC_ROLL(strstart, 1); - lookahead--; - strstart++; - } -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ flush = 1; -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ } - if (flush) FLUSH_BLOCK(0), block_start = strstart; - - /* Make sure that we always have enough lookahead, except -@@ -730,6 +790,7 @@ - */ - lookahead -= prev_length-1; - prev_length -= 2; -+ RSYNC_ROLL(strstart, prev_length+1); - do { - strstart++; - INSERT_STRING(strstart, hash_head); -@@ -742,24 +803,51 @@ - match_available = 0; - match_length = MIN_MATCH-1; - strstart++; -- if (flush) FLUSH_BLOCK(0), block_start = strstart; - -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; - } else if (match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c",window[strstart-1])); -- if (ct_tally (0, window[strstart-1])) { -- FLUSH_BLOCK(0), block_start = strstart; -- } -+ flush = ct_tally (0, window[strstart-1]); -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ FLUSH_BLOCK(0), block_start = strstart; -+ } - match_available = 1; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } -diff -u -r gzip-1.5/doc/gzip.texi /home/bdale/debian/gzip/doc/gzip.texi ---- gzip-1.5/doc/gzip.texi 2012-01-01 01:53:58.000000000 -0700 -+++ /home/bdale/debian/gzip/doc/gzip.texi 2012-06-19 14:09:36.041559612 -0600 -@@ -207,6 +207,7 @@ - -V, --version display version number - -1, --fast compress faster - -9, --best compress better -+ --rsyncable Make rsync-friendly archive - - With no FILE, or when FILE is -, read standard input. - -@@ -353,6 +354,30 @@ - into the directory and compress all the files it finds there (or - decompress them in the case of @command{gunzip}). - -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This can reduce the compression slightly in some cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on -+the input. This increases size by less than 1 percent most -+cases, but means that the @command{rsync} program can much more efficiently -+synchronize files compressed with this flag. @command{gunzip} -+cannot tell the difference between a compressed file created -+with this option, and one created without it. -+ -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This can reduce the compression slightly in some cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ - @item --suffix @var{suf} - @itemx -S @var{suf} - Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be ---- gzip-1.5/gzip.c 2012-04-24 10:25:28.000000000 -0600 -+++ /home/bdale/debian/gzip/gzip.c 2012-06-19 14:00:43.283873180 -0600 -@@ -213,6 +213,7 @@ - unsigned insize; /* valid bytes in inbuf */ - unsigned inptr; /* index of next byte to be processed in inbuf */ - unsigned outcnt; /* bytes in output buffer */ -+int rsync = 0; /* make ryncable chunks */ - - static int handled_sig[] = - { -@@ -270,7 +271,7 @@ - {"best", 0, 0, '9'}, /* compress better */ - {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ - {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ -- -+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ - { 0, 0, 0, 0 } - }; - -@@ -353,6 +354,7 @@ - " -Z, --lzw produce output compatible with old compress", - " -b, --bits=BITS max number of bits per code (implies -Z)", - #endif -+ " --rsyncable Make rsync-friendly archive", - "", - "With no FILE, or when FILE is -, read standard input.", - "", -@@ -481,8 +483,11 @@ - #else - recursive = 1; - #endif -- break; -- case 'S': -+ break; -+ case 'R': -+ rsync = 1; break; -+ -+ case 'S': - #ifdef NO_MULTIPLE_DOTS - if (*optarg == '.') optarg++; - #endif -diff -u -r gzip-1.5/gzip.h /home/bdale/debian/gzip/gzip.h ---- gzip-1.5/gzip.h 2012-01-01 01:53:58.000000000 -0700 -+++ /home/bdale/debian/gzip/gzip.h 2012-06-19 13:57:36.833883093 -0600 -@@ -140,6 +140,7 @@ - extern unsigned insize; /* valid bytes in inbuf */ - extern unsigned inptr; /* index of next byte to be processed in inbuf */ - extern unsigned outcnt; /* bytes in output buffer */ -+extern int rsync; /* deflate into rsyncable chunks */ - - extern off_t bytes_in; /* number of input bytes */ - extern off_t bytes_out; /* number of output bytes */ -diff --git a/gzip.1 b/gzip.1 -index 71e097c..faee860 100644 ---- a/gzip.1 -+++ b/gzip.1 -@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files - .ll +8 - .B gzip - .RB [ " \-acdfhklLnNrtvV19 " ] -+.RB [ --rsyncable ] - .RB [ \-S\ suffix ] - [ - .I "name \&..." -@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there - .I gunzip - ). - .TP -+.B --rsyncable -+While compressing, synchronize the output occasionally based on the input. -+This increases size by less than 1 percent most cases, but means that the -+.BR rsync (1) -+program can take advantage of similarities in the uncompressed input -+when syncronizing two files compressed with this flag. -+.I gunzip -+cannot tell the difference between a compressed file created with this option, -+and one created without it. -+.TP - .B \-S .suf --suffix .suf - When compressing, use suffix .suf instead of .gz. - Any non-empty suffix can be given, but suffixes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 4 15:46:51 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2019 13:46:51 +0000 Subject: SF.net SVN: gar:[26547] csw/mgar/pkg/pv/trunk Message-ID: <1562248011.755519.31790@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26547 http://sourceforge.net/p/gar/code/26547 Author: dmichelsen Date: 2019-07-04 13:46:42 +0000 (Thu, 04 Jul 2019) Log Message: ----------- pv/trunk: Update to 1.6.6 Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pv/trunk/checksums Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2019-07-04 10:10:50 UTC (rev 26546) +++ csw/mgar/pkg/pv/trunk/Makefile 2019-07-04 13:46:42 UTC (rev 26547) @@ -1,5 +1,5 @@ NAME = pv -VERSION = 1.6.0 +VERSION = 1.6.6 GARTYPE = v2 DESCRIPTION = Monitor the progress of data through a pipe Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2019-07-04 10:10:50 UTC (rev 26546) +++ csw/mgar/pkg/pv/trunk/checksums 2019-07-04 13:46:42 UTC (rev 26547) @@ -1 +1 @@ -e163d8963c595b2032666724bc509bcc pv-1.6.0.tar.bz2 +ff3564fddcc2b9bd4a9c1d143aba4b4c pv-1.6.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 4 17:08:48 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2019 15:08:48 +0000 Subject: SF.net SVN: gar:[26548] csw/mgar/pkg/pv/trunk/Makefile Message-ID: <1562252928.608469.5082@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26548 http://sourceforge.net/p/gar/code/26548 Author: dmichelsen Date: 2019-07-04 15:08:32 +0000 (Thu, 04 Jul 2019) Log Message: ----------- pv/trunk: Update dependency to libintl9 Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2019-07-04 13:46:42 UTC (rev 26547) +++ csw/mgar/pkg/pv/trunk/Makefile 2019-07-04 15:08:32 UTC (rev 26548) @@ -20,7 +20,7 @@ PACKAGES += CSWpv SPKG_DESC_CSWpv = Monitor the progress of data through a pipe # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWpv += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpv += CSWlibintl9 # We require GNU grep TEST_ENV_PATH = /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 11 16:52:17 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Jul 2019 14:52:17 +0000 Subject: SF.net SVN: gar:[26549] csw/mgar/pkg/nettle/trunk Message-ID: <1562856737.986986.25901@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26549 http://sourceforge.net/p/gar/code/26549 Author: dmichelsen Date: 2019-07-11 14:52:09 +0000 (Thu, 11 Jul 2019) Log Message: ----------- nettle/trunk: Update to 3.5.1 Modified Paths: -------------- csw/mgar/pkg/nettle/trunk/Makefile csw/mgar/pkg/nettle/trunk/checksums Modified: csw/mgar/pkg/nettle/trunk/Makefile =================================================================== --- csw/mgar/pkg/nettle/trunk/Makefile 2019-07-04 15:08:32 UTC (rev 26548) +++ csw/mgar/pkg/nettle/trunk/Makefile 2019-07-11 14:52:09 UTC (rev 26549) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nettle -VERSION = 3.4.1 +VERSION = 3.5.1 GARTYPE = v2 DESCRIPTION = A low-level cryptographic library @@ -24,29 +24,38 @@ #PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGES += CSWlibhogweed4 -PKGFILES_CSWlibhogweed4 += $(call pkgfiles_lib,libhogweed.so.4) -SPKG_DESC_CSWlibhogweed4 += A low-level cryptographic library, libhogweed.so.4 -RUNTIME_DEP_PKGS_CSWlibhogweed4 += CSWlibgmp10 -RUNTIME_DEP_PKGS_CSWlibhogweed4 += CSWlibnettle6 +PACKAGES += CSWlibhogweed5 +PKGFILES_CSWlibhogweed5 += $(call pkgfiles_lib,libhogweed.so.5) +SPKG_DESC_CSWlibhogweed5 += A low-level cryptographic library, libhogweed.so.5 +RUNTIME_DEP_PKGS_CSWlibhogweed5 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibhogweed5 += CSWlibnettle7 +RUNTIME_DEP_PKGS_CSWlibhogweed5 += CSWlibgcc-s1 -PACKAGES += CSWlibnettle6 -PKGFILES_CSWlibnettle6 += $(call pkgfiles_lib,libnettle.so.6) -SPKG_DESC_CSWlibnettle6 += A low-level cryptographic library, libnettle.so.6 +PACKAGES += CSWlibnettle7 +PKGFILES_CSWlibnettle7 += $(call pkgfiles_lib,libnettle.so.7) +SPKG_DESC_CSWlibnettle7 += A low-level cryptographic library, libnettle.so.7 +RUNTIME_DEP_PKGS_CSWlibnettle7 += CSWlibgcc-s1 PACKAGES += CSWlibnettle-dev PKGFILES_CSWlibnettle-dev = $(PKGFILES_DEVEL) -SPKG_DESC_CSWlibnettle-dev = Development files for libnettle.so.6 and libhogweed.so.4 -RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibhogweed4 -RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibnettle6 +SPKG_DESC_CSWlibnettle-dev = Development files for libnettle.so.7 and libhogweed.so.5 +RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibhogweed5 +RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibnettle7 PACKAGES += CSWlibnettle-utils SPKG_DESC_CSWlibnettle-utils = Utility programs for libnettle # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed4 -RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle6 +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed5 +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle7 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp10 +# Use -shared instead of -G or we will get linker errors of the following form for amd64: +# ld.so.1: base16-test: fatal: relocation error: R_AMD64_PC32: file ../.lib/libhogweed.so.5: symbol main: value 0x2800124b844 does not fit +REINPLACEMENTS += linker +REINPLACE_FILES_linker = configure +REINPLACE_MATCH_linker = -G +REINPLACE_WITH_linker = -shared + GARCOMPILER = GNU # Enable 64 bits, but not for Solaris 9 x86 @@ -66,8 +75,5 @@ EXTRA_CFLAGS-5.10-i386-64 += -fPIC EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL)-$(GARCH)-$(MEMORYMODEL)) -# This is the default install location after configure -CHECKPKG_OVERRIDES_CSWlibnettle-utils += file-with-bad-content|/usr/local|root/opt/csw/share/info/nettle.info - include gar/category.mk Modified: csw/mgar/pkg/nettle/trunk/checksums =================================================================== --- csw/mgar/pkg/nettle/trunk/checksums 2019-07-04 15:08:32 UTC (rev 26548) +++ csw/mgar/pkg/nettle/trunk/checksums 2019-07-11 14:52:09 UTC (rev 26549) @@ -1 +1 @@ -9bdebb0e2f638d3b9d91f7fc264b70c1 nettle-3.4.1.tar.gz +0e5707b418c3826768d41130fbe4ee86 nettle-3.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 11 17:56:34 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Jul 2019 15:56:34 +0000 Subject: SF.net SVN: gar:[26550] csw/mgar/pkg/libtasn1/trunk Message-ID: <1562860594.528955.10241@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26550 http://sourceforge.net/p/gar/code/26550 Author: dmichelsen Date: 2019-07-11 15:56:31 +0000 (Thu, 11 Jul 2019) Log Message: ----------- libtasn1/trunk: Update to 4.13 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2019-07-11 14:52:09 UTC (rev 26549) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2019-07-11 15:56:31 UTC (rev 26550) @@ -1,5 +1,5 @@ NAME = libtasn1 -VERSION = 3.0 +VERSION = 4.13 GARTYPE = v2 DESCRIPTION = GNU ASN1 Library @@ -19,6 +19,7 @@ PACKAGES += CSWlibtasn1-6 SPKG_DESC_CSWlibtasn1-6 = GNU ASN 1 library, libtasn1.so.6 PKGFILES_CSWlibtasn1-6 = $(call pkgfiles_lib,libtasn1.so.6) +RUNTIME_DEP_PKGS_CSWlibtasn1-6 += CSWlibgcc-s1 PACKAGES += CSWlibtasn1-dev SPKG_DESC_CSWlibtasn1-dev = Development files for libtasn1.so.6 @@ -33,7 +34,14 @@ RUNTIME_DEP_PKGS_CSWlibtasn1-utils = CSWlibtasn1-6 OBSOLETED_BY_CSWlibtasn1-utils = CSWlibtasn1 +GARCOMPILER = GNU + BUILD64_LIBS_ONLY = 1 +# Set linker path correctly, otherwise the testsuite uses the install library instead of the +# newly built one +LD_OPTIONS = $(LINKER_DIRECT) +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + include gar/category.mk Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2019-07-11 14:52:09 UTC (rev 26549) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2019-07-11 15:56:31 UTC (rev 26550) @@ -1 +1 @@ -fa74e931a148ec7c2b45afeeb8f86148 libtasn1-3.0.tar.gz +ce2ba4d3088119b48e7531a703669c52 libtasn1-4.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jul 15 09:44:16 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Jul 2019 07:44:16 +0000 Subject: SF.net SVN: gar:[26551] csw/mgar/pkg/pca/trunk Message-ID: <1563176656.586010.12501@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26551 http://sourceforge.net/p/gar/code/26551 Author: dmichelsen Date: 2019-07-15 07:44:13 +0000 (Mon, 15 Jul 2019) Log Message: ----------- pca/trunk: Update to pca-20190715-02 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2019-07-11 15:56:31 UTC (rev 26550) +++ csw/mgar/pkg/pca/trunk/Makefile 2019-07-15 07:44:13 UTC (rev 26551) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20150327-01 +VERSION = 20190715-02 GARTYPE = v2 DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2019-07-11 15:56:31 UTC (rev 26550) +++ csw/mgar/pkg/pca/trunk/checksums 2019-07-15 07:44:13 UTC (rev 26551) @@ -2,4 +2,4 @@ def9838b9f704ec17a32dd2aeec8bf02 clean 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm 9032b788b8a494082368ea0881146078 mkxref -2745e21d035aa068ae23a530a9378dff pca-20150327-01 +8afbde1e30aae35cbb6ae519d93a5ac9 pca-20190715-02 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Mon Jul 15 09:56:09 2019 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 15 Jul 2019 09:56:09 +0200 Subject: SF.net SVN: gar:[26551] csw/mgar/pkg/pca/trunk In-Reply-To: <1563176656.586010.12501@sfp-scm-1.v30.lw.sourceforge.com> References: <1563176656.586010.12501@sfp-scm-1.v30.lw.sourceforge.com> Message-ID: 20 minutes since release. You're incredible Dago! On Mon, Jul 15, 2019 at 9:44 AM dmichelsen--- via devel wrote: > > Revision: 26551 > http://sourceforge.net/p/gar/code/26551 > Author: dmichelsen > Date: 2019-07-15 07:44:13 +0000 (Mon, 15 Jul 2019) > Log Message: > ----------- > pca/trunk: Update to pca-20190715-02 > > Modified Paths: > -------------- > csw/mgar/pkg/pca/trunk/Makefile > csw/mgar/pkg/pca/trunk/checksums > > Modified: csw/mgar/pkg/pca/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/pca/trunk/Makefile 2019-07-11 15:56:31 UTC (rev 26550) > +++ csw/mgar/pkg/pca/trunk/Makefile 2019-07-15 07:44:13 UTC (rev 26551) > @@ -1,5 +1,5 @@ > NAME = pca > -VERSION = 20150327-01 > +VERSION = 20190715-02 > GARTYPE = v2 > > DESCRIPTION = Patch Check Advanced > > Modified: csw/mgar/pkg/pca/trunk/checksums > =================================================================== > --- csw/mgar/pkg/pca/trunk/checksums 2019-07-11 15:56:31 UTC (rev 26550) > +++ csw/mgar/pkg/pca/trunk/checksums 2019-07-15 07:44:13 UTC (rev 26551) > @@ -2,4 +2,4 @@ > def9838b9f704ec17a32dd2aeec8bf02 clean > 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm > 9032b788b8a494082368ea0881146078 mkxref > -2745e21d035aa068ae23a530a9378dff pca-20150327-01 > +8afbde1e30aae35cbb6ae519d93a5ac9 pca-20190715-02 > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > From dam at opencsw.org Mon Jul 15 10:15:14 2019 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 15 Jul 2019 10:15:14 +0200 Subject: SF.net SVN: gar:[26551] csw/mgar/pkg/pca/trunk In-Reply-To: References: <1563176656.586010.12501@sfp-scm-1.v30.lw.sourceforge.com> Message-ID: Hi Peter, > Am 15.07.2019 um 09:56 schrieb Peter Bonivart via devel : > > 20 minutes since release. You're incredible Dago! Well, just had some time and the update is pretty simple :-) Best regards ? Dago > > On Mon, Jul 15, 2019 at 9:44 AM dmichelsen--- via devel > wrote: >> >> Revision: 26551 >> http://sourceforge.net/p/gar/code/26551 >> Author: dmichelsen >> Date: 2019-07-15 07:44:13 +0000 (Mon, 15 Jul 2019) >> Log Message: >> ----------- >> pca/trunk: Update to pca-20190715-02 >> >> Modified Paths: >> -------------- >> csw/mgar/pkg/pca/trunk/Makefile >> csw/mgar/pkg/pca/trunk/checksums >> >> Modified: csw/mgar/pkg/pca/trunk/Makefile >> =================================================================== >> --- csw/mgar/pkg/pca/trunk/Makefile 2019-07-11 15:56:31 UTC (rev 26550) >> +++ csw/mgar/pkg/pca/trunk/Makefile 2019-07-15 07:44:13 UTC (rev 26551) >> @@ -1,5 +1,5 @@ >> NAME = pca >> -VERSION = 20150327-01 >> +VERSION = 20190715-02 >> GARTYPE = v2 >> >> DESCRIPTION = Patch Check Advanced >> >> Modified: csw/mgar/pkg/pca/trunk/checksums >> =================================================================== >> --- csw/mgar/pkg/pca/trunk/checksums 2019-07-11 15:56:31 UTC (rev 26550) >> +++ csw/mgar/pkg/pca/trunk/checksums 2019-07-15 07:44:13 UTC (rev 26551) >> @@ -2,4 +2,4 @@ >> def9838b9f704ec17a32dd2aeec8bf02 clean >> 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm >> 9032b788b8a494082368ea0881146078 mkxref >> -2745e21d035aa068ae23a530a9378dff pca-20150327-01 >> +8afbde1e30aae35cbb6ae519d93a5ac9 pca-20190715-02 >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- An HTML attachment was scrubbed... URL: From dmichelsen at users.sourceforge.net Mon Jul 15 20:11:55 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Jul 2019 18:11:55 +0000 Subject: SF.net SVN: gar:[26552] csw/mgar/pkg/squid/branches/squid-4.x Message-ID: <1563214315.702079.28325@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26552 http://sourceforge.net/p/gar/code/26552 Author: dmichelsen Date: 2019-07-15 18:11:52 +0000 (Mon, 15 Jul 2019) Log Message: ----------- squid/branches/squid-4.x: Update to 4.8 Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid-4.x/Makefile csw/mgar/pkg/squid/branches/squid-4.x/checksums Added Paths: ----------- csw/mgar/pkg/squid/branches/squid-4.x/files/0001-Add-include-for-index.patch Modified: csw/mgar/pkg/squid/branches/squid-4.x/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2019-07-15 07:44:13 UTC (rev 26551) +++ csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2019-07-15 18:11:52 UTC (rev 26552) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 4.0.8 +VERSION = 4.8 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache @@ -28,6 +28,8 @@ # From http://bugs.squid-cache.org/show_bug.cgi?id=4057 #PATCHFILES += bug4057.patch +PATCHFILES += 0001-Add-include-for-index.patch + PACKAGES = CSWsquid RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2 @@ -40,8 +42,9 @@ RUNTIME_DEP_PKGS_CSWsquid += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsquid += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsquid += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsquid += CSWlibnettle6 -RUNTIME_DEP_PKGS_CSWsquid += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibnettle7 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibxml2-2 # Linker anomaly CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibintl8 Modified: csw/mgar/pkg/squid/branches/squid-4.x/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/checksums 2019-07-15 07:44:13 UTC (rev 26551) +++ csw/mgar/pkg/squid/branches/squid-4.x/checksums 2019-07-15 18:11:52 UTC (rev 26552) @@ -1 +1 @@ -1faaba303d7affd061a5162e378e318a squid-4.0.8.tar.xz +08e018f2d8db4911ee90591284fa1ca5 squid-4.8.tar.xz Added: csw/mgar/pkg/squid/branches/squid-4.x/files/0001-Add-include-for-index.patch =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/files/0001-Add-include-for-index.patch (rev 0) +++ csw/mgar/pkg/squid/branches/squid-4.x/files/0001-Add-include-for-index.patch 2019-07-15 18:11:52 UTC (rev 26552) @@ -0,0 +1,25 @@ +From b2432e08f001742c71441909011e217ce17dbcfc Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 15 Jul 2019 15:45:50 +0200 +Subject: [PATCH] Add include for index() + +--- + src/esi/VarState.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc +index c35742c..0635d81 100644 +--- a/src/esi/VarState.cc ++++ b/src/esi/VarState.cc +@@ -12,6 +12,8 @@ + #include "esi/VarState.h" + #include "fatal.h" + #include "HttpReply.h" ++#include ++ + + char const *ESIVariableUserAgent::esiUserOs[]= { + "WIN", +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 17 10:59:45 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Jul 2019 08:59:45 +0000 Subject: SF.net SVN: gar:[26553] csw/mgar/pkg/curl/trunk Message-ID: <1563353985.428979.8478@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26553 http://sourceforge.net/p/gar/code/26553 Author: dmichelsen Date: 2019-07-17 08:59:40 +0000 (Wed, 17 Jul 2019) Log Message: ----------- curl/trunk: Update to 7.65.2 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2019-07-15 18:11:52 UTC (rev 26552) +++ csw/mgar/pkg/curl/trunk/Makefile 2019-07-17 08:59:40 UTC (rev 26553) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.65.1 +VERSION = 7.65.2 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2019-07-15 18:11:52 UTC (rev 26552) +++ csw/mgar/pkg/curl/trunk/checksums 2019-07-17 08:59:40 UTC (rev 26553) @@ -1 +1 @@ -7809378831d10fde18f9f6ae033cd3f3 curl-7.65.1.tar.xz +2b1bde080347332f829718ca85b5f68a curl-7.65.2.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 18 11:06:30 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Jul 2019 09:06:30 +0000 Subject: SF.net SVN: gar:[26554] csw/mgar/pkg/cpan/Net-SSLeay/trunk Message-ID: <1563440790.569265.14362@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26554 http://sourceforge.net/p/gar/code/26554 Author: dmichelsen Date: 2019-07-18 09:06:20 +0000 (Thu, 18 Jul 2019) Log Message: ----------- cpan/Net-SSLeay/trunk: Update to 1.88 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2019-07-17 08:59:40 UTC (rev 26553) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2019-07-18 09:06:20 UTC (rev 26554) @@ -1,8 +1,8 @@ NAME = Net-SSLeay -VERSION = 1.54 +VERSION = 1.88 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = MIKEM +AUTHOR = CHRISN DESCRIPTION = Perl extension for using OpenSSL define BLURB Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums 2019-07-17 08:59:40 UTC (rev 26553) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums 2019-07-18 09:06:20 UTC (rev 26554) @@ -1 +1 @@ -26e758fff1c90cb00e9358fea7e1e22f Net-SSLeay-1.54.tar.gz +fcef4985f5f7e0381e3dddd0ee7878d1 Net-SSLeay-1.88.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 18 11:25:34 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Jul 2019 09:25:34 +0000 Subject: SF.net SVN: gar:[26555] csw/mgar/pkg/cpan/IO-Socket-SSL/trunk Message-ID: <1563441934.546055.5864@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26555 http://sourceforge.net/p/gar/code/26555 Author: dmichelsen Date: 2019-07-18 09:25:30 +0000 (Thu, 18 Jul 2019) Log Message: ----------- cpan/IO-Socket-SSL/trunk: Update to 2.066 Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2019-07-18 09:06:20 UTC (rev 26554) +++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2019-07-18 09:25:30 UTC (rev 26555) @@ -1,5 +1,5 @@ NAME = IO-Socket-SSL -VERSION = 2.002 +VERSION = 2.066 CATEGORIES = cpan GARTYPE = v2 AUTHOR = SULLR Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums 2019-07-18 09:06:20 UTC (rev 26554) +++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums 2019-07-18 09:25:30 UTC (rev 26555) @@ -1 +1 @@ -3b0753495a1ff043bd782a6b876d990f IO-Socket-SSL-2.002.tar.gz +ecf96ce2ff9e04a03a2d101c76ce1020 IO-Socket-SSL-2.066.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 18 11:29:48 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Jul 2019 09:29:48 +0000 Subject: SF.net SVN: gar:[26556] csw/mgar/pkg/gbc/trunk Message-ID: <1563442188.499991.11102@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26556 http://sourceforge.net/p/gar/code/26556 Author: dmichelsen Date: 2019-07-18 09:29:39 +0000 (Thu, 18 Jul 2019) Log Message: ----------- gbc/trunk: Update to 1.07.1, rename bc to gbc and symlink from /opt/csw/gnu/bc to it Modified Paths: -------------- csw/mgar/pkg/gbc/trunk/Makefile csw/mgar/pkg/gbc/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch Modified: csw/mgar/pkg/gbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gbc/trunk/Makefile 2019-07-18 09:25:30 UTC (rev 26555) +++ csw/mgar/pkg/gbc/trunk/Makefile 2019-07-18 09:29:39 UTC (rev 26556) @@ -1,6 +1,6 @@ # $Id$ NAME = bc -VERSION = 1.06 +VERSION = 1.07.1 GARTYPE = v2 DESCRIPTION = An interactive algebraic language with arbitrary precision which follows the POSIX 1003.2 @@ -10,14 +10,26 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = 0001-Do-not-use-Wall.patch - # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWgbc -CATALOGNAME = gbc +SPKG_DESC_CSWgbc = An interactive algebraic language with arbitrary precision which follows the POSIX 1003.2 +# PKGFILES is catchall -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g +SHELL = /bin/bash + include gar/category.mk + +post-install: + (cd $(DESTDIR)$(prefix); \ + mkdir gnu; cd gnu; \ + for f in ../bin/g*; do \ + echo Linking $$f; \ + base=$$(basename $$f); \ + gln -s $$f ./$${base/g/}; \ + done ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gbc/trunk/checksums =================================================================== --- csw/mgar/pkg/gbc/trunk/checksums 2019-07-18 09:25:30 UTC (rev 26555) +++ csw/mgar/pkg/gbc/trunk/checksums 2019-07-18 09:29:39 UTC (rev 26556) @@ -1 +1 @@ -d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz +cda93857418655ea43590736fc3ca9fc bc-1.07.1.tar.gz Deleted: csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch 2019-07-18 09:25:30 UTC (rev 26555) +++ csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch 2019-07-18 09:29:39 UTC (rev 26556) @@ -1,94 +0,0 @@ -From 64e569e3ca2c4d4604a3dca5046364862e7bcf91 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 15:41:01 +0100 -Subject: [PATCH] Do not use -Wall - ---- - bc/Makefile.am | 2 +- - bc/Makefile.in | 2 +- - dc/Makefile.am | 2 +- - dc/Makefile.in | 2 +- - lib/Makefile.am | 2 +- - lib/Makefile.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/bc/Makefile.am b/bc/Makefile.am -index 9187339..735bb39 100644 ---- a/bc/Makefile.am -+++ b/bc/Makefile.am -@@ -18,7 +18,7 @@ LDADD = $(LIBBC) $(LIBL) @READLINELIB@ - - YFLAGS = -d - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - - $(PROGRAMS): $(LIBBC) - -diff --git a/bc/Makefile.in b/bc/Makefile.in -index 18ebce0..2aae747 100644 ---- a/bc/Makefile.in -+++ b/bc/Makefile.in -@@ -85,7 +85,7 @@ LDADD = $(LIBBC) $(LIBL) @READLINELIB@ - - YFLAGS = -d - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - - fbcOBJ = main.o bc.o scan.o execute.o global.o load.o storage.o util.o - -diff --git a/dc/Makefile.am b/dc/Makefile.am -index 99164ba..558e4da 100644 ---- a/dc/Makefile.am -+++ b/dc/Makefile.am -@@ -9,6 +9,6 @@ LDADD = ../lib/libbc.a - - MAINTAINERCLEANFILES = Makefile.in - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - - $(PROGRAMS): $(LDADD) -diff --git a/dc/Makefile.in b/dc/Makefile.in -index 0772dd6..3733a2e 100644 ---- a/dc/Makefile.in -+++ b/dc/Makefile.in -@@ -76,7 +76,7 @@ LDADD = ../lib/libbc.a - - MAINTAINERCLEANFILES = Makefile.in - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6f74b4d..41ea3fd 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -7,7 +7,7 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c - - DEFS = @DEFS@ $(DEFSADD) - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - - MAINTAINERCLEANFILES = Makefile.in number.c - -diff --git a/lib/Makefile.in b/lib/Makefile.in -index 5ffa593..71d5d59 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -74,7 +74,7 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c - - DEFS = @DEFS@ $(DEFSADD) - --CFLAGS = @CFLAGS@ -Wall -funsigned-char -+# CFLAGS = @CFLAGS@ -Wall -funsigned-char - - MAINTAINERCLEANFILES = Makefile.in number.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 18 11:48:17 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Jul 2019 09:48:17 +0000 Subject: SF.net SVN: gar:[26557] csw/mgar/pkg/openssl1/branches/lts102 Message-ID: <1563443297.833166.1977@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26557 http://sourceforge.net/p/gar/code/26557 Author: dmichelsen Date: 2019-07-18 09:48:13 +0000 (Thu, 18 Jul 2019) Log Message: ----------- openssl1/branches/lts102: Update to 1.0.2s Modified Paths: -------------- csw/mgar/pkg/openssl1/branches/lts102/Makefile csw/mgar/pkg/openssl1/branches/lts102/checksums Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile =================================================================== --- csw/mgar/pkg/openssl1/branches/lts102/Makefile 2019-07-18 09:29:39 UTC (rev 26556) +++ csw/mgar/pkg/openssl1/branches/lts102/Makefile 2019-07-18 09:48:13 UTC (rev 26557) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.2o +VERSION = 1.0.2s GARTYPE = v2 # Since version 1.0.0, soname is fixed and does not follow the minor releases SONAME=1.0.0 Modified: csw/mgar/pkg/openssl1/branches/lts102/checksums =================================================================== --- csw/mgar/pkg/openssl1/branches/lts102/checksums 2019-07-18 09:29:39 UTC (rev 26556) +++ csw/mgar/pkg/openssl1/branches/lts102/checksums 2019-07-18 09:48:13 UTC (rev 26557) @@ -1 +1 @@ -44279b8557c3247cbe324e2322ecd114 openssl-1.0.2o.tar.gz +98ec4e085962689b91d25e1dcdfc14a2 openssl-1.0.2s.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jul 19 14:05:05 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Jul 2019 12:05:05 +0000 Subject: SF.net SVN: gar:[26558] csw/mgar/pkg/curl/trunk Message-ID: <1563537905.862323.27468@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26558 http://sourceforge.net/p/gar/code/26558 Author: dmichelsen Date: 2019-07-19 12:05:00 +0000 (Fri, 19 Jul 2019) Log Message: ----------- curl/trunk: Update to 7.65.3 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2019-07-18 09:48:13 UTC (rev 26557) +++ csw/mgar/pkg/curl/trunk/Makefile 2019-07-19 12:05:00 UTC (rev 26558) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.65.2 +VERSION = 7.65.3 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2019-07-18 09:48:13 UTC (rev 26557) +++ csw/mgar/pkg/curl/trunk/checksums 2019-07-19 12:05:00 UTC (rev 26558) @@ -1 +1 @@ -2b1bde080347332f829718ca85b5f68a curl-7.65.2.tar.xz +7bd5b2ebfd3f591034eb8b55314d8c02 curl-7.65.3.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Jul 22 01:08:46 2019 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 21 Jul 2019 23:08:46 +0000 Subject: SF.net SVN: gar:[26559] csw/mgar/pkg/dovecot/trunk Message-ID: <1563750526.330837.11147@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26559 http://sourceforge.net/p/gar/code/26559 Author: jake_goerzen Date: 2019-07-21 23:08:37 +0000 (Sun, 21 Jul 2019) Log Message: ----------- dovecot/trunk: update to 2.3.7 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-19 12:05:00 UTC (rev 26558) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-21 23:08:37 UTC (rev 26559) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.3.6 +VERSION = 2.3.7 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2019-07-19 12:05:00 UTC (rev 26558) +++ csw/mgar/pkg/dovecot/trunk/checksums 2019-07-21 23:08:37 UTC (rev 26559) @@ -1 +1 @@ -437c961998e2e825d22288b7601b7c18 dovecot-2.3.6.tar.gz +fe290112b12e95363c2ffc8d043a40a4 dovecot-2.3.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Jul 22 06:08:17 2019 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Jul 2019 04:08:17 +0000 Subject: SF.net SVN: gar:[26560] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: <1563768498.180700.27949@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26560 http://sourceforge.net/p/gar/code/26560 Author: jake_goerzen Date: 2019-07-22 04:08:13 +0000 (Mon, 22 Jul 2019) Log Message: ----------- dovecot/trunk: update dependencies Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-21 23:08:37 UTC (rev 26559) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-22 04:08:13 UTC (rev 26560) @@ -46,6 +46,7 @@ RUNTIME_DEP_PKGS_CSWdovecot += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssp0 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibsodium23 +RUNTIME_DEP_PKGS_CSWdovecot += CSWliblz4-1 PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Jul 22 18:30:48 2019 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Jul 2019 16:30:48 +0000 Subject: SF.net SVN: gar:[26561] csw/mgar/pkg/dovecot-sieve/trunk Message-ID: <1563813048.803652.31048@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26561 http://sourceforge.net/p/gar/code/26561 Author: jake_goerzen Date: 2019-07-22 16:30:44 +0000 (Mon, 22 Jul 2019) Log Message: ----------- dovecot-sieve/trunk: update to 0.5.7 Modified Paths: -------------- csw/mgar/pkg/dovecot-sieve/trunk/Makefile csw/mgar/pkg/dovecot-sieve/trunk/checksums Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2019-07-22 04:08:13 UTC (rev 26560) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2019-07-22 16:30:44 UTC (rev 26561) @@ -1,5 +1,5 @@ NAME = dovecot-2.3-pigeonhole -VERSION = 0.5.6 +VERSION = 0.5.7 GARTYPE = v2 DESCRIPTION = Secure POP3/IMAP server - Sieve filters support @@ -26,13 +26,13 @@ UNAME := $(shell /usr/bin/uname -p) ifeq ($(UNAME), i386) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.6 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.6 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.7 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.7 endif ifeq ($(UNAME), sparc) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.6 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.6 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.7 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.7 endif CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) Modified: csw/mgar/pkg/dovecot-sieve/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/checksums 2019-07-22 04:08:13 UTC (rev 26560) +++ csw/mgar/pkg/dovecot-sieve/trunk/checksums 2019-07-22 16:30:44 UTC (rev 26561) @@ -1 +1 @@ -96fb4afb0a10da2f3ab6299f8d4f958f dovecot-2.3-pigeonhole-0.5.6.tar.gz +5d3e8f456c78eaf3e811057b030bef3f dovecot-2.3-pigeonhole-0.5.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jul 23 19:44:37 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Jul 2019 17:44:37 +0000 Subject: SF.net SVN: gar:[26562] csw/mgar/pkg Message-ID: <1563903877.965000.21746@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26562 http://sourceforge.net/p/gar/code/26562 Author: dmichelsen Date: 2019-07-23 17:44:33 +0000 (Tue, 23 Jul 2019) Log Message: ----------- libzip: Initial commit Added Paths: ----------- csw/mgar/pkg/libzip/ csw/mgar/pkg/libzip/Makefile csw/mgar/pkg/libzip/branches/ csw/mgar/pkg/libzip/tags/ csw/mgar/pkg/libzip/trunk/ csw/mgar/pkg/libzip/trunk/Makefile csw/mgar/pkg/libzip/trunk/checksums csw/mgar/pkg/libzip/trunk/files/ csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch Added: csw/mgar/pkg/libzip/Makefile =================================================================== --- csw/mgar/pkg/libzip/Makefile (rev 0) +++ csw/mgar/pkg/libzip/Makefile 2019-07-23 17:44:33 UTC (rev 26562) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libzip/trunk =================================================================== --- csw/mgar/pkg/libzip/trunk 2019-07-22 16:30:44 UTC (rev 26561) +++ csw/mgar/pkg/libzip/trunk 2019-07-23 17:44:33 UTC (rev 26562) Property changes on: csw/mgar/pkg/libzip/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/libzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libzip/trunk/Makefile 2019-07-23 17:44:33 UTC (rev 26562) @@ -0,0 +1,69 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libzip +VERSION = 1.5.2 +GARTYPE = v2 + +DESCRIPTION = A C library for reading, creating, and modifying zip archives + +MASTER_SITES = https://libzip.org/download/ +DISTFILES += $(DISTNAME).tar.xz + +PATCHFILES += 0001-Fix-order-of-gnutls-includes.patch + +VENDOR_URL = https://libzip.org + +PACKAGES += CSWlibzip5 +SPKG_DESC_CSWlibzip5 = C library for reading, creating, and modifying zip archives, libzip.so.5 +PKGFILES_CSWlibzip5 += $(call pkgfiles_lib,libzip.so.5) +RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibzip5-sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibnettle7 +RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibzip5 += $(RUNTIME_DEP_PKGS_CSWlibzip5-$(GARCH)) + +PACKAGES += CSWlibzip-dev +SPKG_DESC_CSWlibzip-dev = Development files for libzip.so.5 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibzip-dev += CSWlibzip5 + +PACKAGES += CSWlibzip-utils +SPKG_DESC_CSWlibzip-utils = Utility programs shipped with libzip +PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),zipcmp) +PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),zipmerge) +PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),ziptool) +PKGFILES_CSWlibzip-utils += $(mandir)/man1/.* +RUNTIME_DEP_PKGS_CSWlibzip-utils += CSWlibzip5 +RUNTIME_DEP_PKGS_CSWlibzip-utils-sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibzip-utils-sparc += CSWlibnettle7 +RUNTIME_DEP_PKGS_CSWlibzip-utils += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibzip-utils += $(RUNTIME_DEP_PKGS_CSWlibzip-utils-$(GARCH)) + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_SCRIPTS = cmake + +BUILD_SCRIPTS = $(WORKSRC)/solaris/Makefile + +# The -DMAKE= is needed because docs generation uses $(MAKE) -C which the default /usr/ccs/bin/make does not understand +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX:PATH=$(prefix) +CMAKE_ARGS += -DCMAKE_INSTALL_BINDIR=$(bindir:$(prefix)/%=%) +CMAKE_ARGS += -DCMAKE_INSTALL_LIBDIR=$(libdir:$(prefix)/%=%) +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" + +EXTRA_LINKER_FLAGS += -liconv + +TEST_SCRIPTS = $(WORKSRC)/solaris/Makefile + +INSTALL_SCRIPTS = $(WORKSRC)/solaris/Makefile + +include gar/category.mk + +configure-cmake: + mkdir $(WORKSRC)/solaris + #cd $(WORKSRC)/solaris && $(CONFIGURE_ENV) cmake -DMAKE=/opt/csw/bin/gmake -Dbuild_doc=YES -DCMAKE_INSTALL_PREFIX:PATH=$(prefix) -G 'Unix Makefiles' $(abspath $(WORKSRC)) + cd $(WORKSRC)/solaris && $(CONFIGURE_ENV) cmake $(CMAKE_ARGS) $(abspath $(WORKSRC)) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libzip/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libzip/trunk/checksums =================================================================== --- csw/mgar/pkg/libzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/libzip/trunk/checksums 2019-07-23 17:44:33 UTC (rev 26562) @@ -0,0 +1 @@ +f9dd38d273bcdec5d3d1498fe6684f42 libzip-1.5.2.tar.xz Added: csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch =================================================================== --- csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch (rev 0) +++ csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch 2019-07-23 17:44:33 UTC (rev 26562) @@ -0,0 +1,26 @@ +From 5c09ffa5f5e2668172757d04bafec16c2f406a2e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 23 Jul 2019 13:23:58 +0200 +Subject: [PATCH] Fix order of gnutls includes + +--- + lib/zip_crypto_gnutls.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/zip_crypto_gnutls.h b/lib/zip_crypto_gnutls.h +index 40d34a5..9e06398 100644 +--- a/lib/zip_crypto_gnutls.h ++++ b/lib/zip_crypto_gnutls.h +@@ -37,8 +37,8 @@ + #include + #include + +-#include + #include ++#include + + typedef struct { + union { +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Jul 23 20:22:31 2019 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 23 Jul 2019 18:22:31 +0000 Subject: SF.net SVN: gar:[26563] csw/mgar/pkg/dovecot/trunk Message-ID: <1563906151.343092.5377@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26563 http://sourceforge.net/p/gar/code/26563 Author: jake_goerzen Date: 2019-07-23 18:22:19 +0000 (Tue, 23 Jul 2019) Log Message: ----------- dovecot/trunk: update to 2.3.7.1 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-23 17:44:33 UTC (rev 26562) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2019-07-23 18:22:19 UTC (rev 26563) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.3.7 +VERSION = 2.3.7.1 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2019-07-23 17:44:33 UTC (rev 26562) +++ csw/mgar/pkg/dovecot/trunk/checksums 2019-07-23 18:22:19 UTC (rev 26563) @@ -1 +1 @@ -fe290112b12e95363c2ffc8d043a40a4 dovecot-2.3.7.tar.gz +39a565038aa4ae4123f19fce790e5535 dovecot-2.3.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Jul 24 00:42:40 2019 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 23 Jul 2019 22:42:40 +0000 Subject: SF.net SVN: gar:[26564] csw/mgar/pkg/dovecot-sieve/trunk Message-ID: <1563921760.805636.5171@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26564 http://sourceforge.net/p/gar/code/26564 Author: jake_goerzen Date: 2019-07-23 22:42:34 +0000 (Tue, 23 Jul 2019) Log Message: ----------- dovecot-sieve/trunk: update to 0.5.7.1 Modified Paths: -------------- csw/mgar/pkg/dovecot-sieve/trunk/Makefile csw/mgar/pkg/dovecot-sieve/trunk/checksums Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2019-07-23 18:22:19 UTC (rev 26563) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2019-07-23 22:42:34 UTC (rev 26564) @@ -1,5 +1,5 @@ NAME = dovecot-2.3-pigeonhole -VERSION = 0.5.7 +VERSION = 0.5.7.1 GARTYPE = v2 DESCRIPTION = Secure POP3/IMAP server - Sieve filters support @@ -26,13 +26,13 @@ UNAME := $(shell /usr/bin/uname -p) ifeq ($(UNAME), i386) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.7 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.7 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.7.1 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.7.1 endif ifeq ($(UNAME), sparc) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.7 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.7 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.7.1 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.7.1 endif CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) Modified: csw/mgar/pkg/dovecot-sieve/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/checksums 2019-07-23 18:22:19 UTC (rev 26563) +++ csw/mgar/pkg/dovecot-sieve/trunk/checksums 2019-07-23 22:42:34 UTC (rev 26564) @@ -1 +1 @@ -5d3e8f456c78eaf3e811057b030bef3f dovecot-2.3-pigeonhole-0.5.7.tar.gz +3365a3a102406bd11eaea7b88752e6e5 dovecot-2.3-pigeonhole-0.5.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jul 24 00:45:13 2019 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 23 Jul 2019 22:45:13 +0000 Subject: SF.net SVN: gar:[26565] csw/mgar/pkg/memconf/trunk Message-ID: <1563921913.322693.8294@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26565 http://sourceforge.net/p/gar/code/26565 Author: bonivart Date: 2019-07-23 22:45:10 +0000 (Tue, 23 Jul 2019) Log Message: ----------- memconf/trunk: Update to 3.15 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2019-07-23 22:42:34 UTC (rev 26564) +++ csw/mgar/pkg/memconf/trunk/Makefile 2019-07-23 22:45:10 UTC (rev 26565) @@ -2,7 +2,7 @@ # rm /home/src/memconf* NAME = memconf -VERSION = 3.14 +VERSION = 3.15 GARTYPE = v2 DESCRIPTION = Perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2019-07-23 22:42:34 UTC (rev 26564) +++ csw/mgar/pkg/memconf/trunk/checksums 2019-07-23 22:45:10 UTC (rev 26565) @@ -1,2 +1,2 @@ -212f818e82bef83b34788abd0df969a9 memconf.gz -b61ccf068e738d1f1b7a540dc564fe31 memconf.man +a34bc8c2091ae98a77e73a6cb5c53f92 memconf.gz +a8345b133c151c33d734c7affd8fe23b memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jul 25 00:08:34 2019 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Jul 2019 22:08:34 +0000 Subject: SF.net SVN: gar:[26566] csw/mgar/pkg/collectd/trunk Message-ID: <1564006115.204771.18027@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26566 http://sourceforge.net/p/gar/code/26566 Author: dmichelsen Date: 2019-07-24 22:08:32 +0000 (Wed, 24 Jul 2019) Log Message: ----------- collectd/trunk: Update to 5.9.1 Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/collectd/trunk/files/0003-Include-config.h-early-or-_FILE_OFFSET_BITS-is-wrong.patch csw/mgar/pkg/collectd/trunk/files/0071-Include-kstat.h-if-available-to-provide-kstat_ctl_t.patch csw/mgar/pkg/collectd/trunk/files/0076-Include-kstat.h-when-available.patch csw/mgar/pkg/collectd/trunk/files/0077-Add-fallback-for-endianess-conversion.patch Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/Makefile 2019-07-24 22:08:32 UTC (rev 26566) @@ -1,20 +1,17 @@ # $Id$ # NAME = collectd -VERSION = 5.8.0 +VERSION = 5.9.1 GARTYPE = v2 DESCRIPTION = Collects system performance statistics periodically -MASTER_SITES = http://collectd.org/files/ -# MASTER_SITES += https://ci.collectd.org/job/packages-prepare-tarball-collectd-5.6/lastSuccessfulBuild/artifact/ -DISTFILES += $(DISTNAME).tar.bz2 +MASTER_SITES += http://collectd.org/files/ +MASTER_SITES += https://github.com/collectd/collectd/archive/ +DISTFILES += $(DISTNAME).tar.gz DISTFILES += cswcollectd -PATCHFILES += 0003-Include-config.h-early-or-_FILE_OFFSET_BITS-is-wrong.patch -PATCHFILES += 0071-Include-kstat.h-if-available-to-provide-kstat_ctl_t.patch -PATCHFILES += 0076-Include-kstat.h-when-available.patch -PATCHFILES += 0077-Add-fallback-for-endianess-conversion.patch +WORKSRC = $(WORKDIR)/collectd-$(DISTNAME) VENDOR_URL = http://collectd.org/ @@ -275,11 +272,9 @@ PRESERVECONF += $(sysconfdir)/collectd.conf PRESERVECONF += $(sysconfdir)/64/collectd.conf -SKIPTEST ?= 1 - include gar/category.mk -xxxpost-patch: +post-patch: cd $(WORKSRC) && autoreconf -fi @$(MAKECOOKIE) Modified: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/checksums 2019-07-24 22:08:32 UTC (rev 26566) @@ -1 +1 @@ -a841159323624f18bf03198e9f5aa364 collectd-5.8.0.tar.bz2 +f05ba142d995df8ae1c58d34878cf892 collectd-5.9.1.tar.gz Deleted: csw/mgar/pkg/collectd/trunk/files/0003-Include-config.h-early-or-_FILE_OFFSET_BITS-is-wrong.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0003-Include-config.h-early-or-_FILE_OFFSET_BITS-is-wrong.patch 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/files/0003-Include-config.h-early-or-_FILE_OFFSET_BITS-is-wrong.patch 2019-07-24 22:08:32 UTC (rev 26566) @@ -1,26 +0,0 @@ -From 3f24dce20ad6ea1b2ed11780f9423e8675885539 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 22 Mar 2018 14:54:01 +0100 -Subject: [PATCH 03/10] Include config.h early or _FILE_OFFSET_BITS is wrongly - defined and bails out on Solaris 32 bit - ---- - src/libcollectdclient/collectd/network_buffer.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libcollectdclient/collectd/network_buffer.h b/src/libcollectdclient/collectd/network_buffer.h -index d66b815..ed8ab51 100644 ---- a/src/libcollectdclient/collectd/network_buffer.h -+++ b/src/libcollectdclient/collectd/network_buffer.h -@@ -27,6 +27,8 @@ - #ifndef LIBCOLLECTDCLIENT_NETWORK_BUFFER_H - #define LIBCOLLECTDCLIENT_NETWORK_BUFFER_H 1 - -+#include "config.h" -+ - #include "collectd/network.h" /* for lcc_security_level_t */ - #include "collectd/types.h" - --- -2.4.0 - Deleted: csw/mgar/pkg/collectd/trunk/files/0071-Include-kstat.h-if-available-to-provide-kstat_ctl_t.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0071-Include-kstat.h-if-available-to-provide-kstat_ctl_t.patch 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/files/0071-Include-kstat.h-if-available-to-provide-kstat_ctl_t.patch 2019-07-24 22:08:32 UTC (rev 26566) @@ -1,225 +0,0 @@ -From b2ce05053cc602f0b8599e8a6c0de80063647ba4 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sat, 10 Mar 2018 18:34:33 +0100 -Subject: [PATCH 071/100] Include kstat.h if available to provide kstat_ctl_t - ---- - src/cpu.c | 3 +++ - src/daemon/collectd.c | 5 +++++ - src/daemon/common.c | 4 ++++ - src/daemon/common_test.c | 4 ++++ - src/daemon/plugin_mock.c | 4 ++++ - src/daemon/utils_subst_test.c | 4 ++++ - src/disk.c | 3 +++ - src/interface.c | 3 +++ - src/tape.c | 4 ++++ - src/uptime.c | 4 ++++ - src/utils_mount_test.c | 4 ++++ - src/utils_vl_lookup.c | 4 ++++ - src/zfs_arc.c | 5 +++++ - 13 files changed, 51 insertions(+) - -diff --git a/src/cpu.c b/src/cpu.c -index 0bf38e7..8480f11 100644 ---- a/src/cpu.c -+++ b/src/cpu.c -@@ -134,6 +134,9 @@ static mach_msg_type_number_t cpu_list_len; - /* #endif KERNEL_LINUX */ - - #elif defined(HAVE_LIBKSTAT) -+#if HAVE_KSTAT_H -+#include -+#endif - /* colleague tells me that Sun doesn't sell systems with more than 100 or so - * CPUs.. */ - #define MAX_NUMCPU 256 -diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c -index d6060a1..727876b 100644 ---- a/src/daemon/collectd.c -+++ b/src/daemon/collectd.c -@@ -43,6 +43,10 @@ - #include - #endif - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #ifndef COLLECTD_LOCALE - #define COLLECTD_LOCALE "C" - #endif -@@ -201,6 +205,7 @@ static int change_basedir(const char *orig_dir, _Bool create) { - } /* static int change_basedir (char *dir) */ - - #if HAVE_LIBKSTAT -+extern kstat_ctl_t *kc; - static void update_kstat(void) { - if (kc == NULL) { - if ((kc = kstat_open()) == NULL) -diff --git a/src/daemon/common.c b/src/daemon/common.c -index bf833ee..fbbb608 100644 ---- a/src/daemon/common.c -+++ b/src/daemon/common.c -@@ -60,6 +60,10 @@ - #include - #endif - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #ifdef HAVE_LIBKSTAT - extern kstat_ctl_t *kc; - #endif -diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c -index 4d2ccaa..af2840e 100644 ---- a/src/daemon/common_test.c -+++ b/src/daemon/common_test.c -@@ -27,6 +27,10 @@ - #include "common.h" - #include "testing.h" - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - kstat_ctl_t *kc; - #endif /* HAVE_LIBKSTAT */ -diff --git a/src/daemon/plugin_mock.c b/src/daemon/plugin_mock.c -index 6df4c15..96bf382 100644 ---- a/src/daemon/plugin_mock.c -+++ b/src/daemon/plugin_mock.c -@@ -26,6 +26,10 @@ - - #include "plugin.h" - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - kstat_ctl_t *kc = NULL; - #endif /* HAVE_LIBKSTAT */ -diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c -index 00ea0ea..5379219 100644 ---- a/src/daemon/utils_subst_test.c -+++ b/src/daemon/utils_subst_test.c -@@ -30,6 +30,10 @@ - #include "testing.h" - #include "utils_subst.h" - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - kstat_ctl_t *kc; - #endif /* HAVE_LIBKSTAT */ -diff --git a/src/disk.c b/src/disk.c -index 004ce9e..45706bc 100644 ---- a/src/disk.c -+++ b/src/disk.c -@@ -120,6 +120,9 @@ static struct gmesh geom_tree; - /* #endif KERNEL_FREEBSD */ - - #elif HAVE_LIBKSTAT -+#if HAVE_KSTAT_H -+#include -+#endif - #define MAX_NUMDISK 1024 - extern kstat_ctl_t *kc; - static kstat_t *ksp[MAX_NUMDISK]; -diff --git a/src/interface.c b/src/interface.c -index 6c80334..c45ef66 100644 ---- a/src/interface.c -+++ b/src/interface.c -@@ -91,6 +91,9 @@ static ignorelist_t *ignorelist = NULL; - static _Bool report_inactive = 1; - - #ifdef HAVE_LIBKSTAT -+#if HAVE_KSTAT_H -+#include -+#endif - #define MAX_NUMIF 256 - extern kstat_ctl_t *kc; - static kstat_t *ksp[MAX_NUMIF]; -diff --git a/src/tape.c b/src/tape.c -index debb1d2..f59b7ea 100644 ---- a/src/tape.c -+++ b/src/tape.c -@@ -29,6 +29,10 @@ - #error "No applicable input method." - #endif - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #define MAX_NUMTAPE 256 - extern kstat_ctl_t *kc; - static kstat_t *ksp[MAX_NUMTAPE]; -diff --git a/src/uptime.c b/src/uptime.c -index 31a2c1e..43d72e5 100644 ---- a/src/uptime.c -+++ b/src/uptime.c -@@ -53,6 +53,10 @@ - * Global variables - */ - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - extern kstat_ctl_t *kc; - #endif /* #endif HAVE_LIBKSTAT */ -diff --git a/src/utils_mount_test.c b/src/utils_mount_test.c -index ca65950..e8f3009 100644 ---- a/src/utils_mount_test.c -+++ b/src/utils_mount_test.c -@@ -30,6 +30,10 @@ - #include "testing.h" - #include "utils_mount.h" - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - kstat_ctl_t *kc; - #endif /* HAVE_LIBKSTAT */ -diff --git a/src/utils_vl_lookup.c b/src/utils_vl_lookup.c -index 76c0674..052c4c0 100644 ---- a/src/utils_vl_lookup.c -+++ b/src/utils_vl_lookup.c -@@ -33,6 +33,10 @@ - #include "utils_avltree.h" - #include "utils_vl_lookup.h" - -+#if HAVE_KSTAT_H -+#include -+#endif -+ - #if HAVE_LIBKSTAT - kstat_ctl_t *kc; - #endif /* HAVE_LIBKSTAT */ -diff --git a/src/zfs_arc.c b/src/zfs_arc.c -index af4bfcc..c9abdd5 100644 ---- a/src/zfs_arc.c -+++ b/src/zfs_arc.c -@@ -99,6 +99,11 @@ static void free_zfs_values(kstat_t *ksp) { - } - - #elif defined(KERNEL_SOLARIS) -+ -+#if HAVE_KSTAT_H -+#include -+#endif -+ - extern kstat_ctl_t *kc; - - static long long get_zfs_value(kstat_t *ksp, char *name) { --- -2.4.0 - Deleted: csw/mgar/pkg/collectd/trunk/files/0076-Include-kstat.h-when-available.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0076-Include-kstat.h-when-available.patch 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/files/0076-Include-kstat.h-when-available.patch 2019-07-24 22:08:32 UTC (rev 26566) @@ -1,26 +0,0 @@ -From 45df07a30926475b2a33f63f79cda615928a7d96 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 21 Mar 2018 21:22:45 +0100 -Subject: [PATCH 076/100] Include kstat.h when available - ---- - src/daemon/common.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/daemon/common.h b/src/daemon/common.h -index cf4c5a7..e364362 100644 ---- a/src/daemon/common.h -+++ b/src/daemon/common.h -@@ -289,6 +289,9 @@ int timeval_cmp(struct timeval tv0, struct timeval tv1, struct timeval *delta); - int check_create_dir(const char *file_orig); - - #ifdef HAVE_LIBKSTAT -+#if HAVE_KSTAT_H -+#include -+#endif - int get_kstat(kstat_t **ksp_ptr, char *module, int instance, char *name); - long long get_kstat_value(kstat_t *ksp, char *name); - #endif --- -2.4.0 - Deleted: csw/mgar/pkg/collectd/trunk/files/0077-Add-fallback-for-endianess-conversion.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0077-Add-fallback-for-endianess-conversion.patch 2019-07-23 22:45:10 UTC (rev 26565) +++ csw/mgar/pkg/collectd/trunk/files/0077-Add-fallback-for-endianess-conversion.patch 2019-07-24 22:08:32 UTC (rev 26566) @@ -1,261 +0,0 @@ -From 32f1126d3f18fce78e6d06c8c7f94763f21afcef Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 21 Mar 2018 22:09:15 +0100 -Subject: [PATCH 077/100] Add fallback for endianess conversion - ---- - src/stdendian.h | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 242 insertions(+) - create mode 100644 src/stdendian.h - -diff --git a/src/stdendian.h b/src/stdendian.h -new file mode 100644 -index 0000000..d419096 ---- /dev/null -+++ b/src/stdendian.h -@@ -0,0 +1,242 @@ -+/* -+ * stdendian.h -+ * -+ * This header defines the following endian macros as defined here: -+ * http://austingroupbugs.net/view.php?id=162 -+ * -+ * BYTE_ORDER this macro shall have a value equal to one -+ * of the *_ENDIAN macros in this header. -+ * LITTLE_ENDIAN if BYTE_ORDER == LITTLE_ENDIAN, the host -+ * byte order is from least significant to -+ * most significant. -+ * BIG_ENDIAN if BYTE_ORDER == BIG_ENDIAN, the host byte -+ * order is from most significant to least -+ * significant. -+ * -+ * The following are defined as macros: -+ * -+ * uint16_t bswap16(uint16_t x); -+ * uint32_t bswap32(uint32_t x); -+ * uint64_t bswap64(uint64_t x); -+ -+ * uint16_t htobe16(uint16_t x); -+ * uint16_t htole16(uint16_t x); -+ * uint16_t be16toh(uint16_t x); -+ * uint16_t le16toh(uint16_t x); -+ * -+ * uint32_t htobe32(uint32_t x); -+ * uint32_t htole32(uint32_t x); -+ * uint32_t be32toh(uint32_t x); -+ * uint32_t le32toh(uint32_t x); -+ * -+ * uint64_t htobe64(uint64_t x); -+ * uint64_t htole64(uint64_t x); -+ * uint64_t be64toh(uint64_t x); -+ * uint64_t le64toh(uint64_t x); -+ * -+ * The header defines the following macro for OpenCL compatibility -+ * https://www.khronos.org/registry/cl/sdk/2.0/docs/man/xhtml/preprocessorDirectives.html -+ * -+ * __ENDIAN_LITTLE__ if BYTE_ORDER == LITTLE_ENDIAN then this -+ * macro is present for OpenCL compatibility -+ * -+ * The implementation provides a uniform interface to endian macros using only -+ * system headers on recent Linux, Darwin, FreeBSD, Solaris and Windows systems. -+ * -+ * This approach is intended to avoid the need for preflight configure scripts. -+ * An alternative approach would be to test compiler CPU architecture marcros. -+ * -+ * This header has had *limited* testing on recent C11/C++11 compilers and is -+ * based on the austin bug tracker interface, manpages, and headers present in -+ * Linux, FreeBSD, Windows, Solaris and Darwin. -+ * -+ * The header uses __builtin_bswapXX intrinsic with GCC/Clang (__GNUC__) on -+ * platforms that do not provide bswap16, bswap32, bswap64 (Darwin) -+ * -+ * Public Domain. -+ */ -+ -+#if HAVE_STDINT_H -+#include -+#endif -+ -+/* Linux / GLIBC */ -+#if defined(__linux__) || defined(__GLIBC__) -+#include -+#include -+#define __ENDIAN_DEFINED 1 -+#define __BSWAP_DEFINED 1 -+#define __HOSTSWAP_DEFINED 1 -+#define _BYTE_ORDER __BYTE_ORDER -+#define _LITTLE_ENDIAN __LITTLE_ENDIAN -+#define _BIG_ENDIAN __BIG_ENDIAN -+#define bswap16(x) bswap_16(x) -+#define bswap32(x) bswap_32(x) -+#define bswap64(x) bswap_64(x) -+#endif /* __linux__ || __GLIBC__ */ -+ -+/* BSD */ -+#if defined(__FreeBSD__) || defined(__NetBSD__) || \ -+ defined(__DragonFly__) || defined(__OpenBSD__) -+#include -+#define __ENDIAN_DEFINED 1 -+#define __BSWAP_DEFINED 1 -+#define __HOSTSWAP_DEFINED 1 -+#endif /* BSD */ -+ -+/* Solaris */ -+#if defined (sun) -+#include -+#include -+#define bswap16(x) BSWAP_16(x) -+#define bswap32(x) BSWAP_32(x) -+#define bswap64(x) BSWAP_64(x) -+/* sun headers don't set a value for _LITTLE_ENDIAN or _BIG_ENDIAN */ -+#if defined(_LITTLE_ENDIAN) -+#undef _LITTLE_ENDIAN -+#define _LITTLE_ENDIAN 1234 -+#define _BIG_ENDIAN 4321 -+#define _BYTE_ORDER _LITTLE_ENDIAN -+#elif defined(_BIG_ENDIAN) -+#undef _BIG_ENDIAN -+#define _LITTLE_ENDIAN 1234 -+#define _BIG_ENDIAN 4321 -+#define _BYTE_ORDER _BIG_ENDIAN -+#endif -+#define __ENDIAN_DEFINED 1 -+#endif /* sun */ -+ -+/* Windows */ -+#if defined(_WIN32) || defined(_MSC_VER) -+/* assumes all Microsoft targets are little endian */ -+#define _LITTLE_ENDIAN 1234 -+#define _BIG_ENDIAN 4321 -+#define _BYTE_ORDER _LITTLE_ENDIAN -+#define __ENDIAN_DEFINED 1 -+#endif /* _MSC_VER */ -+ -+/* OS X */ -+#if defined(__APPLE__) -+#include -+#define _BYTE_ORDER BYTE_ORDER -+#define _LITTLE_ENDIAN LITTLE_ENDIAN -+#define _BIG_ENDIAN BIG_ENDIAN -+#define __ENDIAN_DEFINED 1 -+#endif /* __APPLE__ */ -+ -+/* OpenCL */ -+#if defined (__OPENCL_VERSION__) -+#define _LITTLE_ENDIAN 1234 -+#define __BIG_ENDIAN 4321 -+#if defined (__ENDIAN_LITTLE__) -+#define _BYTE_ORDER _LITTLE_ENDIAN -+#else -+#define _BYTE_ORDER _BIG_ENDIAN -+#endif -+#define bswap16(x) as_ushort(as_uchar2(ushort(x)).s1s0) -+#define bswap32(x) as_uint(as_uchar4(uint(x)).s3s2s1s0) -+#define bswap64(x) as_ulong(as_uchar8(ulong(x)).s7s6s5s4s3s2s1s0) -+#define __ENDIAN_DEFINED 1 -+#define __BSWAP_DEFINED 1 -+#endif -+ -+/* Unknown */ -+#if !__ENDIAN_DEFINED -+#error Could not determine CPU byte order -+#endif -+ -+/* POSIX - http://austingroupbugs.net/view.php?id=162 */ -+#ifndef BYTE_ORDER -+#define BYTE_ORDER _BYTE_ORDER -+#endif -+#ifndef LITTLE_ENDIAN -+#define LITTLE_ENDIAN _LITTLE_ENDIAN -+#endif -+#ifndef BIG_ENDIAN -+#define BIG_ENDIAN _BIG_ENDIAN -+#endif -+ -+/* OpenCL compatibility - define __ENDIAN_LITTLE__ on little endian systems */ -+#if _BYTE_ORDER == _LITTLE_ENDIAN -+#if !defined (__ENDIAN_LITTLE__) -+#define __ENDIAN_LITTLE__ 1 -+#endif -+#endif -+ -+/* Byte swap macros */ -+#if !__BSWAP_DEFINED -+ -+#ifndef bswap16 -+/* handle missing __builtin_bswap16 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 */ -+#if defined __GNUC__ -+/* define bswap16(x) __builtin_bswap16(x) */ -+#else -+#define bswap16(x) ((uint16_t)((((uint16_t) (x) & 0xff00) >> 8) | \ -+ (((uint16_t) (x) & 0x00ff) << 8))) -+#endif -+#endif -+ -+#ifndef bswap32 -+#if defined __GNUC__ -+#define bswap32(x) __builtin_bswap32(x) -+#else -+#define bswap32(x) ((uint32_t)((((uint32_t) (x) & 0xff000000) >> 24) | \ -+ (((uint32_t) (x) & 0x00ff0000) >> 8) | \ -+ (((uint32_t) (x) & 0x0000ff00) << 8) | \ -+ (((uint32_t) (x) & 0x000000ff) << 24))) -+#endif -+#endif -+ -+#ifndef bswap64 -+#if defined __GNUC__ -+#define bswap64(x) __builtin_bswap64(x) -+#else -+#define bswap64(x) ((uint64_t)((((uint64_t) (x) & 0xff00000000000000ull) >> 56) | \ -+ (((uint64_t) (x) & 0x00ff000000000000ull) >> 40) | \ -+ (((uint64_t) (x) & 0x0000ff0000000000ull) >> 24) | \ -+ (((uint64_t) (x) & 0x000000ff00000000ull) >> 8) | \ -+ (((uint64_t) (x) & 0x00000000ff000000ull) << 8) | \ -+ (((uint64_t) (x) & 0x0000000000ff0000ull) << 24) | \ -+ (((uint64_t) (x) & 0x000000000000ff00ull) << 40) | \ -+ (((uint64_t) (x) & 0x00000000000000ffull) << 56))) -+#endif -+#endif -+ -+#endif -+ -+/* Host swap macros */ -+#ifndef __HOSTSWAP_DEFINED -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define htobe16(x) bswap16((x)) -+#define htole16(x) ((uint16_t)(x)) -+#define be16toh(x) bswap16((x)) -+#define le16toh(x) ((uint16_t)(x)) -+ -+#define htobe32(x) bswap32((x)) -+#define htole32(x) ((uint32_t)(x)) -+#define be32toh(x) bswap32((x)) -+#define le32toh(x) ((uint32_t)(x)) -+ -+#define htobe64(x) bswap64((x)) -+#define htole64(x) ((uint64_t)(x)) -+#define be64toh(x) bswap64((x)) -+#define le64toh(x) ((uint64_t)(x)) -+#elif __BYTE_ORDER == __BIG_ENDIAN -+#define htobe16(x) ((uint16_t)(x)) -+#define htole16(x) bswap16((x)) -+#define be16toh(x) ((uint16_t)(x)) -+#define le16toh(x) bswap16((x)) -+ -+#define htobe32(x) ((uint32_t)(x)) -+#define htole32(x) bswap32((x)) -+#define be32toh(x) ((uint32_t)(x)) -+#define le64toh(x) bswap64((x)) -+ -+#define htobe64(x) ((uint64_t)(x)) -+#define htole64(x) bswap64((x)) -+#define be64toh(x) ((uint64_t)(x)) -+#define le32toh(x) bswap32((x)) -+#endif -+#endif -+ -+ --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.