ports/91855: Upgrade RAQdevil port to 1.0

Devon H. O'Dell dodell at iXsystems.com
Mon Jan 16 04:20:05 UTC 2006 

>Number:         91855
>Category:       ports
>Synopsis:       Upgrade RAQdevil port to 1.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 16 04:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Devon H. O'Dell
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
iXsystems
>Environment:
System: FreeBSD raqdevil.offmyserver.com 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Thu Sep 22 13:39:54 UTC 2005 root at raqdevil.offmyserver.com:/usr/obj/usr/src/sys/RD i386

>Description:
	RAQdevil has undergone two revisions since 0.9.6 and is now at
	1.0. This port should no longer depend on Apache 1.3 and 2.0
	(I never noticed that behavior myself) and contains several
	security and bugfixes, as well as feature enhancements.

>How-To-Repeat:
	N/A
>Fix:
	Remove top and set aside. Remove metal cover and throw away.
	Re-place top and put in microwave for 2 minutes and 30 seconds.
	Let stand for 1 minute for maximum flavor.

--- raqdevil.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/raqdevil/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	21 Nov 2005 01:13:52 -0000	1.7
+++ Makefile	16 Jan 2006 04:13:43 -0000
@@ -1,27 +1,40 @@
 # New ports collection makefile for:    raqdevil
 # Date created:         06 September 2005
-# Whom:                 Devon H. O'Dell <dodell at offmyserver.com>
+# Whom:                 Devon H. O'Dell <dodell at ixsystems.com>
 #
-# $FreeBSD: ports/www/raqdevil/Makefile,v 1.7 2005/11/21 01:13:52 kris Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	raqdevil
-PORTVERSION=	0.9.6
+PORTVERSION=	1.0
 CATEGORIES=	www sysutils
 MASTER_SITES=	http://www.raqdevil.com/
 
-MAINTAINER=	dodell at offmyserver.com
+MAINTAINER=	dodell at ixsystems.com
 COMMENT=	A port of the Sun Cobalt RaQ550 software to FreeBSD
 
+# The explicit dependencies on p5-Net, p5-Digest, p5-Authen-SASL,
+# p5-Test-Harness, p5-Test-Simple, p5-Authen-SASL and p5-MIME-Base64
+# are necessary due to ports/86310. This is a work-around: RAQdevil
+# does not depend on these ports itself.
+
 RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}	\
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode			\
-		${SITE_PERL}/mach/Quota.pm:${PORTSDIR}/sysutils/p5-Quota		\
-		${SITE_PERL}/mach/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext	\
+		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL		\
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest			\
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net				\
+		${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness		\
+		${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple		\
+		${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw			\
+		${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode			\
+		${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota		\
+		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext	\
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph		\
 		${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query	\
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode		\
+		expect:${PORTSDIR}/lang/expect			\
 		logrotate:${PORTSDIR}/sysutils/logrotate	\
-		perl:${PORTSDIR}/lang/perl5.8			\
-		imapd:${PORTSDIR}/mail/imap-uw			\
 		pcretest:${PORTSDIR}/devel/pcre			\
 		snmpd:${PORTSDIR}/net-mgmt/net-snmp		\
 		proftpd:${PORTSDIR}/ftp/proftpd			\
@@ -33,8 +46,6 @@
 		analog:${PORTSDIR}/www/analog
 BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
 
-BROKEN=		"Conflicting dependencies (apache 1.x vs 2.x)"
-
 USE_GNOME=	glib20
 USE_PHP=	pcre session xml
 USE_GMAKE=	yes
@@ -42,6 +53,7 @@
 USE_REINPLACE=	yes
 USE_APACHE=	yes
 
+WITHOUT_X11=	yes
 WITH_APACHE2=	yes
 REINPLACE_ARGS=	-i""
 INSTALLS_SHLIB=	yes
@@ -68,12 +80,12 @@
 .endif
 
 pre-extract:
-.if !defined(PACKAGE_BUILDING)
+.if !defined(BATCH)
 	@${SH} ${FILESDIR}/warning
 .endif
 
 post-extract:
-.if !defined(PACKAGE_BUILDING)
+.if !defined(BATCH)
 	${CC} -o ${WRKSRC}/rdqchk ${FILESDIR}/rdqchk.c
 	${WRKSRC}/rdqchk
 .endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/raqdevil/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2 Nov 2005 02:11:52 -0000	1.2
+++ distinfo	16 Jan 2006 04:13:43 -0000
@@ -1,2 +1,3 @@
-MD5 (raqdevil-0.9.6.tar.gz) = 7fa7a5134daa037384f465032cd15d2c
-SIZE (raqdevil-0.9.6.tar.gz) = 2196422
+MD5 (raqdevil-1.0.tar.gz) = b57e6d1769a73319a0bc82b9052821f1
+SHA256 (raqdevil-1.0.tar.gz) = 185e1e2453a0febc0f4379da54fc668a3ae282c47840e60e7ccc85291323281b
+SIZE (raqdevil-1.0.tar.gz) = 2196744
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/www/raqdevil/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	31 Oct 2005 11:25:56 -0000	1.1
+++ pkg-descr	16 Jan 2006 04:13:43 -0000
@@ -1,4 +1,4 @@
-RAQdevil is a web control panel application, developed by OffMyServer and 
+RAQdevil is a web control panel application, developed by iXsystems and 
 based upon the Sun Cobalt RaQ550 software.
 The RAQdevil is software that provides web based management of multiple 
 aspects of a server. RAQdevil manages system users, web sites, email, DNS, 
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/www/raqdevil/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- pkg-install	2 Nov 2005 02:11:52 -0000	1.2
+++ pkg-install	16 Jan 2006 04:13:43 -0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREF=${PREFIX:-$PKG_PREFIX}
-PATH=/bin:/usr/sbin
+PATH=/bin:/usr/sbin:/usr/bin
 
 case $2 in
 POST-INSTALL)
@@ -18,14 +18,39 @@
 		fi
 	fi
 
-	/usr/bin/touch /etc/mail/access
+	/usr/bin/touch /etc/mail/access;
 
 	mkdir -p ${PREF}/raqdevil/ui/web/base/sitestats/img;
 	chown www:wheel ${PREF}/raqdevil/ui/web/base/sitestats/img;
-	mkdir -p ${PREF}/raqdevil/skel/spam;
-	mkdir -p ${PREF}/raqdevil/skel/quarantine;
 	mkdir -p ${PREF}/raqdevil/sessions;
 
+	/usr/bin/touch ${PREF}/etc/apache2/httpd.local.conf
+	/usr/bin/touch ${PREF}/etc/apache2/httpd.raqdevil.conf
+
+	# generate certificates if required
+	CERTPATH=${PREF}/admserv/certs
+	KEYPATH=${CERTPATH}/key
+	CSRPATH=${CERTPATH}/request
+	CRTPATH=${CERTPATH}/certificate
+
+	mkdir -p ${CERTPATH}
+
+	if [ ! -f ${KEYPATH} ]; then
+	        openssl genrsa -out ${KEYPATH} 2048
+	fi
+	if [ ! -f ${CSRPATH} ]; then
+	        openssl req -new -key ${KEYPATH} -out ${CSRPATH}
+	fi
+	if [ ! -f ${CRTPATH} ]; then
+	        openssl x509 -req -days 365 -in ${CSRPATH} -signkey ${KEYPATH} -out ${CRTPATH}
+	fi
+
+	# fix up the apache httpd.conf file using database values
+	# probably should use /usr/local/raqdevil/bin/cce_construct instead
+	# to make a package install work correctly
+	${PREF}/raqdevil/constructor/base/apache/processAdvise.pl
+
+
 	( cd /etc/namedb; sh /etc/namedb/make-localhost )
 	;;
 esac
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/raqdevil/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	2 Nov 2005 02:11:52 -0000	1.2
+++ pkg-plist	16 Jan 2006 04:13:43 -0000
@@ -9,18 +9,19 @@
 @exec touch /etc/mail/access
 @exec mkdir -p /var/log/admserv
 @unexec rm -rf /var/log/admserv 2>&1 >/dev/null || true
+ at exec echo "Updating crontab"; cp /etc/crontab /etc/crontab.bak; (grep -v "%D/sbin/swatch" /etc/crontab.bak; echo "*/15	*	*	*	*	root %D/sbin/swatch -c %D/etc/swatch.conf") > /etc/crontab; rm -f /etc/crontab.bak
+ at unexec echo "Updating crontab"; cp /etc/crontab /etc/crontab.bak; (grep -v "%D/sbin/swatch" /etc/crontab.bak;) > /etc/crontab; rm -f /etc/crontab.bak
 @exec echo "Updating /etc/ssh/sshd_config"; cp /etc/ssh/sshd_config /etc/ssh/sshd_config.bak; (grep -v "Banner %D/etc/ssh_banner" /etc/ssh/sshd_config.bak; echo "Banner %D/etc/ssh_banner") > /etc/ssh/sshd_config; rm -f /etc/ssh/sshd_config.bak
 @unexec echo "Updating /etc/ssh/sshd_config"; cp /etc/ssh/sshd_config /etc/ssh/sshd_config.bak; (grep -v "Banner %D/etc/ssh_banner" /etc/ssh/sshd_config.bak) > /etc/ssh/sshd_config; rm -f /etc/ssh/sshd_config.bak
 @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v /usr/sbin/nologin /etc/shells.bak; echo /usr/sbin/nologin) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v /usr/sbin/nologin /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+ at exec touch etc/apache2/httpd.raqdevil.conf
+ at exec touch etc/apache2/httpd.local.conf
 admserv/conf.d/php.conf
 admserv/conf.d/ssl.conf
 admserv/conf/admserv.conf
 admserv/conf/magic
 admserv/conf/php.ini
-admserv/certs/certificate
-admserv/certs/key
-admserv/certs/request
 admserv/libexec
 bin/clamfilter.pl
 bin/generateGraph.pl
@@ -36,6 +37,7 @@
 etc/rc.d/cced.sh
 etc/ssh_banner
 etc/snmp/snmpd.conf
+etc/swatch.conf
 etc/xinetd.conf
 etc/xinetd/xinetd.d/imap
 etc/xinetd/xinetd.d/imaps
@@ -50,6 +52,7 @@
 lib/php/20020429/cce.so
 lib/php/20020429/i18n.so
 lib/security/pam_cce.so
+libexec/apache2/mod_raqdevil.so
 raqdevil/bin/cce_construct
 raqdevil/bin/ccewrap
 raqdevil/bin/i18n_get
@@ -307,6 +310,7 @@
 raqdevil/perl/I18n.pm
 raqdevil/perl/I18nMail.pm
 raqdevil/perl/JConv.pl
+raqdevil/perl/AM/Util.pm
 raqdevil/perl/Sauce/Config.pm
 raqdevil/perl/Sauce/Service.pm
 raqdevil/perl/Sauce/Service/Client.pm
@@ -329,9 +333,14 @@
 raqdevil/sbin/update.php
 raqdevil/sbin/vacation.pl
 raqdevil/sbin/vsite_destroy.pl
+raqdevil/schemas/base/am/admserv-am.schema
 raqdevil/schemas/base/am/am.schema
 raqdevil/schemas/base/am/am_base.schema
+raqdevil/schemas/base/am/apache-am.schema
+raqdevil/schemas/base/am/dns-am.schema
 raqdevil/schemas/base/am/fans-am.schema
+raqdevil/schemas/base/am/ftp-am.schema
+raqdevil/schemas/base/am/network-am.schema
 raqdevil/schemas/base/am/temperature-am.schema
 raqdevil/schemas/base/apache/apache.schema
 raqdevil/schemas/base/apache/apache_caps.schema
@@ -377,6 +386,8 @@
 raqdevil/schemas/basetypes.schema
 raqdevil/skel/dot.ftphelp
 raqdevil/skel/dot.procmailrc
+raqdevil/skel/quarantine
+raqdevil/skel/spam
 raqdevil/skel/web/bsd.gif
 raqdevil/skel/web/grad.gif
 raqdevil/skel/web/index.html
@@ -390,15 +401,18 @@
 raqdevil/skel/web/error/warning.gif
 raqdevil/swatch/bin/am_admserv.exp
 raqdevil/swatch/bin/am_apache.exp
+raqdevil/swatch/bin/am_cpu.sh
 raqdevil/swatch/bin/am_disk.pl
 raqdevil/swatch/bin/am_dns.sh
 raqdevil/swatch/bin/am_ftp.exp
 raqdevil/swatch/bin/am_imap.exp
+raqdevil/swatch/bin/am_mem.pl
 raqdevil/swatch/bin/am_network.sh
 raqdevil/swatch/bin/am_pop.exp
 raqdevil/swatch/bin/am_smtp.exp
 raqdevil/swatch/bin/am_snmp.pl
-raqdevil/swatch/bin/am_telnet.exp
+raqdevil/swatch/statecodes
+raqdevil/swatch/statecodes.tcl
 raqdevil/ui/conf/ui.cfg
 raqdevil/ui/extensions/create.User/Apop.php
 raqdevil/ui/extensions/create.User/Shell.php
@@ -1012,9 +1026,10 @@
 raqdevil/ui/web/uifc/MultiFileUpload.php
 raqdevil/ui/web/uifc/MultiFileUploadHandler.php
 sbin/ftplog2commonlog
+sbin/grab_logs.pl
 sbin/maillog2commonlog.pl
 sbin/split_logs
-sbin/grab_logs.pl
+sbin/swatch
 share/locale/de/LC_MESSAGES/base-am.mo
 share/locale/de/LC_MESSAGES/base-apache.mo
 share/locale/de/LC_MESSAGES/base-cce.mo
@@ -1035,6 +1050,7 @@
 share/locale/de/LC_MESSAGES/base-time.mo
 share/locale/de/LC_MESSAGES/base-user.mo
 share/locale/de/LC_MESSAGES/palette.mo
+share/locale/de/LC_MESSAGES/swatch.mo
 share/locale/de/LC_MESSAGES/trueBlue.mo
 share/locale/en/LC_MESSAGES/base-alpine.mo
 share/locale/en/LC_MESSAGES/base-am.mo
@@ -1071,6 +1087,7 @@
 share/locale/en/LC_MESSAGES/base-vsite.mo
 share/locale/en/LC_MESSAGES/base-websitestats.mo
 share/locale/en/LC_MESSAGES/palette.mo
+share/locale/en/LC_MESSAGES/swatch.mo
 share/locale/en/LC_MESSAGES/trueBlue.mo
 share/locale/es/LC_MESSAGES/base-am.mo
 share/locale/es/LC_MESSAGES/base-apache.mo
@@ -1091,6 +1108,7 @@
 share/locale/es/LC_MESSAGES/base-time.mo
 share/locale/es/LC_MESSAGES/base-user.mo
 share/locale/es/LC_MESSAGES/palette.mo
+share/locale/es/LC_MESSAGES/swatch.mo
 share/locale/es/LC_MESSAGES/trueBlue.mo
 share/locale/fr/LC_MESSAGES/base-am.mo
 share/locale/fr/LC_MESSAGES/base-apache.mo
@@ -1111,6 +1129,7 @@
 share/locale/fr/LC_MESSAGES/base-time.mo
 share/locale/fr/LC_MESSAGES/base-user.mo
 share/locale/fr/LC_MESSAGES/palette.mo
+share/locale/fr/LC_MESSAGES/swatch.mo
 share/locale/fr/LC_MESSAGES/trueBlue.mo
 @dirrm raqdevil/ui/web/uifc
 @dirrm raqdevil/ui/web/nav
@@ -1190,8 +1209,6 @@
 @dirrm raqdevil/swatch
 @dirrm raqdevil/skel/web/error
 @dirrm raqdevil/skel/web
- at dirrm raqdevil/skel/spam
- at dirrm raqdevil/skel/quarantine
 @dirrm raqdevil/skel
 @dirrm raqdevil/sessions
 @dirrm raqdevil/schemas/base/vsite
--- raqdevil.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list