Attachment 251315 Details for Bug 279607 – [PATCH] www/archiva: update 2.2.3 → 2.2.10

[patch] [PATCH] www/archiva: update 2.2.3 → 2.2.10

0001-www-archiva-update-2.2.3-2.2.10.patch (text/plain), 3.10 KB, created by Älven on 2024-06-09 12:09:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2024-06-09 12:09:37 UTC

Size: 3.10 KB

patch

obsolete

>From c389e5d31751d3275e71a2818a2c11014d672ead Mon Sep 17 00:00:00 2001
>From: Ãlven <alster@vinterdalen.se>
>Date: Sun, 9 Jun 2024 16:07:49 +0400
>Subject: [PATCH] www/archiva: update 2.2.3 â 2.2.10
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> www/archiva/Makefile                | 16 ++++++++--------
> www/archiva/distinfo                |  6 +++---
> www/archiva/files/patch-bin_archiva | 21 ++++++++++-----------
> 3 files changed, 21 insertions(+), 22 deletions(-)
>
>diff --git a/www/archiva/Makefile b/www/archiva/Makefile
>index 0dad121c36e6..cd5fc6f1a812 100644
>--- a/www/archiva/Makefile
>+++ b/www/archiva/Makefile
>@@ -1,12 +1,12 @@
> PORTNAME=	archiva
>-PORTVERSION=	2.2.3
>+PORTVERSION=	2.2.10
> CATEGORIES=	www java
>-MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}/binaries
>+MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTVERSION}/binaries/
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
> 
> MAINTAINER=	freebsd@dussan.org
> COMMENT=	Extensible repository management software
>-WWW=		https://archiva.apache.org
>+WWW=		https://archiva.apache.org/
> 
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
>@@ -20,16 +20,16 @@ USE_JAVA=	yes
> 
> USE_RC_SUBR=	${PORTNAME}
> 
>-PLIST_SUB=	ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
>-		ARCHIVA_GROUP=${GROUPS} \
>-		ARCHIVA_HOME=${DATADIR} \
>-		ARCHIVA_USER=${USERS}
>-
> NO_ARCH=	yes
> NO_BUILD=	yes
> 
> WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
> 
>+PLIST_SUB=	ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
>+		ARCHIVA_GROUP=${GROUPS} \
>+		ARCHIVA_HOME=${DATADIR} \
>+		ARCHIVA_USER=${USERS}
>+
> post-patch:
> 	@${REINPLACE_CMD} \
> 		-e 's|%%BASEDIR%%|${PREFIX}/${PORTNAME}|' \
>diff --git a/www/archiva/distinfo b/www/archiva/distinfo
>index 94cb975c07ad..03d968999766 100644
>--- a/www/archiva/distinfo
>+++ b/www/archiva/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1502079137
>-SHA256 (apache-archiva-2.2.3-bin.tar.gz) = cf90d097e7c2763f6ff8df458b64be0348b35847de8b238c3e1e28e006da8bad
>-SIZE (apache-archiva-2.2.3-bin.tar.gz) = 69995241
>+TIMESTAMP = 1717933026
>+SHA256 (apache-archiva-2.2.10-bin.tar.gz) = 9d468f5cd3d7f6841e133e853fc24e73fb62397091f1bb3601b6f157a5eadf77
>+SIZE (apache-archiva-2.2.10-bin.tar.gz) = 68419100
>diff --git a/www/archiva/files/patch-bin_archiva b/www/archiva/files/patch-bin_archiva
>index 594954dfd7ad..8fac4d65a3a8 100644
>--- a/www/archiva/files/patch-bin_archiva
>+++ b/www/archiva/files/patch-bin_archiva
>@@ -1,14 +1,13 @@
>---- bin/archiva.orig    2018-06-30 21:13:59.141026000 +0200
>-+++ bin/archiva 2018-06-30 21:16:04.098265000 +0200
>-@@ -41,6 +41,7 @@ APP_NAME="archiva"
>- APP_LONG_NAME="Apache Archiva"
>- 
>- # discover BASEDIR
>-+BASEDIR="%%LOCALBASE%%/archiva"
>- BASEDIR=`dirname "$0"`/..
>- BASEDIR=`(cd "$BASEDIR"; pwd)`
>- ls -l "$0" | grep -e '->' > /dev/null 2>&1
>-@@ -57,10 +58,9 @@ if [ $? = 0 ]; then
>+--- bin/archiva.orig	2023-03-15 23:27:06 UTC
>++++ bin/archiva
>+@@ -42,6 +42,7 @@ if [ -z "$ARCHIVA_BASE" ]; then
>+
>+ if [ -z "$ARCHIVA_BASE" ]; then
>+   # discover BASEDIR
>++  BASEDIR="%%LOCALBASE%%/archiva"
>+   BASEDIR=`dirname "$0"`/..
>+   BASEDIR=`(cd "$BASEDIR"; pwd)`
>+   ls -l "$0" | grep -e '->' > /dev/null 2>&1
>  fi
>  
>  
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 279607: 251315 | 251317 | 251318