pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(www/bugzilla) Add INSTALL file to chown to www:www. Tks ryoon@ for suggestion.
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara (CF-S9) <makoto%ki.nu@localhost>
Pushed By: mef
Date: Sun Mar 12 11:38:23 2017 +0900
Changeset: 1bfdaf40f202e660b7780ed7c4a018652318cc50
Modified Files:
bugzilla/Makefile
bugzilla/distinfo
bugzilla/options.mk
Added Files:
bugzilla/INSTALL
bugzilla/patches/patch-Bugzilla_Install_Filesystem_pm
Log Message:
(www/bugzilla) Add INSTALL file to chown to www:www. Tks ryoon@ for suggestion.
- INSTALL takes care to owner/group to APACHE_USER/GPOUP
- Make sqlite as default (formerly mysql)
- Add minor patch to tell the filename if missing at installation
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1bfdaf40f202e660b7780ed7c4a018652318cc50
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bugzilla/INSTALL | 15 +++++++++++++++
bugzilla/Makefile | 14 ++++++++------
bugzilla/distinfo | 1 +
bugzilla/options.mk | 2 +-
bugzilla/patches/patch-Bugzilla_Install_Filesystem_pm | 15 +++++++++++++++
5 files changed, 40 insertions(+), 7 deletions(-)
diffs:
diff --git a/bugzilla/INSTALL b/bugzilla/INSTALL
new file mode 100644
index 0000000000..85544cec58
--- /dev/null
+++ b/bugzilla/INSTALL
@@ -0,0 +1,15 @@
+#!@SH@
+#
+# $NetBSD: INSTALL,v 1.1 2017/01/12 15:07:38 ryoon Exp $
+
+WWWGRP="@WWWGRP@"
+WWWOWN="@WWWOWN@"
+BZDIR="@BZDIR@"
+
+case "${STAGE}" in
+POST-INSTALL)
+ cd ${BZDIR} &&
+ ${CHOWN} -R ${WWWOWN} ${BZDIR} &&
+ ${CHGRP} -R ${WWWGRP} ${BZDIR}
+ ;;
+esac
diff --git a/bugzilla/Makefile b/bugzilla/Makefile
index 225b5ccbcf..af63b3b0d8 100644
--- a/bugzilla/Makefile
+++ b/bugzilla/Makefile
@@ -113,9 +113,12 @@ INSTALLATION_DIRS+= ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins
INSTALLATION_DIRS+= ${BZDIR}/docs ${BZDIR}/docs/en ${BZDIR}/docs/en/html
INSTALLATION_DIRS+= ${BZDIR}/images ${BZDIR}/docs/en/html/api
INSTALLATION_DIRS+= ${BZDIR}/docs/en/html/api/Bugzilla
+.for i in data contrib t xt template lib graphs skins
+INSTALLATION_DIRS+= ${BZDIR}/${i}
+.endfor
-# file user group mode
-#SPECIAL_PERMS= * www data 0600
+FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
+ BZDIR=${BZDIR}
do-configure:
(cd ${WRKSRC}; ./checksetup.pl)
@@ -125,7 +128,8 @@ post-extract:
${CP} ${FILESDIR}/localconfig ${WRKSRC}
do-install:
-.for i in ${BZDIR} ${EGDIR} ${DOCDIR}
+
+.for i in ${BZDIR} ${EGDIR} ${DOCDIR} ${BZDIR}/lib
${INSTALL_DATA_DIR} ${DESTDIR}${i}
.endfor
(cd ${WRKSRC} ;\
@@ -142,9 +146,7 @@ do-install:
pax -rw -pmp js ${DESTDIR}${BZDIR} ;\
pax -rw -pmp template ${DESTDIR}${BZDIR} ;\
)
-.for i in data contrib t xt template lib graphs skins
- ${INSTALL_DATA_DIR} ${DESTDIR}${BZDIR}/${i}
-.endfor
+ ${RM} ${DESTDIR}${BZDIR}/Bugzilla/Install/Filesystem.pm.orig
.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/bugzilla/distinfo b/bugzilla/distinfo
index 1e3e82e131..da2fdbf366 100644
--- a/bugzilla/distinfo
+++ b/bugzilla/distinfo
@@ -4,3 +4,4 @@ SHA1 (bugzilla-5.0.3.tar.gz) = 49b4b2b1b3086cb9b75f65138e702da71dc29c93
RMD160 (bugzilla-5.0.3.tar.gz) = f48c7e903a9984d9bf95b969dba3b8d0b4ba4cb2
SHA512 (bugzilla-5.0.3.tar.gz) = 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
Size (bugzilla-5.0.3.tar.gz) = 4069689 bytes
+SHA1 (patch-Bugzilla_Install_Filesystem_pm) = 9ec49194210270be0a4af872765d29ec0544b189
diff --git a/bugzilla/options.mk b/bugzilla/options.mk
index e5e639cdea..f3eefde0d4 100644
--- a/bugzilla/options.mk
+++ b/bugzilla/options.mk
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS+= bugzilla-imagemagick bugzilla-patchviewer
PKG_SUPPORTED_OPTIONS+= bugzilla-descriptions bugzilla-xmlrpc
PKG_SUPPORTED_OPTIONS+= bugzilla-modperl radius
PKG_SUPPORTED_OPTIONS+= mysql pgsql oracle ldap sqlite
-PKG_SUGGESTED_OPTIONS= mysql
+PKG_SUGGESTED_OPTIONS= sqlite
.include "../../mk/bsd.options.mk"
diff --git a/bugzilla/patches/patch-Bugzilla_Install_Filesystem_pm b/bugzilla/patches/patch-Bugzilla_Install_Filesystem_pm
new file mode 100644
index 0000000000..500bc0f3d4
--- /dev/null
+++ b/bugzilla/patches/patch-Bugzilla_Install_Filesystem_pm
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Make it verbose when giving error, which file is missing.
+
+--- Bugzilla/Install/Filesystem.pm.orig 2016-05-17 04:02:18.000000000 +0900
++++ Bugzilla/Install/Filesystem.pm 2017-03-11 22:47:12.306643791 +0900
+@@ -693,7 +693,7 @@ sub _create_files {
+ print "Creating $file...\n";
+ my $info = $files{$file};
+ my $fh = new IO::File($file, O_WRONLY | O_CREAT, $info->{perms})
+- || die $!;
++ || die $file . ': '. $!;
+ print $fh $info->{contents} if $info->{contents};
+ $fh->close;
+ }
Home |
Main Index |
Thread Index |
Old Index