<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bedbcce66fa0a8dcaed0aafba07267e7fe4b4ac1">https://github.com/macports/macports-ports/commit/bedbcce66fa0a8dcaed0aafba07267e7fe4b4ac1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bedbcce66fa cgit: update to v1.2.3 (#8018)
</span>bedbcce66fa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bedbcce66fa0a8dcaed0aafba07267e7fe4b4ac1
</span>Author: Eric F <iEFdev@users.noreply.github.com>
AuthorDate: Mon Aug 10 13:15:20 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> cgit: update to v1.2.3 (#8018)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - A patch has been added to fix the build error until
</span><span style='display:block; white-space:pre;color:#404040;'> upstream adds it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60967
</span>---
www/cgit/Portfile | 68 ++++++++++++-----------
www/cgit/files/patch-add-memrchr.diff | 100 ++++++++++++++++++++++++++++++++++
2 files changed, 136 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/Portfile b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 911ef3ac2f9..5f8ef037143 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,47 +2,50 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name cgit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name cgit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.3
</span>
# See Makefile GIT_VER
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_version 2.18.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories www devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A fast web interface for the git source code management system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cgit is an attempt to create a fast web interface for the git scm, using a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builtin cache to decrease server io-pressure. It can run on any \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGI-capable web server.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_version 2.25.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories www devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A hyperfast web frontend for git repositories written in C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description cgit is an attempt to create a fast web interface for the Git SCM \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Source Code Management) using a builtin cache to decrease server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ io-pressure. It can run on any CGI-capable web server.
</span>
homepage https://git.zx2c4.com/cgit/
master_sites ${homepage}snapshot:cgit \
https://www.kernel.org/pub/software/scm/git:git
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> dist_subdir git
use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set cgit_distfile ${distfiles}
set git_distname git-${git_version}
set git_distfile ${git_distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${cgit_distfile}:cgit ${git_distfile}:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${cgit_distfile}:cgit ${git_distfile}:git
</span>
checksums ${cgit_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8057b3cbfde51d64272e01bf7325084677634a8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3c547c146340fb16d4134326e7524bfb28ffa681284f1e3914bde1c27a9182bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 89648 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4884b999302eb89afa67c73f07e8853f9402e681 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a5f12d2f66bd3629c8bc103ec8ec2301b292e97155d30a9a61884ea414a6da4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 90632 \
</span> ${git_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2fc27cb7eaf9d74d0d305ef97fc1c6f7ea14a75f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5102264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8ab476982440c2cc94c7d21f619320d74f117d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 222796cc6e3bf2f9fd765f8f097daa3c3999bb7865ac88a8c974d98182e29f26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5875548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for memrch: https://trac.macports.org/ticket/60967
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-add-memrchr.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:git \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span>
post-extract {
delete ${worksrcpath}/git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +59,9 @@ post-patch {
</span> reinplace "s|@GIT_URL@|file://${distpath}/${git_distfile}|g" ${worksrcpath}/cgit.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set user _www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set group _www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set user www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set group www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set user_group [expr {${os.platform} eq "darwin" && ${os.major} <= 8 ? "www" : "_www"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set user ${user_group}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set group ${user_group}
</span>
post-destroot {
xinstall -m 444 ${worksrcpath}/cgitrc.5.txt ${destroot}${prefix}/etc/cgitrc.sample
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,3 +87,8 @@ destroot.env {*}${build.env}
</span> livecheck.type regex
livecheck.url ${homepage}log/?h=master
livecheck.regex {>v([0-9.]+)<}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A sample config file have been placed in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ยป ${prefix}/etc/cgitrc.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/files/patch-add-memrchr.diff b/www/cgit/files/patch-add-memrchr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0620f2fbd6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/files/patch-add-memrchr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,100 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Comments from the original patch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macOS doesn't come with a memrchr() of its own, so let's provide an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implementation it can use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memrchr.c was taken from Apple's own open source site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://opensource.apple.com/source/sudo/sudo-87.80.2/sudo/lib/util/memrchr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It was minimally modified, so it would work for cgit:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - Removed #include "sudo_compat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - Renamed function from sudo_memrchr() to memrchr()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We can use this patch for now, until upstream has fixed it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../cgit-1.2.3.orig/cgit.h 2020-03-14 00:49:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./cgit.h 2020-08-08 20:46:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -395,4 +395,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *get_mimetype_for_filename(const char *filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef NEED_MEMRCHR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void *memrchr(const void *s, int c, size_t n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* CGIT_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur ../cgit-1.2.3.orig/cgit.mk ./cgit.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../cgit-1.2.3.orig/cgit.mk 2020-03-14 00:49:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./cgit.mk 2020-08-08 20:49:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,10 +63,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_LINUX_SENDFILE = YesPlease
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(uname_S),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IS_DARWIN = yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef HAVE_LINUX_SENDFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGIT_CFLAGS += -DHAVE_LINUX_SENDFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifdef IS_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGIT_CFLAGS += -DNEED_MEMRCHR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGIT_OBJ_NAMES += memrchr.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGIT_OBJ_NAMES += cgit.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGIT_OBJ_NAMES += cache.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGIT_OBJ_NAMES += cmd.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./memrchr.c 2020-08-08 21:17:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * SPDX-License-Identifier: ISC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright (c) 2007, 2010-2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Todd C. Miller <Todd.Miller@sudo.ws>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Permission to use, copy, modify, and distribute this software for any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * purpose with or without fee is hereby granted, provided that the above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * copyright notice and this permission notice appear in all copies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This is an open source non-commercial project. Dear PVS-Studio, please check it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef HAVE_MEMRCHR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Reverse memchr()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++memrchr(const void *s, int c, size_t n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const unsigned char *cp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (n != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp = (unsigned char *)s + n;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (*(--cp) == (unsigned char)c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (void *)cp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while (--n != 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (void *)0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* HAVE_MEMRCHR */
</span></pre><pre style='margin:0'>
</pre>