pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/geeklog Update geeklog package from 1.4.1nb4 to 1....
details: https://anonhg.NetBSD.org/pkgsrc/rev/d547fbd36fcb
branches: trunk
changeset: 393761:d547fbd36fcb
user: taca <taca%pkgsrc.org@localhost>
date: Tue May 26 14:19:29 2009 +0000
description:
Update geeklog package from 1.4.1nb4 to 1.5.2.4 (1.5.2sr4).
pkgsrc changes: overhaul this package.
* Add LICENSE.
* Clean up bmake's macros, such as addition of PRINT_PLIST_AWK.
Geeklog changes: too many chagnes to write here.
* New user-friendly installation.
* New Configuration GUI.
* New Webservice GUI.
* And more.
Please refer http://www.geeklog.net/docs/english/changes.html
for more information.
Fixed some security problems about SQL injection vulnerability.
diffstat:
www/geeklog/DEINSTALL | 44 +-
www/geeklog/INSTALL | 11 +-
www/geeklog/Makefile | 117 ++--
www/geeklog/Makefile.common | 57 ++-
www/geeklog/PLIST | 917 +++++++++++++++++++++++++---------------
www/geeklog/distinfo | 16 +-
www/geeklog/files/README | 20 +-
www/geeklog/files/createdb.php | 61 --
www/geeklog/files/geeklog.conf | 6 +-
www/geeklog/patches/patch-aa | 86 +---
www/geeklog/patches/patch-ab | 19 -
www/geeklog/patches/patch-ac | 13 -
www/geeklog/patches/patch-ag | 20 -
www/geeklog/patches/patch-ah | 26 -
www/geeklog/patches/patch-ai | 17 -
www/geeklog/patches/patch-aj | 23 +
16 files changed, 748 insertions(+), 705 deletions(-)
diffs (truncated from 2280 to 300 lines):
diff -r 6a4511c85db6 -r d547fbd36fcb www/geeklog/DEINSTALL
--- a/www/geeklog/DEINSTALL Tue May 26 13:32:29 2009 +0000
+++ b/www/geeklog/DEINSTALL Tue May 26 14:19:29 2009 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: DEINSTALL,v 1.4 2007/05/20 15:56:44 taca Exp $
+# $NetBSD: DEINSTALL,v 1.5 2009/05/26 14:19:29 taca Exp $
-GEEKLOG_DIR="@GEEKLOG_DIR@"
-GEEKLOG_EXAMPLESDIR="@GEEKLOG_EXAMPLESDIR@"
-GEEKLOG_PUBDIR="@GEEKLOG_PUBDIR@"
-GEEKLOG_TMPL_SUB="@GEEKLOG_TMPL_SUB@"
-GEEKLOG_TMPL_DIR="@GEEKLOG_TMPL_DIR@"
+GEEKLOG_PUBDIR="${PREFIX}/@GEEKLOG_PUB@"
+GEEKLOG_DIR="${PREFIX}/@GEEKLOG_BASE@"
+GEEKLOG_TMPL_DIR="${PREFIX}/@GL_TMPL@"
+GEEKLOG_TMPL_SUB="@GL_TMPL_SUB@"
case ${STAGE} in
DEINSTALL)
+ (cd ${GEEKLOG_DIR}; \
+ if [ ! -s logs/error.log ]; then
+ rm -f logs/error.log
+ fi
+ )
(cd ${GEEKLOG_PUBDIR}; ${RM} -fr admin)
(cd ${GEEKLOG_TMPL_DIR}
${FIND} ${GEEKLOG_TMPL_SUB} -type f -print | \
@@ -23,34 +27,6 @@
while read d; do
${RMDIR} ${d} 2>/dev/null
done
- # XXX: work around for remaining config.php and system/lib-custom.php
- conf_files="${GEEKLOG_EXAMPLESDIR}/config.php \
- ${GEEKLOG_DIR}/config.php \
- ${GEEKLOG_EXAMPLESDIR}/system/lib-custom.php \
- ${GEEKLOG_DIR}/system/lib-custom.php"
- file_list=
- set ${conf_files}
- while ${TEST} $# -gt 0; do
- eg=$1; shift
- cf=$1; shift
- if ${TEST} -f ${cf} -a -f ${eg} && ${CMP} -s ${cf} ${eg}; then
- ${RM} ${cf}
- else
- file_list="${file_list} ${cf}"
- fi
- done
- if ${TEST} -n "${file_list}"; then
- ${ECHO} "==========================================================================="
- ${ECHO} "The following files are no longer being used by ${PKGNAME},"
- ${ECHO} "and they can be removed if no other packages are using them:"
- ${ECHO} ""
- for f in ${file_list}; do
- ${ECHO} " ${f}"
- done
- ${ECHO} ""
- ${ECHO} "==========================================================================="
- fi
)
;;
-
esac
diff -r 6a4511c85db6 -r d547fbd36fcb www/geeklog/INSTALL
--- a/www/geeklog/INSTALL Tue May 26 13:32:29 2009 +0000
+++ b/www/geeklog/INSTALL Tue May 26 14:19:29 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: INSTALL,v 1.3 2007/05/20 15:56:44 taca Exp $
+# $NetBSD: INSTALL,v 1.4 2009/05/26 14:19:29 taca Exp $
APACHE_GROUP="@APACHE_GROUP@"
-GEEKLOG_PUBDIR="@GEEKLOG_PUBDIR@"
-GEEKLOG_ADMIN_DIR="@GEEKLOG_ADMIN_DIR@"
-GEEKLOG_TMPL_SUB="@GEEKLOG_TMPL_SUB@"
-GEEKLOG_TMPL_DIR="@GEEKLOG_TMPL_DIR@"
+GEEKLOG_PUBDIR="${PREFIX}/@GEEKLOG_PUB@"
+GEEKLOG_ADMIN_DIR="${PREFIX}/@GL_ADMIN@"
+GEEKLOG_TMPL_DIR="${PREFIX}/@GL_TMPL@"
+GEEKLOG_TMPL_SUB="@GL_TMPL_SUB@"
PAX="@PAX@"
case ${STAGE} in
@@ -26,6 +26,7 @@
if ${TEST} ! -f ${file}; then
${CP} -p ${f} ${file}
${CHGRP} ${APACHE_GROUP} ${file}
+ ${CHMOD} 0660 ${file}
fi
done
)
diff -r 6a4511c85db6 -r d547fbd36fcb www/geeklog/Makefile
--- a/www/geeklog/Makefile Tue May 26 13:32:29 2009 +0000
+++ b/www/geeklog/Makefile Tue May 26 14:19:29 2009 +0000
@@ -1,129 +1,128 @@
-# $NetBSD: Makefile,v 1.21 2008/09/28 02:25:26 taca Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/26 14:19:29 taca Exp $
#
DISTNAME= geeklog-${VER}
PKGNAME= geeklog-${VER:C/(sr|-)/./g}
-PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.geeklog.net/filemgmt/upload_dir/
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= http://www.geeklog.net/
COMMENT= PHP/MySQL based application for managing dynamic web content
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
+PRIVILEGED_STAGES+= clean
+DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql
-USE_TOOLS+= pax:run
+USE_TOOLS+= pax
-VER= 1.4.1
+VER= 1.5.2sr4
NO_BUILD= YES
PKG_GROUPS_VARS+= APACHE_GROUP
BUILD_DEFS+= GEEKLOG_SITEBASE
-GEEKLOG_SYS= emailgeeklogstories language plugins readme sql system
-GEEKLOG_TMPL_SUB= backend images/articles images/library \
- images/topics images/userphotos
+CHECK_PERMS_SKIP= ${GEEKLOG_PUB}/backend ${GEEKLOG_PUB}/images/*
-GEEKLOG_CONF_FILES= config.php plugins/calendar/config.php \
- plugins/links/config.php plugins/polls/config.php \
- plugins/spamx/config.php \
- plugins/staticpages/config.php \
- system/lib-custom.php
+GL_SYS= emailgeeklogstories language plugins readme sql system
+GL_TMPL_SUB= backend images/articles images/library images/topics \
+ images/userphotos
-CONF_FILES+= ${GEEKLOG_EXAMPLESDIR}/geeklog.conf \
+GL_CONF_FILES= db-config.php system/lib-custom.php
+GL_CONF_PUB_FILES= public_html/siteconfig.php
+
+CONF_FILES+= ${GL_EG}/geeklog.conf \
${PKG_SYSCONFDIR}/geeklog.conf
-.for f in ${GEEKLOG_CONF_FILES}
-CONF_FILES_PERMS+= ${GEEKLOG_EXAMPLESDIR}/${f} \
- ${GEEKLOG_DIR}/${f} \
- ${BINOWN} ${APACHE_GROUP} 0640
+.for f in ${GL_CONF_FILES}
+CONF_FILES_PERMS+= ${GL_EG}/${f:T} ${GEEKLOG_BASE}/${f} \
+ ${BINOWN} ${APACHE_GROUP} 0660
.endfor
-OWN_DIRS_PERMS+= ${GEEKLOG_DIR}/backups ${BINOWN} ${APACHE_GROUP} 0770 \
- ${GEEKLOG_DIR}/data ${BINOWN} ${APACHE_GROUP} 0770 \
- ${GEEKLOG_DIR}/logs ${BINOWN} ${APACHE_GROUP} 0775
+.for f in ${GL_CONF_PUB_FILES}
+CONF_FILES_PERMS+= ${GL_EG}/${f:T} ${GEEKLOG_PUB}/${f:T} \
+ ${BINOWN} ${APACHE_GROUP} 0660
+.endfor
+
+OWN_DIRS_PERMS+= ${GEEKLOG_BASE}/backups ${BINOWN} ${APACHE_GROUP} 0770 \
+ ${GEEKLOG_BASE}/data ${BINOWN} ${APACHE_GROUP} 0770 \
+ ${GEEKLOG_BASE}/logs ${BINOWN} ${APACHE_GROUP} 0775
OWN_DIRS+= ${GEEKLOG_PUB}
FILES_SUBST+= APACHE_GROUP=${APACHE_GROUP:Q} \
- GEEKLOG_DIR=${GEEKLOG_DIR:Q} \
- GEEKLOG_EXAMPLESDIR=${GEEKLOG_EXAMPLESDIR:Q} \
- GEEKLOG_PUBDIR=${GEEKLOG_PUBDIR:Q} \
- GEEKLOG_ADMIN_DIR=${GEEKLOG_ADMIN_DIR:Q} \
- GEEKLOG_TMPL_SUB=${GEEKLOG_TMPL_SUB:Q} \
- GEEKLOG_TMPL_DIR=${GEEKLOG_TMPL_DIR:Q} \
+ GEEKLOG_BASE=${GEEKLOG_BASE:Q} \
+ GL_EG=${GL_EG:Q} \
+ GEEKLOG_PUB=${GEEKLOG_PUB:Q} \
+ GL_ADMIN=${GL_ADMIN:Q} \
+ GL_TMPL_SUB=${GL_TMPL_SUB:Q} \
+ GL_TMPL=${GL_TMPL:Q} \
PAX=${PAX:Q}
PLIST_SUBST+= GEEKLOG_BASE=${GEEKLOG_BASE:Q} \
GEEKLOG_PUB=${GEEKLOG_PUB:Q} \
- GEEKLOG_ADMIN=${GEEKLOG_ADMIN:Q} \
- GEEKLOG_TMPL=${GEEKLOG_TMPL:Q}
+ GL_ADMIN=${GL_ADMIN:Q} \
+ GL_TMPL=${GL_TMPL:Q} \
+ GL_DOC=${GL_DOC:Q} \
+ GL_EG=${GL_EG:Q}
.include "../../www/geeklog/Makefile.common"
PKG_SYSCONFSUBDIR?= geeklog
SUBST_CLASSES+= paths
-SUBST_FILES.paths+= ${WRKDIR}/README ${WRKDIR}/createdb.php
-SUBST_FILES.paths+= ${WRKSRC}/config.php ${WRKSRC}/emailgeeklogstories
-SUBST_FILES.paths+= ${WRKSRC}/public_html/lib-common.php
-SUBST_SED.paths+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
+SUBST_FILES.paths+= ${WRKDIR}/README
+SUBST_FILES.paths+= ${WRKSRC}/emailgeeklogstories
+SUBST_FILES.paths+= ${WRKSRC}/public_html/admin/install/index.php
+SUBST_FILES.paths+= ${WRKDIR}/geeklog.conf
+SUBST_SED.paths+= -e 's,@GEEKLOG_BASE@,${GEEKLOG_BASE:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_PUB@,${GEEKLOG_PUB:Q},g'
SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_STAGE.paths= post-configure
-
-SUBST_CLASSES+= conf
-SUBST_FILES.conf+= ${WRKDIR}/geeklog.conf
-SUBST_SED.conf+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
-SUBST_SED.conf+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
.if empty(GEEKLOG_SITEBASE)
SUBST_SED.conf+= -e '/^Alias/s,^,\#,'
.endif
-SUBST_STAGE.conf= post-configure
+SUBST_STAGE.paths= post-configure
-INSTALLATION_DIRS= ${GEEKLOG_BASE} ${GEEKLOG_PUB} ${GEEKLOG_TMPL}/images \
- share/examples/geeklog ${GEEKLOG_DOCDIR}
+INSTALLATION_DIRS= ${GEEKLOG_BASE} ${GEEKLOG_PUB} ${GL_TMPL}/images \
+ share/examples/geeklog ${GL_DOC} ${GL_EG}
post-extract:
- ${CP} ${FILESDIR}/README ${FILESDIR}/createdb.php \
- ${FILESDIR}/geeklog.conf ${WRKDIR}
+ ${CP} ${FILESDIR}/README ${FILESDIR}/geeklog.conf ${WRKDIR}
pre-install:
- ${FIND} ${WRKSRC:Q} -name "*.orig*" -exec ${RM} -f {} \;
+ ${FIND} ${WRKSRC:Q} -type f -name "*.orig" -exec ${RM} -f {} \;
cd ${WRKSRC}/public_html; \
- ${FIND} ${GEEKLOG_TMPL_SUB} -type f -exec ${CHMOD} -x {} \;
+ ${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 {} \;
do-install:
- ${INSTALL_DATA} ${WRKDIR}/README ${DESTDIR}${GEEKLOG_DOCDIR}
-.for f in ${GEEKLOG_CONF_FILES}
- ${INSTALL_DATA_DIR} ${DESTDIR}${GEEKLOG_EXAMPLESDIR}/${f:H}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${GEEKLOG_EXAMPLESDIR}/${f}
+ ${INSTALL_DATA} ${WRKDIR}/README ${DESTDIR}${PREFIX}/${GL_DOC}
+.for f in ${GL_CONF_FILES} ${GL_CONF_PUB_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${GL_EG}
${RM} ${WRKSRC}/${f}
.endfor
- ${INSTALL_SCRIPT} ${WRKDIR}/createdb.php ${DESTDIR}${GEEKLOG_DIR}
- ${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${DESTDIR}${GEEKLOG_EXAMPLESDIR}
-.for f in ${GEEKLOG_SYS}
- cd ${WRKSRC}; pax -rw ${f} ${DESTDIR}${GEEKLOG_DIR}
+ ${INSTALL_DATA} ${WRKDIR}/geeklog.conf ${DESTDIR}${PREFIX}/${GL_EG}
+.for f in ${GL_SYS}
+ cd ${WRKSRC}; pax -rw ${f} ${DESTDIR}${PREFIX}/${GEEKLOG_BASE}
.endfor
cd ${WRKSRC}/public_html; \
- pax -rw admin ${DESTDIR}${GEEKLOG_DIR}; \
+ pax -rw admin ${DESTDIR}${PREFIX}/${GEEKLOG_BASE}; \
${RM} -rf admin
-.for d in ${GEEKLOG_TMPL_SUB}
+.for d in ${GL_TMPL_SUB}
cd ${WRKSRC}/public_html; \
if [ -d ${d} ]; then \
- pax -rw ${d} ${DESTDIR}${GEEKLOG_TMPL_DIR}; \
+ pax -rw ${d} ${DESTDIR}${PREFIX}/${GL_TMPL}; \
${RM} -rf ${d}; \
fi
.endfor
- cd ${WRKSRC}/public_html; pax -rw . ${DESTDIR}${GEEKLOG_PUBDIR}
+ 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 6a4511c85db6 -r d547fbd36fcb www/geeklog/Makefile.common
--- a/www/geeklog/Makefile.common Tue May 26 13:32:29 2009 +0000
+++ b/www/geeklog/Makefile.common Tue May 26 14:19:29 2009 +0000
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile.common,v 1.6 2008/06/19 14:08:42 taca Exp $
+# $NetBSD: Makefile.common,v 1.7 2009/05/26 14:19:29 taca Exp $
#
# used by www/geeklog/Makefile
-GEEKLOG_ADMIN= ${GEEKLOG_BASE}/admin
-GEEKLOG_TMPL= ${GEEKLOG_BASE}/default
-
# Geeklog system
-GEEKLOG_DIR= ${PREFIX}/${GEEKLOG_BASE}
+GL_ADMIN= ${GEEKLOG_BASE}/admin
+GL_TMPL= ${GEEKLOG_BASE}/default
# Geeklog public area
-GEEKLOG_PUBDIR= ${PREFIX}/${GEEKLOG_PUB}
-GEEKLOG_ADMIN_DIR= ${PREFIX}/${GEEKLOG_ADMIN}
Home |
Main Index |
Thread Index |
Old Index