From nobody Sat Dec 30 09:12:05 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2Gj13x0Wz55xJf; Sat, 30 Dec 2023 09:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2Gj135ktz4TJy; Sat, 30 Dec 2023 09:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703927525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lAzwVUnAl2OJAo98DfXVtLL0683j1Xfr0paP9n9/kU=; b=BnLk9T8jjOZrYyOUT/8gqgFmYPORhNSKSG5OqfoZ5lRA1aoTuVRtqGKZz5nc9s5ypvDyvv fQZtu1mh0o7OpJEAZqatxE3bFFRcISe2545DrJjJhe0kLRT105AGbv5VrYmcXQYODQKQKQ U0VoqZ5Ce5ti8FzsBZjzeX16PxG/6IkxS0UI2ot7U/Qaa27IfdIfHDXNnSVjzdrYN/zfHN yjAWQhqa5hYs5qH+nrP/dm4fiMM8o48gjuk80jEPZQx9SSU9gI1vJ6xouXXj2yn+Iq4Dgy g6U9YLrxuS1XeHn5fMI+NU/muc4OorYjc3rDpy+zeulyhwtkstJrqzDhly3XAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703927525; a=rsa-sha256; cv=none; b=kB7UilF/VzVjde1D5j2r/DL4BteNQfSp18ZJqW3Pz1+zCYmiSLhMfWoZj+GgkjYS6pBp6S VpnCzaWWTvxmSfhYGNzd6Qe6vRK+NDghT0HG2ax81c5uhOu/F2OWxu0ud5YMRsHZ3ESKrO NDIXtZUzTrlsSpdS9ThzvgL/TLxEcdetcVamxhlV9//GWYPkcOlPSuuoGu83MCI0YTIEVS HRNz64Arty871+sRq5PUWVcBDydUchF91olrCLtcmaPSuvlw3dUA0Nf9CUhVsWleJOqgq1 VmXxpWYguUlaapuMYOCF2wqoxGp/NlftjJaQV2Qv4O3Y0LUm4pp5rbGIIRY2Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703927525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lAzwVUnAl2OJAo98DfXVtLL0683j1Xfr0paP9n9/kU=; b=OTrdUbaDdTpdWYFgduWMy/ZBDgtjjy7g7wUbLXmIue7bsJ8NGikIhWlaBEhFbmn5tMcaOI A2qIKMkwFAy45GitK/MHYwxbBsuTDd+/P04ABI+L4irIvvXebWu5JeeFGmfeFThs512r/g izfS2IihzvqGRwgA98emXnOI+nC3TAw2B9XhgQRAOy6X0ofIa0XMXBUluFD88EbMP2L5gp 92COFCj2uabyU7VmXCU63IF8eamvtI/+hYTWCiGdPi5ljC1sXW5QNquyRPGy8qFEEEHn0O cpUyXg2NexCVqNK2ylgL9YJVOxkLe48C3mpAV3qzvTxAfk3zXLJ5daS15VWqng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2Gj12B5Yzks5; Sat, 30 Dec 2023 09:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BU9C5P1098464; Sat, 30 Dec 2023 09:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BU9C5Wu098460; Sat, 30 Dec 2023 09:12:05 GMT (envelope-from git) Date: Sat, 30 Dec 2023 09:12:05 GMT Message-Id: <202312300912.3BU9C5Wu098460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: f7fbe95c364e - main - finance/frontaccounting24: Update version 2.4.11=>2.4.12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7fbe95c364e8383d474aa72a0d6e9e1551322ca Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7fbe95c364e8383d474aa72a0d6e9e1551322ca commit f7fbe95c364e8383d474aa72a0d6e9e1551322ca Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 09:10:02 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-30 09:10:02 +0000 finance/frontaccounting24: Update version 2.4.11=>2.4.12 The port has hard coded DEFAULT_VERSIONS= php=8.0 which is very much unlikely to be. So for now update to the next version to add support for php 8.1 and later. This is required for the removal of php80 Approved by: portmgr (blanket) --- finance/frontaccounting24/Makefile | 27 +++++++++------------- finance/frontaccounting24/distinfo | 6 ++--- .../files/patch-includes_session.inc | 13 ++--------- .../files/xpatch-includes_session.inc | 11 --------- 4 files changed, 16 insertions(+), 41 deletions(-) diff --git a/finance/frontaccounting24/Makefile b/finance/frontaccounting24/Makefile index 2f905e5f006b..deb0370135fe 100644 --- a/finance/frontaccounting24/Makefile +++ b/finance/frontaccounting24/Makefile @@ -1,5 +1,5 @@ PORTNAME= frontaccounting24 -PORTVERSION= 2.4.11 +PORTVERSION= 2.4.12 DISTVERSIONSUFFIX= ${PORTVERSION} CATEGORIES= finance www MASTER_SITES= SF/${DIST_SUBDIR}/FrontAccounting%202.4/${PORTVERSION} @@ -16,32 +16,31 @@ LICENSE_FILE= ${WRKSRC}/doc/license.txt USES= cpe USE_PHP+= mysqli session ctype zlib -WRKSRC= ${WRKDIR}/${DIST_SUBDIR} NO_BUILD= yes SUB_FILES= pkg-deinstall pkg-message -PORTDOCSARGS= -DEFAULT_VERSIONS+= php=8.0 + +WRKSRC= ${WRKDIR}/${DIST_SUBDIR} OPTIONS_DEFINE= APACHE LIGHTTPD NGINX NLS DOCS OPTIONS_DEFAULT= APACHE MYSQL_SERVER - OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= MARIADB_CLIENT MYSQL_CLIENT MYSQL_SERVER -RG1_DESC= Database Connectivity MARIADB_CLIENT_DESC= MariaDB client connector support MYSQL_CLIENT_DESC= MySQL client connector support MYSQL_SERVER_DESC= MySQL server support NGINX_DESC= NGINX web server +RG1_DESC= Database Connectivity APACHE_USES= apache:run php:web +DOCS_VARS_OFF= PORTDOCSARGS='-not -path "./doc*"' LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd LIGHTTPD_USES= php:web +MARIADB_CLIENT_USES= mysql:106m +MYSQL_CLIENT_USES= mysql:client +MYSQL_SERVER_USES= mysql:server NGINX_RUN_DEPENDS= nginx:www/nginx NGINX_USES= php:web -MYSQL_SERVER_USES= mysql:server -MYSQL_CLIENT_USES= mysql:client -MARIADB_CLIENT_USES= mysql:106m NLS_USES= gettext .include @@ -54,13 +53,9 @@ USES+= php:cgi php:cli USE_PHP+= mysqli .endif -.if !${PORT_OPTIONS:MDOCS} -PORTDOCSARGS= '-not -path "./doc*"' -.endif - do-install: - @${MKDIR} ${STAGEDIR}${WWWDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${WWWDIR} ${PORTDOCSARGS}) + @${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${WWWDIR} ${PORTDOCSARGS}) .include diff --git a/finance/frontaccounting24/distinfo b/finance/frontaccounting24/distinfo index 40ae1e49161e..7bd9710bf637 100644 --- a/finance/frontaccounting24/distinfo +++ b/finance/frontaccounting24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648556109 -SHA256 (frontaccounting/frontaccounting-2.4.11.tar.gz) = 5ee17c063d68c1e84eeadf8b2a14b3bb2ca46db597fd508403c50644717addd9 -SIZE (frontaccounting/frontaccounting-2.4.11.tar.gz) = 1874152 +TIMESTAMP = 1703926379 +SHA256 (frontaccounting/frontaccounting-2.4.12.tar.gz) = 6e4a0eaf388550655dcb696668bac977a2cb2f5f3e78ee14b7d61879b7c3e808 +SIZE (frontaccounting/frontaccounting-2.4.12.tar.gz) = 1876122 diff --git a/finance/frontaccounting24/files/patch-includes_session.inc b/finance/frontaccounting24/files/patch-includes_session.inc index 600f915e66dd..74af7895836a 100644 --- a/finance/frontaccounting24/files/patch-includes_session.inc +++ b/finance/frontaccounting24/files/patch-includes_session.inc @@ -1,15 +1,6 @@ ---- includes/session.inc.orig 2021-12-04 13:45:21 UTC +--- includes/session.inc.orig 2022-07-13 06:00:09 UTC +++ includes/session.inc -@@ -397,7 +397,7 @@ foreach ($installed_extensions as $ext) - ini_set('session.gc_maxlifetime', 36000); // moved from below. - - $Session_manager = new SessionManager(); --$Session_manager->sessionStart('FA'.md5(dirname(__FILE__)), 0, '/', null, True); -+$Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); - - $_SESSION['SysPrefs'] = new sys_prefs(); - -@@ -431,9 +431,8 @@ if ($SysPrefs->error_logfile != '') { +@@ -432,9 +432,8 @@ if ($SysPrefs->error_logfile != '') { to avoid unexpeced session timeouts. Make sure this directory exists and is writable! */ diff --git a/finance/frontaccounting24/files/xpatch-includes_session.inc b/finance/frontaccounting24/files/xpatch-includes_session.inc deleted file mode 100644 index e0413dc31d1a..000000000000 --- a/finance/frontaccounting24/files/xpatch-includes_session.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- includes/session.inc.orig 2021-12-04 13:45:21 UTC -+++ includes/session.inc -@@ -397,7 +397,7 @@ foreach ($installed_extensions as $ext) - ini_set('session.gc_maxlifetime', 36000); // moved from below. - - $Session_manager = new SessionManager(); --$Session_manager->sessionStart('FA'.md5(dirname(__FILE__)), 0, '/', null, True); -+$Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); - - $_SESSION['SysPrefs'] = new sys_prefs(); -