diff options
Diffstat (limited to 'www/cgit/patches')
| -rw-r--r-- | www/cgit/patches/CVS/Entries | 5 | ||||
| -rw-r--r-- | www/cgit/patches/CVS/Repository | 1 | ||||
| -rw-r--r-- | www/cgit/patches/CVS/Root | 1 | ||||
| -rw-r--r-- | www/cgit/patches/CVS/Tag | 1 | ||||
| -rw-r--r-- | www/cgit/patches/patch-Makefile | 31 | ||||
| -rw-r--r-- | www/cgit/patches/patch-cgit_mk | 11 | ||||
| -rw-r--r-- | www/cgit/patches/patch-filter_c | 20 | ||||
| -rw-r--r-- | www/cgit/patches/patch-setup_c | 22 |
8 files changed, 92 insertions, 0 deletions
diff --git a/www/cgit/patches/CVS/Entries b/www/cgit/patches/CVS/Entries new file mode 100644 index 0000000..5877bf3 --- /dev/null +++ b/www/cgit/patches/CVS/Entries @@ -0,0 +1,5 @@ +/patch-Makefile/1.9/Sat Aug 4 09:19:35 2018//TOPENBSD_7_0 +/patch-cgit_mk/1.1/Mon Jul 15 07:00:49 2013//TOPENBSD_7_0 +/patch-filter_c/1.3/Sat Aug 4 09:19:35 2018//TOPENBSD_7_0 +/patch-setup_c/1.1/Wed Mar 22 20:23:52 2017//TOPENBSD_7_0 +D diff --git a/www/cgit/patches/CVS/Repository b/www/cgit/patches/CVS/Repository new file mode 100644 index 0000000..a73903d --- /dev/null +++ b/www/cgit/patches/CVS/Repository @@ -0,0 +1 @@ +ports/www/cgit/patches diff --git a/www/cgit/patches/CVS/Root b/www/cgit/patches/CVS/Root new file mode 100644 index 0000000..175df2f --- /dev/null +++ b/www/cgit/patches/CVS/Root @@ -0,0 +1 @@ +anoncvs@obsdacvs.cs.toronto.edu:/cvs diff --git a/www/cgit/patches/CVS/Tag b/www/cgit/patches/CVS/Tag new file mode 100644 index 0000000..19a080a --- /dev/null +++ b/www/cgit/patches/CVS/Tag @@ -0,0 +1 @@ +TOPENBSD_7_0 diff --git a/www/cgit/patches/patch-Makefile b/www/cgit/patches/patch-Makefile new file mode 100644 index 0000000..f51ac50 --- /dev/null +++ b/www/cgit/patches/patch-Makefile @@ -0,0 +1,31 @@ +$OpenBSD: patch-Makefile,v 1.9 2018/08/04 09:19:35 kn Exp $ +Index: Makefile +--- Makefile.orig ++++ Makefile +@@ -2,11 +2,11 @@ all:: + + CGIT_VERSION = v1.2.3 + CGIT_SCRIPT_NAME = cgit.cgi +-CGIT_SCRIPT_PATH = /var/www/htdocs/cgit +-CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) +-CGIT_CONFIG = /etc/cgitrc +-CACHE_ROOT = /var/cache/cgit +-prefix = /usr/local ++CGIT_SCRIPT_PATH = /var/www/cgi-bin ++CGIT_DATA_PATH = /var/www/htdocs ++CGIT_CONFIG = /conf/cgitrc ++CACHE_ROOT = /tmp/cgit ++prefix = ${PREFIX} + libdir = $(prefix)/lib + filterdir = $(libdir)/cgit/filters + docdir = $(prefix)/share/doc/cgit +@@ -90,8 +90,6 @@ install: all + $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png + $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico + $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt + $(INSTALL) -m 0644 about.md $(DESTDIR)$(CGIT_DATA_PATH)/about.md +- $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) +- $(COPYTREE) filters/* $(DESTDIR)$(filterdir) + + install-doc: install-man install-html install-pdf + diff --git a/www/cgit/patches/patch-cgit_mk b/www/cgit/patches/patch-cgit_mk new file mode 100644 index 0000000..c74f62d --- /dev/null +++ b/www/cgit/patches/patch-cgit_mk @@ -0,0 +1,11 @@ +$OpenBSD: patch-cgit_mk,v 1.1 2013/07/15 07:00:49 jasper Exp $ +--- cgit.mk.orig Sun Jul 14 23:18:05 2013 ++++ cgit.mk Sun Jul 14 23:18:39 2013 +@@ -17,6 +17,7 @@ $(CGIT_PREFIX)VERSION: force-version + + # CGIT_CFLAGS is a separate variable so that we can track it separately + # and avoid rebuilding all of Git when these variables change. ++CGIT_CFLAGS += -L${LOCALBASE}/include + CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' + CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' + CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' diff --git a/www/cgit/patches/patch-filter_c b/www/cgit/patches/patch-filter_c new file mode 100644 index 0000000..20adde9 --- /dev/null +++ b/www/cgit/patches/patch-filter_c @@ -0,0 +1,20 @@ +$OpenBSD: patch-filter_c,v 1.3 2018/08/04 09:19:35 kn Exp $ +Wtf. +Index: filter.c +--- filter.c.orig ++++ filter.c +@@ -149,12 +149,13 @@ static struct cgit_filter *current_write_filter = NULL + + void cgit_init_filters(void) + { ++ return; + libc_write = dlsym(RTLD_NEXT, "write"); + if (!libc_write) + die("Could not locate libc's write function"); + } + +-ssize_t write(int fd, const void *buf, size_t count) ++ssize_t wtf__write(int fd, const void *buf, size_t count) + { + if (fd != STDOUT_FILENO || !filter_write) + return libc_write(fd, buf, count); diff --git a/www/cgit/patches/patch-setup_c b/www/cgit/patches/patch-setup_c new file mode 100644 index 0000000..c93edf7 --- /dev/null +++ b/www/cgit/patches/patch-setup_c @@ -0,0 +1,22 @@ +$OpenBSD: patch-setup_c,v 1.1 2017/03/22 20:23:52 landry Exp $ + +Dont openbsd dev/null, doesnt exist in the default chroot + +--- git/setup.c.orig Wed Mar 1 21:01:06 2017 ++++ git/setup.c Wed Mar 1 21:01:56 2017 +@@ -1024,6 +1024,7 @@ const char *resolve_gitdir(const char *suspect) + /* if any standard file descriptor is missing open it to /dev/null */ + void sanitize_stdfds(void) + { ++#if 0 + int fd = open("/dev/null", O_RDWR, 0); + while (fd != -1 && fd < 2) + fd = dup(fd); +@@ -1031,6 +1032,7 @@ void sanitize_stdfds(void) + die_errno("open /dev/null or dup failed"); + if (fd > 2) + close(fd); ++#endif + } + + int daemonize(void) |