From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 1 17:40:17 2005 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 8F38D16A421 for ; Tue, 1 Nov 2005 17:40:17 +0000 (GMT) (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 733E943D4C for ; Tue, 1 Nov 2005 17:40:15 +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 jA1HeEZJ026343 for ; Tue, 1 Nov 2005 17:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA1HeEQT026342; Tue, 1 Nov 2005 17:40:14 GMT (envelope-from gnats) Resent-Date: Tue, 1 Nov 2005 17:40:14 GMT Resent-Message-Id: <200511011740.jA1HeEQT026342@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, Dan Langille Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E279C16A41F for ; Tue, 1 Nov 2005 17:32:41 +0000 (GMT) (envelope-from dan@xeon.unixathome.org) Received: from m21.unixathome.org (m21.unixathome.org [205.150.199.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36E4443D5F for ; Tue, 1 Nov 2005 17:32:38 +0000 (GMT) (envelope-from dan@xeon.unixathome.org) Received: from localhost (localhost [205.150.199.217]) by m21.unixathome.org (Postfix) with ESMTP id 15FE6BFB3; Tue, 1 Nov 2005 12:32:38 -0500 (EST) Received: from m21.unixathome.org ([205.150.199.217]) by localhost (m21.unixathome.org [205.150.199.217]) (amavisd-new, port 10024) with ESMTP id 24602-10; Tue, 1 Nov 2005 12:32:35 -0500 (EST) Received: from bast.unixathome.org (bast.unixathome.org [70.26.229.230]) by m21.unixathome.org (Postfix) with ESMTP id BF64DBFB0; Tue, 1 Nov 2005 12:32:35 -0500 (EST) Received: from xeon.unixathome.org (xeon.unixathome.org [10.55.0.18]) by bast.unixathome.org (Postfix) with ESMTP id 783533D3B; Tue, 1 Nov 2005 12:32:35 -0500 (EST) Received: by xeon.unixathome.org (Postfix, from userid 1000) id 0E59F3E7F; Tue, 1 Nov 2005 12:32:35 -0500 (EST) Message-Id: <20051101173235.0E59F3E7F@xeon.unixathome.org> Date: Tue, 1 Nov 2005 12:32:35 -0500 (EST) From: Dan Langille To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dan@langille.org, Lars.Koeller@Uni-Bielefeld.DE Subject: ports/88356: update to 1.38.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Langille List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2005 17:40:19 -0000 >Number: 88356 >Category: ports >Synopsis: update to 1.38.0 >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: Tue Nov 01 17:40:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dan Langille >Release: FreeBSD 4.9-STABLE i386 >Organization: The FreeBSD Diary >Environment: System: FreeBSD xeon.unixathome.org 4.9-STABLE FreeBSD 4.9-STABLE #2: Wed Mar 3 08:16:24 EST 2004 dan@polo.unixathome.org:/usr/obj/usr/src/sys/XEON i386 >Description: >How-To-Repeat: >Fix: --- bacula-server.diff begins here --- diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile --- /usr/ports/sysutils/bacula-server/Makefile Mon Oct 3 05:14:49 2005 +++ bacula-server/Makefile Tue Nov 1 11:53:27 2005 @@ -6,13 +6,13 @@ # PORTNAME= bacula -PORTVERSION= 1.36.3 +PORTVERSION= 1.38.0 #PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula PKGNAMESUFFIX?= -server -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-doc-${PORTVERSION}.tar.gz +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT?= The network backup solution (server) @@ -37,12 +37,13 @@ --with-readline=yes \ --disable-conio + CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE MYSQL POSTGRESQL MTX +ALL_OPTIONS= CLIENT_ONLY WXCONSOLE GNOMECONSOLE MYSQL POSTGRESQL MTX OPENSSL .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) @@ -63,6 +64,8 @@ OPTIONS+= MTX "Install mtx for control of autochanger devices" off .endif +OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off + # Prepare if gnome-console is selected this must be happen before # include of bsd.port.pre.mk! WANT_GNOME= yes @@ -78,7 +81,7 @@ .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only -PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo html-manual web-manual +PORTDOCS= ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.client PKGINSTALL= ${PKGDIR}/pkg-install.client # Build gnome-console @@ -126,6 +129,11 @@ .endif .endif +.if defined(WITH_OPENSSL) +CONFIGURE_ARGS+= --with-openssl +.endif + + pre-everything:: .if !defined(WITH_CLIENT_ONLY) @${ECHO_MSG} "=======> ATTENTION <=======" @@ -204,15 +212,17 @@ .endif # Documentaion is only installed in -client port .if !defined(NOPORTDOCS) - for na in html-manual web-manual; do \ + for na in manual bacula-web; do \ ${MKDIR} ${DOCSDIR}/$$na ;\ - cd ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION} && ${FIND} $$na | \ + cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \ ${CPIO} -pdm -L -R root:wheel ${DOCSDIR}; \ done - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/ReleaseNotes ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/bacula.pdf ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/developers.pdf ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/kernstodo ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manual/bacula.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/developers/developers.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR} + MAN8PREFIX=${WRKDIR}/${PORTNAME}-${PORTVERSION}/scripts/ + MAN8=bacula.man .endif .else # Extend /etc/services and install UID/GID diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo --- /usr/ports/sysutils/bacula-server/distinfo Tue May 17 05:02:40 2005 +++ bacula-server/distinfo Tue Nov 1 11:18:40 2005 @@ -1,4 +1,4 @@ -MD5 (bacula-1.36.3.tar.gz) = 9499d6277b8673ae7c24dcdbf89ee026 -SIZE (bacula-1.36.3.tar.gz) = 11153154 -MD5 (bacula-doc-1.36.3.tar.gz) = db08859bc193e777c76bcbf5e60f0c7e -SIZE (bacula-doc-1.36.3.tar.gz) = 4506465 +MD5 (bacula-1.38.0.tar.gz) = 872f5b86404e5c9b47bd56b9ffcb107c +SIZE (bacula-1.38.0.tar.gz) = 1847955 +MD5 (bacula-docs-1.38.0.tar.gz) = b8b10ca59a23c132cf4658c55103b85e +SIZE (bacula-docs-1.38.0.tar.gz) = 22003257 diff -ruN /usr/ports/sysutils/bacula-server/files/patch-autoconf-Make.common.in bacula-server/files/patch-autoconf-Make.common.in --- /usr/ports/sysutils/bacula-server/files/patch-autoconf-Make.common.in Tue Aug 3 16:22:02 2004 +++ bacula-server/files/patch-autoconf-Make.common.in Wed Dec 31 19:00:00 1969 @@ -1,19 +0,0 @@ -*** autoconf/Make.common.in.orig Sat Jun 19 23:16:06 2004 ---- autoconf/Make.common.in Sun Jun 27 18:38:11 2004 -*************** -*** 43,49 **** - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode -! INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@ - INSTALL_DATA = @INSTALL@ -m 644 - INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@ - INSTALL_CONFIG = @INSTALL@ -m 640 ---- 44,50 ---- - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode -! INSTALL_PROGRAM = @INSTALL@ -s -m @SBINPERM@ - INSTALL_DATA = @INSTALL@ -m 644 - INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@ - INSTALL_CONFIG = @INSTALL@ -m 640 diff -ruN /usr/ports/sysutils/bacula-server/files/patch-configure bacula-server/files/patch-configure --- /usr/ports/sysutils/bacula-server/files/patch-configure Sat Mar 12 02:28:45 2005 +++ bacula-server/files/patch-configure Mon Oct 31 14:04:27 2005 @@ -1,7 +1,7 @@ *** configure.org Sun Mar 6 16:46:54 2005 --- configure Sun Mar 6 16:49:20 2005 *************** -*** 21037,21044 **** +*** 29490,29497 **** DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then diff -ruN /usr/ports/sysutils/bacula-server/files/patch-scripts-Makefile.in bacula-server/files/patch-scripts-Makefile.in --- /usr/ports/sysutils/bacula-server/files/patch-scripts-Makefile.in Sun Nov 28 11:39:01 2004 +++ bacula-server/files/patch-scripts-Makefile.in Tue Nov 1 09:08:57 2005 @@ -1,43 +1,32 @@ -*** scripts/Makefile.in.orig Wed Nov 17 23:48:21 2004 ---- scripts/Makefile.in Sun Nov 28 15:00:56 2004 -*************** -*** 32,50 **** - $(MKDIR) $(DESTDIR)$(scriptdir) - - install: installdirs -! $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql -! $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql -! $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole -! $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole -! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula - @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ - echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ - fi - $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb -! $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx -! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) ---- 32,50 ---- - $(MKDIR) $(DESTDIR)$(scriptdir) - - install: installdirs -! # $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql -! # $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql -! # $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole -! # $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole -! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample - @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ - echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ - fi - $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -! # $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb -! # $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx -! # $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) +--- scripts/Makefile.in.org Mon Oct 17 18:07:57 2005 ++++ scripts/Makefile.in Tue Nov 1 08:29:48 2005 +@@ -33,11 +33,11 @@ + $(MKDIR) $(DESTDIR)$(mandir) + + install: installdirs +- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql +- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql +- $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole +- $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole +- $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula ++# $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql ++# $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql ++# $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole ++# $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole ++ $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/z-bacula.sh.sample + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ +@@ -48,9 +48,9 @@ + $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \ + fi + $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler +- $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +- $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx +- $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback ++# $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb ++# $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx ++# $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + gzip bacula.8.gz + $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz + @rm -f bacula.8.gz diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist --- /usr/ports/sysutils/bacula-server/pkg-plist Tue May 17 05:02:40 2005 +++ bacula-server/pkg-plist Tue Nov 1 11:44:11 2005 @@ -28,6 +28,8 @@ %%DATADIR%%/update_%%DBTYPE%%_tables %%DATADIR%%/delete_catalog_backup %%DATADIR%%/make_catalog_backup +%%DATADIR%%/dvd-handler + @dirrm %%DATADIR%% @unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true @unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true --- bacula-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: