ports/130869: www/rt38 [patch] fix configuration handling on upgrade
Steven Kreuzer
skreuzer at exit2shell.com
Mon Jan 26 19:30:07 UTC 2009
The following reply was made to PR ports/130869; it has been noted by GNATS.
From: Steven Kreuzer <skreuzer at exit2shell.com>
To: bug-followup at FreeBSD.ORG
Cc:
Subject: Re: ports/130869: www/rt38 [patch] fix configuration handling on upgrade
Date: Mon, 26 Jan 2009 13:52:43 -0500
--Apple-Mail-1053--861790467
Content-Type: text/plain;
charset=US-ASCII;
format=flowed;
delsp=yes
Content-Transfer-Encoding: 7bit
On Jan 22, 2009, at 6:20 AM, Edwin Groothuis wrote:
> Maintainer of www/rt38,
>
> Please note that PR ports/130869 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
>
> The full text of the PR can be found at:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130869
>
> --
> Edwin Groothuis via the GNATS Auto Assign Tool
> edwin at FreeBSD.org
Patch looks good. I took his patch and combined it with one I have
been sitting on
Please apply that patch which:
- Contains the modifications made by Angelo
- Contains a fix to a directory permissions issue caused by a patch I
made for a previous PR
- Makes use of Macros for the apache user and group
- Starts to change the dependencies listing to use port names rather
then checking if a file exists
Thanks
--
Steven Kreuzer
http://www.exit2shell.com/~skreuzer
--Apple-Mail-1053--861790467
Content-Disposition: attachment;
filename=rt38-patch.txt
Content-Type: text/plain;
x-unix-mode=0644;
name="rt38-patch.txt"
Content-Transfer-Encoding: 7bit
Index: Makefile
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/www/rt38/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 23 Jan 2009 00:51:49 -0000 1.9
+++ Makefile 25 Jan 2009 19:04:04 -0000
@@ -6,8 +6,6 @@
# TODO:
# o etc/rt38 files permissions
-# o install etc/rt38/RT_SiteConfig.pm in pkg-plist for packages, fix make install
-# o patch etc/rt38/RT_SiteConfig.pm and -dist perl -c path
# o GRANTS
# o Schema
# - Vhost Config
@@ -15,7 +13,7 @@
PORTNAME= rt
PORTVERSION= 3.8.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ \
ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -151,8 +149,8 @@
DB_HOST?= localhost
DB_DATABASE?= rt3
-WEB_USER?= www
-WEB_GROUP?= www
+WEB_USER?= ${WWWOWN}
+WEB_GROUP?= ${WWWGRP}
LIBS_GROUP?= wheel
LATEST_LINK= rt38
@@ -173,6 +171,7 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
+SUB_LIST= RT_ETC_PATH=${RT_ETC_PATH}
run-autotools:: run-autotools-autoconf
@@ -196,14 +195,15 @@
@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${SITE_PERL}!g' ${WRKSRC}/config.layout
+ @${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
pre-install:
@${RM} -f ${WRKSRC}/lib/RT.pm.in
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @[ -f ${RT_ETC_PATH}/RT_SiteConfig.pm-dist ] || \
- ${CP} -p ${RT_ETC_PATH}/RT_SiteConfig.pm ${RT_ETC_PATH}/RT_SiteConfig.pm-dist
+ @[ -f ${RT_ETC_PATH}/RT_SiteConfig.pm ] || \
+ ${CP} -p ${RT_ETC_PATH}/RT_SiteConfig.pm-dist ${RT_ETC_PATH}/RT_SiteConfig.pm
${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: Makefile.cpan
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/www/rt38/Makefile.cpan,v
retrieving revision 1.2
diff -u -r1.2 Makefile.cpan
--- Makefile.cpan 22 Jan 2009 00:31:15 -0000 1.2
+++ Makefile.cpan 25 Jan 2009 18:57:36 -0000
@@ -6,16 +6,16 @@
### Scalar::Util 1.18 core
### Text::ParseWords 3.24 core
-CLI_DEPS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+CLI_DEPS= p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
p5-Getopt-Long>=2.24:${PORTSDIR}/devel/p5-Getopt-Long \
- ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
- ${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl \
+ p5-libwww>=5.823:${PORTSDIR}/www/p5-libwww \
+ p5-ReadLine-Perl>=1.0302:${PORTSDIR}/devel/p5-ReadLine-Perl \
p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay
CORE_DEPS= p5-Encode>=2.13:${PORTSDIR}/converters/p5-Encode \
- ${SITE_PERL}/Class/ReturnValue.pm:${PORTSDIR}/devel/p5-Class-ReturnValue \
- ${SITE_PERL}/Text/Quoted.pm:${PORTSDIR}/textproc/p5-Text-Quoted \
- ${SITE_PERL}/CSS/Squish.pm:${PORTSDIR}/textproc/p5-CSS-Squish \
+ p5-Class-ReturnValue>=0.55:${PORTSDIR}/devel/p5-Class-ReturnValue \
+ p5-Text-Quoted>=2.05:${PORTSDIR}/textproc/p5-Text-Quoted \
+ p5-CSS-Squish>=0.07:${PORTSDIR}/textproc/p5-CSS-Squish \
p5-Module-Versions-Report>=1.05:${PORTSDIR}/devel/p5-Module-Versions-Report \
p5-Devel-StackTrace>=1.19:${PORTSDIR}/devel/p5-Devel-StackTrace \
p5-Digest-MD5>=2.27:${PORTSDIR}/security/p5-Digest-MD5 \
@@ -24,8 +24,8 @@
p5-HTML-Scrubber>=0.08:${PORTSDIR}/www/p5-HTML-Scrubber \
p5-DBIx-SearchBuilder>=1.53:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \
p5-Mail-Tools>=1.57:${PORTSDIR}/mail/p5-Mail-Tools \
- ${SITE_PERL}/File/ShareDir.pm:${PORTSDIR}/devel/p5-File-ShareDir \
- ${SITE_PERL}/Cache/Simple/TimedExpiry.pm:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
+ p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
+ p5-Cache-Simple-TimedExpiry>=0.27:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
${SITE_PERL}/Email/Address.pm:${PORTSDIR}/mail/p5-Email-Address \
${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
@@ -42,7 +42,7 @@
${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require \
${SITE_PERL}/Test/Warn.pm:${PORTSDIR}/devel/p5-Test-Warn
-DASHBOARD_DEPS= ${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
+DASHBOARD_DEPS= p5-MIME-Types>=1.25:${PORTSDIR}/mail/p5-MIME-Types \
p5-HTML-RewriteAttributes>=0.02:${PORTSDIR}/textproc/p5-HTML-RewriteAttributes
DEV_DEPS= ${SITE_PERL}/Log/Dispatch/Perl.pm:${PORTSDIR}/devel/p5-Log-Dispatch-Perl \
@@ -76,10 +76,10 @@
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
MASON_DEPS= p5-Storable>=2.08:${PORTSDIR}/devel/p5-Storable \
- ${SITE_PERL}/CSS/Squish.pm:${PORTSDIR}/textproc/p5-CSS-Squish \
- ${SITE_PERL}/Text/WikiFormat.pm:${PORTSDIR}/textproc/p5-Text-WikiFormat \
+ p5-CSS-Squish>=0.07:${PORTSDIR}/textproc/p5-CSS-Squish \
+ p5-Text-WikiFormat>=0.79:${PORTSDIR}/textproc/p5-Text-WikiFormat \
p5-Digest-MD5>=2.27:${PORTSDIR}/security/p5-Digest-MD5 \
- ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno \
+ p5-Errno>=1.10:${PORTSDIR}/devel/p5-Errno \
p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session \
p5-Devel-StackTrace>=1.19:${PORTSDIR}/devel/p5-Devel-StackTrace \
p5-CGI.pm>=1.20:${PORTSDIR}/www/p5-CGI.pm \
@@ -87,8 +87,8 @@
p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS \
p5-HTML-Mason>=1.36:${PORTSDIR}/www/p5-HTML-Mason
-SMTP_DEPS= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+SMTP_DEPS= p5-Net>=1.22:${PORTSDIR}/net/p5-Net
-STANDALONE_DEPS= ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
+STANDALONE_DEPS= p5-Net-Server>=0.97:${PORTSDIR}/net/p5-Net-Server \
p5-HTTP-Server-Simple>=0.34:${PORTSDIR}/www/p5-HTTP-Server-Simple \
p5-HTTP-Server-Siple-Mason>=0.09:${PORTSDIR}/www/p5-HTTP-Server-Simple-Mason
Index: pkg-plist
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/www/rt38/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 23 Jan 2009 00:51:49 -0000 1.5
+++ pkg-plist 25 Jan 2009 16:34:00 -0000
@@ -1,4 +1,6 @@
+ at comment $FreeBSD$
@unexec if cmp -s %D/etc/rt38/RT_SiteConfig.pm %D/etc/rt38/RT_SiteConfig.pm-dist; then rm -f %D/etc/rt38/RT_SiteConfig.pm; fi
+ at exec [ -f %D/etc/rt38/RT_SiteConfig.pm ] || cp %D/rt38/RT_SiteConfig.pm-dist %D/etc/rt38/RT_SiteConfig.pm
bin/mason_handler.fcgi
bin/mason_handler.scgi
bin/mason_handler.svc
Index: files/patch-Makefile.in
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/www/rt38/files/patch-Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile.in
--- files/patch-Makefile.in 22 Jan 2009 00:31:16 -0000 1.3
+++ files/patch-Makefile.in 25 Jan 2009 16:58:07 -0000
@@ -1,5 +1,14 @@
---- ./Makefile.in.orig 2008-08-18 11:13:58.000000000 -0400
-+++ ./Makefile.in 2008-12-28 23:12:31.000000000 -0500
+--- Makefile.in.orig 2008-08-18 11:13:58.000000000 -0400
++++ Makefile.in 2009-01-25 11:57:09.000000000 -0500
+@@ -58,7 +58,7 @@
+
+ CONFIG_FILE_PATH = @CONFIG_FILE_PATH_R@
+ CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_Config.pm
+-SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm
++SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm-dist
+
+
+ RT_VERSION_MAJOR = @RT_VERSION_MAJOR@
@@ -107,7 +107,7 @@
RT_VAR_PATH = @RT_VAR_PATH_R@
RT_DOC_PATH = @RT_DOC_PATH_R@
@@ -18,12 +27,27 @@
# {{{ dependencies
-@@ -361,9 +361,9 @@
+@@ -301,14 +301,6 @@
+
+ # {{{ fixperms
+ fixperms:
+- # Make the libraries readable
+- chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_PATH)
+- chown -R $(LIBS_OWNER) $(DESTDIR)$(RT_LIB_PATH)
+- chgrp -R $(LIBS_GROUP) $(DESTDIR)$(RT_LIB_PATH)
+- chmod -R u+rwX,go-w,go+rX $(DESTDIR)$(RT_LIB_PATH)
+-
+-
+- chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
+
+ chmod 0755 $(DESTDIR)$(RT_ETC_PATH)
+ cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES)
+@@ -361,9 +353,9 @@
$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
# }}}
-install: testdeps config-install dirs files-install fixperms instruct
-+install: config-install dirs files-install
++install: config-install dirs files-install fixperms
-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install
Index: files/pkg-message.in
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/www/rt38/files/pkg-message.in,v
retrieving revision 1.4
diff -u -r1.4 pkg-message.in
--- files/pkg-message.in 2 Jan 2009 13:27:12 -0000 1.4
+++ files/pkg-message.in 25 Jan 2009 16:34:00 -0000
@@ -2,8 +2,8 @@
To complete the installation of this port, please follow these steps:
-1. Edit %%LOCALBASE%%/etc/rt38/RT_SiteConfig.pm, by referring to
- the default config file (%%LOCALBASE%%/etc/rt38/RT_Config.pm).
+1. Edit %%RT_ETC_PATH%%/RT_SiteConfig.pm, by referring to
+ the default config file (%%RT_ETC_PATH%%/RT_Config.pm).
2. Configure the email and web gateways. Please refer to
'SETTING UP THE MAIL GATEWAY' in %%DOCSDIR%%/README
3. Restart Apache.
--Apple-Mail-1053--861790467--
More information about the freebsd-ports-bugs
mailing list