From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 15 13:50:01 2005 Return-Path: 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 D868716A4CE for ; Tue, 15 Mar 2005 13:50:01 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9048243D46 for ; Tue, 15 Mar 2005 13:50:01 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2FDo1ck030092 for ; Tue, 15 Mar 2005 13:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2FDo1aX030091; Tue, 15 Mar 2005 13:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 15 Mar 2005 13:50:01 GMT Resent-Message-Id: <200503151350.j2FDo1aX030091@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, Artis Caune Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8658616A4CE for ; Tue, 15 Mar 2005 13:46:18 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4875643D3F for ; Tue, 15 Mar 2005 13:46:18 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j2FDkIew084667 for ; Tue, 15 Mar 2005 13:46:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j2FDkIk5084666; Tue, 15 Mar 2005 13:46:18 GMT (envelope-from nobody) Message-Id: <200503151346.j2FDkIk5084666@www.freebsd.org> Date: Tue, 15 Mar 2005 13:46:18 GMT From: Artis Caune To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/78866: [PATCH] mail/courier-authlib X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Mar 2005 13:50:02 -0000 >Number: 78866 >Category: ports >Synopsis: [PATCH] mail/courier-authlib >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 15 13:50:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Artis Caune >Release: 5.3 >Organization: >Environment: FreeBSD mansBSD.lv 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #0: Wed Feb 16 17:14:35 EET 2005 root@mansBSD.lv:/usr/obj/usr/src/sys/KERNEL i386 >Description: This patch will change socket and pid location from /usr/local/var/spool/authdaemon/ to /var/run/authdaemon/ and fix default user/group premissions. >How-To-Repeat: >Fix: *** Makefile.orig Tue Mar 15 10:43:59 2005 --- Makefile Tue Mar 15 11:58:18 2005 *************** *** 50,56 **** CONFIGURE_ARGS= --without-authshadow \ --without-authcustom \ --enable-unicode \ ! --enable-ltdl-install=no .include --- 50,57 ---- CONFIGURE_ARGS= --without-authshadow \ --without-authcustom \ --enable-unicode \ ! --enable-ltdl-install=no \ ! --with-authdaemonvar=/var/run/authdaemon .include *************** *** 119,128 **** --- 120,133 ---- .if defined(WITH_MAILUSER) CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER} + .else + CONFIGURE_ARGS+=--with-mailuser=root .endif .if defined(WITH_MAILGROUP) CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP} + .else + CONFIGURE_ARGS+=--with-mailgroup=wheel .endif RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} *** pkg-plist.orig Tue Mar 15 10:45:08 2005 --- pkg-plist Tue Mar 15 11:52:58 2005 *************** *** 1,3 **** --- 1,4 ---- + @unexec [ ! -f /var/run/authdaemon/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true bin/courierauthconfig etc/rc.d/courier-authdaemond.sh %%MYSQLFLAG%%etc/authlib/authmysqlrc.dist *************** *** 60,70 **** %%PORTDOCS%%%%DOCSDIR%%/README.ldap %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% ! @exec mkdir -p %D/var/spool/authdaemon 2>/dev/null || true ! @unexec rmdir %D/var/spool/authdaemon 2>/dev/null || true ! @unexec rmdir %D/var/spool 2>/dev/null || true ! @unexec rmdir %D/var/authdaemon 2>/dev/null || true ! @unexec rmdir %D/var 2>/dev/null || true @unexec rmdir %D/etc/authlib 2>/dev/null || true @dirrm lib/courier-authlib @dirrm libexec/courier-authlib --- 61,68 ---- %%PORTDOCS%%%%DOCSDIR%%/README.ldap %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% ! @exec mkdir -m 0750 /var/run/authdaemon 2>/dev/null || true ! @unexec rmdir /var/run/authdaemon 2>/dev/null || true @unexec rmdir %D/etc/authlib 2>/dev/null || true @dirrm lib/courier-authlib @dirrm libexec/courier-authlib *** files/courier-authdaemond.sh.orig Tue Mar 15 11:04:01 2005 --- files/courier-authdaemond.sh Tue Mar 15 11:04:39 2005 *************** *** 24,30 **** start_cmd="authdaemond_cmd start" stop_cmd="authdaemond_cmd stop" restart_cmd="authdaemond_cmd stop && authdaemond_cmd start" ! pidfile="%%PREFIX%%/var/spool/authdaemon/pid" procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name --- 24,30 ---- start_cmd="authdaemond_cmd start" stop_cmd="authdaemond_cmd stop" restart_cmd="authdaemond_cmd stop && authdaemond_cmd start" ! pidfile="/var/run/authdaemon/pid" procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name *************** *** 41,47 **** if [ $? -eq 0 ] ; then [ -f "$pidfile" ] && rm -f "$pidfile" [ -f "$pidfile".lock ] && rm -f "$pidfile".lock ! [ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket return 0 fi ;; --- 41,47 ---- if [ $? -eq 0 ] ; then [ -f "$pidfile" ] && rm -f "$pidfile" [ -f "$pidfile".lock ] && rm -f "$pidfile".lock ! [ -S /var/run/authdaemon/socket ] && rm -f /var/run/authdaemon/socket return 0 fi ;; >Release-Note: >Audit-Trail: >Unformatted: