From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 18 08:00:38 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A38016A420 for ; Tue, 18 Apr 2006 08:00:38 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A7243D5E for ; Tue, 18 Apr 2006 08:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3I80bFF026480 for ; Tue, 18 Apr 2006 08:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3I80a1Q026474; Tue, 18 Apr 2006 08:00:36 GMT (envelope-from gnats) Resent-Date: Tue, 18 Apr 2006 08:00:36 GMT Resent-Message-Id: <200604180800.k3I80a1Q026474@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, koutek@o-k.cz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1028516A418 for ; Tue, 18 Apr 2006 07:50:37 +0000 (UTC) (envelope-from root@bazalka.mediaturtle.com) Received: from bazalka.mediaturtle.com (bazalka.mediaturtle.com [82.99.173.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B72C43D4C for ; Tue, 18 Apr 2006 07:50:12 +0000 (GMT) (envelope-from root@bazalka.mediaturtle.com) Received: from localhost (localhost.mediaturtle.com [127.0.0.1]) by bazalka.mediaturtle.com (Postfix) with ESMTP id 28CBE1176D for ; Tue, 18 Apr 2006 09:50:11 +0200 (CEST) Received: from bazalka.mediaturtle.com ([127.0.0.1]) by localhost (bazalka.mediaturtle.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z118uTLIiZJi for ; Tue, 18 Apr 2006 09:49:59 +0200 (CEST) Received: by bazalka.mediaturtle.com (Postfix, from userid 0) id 4A96D116A8; Tue, 18 Apr 2006 09:49:59 +0200 (CEST) Message-Id: <20060418074959.4A96D116A8@bazalka.mediaturtle.com> Date: Tue, 18 Apr 2006 09:49:59 +0200 (CEST) From: koutek@o-k.cz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95985: Update port www/campsite 2.5.0 -> 2.5.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: koutek@o-k.cz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 08:00:39 -0000 >Number: 95985 >Category: ports >Synopsis: Update port www/campsite 2.5.0 -> 2.5.1 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 18 08:00:36 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Ondra Koutek >Release: FreeBSD 6.0-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD bazalka.mediaturtle.com 6.0-RELEASE-p6 FreeBSD 6.0-RELEASE-p6 #11: Wed Mar 22 20:42:54 CET 2006 root@bazalka.mediaturtle.com:/usr/obj/usr/src/sys/S1 i386 >Description: Update port www/campsite 2.5.0 -> 2.5.1 >How-To-Repeat: >Fix: --- campsite.diff begins here --- diff -ruN campsite.orig/Makefile campsite/Makefile --- campsite.orig/Makefile Fri Mar 31 17:28:46 2006 +++ campsite/Makefile Tue Apr 18 08:50:34 2006 @@ -6,7 +6,7 @@ # PORTNAME= campsite -PORTVERSION= 2.5.0 +PORTVERSION= 2.5.1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -51,7 +51,7 @@ post-patch: @${FIND} ${WRKSRC} -type f -perm 755 \ - -or -name create_instance \ + -or -name campsite_create_instance \ -or -name global_functions \ -or -name check4_functions \ -or -name conf_functions | ${XARGS} \ diff -ruN campsite.orig/distinfo campsite/distinfo --- campsite.orig/distinfo Fri Mar 31 17:28:46 2006 +++ campsite/distinfo Tue Apr 18 08:58:37 2006 @@ -1,3 +1,3 @@ -MD5 (campsite-2.5.0.tar.gz) = ea6f32f05e84a88712505b21b4091282 -SHA256 (campsite-2.5.0.tar.gz) = a104f8b217b2a6788c7393329a8af8219204960c3717a2192e2fafc5be3ccec6 -SIZE (campsite-2.5.0.tar.gz) = 3912230 +MD5 (campsite-2.5.1.tar.gz) = b3fc1d2609bd7de323d44d416ee261aa +SHA256 (campsite-2.5.1.tar.gz) = a599e66b5040a287033409b6a15bda476fb2e4bd6c749719df342351d3fa2a5c +SIZE (campsite-2.5.1.tar.gz) = 3945108 diff -ruN campsite.orig/files/patch-install_autopublish campsite/files/patch-install_autopublish --- campsite.orig/files/patch-install_autopublish Fri Jan 13 20:37:05 2006 +++ campsite/files/patch-install_autopublish Tue Apr 18 08:56:46 2006 @@ -1,12 +1,8 @@ --- implementation/management/bin/install_autopublish.orig Fri Nov 11 19:34:40 2005 -+++ implementation/management/bin/install_autopublish Fri Jan 13 14:52:04 2006 -@@ -1,12 +1,12 @@ - #!/bin/bash - --[ "$USER_INSTALL" = "" ] && USER_INSTALL=false --if $USER_INSTALL; then exit 0; fi -+#[ "$USER_INSTALL" = "" ] && USER_INSTALL=false -+#if $USER_INSTALL; then exit 0; fi ++++ implementation/management/bin/install_autopublish Tue Apr 18 08:56:05 2006 +@@ -3,10 +3,10 @@ + [ "$USER_INSTALL" = "" ] && USER_INSTALL=false + if $USER_INSTALL; then exit 0; fi -. ${INSTALL_CONF}/cron_functions -if [ -f /etc/crontab ]; then diff -ruN campsite.orig/files/patch-install_mailnotify campsite/files/patch-install_mailnotify --- campsite.orig/files/patch-install_mailnotify Fri Jan 13 20:37:05 2006 +++ campsite/files/patch-install_mailnotify Tue Apr 18 08:52:52 2006 @@ -1,22 +1,33 @@ ---- implementation/mailnotify/install_mailnotify.orig Fri Nov 11 19:34:40 2005 -+++ implementation/mailnotify/install_mailnotify Fri Jan 13 15:17:45 2006 -@@ -6,12 +6,12 @@ +--- implementation/mailnotify/install_mailnotify.orig Tue Mar 21 16:06:05 2006 ++++ implementation/mailnotify/install_mailnotify Tue Apr 18 08:51:35 2006 +@@ -8,20 +8,20 @@ + install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_notifyendsubs "$SBIN_DIR" + install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_notifyevents "$SBIN_DIR" - if $USER_INSTALL; then exit 0; fi +-if $USER_INSTALL; then exit 0; fi ++#if $USER_INSTALL; then exit 0; fi -. ${INSTALL_CONF}/cron_functions ++#. ${INSTALL_CONF}/cron_functions + + # remove cron tasks from older versions +-uninstall_cron_task "$BIN_DIR/notifyendsubs" "/etc/cron.d/notifyendsubs" &> /dev/null +-uninstall_cron_task "$BIN_DIR/notifyevents" "/etc/cron.d/notifyevents" &> /dev/null -if [ -f /etc/crontab ]; then -- uninstall_cron_task "$BIN_DIR/notifyendsubs" /etc/crontab -- uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab +- uninstall_cron_task "$BIN_DIR/notifyendsubs" /etc/crontab &> /dev/null +- uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab &> /dev/null -fi ++#uninstall_cron_task "$BIN_DIR/notifyendsubs" "/etc/cron.d/notifyendsubs" &> /dev/null ++#uninstall_cron_task "$BIN_DIR/notifyevents" "/etc/cron.d/notifyevents" &> /dev/null ++#if [ -f /etc/crontab ]; then ++# uninstall_cron_task "$BIN_DIR/notifyendsubs" /etc/crontab &> /dev/null ++# uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab &> /dev/null ++#fi + + # install our cron tasks -install_cron_task "0" "*/8" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyendsubs" "/etc/cron.d/campsite_notifyendsubs" || exit 1 -install_cron_task "*/2" "*" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyevents" "/etc/cron.d/campsite_notifyevents" || exit 1 -restart_cron || exit 1 -+#. ${INSTALL_CONF}/cron_functions -+#if [ -f /etc/crontab ]; then -+# uninstall_cron_task "$BIN_DIR/notifyendsubs" /etc/crontab -+# uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab -+#fi +#install_cron_task "0" "*/8" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyendsubs" "/etc/cron.d/campsite_notifyendsubs" || exit 1 +#install_cron_task "*/2" "*" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyevents" "/etc/cron.d/campsite_notifyevents" || exit 1 +#restart_cron || exit 1 diff -ruN campsite.orig/files/patch-install_search campsite/files/patch-install_search --- campsite.orig/files/patch-install_search Fri Jan 13 20:37:05 2006 +++ campsite/files/patch-install_search Tue Apr 18 08:55:14 2006 @@ -1,19 +1,29 @@ ---- implementation/search/install_search.orig Fri Nov 11 19:34:40 2005 -+++ implementation/search/install_search Fri Jan 13 15:17:55 2006 -@@ -6,10 +6,10 @@ +--- implementation/search/install_search.orig Tue Mar 21 16:06:05 2006 ++++ implementation/search/install_search Tue Apr 18 08:54:16 2006 +@@ -8,18 +8,18 @@ + install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_indexer "$SBIN_DIR" + [ $? -ne 0 ] && exit 1 - if $USER_INSTALL; then exit 0; fi +-if $USER_INSTALL; then exit 0; fi ++#if $USER_INSTALL; then exit 0; fi -. ${INSTALL_CONF}/cron_functions ++#. ${INSTALL_CONF}/cron_functions + + # remove cron tasks from older versions +-uninstall_cron_task "$BIN_DIR/gather" /etc/cron.d/campsite_gather &> /dev/null -if [ -f /etc/crontab ]; then -- uninstall_cron_task "$BIN_DIR/gather" /etc/crontab +- uninstall_cron_task "$BIN_DIR/gather" /etc/crontab &> /dev/null -fi --install_cron_task "0" "*/4" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_indexer" /etc/cron.d/campsite_indexer -c || exit 1 --restart_cron || exit 1 -+#. ${INSTALL_CONF}/cron_functions ++#uninstall_cron_task "$BIN_DIR/gather" /etc/cron.d/campsite_gather &> /dev/null +#if [ -f /etc/crontab ]; then -+# uninstall_cron_task "$BIN_DIR/gather" /etc/crontab ++# uninstall_cron_task "$BIN_DIR/gather" /etc/crontab &> /dev/null +#fi + + # install our cron task +-install_cron_task "0" "*/4" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_indexer" /etc/cron.d/campsite_indexer -c || exit 1 +-restart_cron || exit 1 +#install_cron_task "0" "*/4" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_indexer" /etc/cron.d/campsite_indexer -c || exit 1 +#restart_cron || exit 1 + exit 0 --- campsite.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: