Attachment 229878 Details for Bug 260207 – see commit msg

[patch] see commit msg

0005-rubygem-gollum-update-4.1.4-5.2.3.patch (text/plain), 6.04 KB, created by Sir l33tname on 2021-12-04 11:52:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sir l33tname

Created: 2021-12-04 11:52:40 UTC

Size: 6.04 KB

patch

obsolete

>From 9efd05979b4d1b5b7fd505f244a4e16543b38cfd Mon Sep 17 00:00:00 2001
>From: Sir l33tname <sirl33tname@gmail.com>
>Date: Sat, 4 Dec 2021 12:36:52 +0100
>Subject: [PATCH 5/5] rubygem-gollum update 4.1.4 -> 5.2.3
>
>---
> www/rubygem-gollum/Makefile            | 24 +++++++++++++++++-------
> www/rubygem-gollum/distinfo            |  6 +++---
> www/rubygem-gollum/files/gollum.in     | 12 ++++++------
> www/rubygem-gollum/files/patch-gemspec | 25 ++++++++++++++++---------
> 4 files changed, 42 insertions(+), 25 deletions(-)
>
>diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile
>index ebc20ffe71..93de3d5660 100644
>--- a/www/rubygem-gollum/Makefile
>+++ b/www/rubygem-gollum/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Sir l33tname <sirl33tname@gmail.com>
> 
> PORTNAME=	gollum
>-PORTVERSION=	4.1.4
>-PORTREVISION=	1
>+PORTVERSION=	5.2.3
> CATEGORIES=	www rubygems
> MASTER_SITES=	RG
> 
>@@ -13,12 +12,23 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	git:devel/git \
>-		rubygem-gemojione>=3.2:graphics/rubygem-gemojione \
>-		rubygem-gollum-lib>=4.2.10:www/rubygem-gollum-lib \
>-		rubygem-kramdown1>=1.9.0:textproc/rubygem-kramdown1 \
>+		rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \
>+		rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \
>+		rubygem-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \
>+		rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \
>+		rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \
> 		rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \
>-		rubygem-sinatra1>=1.4.4:www/rubygem-sinatra1 \
>-		rubygem-useragent>=0.16.2:devel/rubygem-useragent
>+		rubygem-sinatra>=2.1.0:www/rubygem-sinatra \
>+		rubygem-sinatra-contrib>=2.1.0:www/rubygem-sinatra-contrib \
>+		rubygem-mustache-sinatra>=1.0.1:devel/rubygem-mustache-sinatra \
>+		rubygem-useragent>=0.16.2:devel/rubygem-useragent \
>+		rubygem-octicons>=12.0.0:misc/rubygem-octicons \
>+		rubygem-sprockets>=3.7:devel/rubygem-sprockets \
>+		rubygem-sass>=3.5:textproc/rubygem-sass \
>+		rubygem-uglifier>=4.1:www/rubygem-uglifier \
>+		rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \
>+		rubygem-rss>=0.2.9:www/rubygem-rss \
>+		rubygem-webrick>=1.7.0:www/rubygem-webrick \
> 
> USES=		cpe gem
> CPE_VENDOR=	${PORTNAME}_project
>diff --git a/www/rubygem-gollum/distinfo b/www/rubygem-gollum/distinfo
>index 43f2735be8..f4f35a2e44 100644
>--- a/www/rubygem-gollum/distinfo
>+++ b/www/rubygem-gollum/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1547307875
>-SHA256 (rubygem/gollum-4.1.4.gem) = 87c2dc6c68c91a423727a59b9d3e78e9e4656e2308065a1d779dd1711c586146
>-SIZE (rubygem/gollum-4.1.4.gem) = 2106880
>+TIMESTAMP = 1638085846
>+SHA256 (rubygem/gollum-5.2.3.gem) = 5dad0200fbb2203c588aca350fe0543e66494f897c2bc95ed457642333a2b7fd
>+SIZE (rubygem/gollum-5.2.3.gem) = 4806656
>diff --git a/www/rubygem-gollum/files/gollum.in b/www/rubygem-gollum/files/gollum.in
>index 6f3d6d2953..cd24069b85 100644
>--- a/www/rubygem-gollum/files/gollum.in
>+++ b/www/rubygem-gollum/files/gollum.in
>@@ -9,19 +9,19 @@
> # to enable this service:
> #
> # gollum_enable (bool):    Set to NO by default.
>-#                                Set it to YES to enable.
>+#                          Set it to YES to enable.
> #
> # gollum_path              Set it to the location where 
>-#                                your git repo is located.
>+#                          your git repo is located.
> #
> # gollum_user              User to run command as 
>-#                                  Default is root
>+#                          Default is root
> #
> # gollum_ip                Set the IP address gollum listens on
>-#                                  Default is "0.0.0.0"
>+#                          Default is "0.0.0.0"
> #
> # gollum_port              Set the IP address gollum listens on
>-#                                  Default is "80"
>+#                          Default is "80"
> 
> . /etc/rc.subr
> 
>@@ -43,7 +43,7 @@ load_rc_config $name
> 
> pidfile=/var/run/${name}.pid
> command="/usr/sbin/daemon"
>-command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} --live-preview ${gollum_path}"
>+command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} ${gollum_path}"
> 
> load_rc_config $name
> run_rc_command "$1"
>diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec
>index 061489f235..8edc9a0f9b 100644
>--- a/www/rubygem-gollum/files/patch-gemspec
>+++ b/www/rubygem-gollum/files/patch-gemspec
>@@ -1,11 +1,18 @@
>---- gollum.gemspec.orig	2019-02-07 15:28:31 UTC
>+--- gollum.gemspec.orig	2021-12-04 11:08:45 UTC
> +++ gollum.gemspec
>-@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
>- 
>-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
>-       s.add_runtime_dependency(%q<gollum-lib>.freeze, ["~> 4.2", ">= 4.2.10"])
>--      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
>-+      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9"])
>-       s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.4"])
>-       s.add_runtime_dependency(%q<mustache>.freeze, [">= 0.99.5", "< 1.0.0"])
>+@@ -33,13 +33,12 @@ Gem::Specification.new do |s|
>+       s.add_runtime_dependency(%q<mustache-sinatra>.freeze, ["~> 1.0"])
>        s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
>+       s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 4.1"])
>+-      s.add_runtime_dependency(%q<octicons>.freeze, ["~> 12.0"])
>++      s.add_runtime_dependency(%q<octicons>.freeze, ["~> 16.0"])
>+       s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.7"])
>+       s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.5"])
>+-      s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2"])
>++      s.add_runtime_dependency(%q<uglifier>.freeze, [">= 4.1"])
>+       s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2"])
>+       s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.2.9"])
>+-      s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0"])
>+       s.add_runtime_dependency(%q<webrick>.freeze, ["~> 1.7"])
>+       s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
>+       s.add_development_dependency(%q<shoulda>.freeze, ["~> 3.6.0"])
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 260207: 229878 | 229879 | 229880 | 229881 | 229882 | 229883 | 230119 | 230378 | 231247 | 231250