pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/geeklog www/geeklog: update to 2.2.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/5602da574b5e
branches: trunk
changeset: 390604:5602da574b5e
user: taca <taca%pkgsrc.org@localhost>
date: Fri Dec 23 13:47:42 2022 +0000
description:
www/geeklog: update to 2.2.2
This is a leaf package.
Please refer <https://www.geeklog.net/> for changes before 2.2.2.
2.2.2 (2022-09-27)
Geeklog v2.2.2 is now available for download and is the recommended version
for all production sites. An update package is also available that contains
only the files needed to upgrade from Geeklog v2.2.1sr1 to 2.2.2.
This version of Geeklog now fully supports PHP v8.1. The minimum system
requirements for installing Geeklog v2.2.2 is:
* PHP v5.6.4 or higher (PHP 8.1 is supported)
* MySQL v4.1.2 or higher (MySQL 5 recommended)
* Postgresql v9.1.7 or later
There was 95 closed issues for this version of Geeklog which resulted in 468
code commits (with 2,342 changed files). The major new features,
improvements and fixes in this version include:
* [Feature] Added Top 10 Likes and Dislikes to User Profile
* [Feature] Added Likes Control to Static Pages and Polls
* [Feature] Added Error Limit for submissions that works similar to Speed
Limit. Ban plugin v2.0.4 supports this feature
* [Feature] Geeklog Core emails now use templates (for HTML and plain text)
and are sent as HTML by default
* [Feature] Add an option to anonymize IP addresses and APIs to handle them
* [Feature] Added redirects in Routing Manager
* [Feature] reCAPTCHA Plugin support reCAPTCHA v3
* [Improvement] Support for PHP 8.1
* [Improvement] Now uses PHPMailer to send emails (replaces abandoned
Swiftmailer)
* [Improvement] Added Persian language and dropped support for languages
that have not received new translations in a while
* [Improvement] Removed unused user settings and cleaned up user tables
structure
* [Improvement] Sitemap is now updated and not completely recreated each
time something changes
* [Bug] Added missing postmode field to Admin User Editor
* [Bug] After logging out of one user account, cannot log into different
user account in the same browser
* [Bug] Fixed Staticpage Editor Doesn't Remember Some Settings on Reload of
Editor
* [Bug] Handling of Zip Files that have Files with Names not Compatible with
the Web Servers OS
... as well as a lot of other improvements and bug fixes. The complete list
can be found on Github and in the history text file located in the docs
directory of this release.
In the next month or so we plan to release a number of updated 3rd party
plugins that include bug fixes, support for PHP v8.1, and support for the
latest Geeklog v2.2.2 features (where needed). This includes:
* Autotags
* Ban
* Downloads
* FAQ and FAQMan
* Forum (the new version will only work with Geeklog v2.2.2)
* GUS
* Media Gallery
* Menu
* Messenger
* Net Tools
* Searchrank
These plugins can be found on Github in our Geeklog Plugins Repository.
Most are currently in testing and have close to final code. Feel free to
test these updated plugins and provide any feedback.
diffstat:
www/geeklog/Makefile | 98 +-
www/geeklog/PLIST | 6025 ++++++---
www/geeklog/distinfo | 13 +-
www/geeklog/options.mk | 20 +
www/geeklog/patches/patch-aa | 21 -
www/geeklog/patches/patch-ak | 14 -
www/geeklog/patches/patch-cron-emailgeeklogdailydigest | 12 +
www/geeklog/patches/patch-cron-emailgeeklogdatabasebackup | 12 +
www/geeklog/patches/patch-public__html_admin_install_configinfo.php | 13 +
9 files changed, 3794 insertions(+), 2434 deletions(-)
diffs (truncated from 7235 to 300 lines):
diff -r 5d0589796d15 -r 5602da574b5e www/geeklog/Makefile
--- a/www/geeklog/Makefile Fri Dec 23 13:39:57 2022 +0000
+++ b/www/geeklog/Makefile Fri Dec 23 13:47:42 2022 +0000
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:20 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2022/12/23 13:47:42 taca Exp $
#
DISTNAME= geeklog-${VER}
PKGNAME= ${PHP_PKG_PREFIX}-geeklog-${VER:C/(sr|-)/./g}
CATEGORIES= www
-MASTER_SITES= https://www.geeklog.net/filemgmt/upload_dir/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=Geeklog-Core/}
+GITHUB_PROJECT= geeklog
+GITHUB_RELEASE= v${VER}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.geeklog.net/
COMMENT= PHP/MySQL based application for managing dynamic web content
LICENSE= gnu-gpl-v2
-DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
-DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=4.3.0:../../databases/php-mysqli
+DEPENDS+= ${PHP_PKG_PREFIX}-bz2>=7.4.0:../../archivers/php-bz2
+DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=7.4.0:../../converters/php-mbstring
+PHP_VERSIONS_ACCEPTED= 56 74 80 81
+
+EXTRACT_DIR= ${WRKSRC}
USE_TOOLS+= pax
-VER= 2.1.1
+VER= 2.2.2
NO_BUILD= YES
PKG_GROUPS_VARS+= APACHE_GROUP
@@ -24,7 +29,9 @@
CHECK_PERMS_SKIP= ${GEEKLOG_PUB}/backend ${GEEKLOG_PUB}/images/*
-GL_SYS= emailgeeklogstories language plugins readme sql system
+GL_SYS= cron-emailgeeklogdailydigest \
+ cron-emailgeeklogdatabasebackup language plugins \
+ readme sql system
GL_TMPL_SUB= backend images/articles images/library images/topics \
images/userphotos
@@ -65,27 +72,93 @@
GL_DOC=${GL_DOC:Q} \
GL_EG=${GL_EG:Q}
-.include "../../www/geeklog/Makefile.common"
+# Geeklog system
+GL_ADMIN= ${GEEKLOG_BASE}/admin
+GL_TMPL= ${GEEKLOG_BASE}/default
+
+# for Geeklog public area
+GL_DOC= share/doc/geeklog
+GL_EG= share/examples/geeklog
PKG_SYSCONFSUBDIR?= geeklog
SUBST_CLASSES+= paths
SUBST_FILES.paths+= ${WRKDIR}/README
-SUBST_FILES.paths+= ${WRKSRC}/emailgeeklogstories
SUBST_FILES.paths+= ${WRKDIR}/geeklog.conf
+SUBST_FILES.paths+= cron-emailgeeklogdailydigest
+SUBST_FILES.paths+= cron-emailgeeklogdatabasebackup
SUBST_VARS.paths= GEEKLOG_BASE
SUBST_VARS.paths+= GEEKLOG_PUB
SUBST_VARS.paths+= GEEKLOG_SITESUBDIR
SUBST_VARS.paths+= PKG_SYSCONFDIR
SUBST_VARS.paths+= PREFIX
.if empty(GEEKLOG_SITEBASE)
-SUBST_SED.conf+= -e '/^Alias/s,^,\#,'
+SUBST_SED.paths+= -e '/^Alias/s,^,\#,'
.endif
SUBST_STAGE.paths= post-configure
INSTALLATION_DIRS= ${GEEKLOG_BASE} ${GEEKLOG_PUB} ${GL_TMPL}/images \
share/examples/geeklog ${GL_DOC} ${GL_EG}
+.include "../../lang/php/phpversion.mk"
+
+.if ${PKG_PHP_VERSION} == 74
+DEPENDS+= ${PHP_PKG_PREFIX}-json>=7.4.0:../../textproc/php-json
+.endif
+
+.include "options.mk"
+
+GEEKLOG_BASE?= share/geeklog
+
+# Geeklog's basic directories.
+GEEKLOG_PUB?= share/httpd/geeklog
+
+# access Geeklog as its own directory?
+GEEKLOG_SITEBASE?= geeklog
+
+BUILD_DEFS+= GEEKLOG_BASE GEEKLOG_PUB GEEKLOG_SITEBASE
+
+.if !empty(GEEKLOG_SITEBASE)
+GEEKLOG_SITESUBDIR= /${GEEKLOG_SITEBASE}
+.endif
+
+PRINT_PLIST_AWK+= /^${GL_ADMIN:S|/|\\/|g}/ \
+ { gsub(/${GL_ADMIN:S|/|\\/|g}/, "$${GL_ADMIN}"); \
+ print; next; }
+PRINT_PLIST_AWK+= /^${GL_TMPL:S|/|\\/|g}/ \
+ { gsub(/${GL_TMPL:S|/|\\/|g}/, "$${GL_TMPL}"); \
+ print; next; }
+PRINT_PLIST_AWK+= /^${GL_DOC:S|/|\\/|g}/ \
+ { gsub(/${GL_DOC:S|/|\\/|g}/, "$${GL_DOC}"); \
+ print; next; }
+PRINT_PLIST_AWK+= /^${GL_EG:S|/|\\/|g}/ \
+ { gsub(/${GL_EG:S|/|\\/|g}/, "$${GL_EG}"); \
+ print; next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}\/backups/ \
+ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}\/data/ { next; }
+PRINT_PLIST_AWK+= /^?${GEEKLOG_BASE:S|/|\\/|g}\/logs/ { next; }
+PRINT_PLIST_AWK+= /${GEEKLOG_BASE:S|/|\\/|g}\/db-config.php/ { next; }
+PRINT_PLIST_AWK+= /${GEEKLOG_BASE:S|/|\\/|g}\/system\/lib-custom.php/ \
+ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}/ \
+ { gsub(/${GEEKLOG_BASE:S|/|\\/|g}/, "$${GEEKLOG_BASE}"); \
+ print; next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/admin/ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/backend/ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/articles/ \
+ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/library/ \
+ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/topics/ \
+ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/userphotos/ \
+ { next; }
+PRINT_PLIST_AWK+= /${GEEKLOG_PUB:S|/|\\/|g}\/siteconfig.php/ { next; }
+PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}/ \
+ { gsub(/${GEEKLOG_PUB:S|/|\\/|g}/, "$${GEEKLOG_PUB}"); \
+ print; next; }
+
post-extract:
${CP} ${FILESDIR}/README ${FILESDIR}/geeklog.conf ${WRKDIR}
@@ -94,8 +167,8 @@
cd ${WRKSRC}/public_html; \
${FIND} ${GL_TMPL_SUB} -type f -exec ${CHMOD} -x {} \;
${CHMOD} 0664 ${WRKSRC}/public_html/backend/geeklog.rss
- cd ${WRKSRC}/system; \
- ${FIND} pear -type f -exec ${CHMOD} 0644 {} \;
+ cd ${WRKSRC}/system/vendor/bin; \
+ ${FIND} . -type f -exec ${CHMOD} 0644 {} \;
do-install:
${INSTALL_DATA} ${WRKDIR}/README ${DESTDIR}${PREFIX}/${GL_DOC}
@@ -112,7 +185,7 @@
${RM} -rf admin
.for d in ${GL_TMPL_SUB}
cd ${WRKSRC}/public_html; \
- if [ -d ${d} ]; then \
+ if ${TEST} -d ${d}; then \
pax -rw ${d} ${DESTDIR}${PREFIX}/${GL_TMPL}; \
${RM} -rf ${d}; \
fi
@@ -120,5 +193,4 @@
cd ${WRKSRC}/public_html; pax -rw . ${DESTDIR}${PREFIX}/${GEEKLOG_PUB}
.include "../../mk/apache.mk"
-.include "../../lang/php/phpversion.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5d0589796d15 -r 5602da574b5e www/geeklog/PLIST
--- a/www/geeklog/PLIST Fri Dec 23 13:39:57 2022 +0000
+++ b/www/geeklog/PLIST Fri Dec 23 13:47:42 2022 +0000
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.21 2015/12/13 14:55:35 taca Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/12/23 13:47:42 taca Exp $
${GL_DOC}/README
${GL_EG}/db-config.php
${GL_EG}/geeklog.conf
${GL_EG}/lib-custom.php
${GL_EG}/siteconfig.php
+${GL_ADMIN}/article.php
${GL_ADMIN}/auth.inc.php
${GL_ADMIN}/block.php
${GL_ADMIN}/clearctl.php
+${GL_ADMIN}/comment.php
${GL_ADMIN}/configuration.php
${GL_ADMIN}/configuration_validation.php
${GL_ADMIN}/database.php
@@ -14,27 +16,51 @@
${GL_ADMIN}/group.php
${GL_ADMIN}/index.php
${GL_ADMIN}/install/bigdump.php
+${GL_ADMIN}/install/classes/Common.php
+${GL_ADMIN}/install/classes/Install.php
+${GL_ADMIN}/install/classes/Migrate.php
+${GL_ADMIN}/install/classes/Upgrade.php
+${GL_ADMIN}/install/classes/db.class.php
+${GL_ADMIN}/install/classes/installer.class.php
+${GL_ADMIN}/install/classes/micro_template.class.php
+${GL_ADMIN}/install/classes/mysql.class.php
+${GL_ADMIN}/install/classes/mysqli.class.php
+${GL_ADMIN}/install/classes/pgsql.class.php
${GL_ADMIN}/install/config-install.php
${GL_ADMIN}/install/configinfo.php
+${GL_ADMIN}/install/devel-db-update.php
${GL_ADMIN}/install/help.php
${GL_ADMIN}/install/index.php
-${GL_ADMIN}/install/info.php
${GL_ADMIN}/install/install-plugins.php
+${GL_ADMIN}/install/language/_list.php
${GL_ADMIN}/install/language/chinese_simplified_utf-8.php
${GL_ADMIN}/install/language/chinese_traditional_utf-8.php
${GL_ADMIN}/install/language/english.php
-${GL_ADMIN}/install/language/german.php
+${GL_ADMIN}/install/language/english_utf-8.php
+${GL_ADMIN}/install/language/german_utf-8.php
${GL_ADMIN}/install/language/hebrew_utf-8.php
${GL_ADMIN}/install/language/japanese_utf-8.php
-${GL_ADMIN}/install/language/polish.php
-${GL_ADMIN}/install/layout/header-bg.png
+${GL_ADMIN}/install/layout/index.thtml
+${GL_ADMIN}/install/layout/language_selector.thtml
${GL_ADMIN}/install/layout/logo.png
+${GL_ADMIN}/install/layout/migrate_prompt_error.thtml
+${GL_ADMIN}/install/layout/return_form_data.thtml
+${GL_ADMIN}/install/layout/select_installation_method.thtml
+${GL_ADMIN}/install/layout/step1-migrate.thtml
+${GL_ADMIN}/install/layout/step1.thtml
+${GL_ADMIN}/install/layout/step2-install.thtml
+${GL_ADMIN}/install/layout/step2-upgrade.thtml
+${GL_ADMIN}/install/layout/step3-install.thtml
+${GL_ADMIN}/install/layout/style-rtl.css
${GL_ADMIN}/install/layout/style.css
-${GL_ADMIN}/install/lib-install.php
-${GL_ADMIN}/install/lib-upgrade.php
-${GL_ADMIN}/install/migrate.php
+${GL_ADMIN}/install/layout/success.thtml
+${GL_ADMIN}/install/layout/system_path.thtml
+${GL_ADMIN}/install/layout/system_path_error.thtml
+${GL_ADMIN}/install/layout/upgrade_prompt_error.thtml
+${GL_ADMIN}/install/layout/upgrade_prompt_warning.thtml
${GL_ADMIN}/install/rescue.php
${GL_ADMIN}/install/success.php
+${GL_ADMIN}/language.php
${GL_ADMIN}/logviewer.php
${GL_ADMIN}/mail.php
${GL_ADMIN}/moderation.php
@@ -43,46 +69,29 @@
${GL_ADMIN}/plugins/links/category.php
${GL_ADMIN}/plugins/links/index.php
${GL_ADMIN}/plugins/polls/index.php
+${GL_ADMIN}/plugins/recaptcha/docs/docstyle.css
+${GL_ADMIN}/plugins/recaptcha/docs/english/config.html
+${GL_ADMIN}/plugins/recaptcha/docs/english/install.html
+${GL_ADMIN}/plugins/recaptcha/docs/japanese/config.html
+${GL_ADMIN}/plugins/recaptcha/docs/japanese/install.html
+${GL_ADMIN}/plugins/recaptcha/images/recaptcha.png
+${GL_ADMIN}/plugins/recaptcha/index.php
${GL_ADMIN}/plugins/spamx/images/spamx.png
${GL_ADMIN}/plugins/spamx/index.php
${GL_ADMIN}/plugins/staticpages/index.php
+${GL_ADMIN}/plugins/xmlsitemap/index.php
+${GL_ADMIN}/router.php
${GL_ADMIN}/sectest.php
-${GL_ADMIN}/story.php
${GL_ADMIN}/syndication.php
${GL_ADMIN}/topic.php
${GL_ADMIN}/trackback.php
${GL_ADMIN}/user.php
${GL_TMPL}/backend/geeklog.rss
${GL_TMPL}/images/articles/index.html
+${GL_TMPL}/images/articles/no_image_thumbnail.png
${GL_TMPL}/images/library/File/test.pdf
${GL_TMPL}/images/library/Flash/index.html
${GL_TMPL}/images/library/Image/_thumbs/index.html
-${GL_TMPL}/images/library/Image/icons/ai.gif
-${GL_TMPL}/images/library/Image/icons/avi.gif
-${GL_TMPL}/images/library/Image/icons/bmp.gif
-${GL_TMPL}/images/library/Image/icons/cs.gif
-${GL_TMPL}/images/library/Image/icons/default.icon.gif
-${GL_TMPL}/images/library/Image/icons/dll.gif
-${GL_TMPL}/images/library/Image/icons/doc.gif
-${GL_TMPL}/images/library/Image/icons/exe.gif
-${GL_TMPL}/images/library/Image/icons/fla.gif
-${GL_TMPL}/images/library/Image/icons/gif.gif
-${GL_TMPL}/images/library/Image/icons/htm.gif
-${GL_TMPL}/images/library/Image/icons/html.gif
-${GL_TMPL}/images/library/Image/icons/jpg.gif
-${GL_TMPL}/images/library/Image/icons/js.gif
-${GL_TMPL}/images/library/Image/icons/mdb.gif
-${GL_TMPL}/images/library/Image/icons/mp3.gif
-${GL_TMPL}/images/library/Image/icons/pdf.gif
-${GL_TMPL}/images/library/Image/icons/ppt.gif
-${GL_TMPL}/images/library/Image/icons/rdp.gif
-${GL_TMPL}/images/library/Image/icons/swf.gif
-${GL_TMPL}/images/library/Image/icons/swt.gif
-${GL_TMPL}/images/library/Image/icons/txt.gif
-${GL_TMPL}/images/library/Image/icons/vsd.gif
-${GL_TMPL}/images/library/Image/icons/xls.gif
Home |
Main Index |
Thread Index |
Old Index