[patch] update cgit to 1.1

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[patch] update cgit to 1.1

Fritjof Bornebusch
Hi,

here is a patch that updates cgit from 1.0 to 1.1.

If I use cgit 1.0 with httpd(8) and slowcgi(8) it works as expected.
But if I update cgit to 1.1 than I get the following error:
# httpd -d -vvv            
startup
server_privinit: adding server default
socket_rlimit: max open files 1024
socket_rlimit: max open files 1024
socket_rlimit: max open files 1024
server_launch: configuring server default
server_launch: configuring server default
server_launch: running server default
server_launch: running server default
server_launch: configuring server default
server_launch: running server default
fatal: open /dev/null or dup failed: No such file or directory

default 127.0.0.1 - - [14/Mar/2017:22:44:04 +0100] "GET /dec.git/about/ HTTP/1.1" 500 0
server default, client 1 (1 active), 127.0.0.1:28801 -> 127.0.0.1, empty stdout (500 Internal Server Error)

I don't know exactly if there is a relation between the error and cgit-1.1, but
works with nginx(8) and slowcgi(8) as expected - testet on amd64.
Maybe someone else can help me with that.

--f.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/cgit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 17 Jun 2016 07:22:39 -0000 1.21
+++ Makefile 14 Mar 2017 21:50:00 -0000
@@ -2,11 +2,11 @@
 
 COMMENT = web frontend for git repositories
 
-DISTNAME = cgit-1.0
+DISTNAME = cgit-1.1
 CATEGORIES = www devel
 
 DISTFILES = ${DISTNAME}.tar.gz:0 \
- git-2.8.3.tar.gz:1
+ git-2.10.2.tar.gz:1
 
 MASTER_SITES0 = http://git.zx2c4.com/cgit/snapshot/
 MASTER_SITES1 = https://www.kernel.org/pub/software/scm/git/
@@ -20,7 +20,7 @@ USE_GMAKE = yes
 LIB_DEPENDS = converters/libiconv
 
 PREFIX = ${VARBASE}/www
-MAKE_FLAGS += V=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib'
+MAKE_FLAGS += NO_GETTEXT=1 V=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib'
 
 post-extract:
  rmdir ${WRKSRC}/git
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/cgit/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 17 Jun 2016 07:22:39 -0000 1.10
+++ distinfo 14 Mar 2017 21:50:00 -0000
@@ -1,4 +1,4 @@
-SHA256 (cgit-1.0.tar.gz) = 56yIddhatPaqQc3fGB3JjAuoBI6HdFLOtEAcPucvpPQ=
-SHA256 (git-2.8.3.tar.gz) = La1Qx1gznW9SNTCdtiDlEkngAA/zSqLyrLy4TCEj7Qk=
-SIZE (cgit-1.0.tar.gz) = 105139
-SIZE (git-2.8.3.tar.gz) = 5847849
+SHA256 (cgit-1.1.tar.gz) = 9A3soz5VbJohi73Ce9nEd62ZxwhjkjCWhtIWkB3RDTs=
+SHA256 (git-2.10.2.tar.gz) = PX7yddgLl6qmHztr6dPcUWIC5vb12IXywJtZ66WS3MQ=
+SIZE (cgit-1.1.tar.gz) = 105738
+SIZE (git-2.10.2.tar.gz) = 6065116
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/cgit/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile 17 Jun 2016 07:22:39 -0000 1.7
+++ patches/patch-Makefile 14 Mar 2017 21:50:00 -0000
@@ -1,9 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.7 2016/06/17 07:22:39 landry Exp $
---- Makefile.orig Tue Jun  7 14:45:04 2016
-+++ Makefile Fri Jun 17 07:30:53 2016
-@@ -2,11 +2,11 @@ all::
+--- /tmp/cgit-1.1/Makefile Wed Nov 23 05:24:36 2016
++++ Makefile Tue Mar 14 12:03:33 2017
+@@ -2,11 +2,11 @@
 
- CGIT_VERSION = v1.0
+ CGIT_VERSION = v1.1
  CGIT_SCRIPT_NAME = cgit.cgi
 -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 -CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -18,12 +17,12 @@ $OpenBSD: patch-Makefile,v 1.7 2016/06/1
  libdir = $(prefix)/lib
  filterdir = $(libdir)/cgit/filters
  docdir = $(prefix)/share/doc/cgit
-@@ -84,8 +84,6 @@ install: all
+@@ -84,8 +84,6 @@
  $(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 0755 -d $(DESTDIR)$(filterdir)
-- $(COPYTREE)  filters/* $(DESTDIR)$(filterdir)
+- $(COPYTREE) filters/* $(DESTDIR)$(filterdir)
 
  install-doc: install-man install-html install-pdf
 

Reply | Threaded
Open this post in threaded view
|

Re: [patch] update cgit to 1.1

Stuart Henderson
On 2017/03/14 22:55, Fritjof Bornebusch wrote:
> here is a patch that updates cgit from 1.0 to 1.1.

See the thread "UPDATE: www/cgit 1.1" in ports@ archives.