Attachment 63816 Details for Bug 95073 – bacula.patch

[patch] bacula.patch

bacula.patch (text/plain), 13.07 KB, created by Dan Langille on 2006-03-29 12:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2006-03-29 12:40:16 UTC

Size: 13.07 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
>--- /usr/ports/sysutils/bacula-server/Makefile	Sun Mar 19 05:19:59 2006
>+++ bacula-server/Makefile	Wed Mar 29 06:31:34 2006
>@@ -6,15 +6,15 @@
> #
> 
> PORTNAME=	bacula
>-PORTVERSION=	1.38.5
>-PORTREVISION=	1
>+DISTVERSION=	1.38.6
>+#PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	bacula
> PKGNAMESUFFIX?=	-server
> UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
> 
>-MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
>+MAINTAINER=	dan@langille.org
> COMMENT?=	The network backup solution (server)
> 
> CONFLICTS=	bacula-server-devel-[0-9]* bacula-client-devel-[0-9]*
>@@ -28,17 +28,22 @@
> CONFIGURE_ARGS=	--with-tcp-wrappers=/usr/lib \
> 		--enable-smartalloc \
> 		--with-working-dir=${BACULA_DIR} \
>-		--with-scriptdir=${PREFIX}/share/bacula \
>+		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
> 		--mandir=${PREFIX}/man \
>-		--with-fd-user=root \
>-		--with-fd-group=wheel \
>-		--with-dir-user=bacula \
>-		--with-dir-group=bacula \
>-		--with-sd-user=bacula \
>-		--with-sd-group=operator \
> 		--with-readline=yes \
> 		--disable-conio
> 
>+.if defined(WITH_CLIENT_ONLY)
>+CONFIGURE_ARGS+=		--with-fd-user=root \
>+		--with-fd-group=wheel
>+.else
>+CONFIGURE_ARGS+= 		--with-dir-user=bacula \
>+		--with-dir-group=bacula \
>+		--with-sd-user=bacula \
>+		--with-sd-group=operator
>+.endif
>+
>+
> CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib" \
> 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>@@ -66,6 +71,7 @@
> OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
> 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
>@@ -77,7 +83,7 @@
> 
> PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
> 
>-MAN8=           bacula.8
>+MAN8=		bacula.8
> 
> .include <bsd.port.pre.mk>
> 
>@@ -94,6 +100,7 @@
> .if defined(WITH_CLIENT_ONLY)
> CONFFILES=	fd
> CONFIGURE_ARGS+=	--enable-client-only
>+
> PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.client
> PKGINSTALL=	${PKGDIR}/pkg-install.client
> # Build gnome-console
>@@ -190,22 +197,38 @@
> # 	Dont mkdir ${PREFIX}/share/bacula cause it's empty
> 	@${REINPLACE_CMD} -e 's|^$fd_subdirs = .*$scripts$.*$|\1\2|g' ${WRKSRC}/Makefile.in
> 	${REINPLACE_CMD} -e 's|$.*$$(MKDIR) $$(DESTDIR)$$(scriptdir)$|#\1|g' ${WRKSRC}/Makefile.in
>+#	${REINPLACE_CMD} -e 's|/z-bacula-server.sh.sample|/z-bacula-client.sh.sample|g' ${WRKSRC}/scripts/Makefile.in
> .else
> #	In server port don't install filed
> 	@${REINPLACE_CMD} -e 's|^all_subdirs = .*|all_subdirs = scripts src\/lib src\/findlib $${subdirs}|g' ${WRKSRC}/Makefile.in
> .endif
> 
>+pre-install:
>+	if [ ! -d "${BACULA_DIR}" ]; then \
>+		${ECHO_CMD} "creating ${BACULA_DIR}" ; \
>+		${MKDIR} ${BACULA_DIR}; \
>+	else \
>+		${ECHO_CMD} "${BACULA_DIR} already exists"; \
>+	fi
>+
>+.if !defined(WITH_CLIENT_ONLY)
>+# 	Extend /etc/services and install UID/GID
>+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
>+		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
>+.endif
>+
>+
> post-install:
> #	Migration: move existing bacula.sh to z-bacula.sh to start bacula AFTER DB start
> 	if [ -f ${PREFIX}/etc/rc.d/bacula.sh ]; then \
>-		${MV} ${PREFIX}/etc/rc.d/bacula.sh ${PREFIX}/etc/rc.d/z-bacula.sh; \
>+		${MV} ${PREFIX}/etc/rc.d/bacula.sh ${PREFIX}/etc/rc.d/z-bacula-server.sh; \
> 	fi
> 	if [ -f ${PREFIX}/etc/rc.d/bacula.sh.sample ]; then \
>-		${MV} ${PREFIX}/etc/rc.d/bacula.sh.sample ${PREFIX}/etc/rc.d/z-bacula.sh.sample; \
>+		${MV} ${PREFIX}/etc/rc.d/bacula.sh.sample ${PREFIX}/etc/rc.d/z-bacula-server.sh.sample; \
> 	fi
> .if defined(WITH_CLIENT_ONLY)
> # 	Install start script
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/bacula ${PREFIX}/etc/rc.d/z-bacula.sh.sample
>+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/bacula-ctl-fd ${PREFIX}/etc/rc.d/z-bacula-ctl-fd.sh.sample
> # 	Extend only /etc/services
> 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
> 		${SH} ${PKGINSTALL} ${PORTNAME}
>@@ -250,10 +273,8 @@
> 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/developers/developers.pdf ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR}
> .endif
>+
> .else
>-# 	Extend /etc/services and install UID/GID
>-	@ ${SETENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
> # 	Install config files and preserve existing ones
> 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin
> 	if [ -f ${PREFIX}/etc/bacula-barcodes ]; then \
>@@ -327,7 +348,7 @@
> 	@${ECHO_MSG} "For USB support read the bacula manual!! It could be necessary"
> 	@${ECHO_MSG} "to configure/compile a new kernel!"
> 	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "Look at ${PREFIX}/share/bacula/update_bacula_tables for"
>+	@${ECHO_MSG} "Look at $PREFIX/share/bacula/update_bacula_tables for"
> 	@${ECHO_MSG} "database update procedure. Details can be found in the"
> 	@${ECHO_MSG} "ReleaseNotes"
> .endif
>diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo
>--- /usr/ports/sysutils/bacula-server/distinfo	Fri Feb  3 17:04:21 2006
>+++ bacula-server/distinfo	Wed Mar 29 05:00:57 2006
>@@ -1,6 +1,3 @@
>-MD5 (bacula-1.38.5.tar.gz) = 7f8f0f642b22dc2089ef7b42eb08f826
>-SHA256 (bacula-1.38.5.tar.gz) = df760f15ba4667fbc1ac2d985b982920eb3a1d25c17ba744bc688f0f10fe47c7
>-SIZE (bacula-1.38.5.tar.gz) = 1911024
>-MD5 (bacula-docs-1.38.5.tar.gz) = 11035d75fdd9d10801f0b3dda1f09440
>-SHA256 (bacula-docs-1.38.5.tar.gz) = f83e60a33ac73eb35fce30ce5a1beecd596024068386a91662b43468bb42b853
>-SIZE (bacula-docs-1.38.5.tar.gz) = 23183760
>+MD5 (bacula-1.38.6.tar.gz) = 219382ae85671c8ff13f375b6d9aa079
>+SHA256 (bacula-1.38.6.tar.gz) = e671f3ff20c97e8392908920ae9ca38f814359c5b85b89625d43df9ad7349ed3
>+SIZE (bacula-1.38.6.tar.gz) = 1952827
>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	Fri Feb  3 17:04:21 2006
>+++ bacula-server/files/patch-scripts-Makefile.in	Wed Mar 29 04:55:53 2006
>@@ -1,52 +1,48 @@
>-*** scripts/Makefile.in.orig	Thu Nov  3 15:33:16 2005
>---- scripts/Makefile.in	Thu Nov 17 08:31:29 2005
>-***************
>-*** 33,43 ****
>-  	$(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
>-  	@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; \
>---- 33,43 ----
>-  	$(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)$(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,58 ****
>-  	   $(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
>-! 	gzip <bacula.man >bacula.8.gz
>-! 	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
>-  	@rm -f bacula.8.gz
>-  
>-  
>---- 48,58 ----
>-  	   $(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
>-! #	gzip <bacula.man >bacula.8.gz
>-! 	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
>-  	@rm -f bacula.8.gz
>-  
>-  
>+--- scripts/Makefile.in.orig	Sat Mar 25 08:37:41 2006
>++++ scripts/Makefile.in	Sat Mar 25 10:47:33 2006
>+@@ -33,14 +33,14 @@
>+ 	$(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) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir
>+-	$(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd
>+-	$(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd
>++#	$(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
>++	$(INSTALL_SCRIPT) bacula-ctl-dir $(DESTDIR)$(sysconfdir)/rc.d/z-bacula-ctl-dir.sh.sample
>++#	$(INSTALL_SCRIPT) bacula-ctl-fd  $(DESTDIR)$(sysconfdir)/rc.d/z-bacula-ctl-fd.sh.sample
>++	$(INSTALL_SCRIPT) bacula-ctl-sd  $(DESTDIR)$(sysconfdir)/rc.d/z-bacula-ctl-sd.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; \
>+@@ -56,14 +56,14 @@
>+ 	   $(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
>+-	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
>+-		   $(DESTDIR)$(scriptdir)/btraceback.dbx
>+-	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
>+-	gzip <bacula.man >bacula.8.gz
>+-	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
>+-	@rm -f bacula.8.gz
>++#	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
>++#	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
>++#	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
>++#		   $(DESTDIR)$(scriptdir)/btraceback.dbx
>++#	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
>++#	gzip <bacula.man >bacula.8.gz
>++	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
>++#	@rm -f bacula.8.gz
>+ 
>+ 
>+ uninstall:
>diff -ruN /usr/ports/sysutils/bacula-server/pkg-install bacula-server/pkg-install
>--- /usr/ports/sysutils/bacula-server/pkg-install	Mon Jan 12 14:56:23 2004
>+++ bacula-server/pkg-install	Wed Mar 29 04:55:53 2006
>@@ -16,12 +16,16 @@
> fi
> 
> case $2 in
>-POST-INSTALL)
>+PRE-INSTALL)
> 	# Install UID/GID
> 	USER=bacula
> 	GROUP=${USER}
> 	UID=910
> 	GID=${UID}
>+
>+	if [ ! -d ${BACULA_DIR} ]; then
>+		mkdir -p ${BACULA_DIR}
>+	fi
> 
> 	if pw group show "${GROUP}" 2>/dev/null; then
> 		echo "You already have a group \"${GROUP}\", so I will use it."
>diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist
>--- /usr/ports/sysutils/bacula-server/pkg-plist	Fri Feb  3 17:04:21 2006
>+++ bacula-server/pkg-plist	Wed Mar 29 04:55:53 2006
>@@ -1,5 +1,6 @@
> %%DATADIR%%/query.sql
>-etc/rc.d/z-bacula.sh.sample
>+etc/rc.d/z-bacula-ctl-dir.sh.sample
>+etc/rc.d/z-bacula-ctl-sd.sh.sample
> sbin/chio-bacula
> sbin/bacula-dir
> sbin/bacula-sd
>@@ -13,6 +14,7 @@
> sbin/dbcheck
> sbin/bsmtp
> @unexec if cmp -s %D/share/bacula/mtx-changer.old %D/share/bacula/mtx-changer; then rm -f %D/share/bacula/mtx-changer.old; fi
>+@unexec if cmp -s %D/share/bacula/disk-changer.old %D/share/bacula/disk-changer; then rm -f %D/share/bacula/disk-changer.old; fi
> %%DATADIR%%/mtx-changer
> %%DATADIR%%/create_bacula_database
> %%DATADIR%%/create_%%DBTYPE%%_database
>@@ -29,8 +31,10 @@
> %%DATADIR%%/delete_catalog_backup
> %%DATADIR%%/make_catalog_backup
> %%DATADIR%%/dvd-handler
>+%%DATADIR%%/disk-changer
> 
> @dirrm %%DATADIR%%
>-@unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true
>+@unexec /usr/bin/killall bacula-sd  > /dev/null 2>&1 || true
> @unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true
> @exec mkdir -p %%BACULA_DIR%%
>+@dirrmtry %%BACULA_DIR%%
>diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist.client bacula-server/pkg-plist.client
>--- /usr/ports/sysutils/bacula-server/pkg-plist.client	Sun May 15 10:44:50 2005
>+++ bacula-server/pkg-plist.client	Wed Mar 29 04:55:53 2006
>@@ -1,7 +1,8 @@
>-etc/rc.d/z-bacula.sh.sample
>+etc/rc.d/z-bacula-ctl-fd.sh.sample
> sbin/bacula-fd
> sbin/bconsole
> %%GNOMECONS%%sbin/gnome-console
> %%WXCONS%%sbin/wx-console
> @unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
> @exec mkdir -p %%BACULA_DIR%%
>+@dirrmtry %%BACULA_DIR%%

Actions: View | Diff

Attachments on bug 95073: 63816