From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 20 21:20:19 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A521516A407 for ; Sat, 20 Jan 2007 21:20:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 82F9113C44B for ; Sat, 20 Jan 2007 21:20:19 +0000 (UTC) (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 l0KLKJRR024827 for ; Sat, 20 Jan 2007 21:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0KLKJXE024823; Sat, 20 Jan 2007 21:20:19 GMT (envelope-from gnats) Resent-Date: Sat, 20 Jan 2007 21:20:19 GMT Resent-Message-Id: <200701202120.l0KLKJXE024823@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, Juergen Lock Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 380C916A400 for ; Sat, 20 Jan 2007 21:12:23 +0000 (UTC) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242]) by mx1.freebsd.org (Postfix) with ESMTP id BE9B513C455 for ; Sat, 20 Jan 2007 21:12:22 +0000 (UTC) (envelope-from nox@saturn.kn-bremen.de) Received: by gwyn.kn-bremen.de (Postfix, from userid 10) id 5FE8D19BE75; Sat, 20 Jan 2007 21:49:12 +0100 (CET) Received: from saturn.kn-bremen.de (nox@localhost [127.0.0.1]) by saturn.kn-bremen.de (8.13.6/8.13.6) with ESMTP id l0KKlk6H094815 for ; Sat, 20 Jan 2007 21:47:46 +0100 (CET) (envelope-from nox@saturn.kn-bremen.de) Received: (from nox@localhost) by saturn.kn-bremen.de (8.13.6/8.13.6/Submit) id l0KKlk81094814; Sat, 20 Jan 2007 21:47:46 +0100 (CET) (envelope-from nox) Message-Id: <200701202047.l0KKlk81094814@saturn.kn-bremen.de> Date: Sat, 20 Jan 2007 21:47:46 +0100 (CET) From: Juergen Lock To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/108167: sysutils/bacula-server: auto seteotmodel option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Juergen Lock List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jan 2007 21:20:19 -0000 >Number: 108167 >Category: ports >Synopsis: sysutils/bacula-server: auto seteotmodel option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jan 20 21:20:18 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 6.1-RELEASE-p5 i386 >Organization: me? organized?? >Environment: System: FreeBSD saturn 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #0: Mon Sep 4 15:37:14 CEST 2006 nox@saturn:/ad4/usr/home/nox/src61/src/sys/i386/compile/GENERICua i386 >Description: add option to enable auto seteotmodel code >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/bacula-server/Makefile,v retrieving revision 1.78 diff -u -r1.78 Makefile --- Makefile 13 Jan 2007 17:01:57 -0000 1.78 +++ Makefile 19 Jan 2007 23:01:47 -0000 @@ -79,6 +79,7 @@ OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off OPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off OPTIONS+= MTX "Install mtx for control of autochanger devices" off +OPTIONS+= AUTOSETEOT "Enable auto seteotmodel" off .endif OPTIONS+= NLS "Native Language Support via gettext utilities" on @@ -196,6 +197,9 @@ @${ECHO_MSG} "The default DB is SQLite-2!" .endif @${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication." +.if !defined(WITH_AUTOSETEOT) + @${ECHO_MSG} " WITH_AUTOSETEOT=yes Enable auto seteotmodel (especially useful with TWO EOF = no.)" +.endif @${ECHO_MSG} "" @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." @${ECHO_MSG} "" @@ -215,6 +219,10 @@ # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in .endif +.if defined(WITH_AUTOSETEOT) + @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/eotmodel-src-stored-dev.c.patch +.endif + pre-install: if [ ! -d "${BACULA_DIR}" ]; then \ Index: files/eotmodel-src-stored-dev.c.patch @@ -0,0 +1,10 @@ +Index: src/stored/dev.c +@@ -2368,7 +2368,7 @@ + } + } + /* Turn this on later when fully tested */ +-#if defined(xxxMTIOCSETEOTMODEL) ++#if defined(MTIOCSETEOTMODEL) + uint32_t neof; + if (dev->has_cap(CAP_TWOEOF)) { + neof = 2; >Release-Note: >Audit-Trail: >Unformatted: