Attachment 98293 Details for Bug 137160 – bacula-server.diff

[patch] bacula-server.diff

bacula-server.diff (text/plain), 3.37 KB, created by Dan Langille on 2009-07-27 01:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2009-07-27 01:20:01 UTC

Size: 3.37 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
>--- /usr/ports/sysutils/bacula-server/Makefile	Sat Jul  4 19:32:30 2009
>+++ bacula-server/Makefile	Sun Jul 26 19:51:45 2009
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	bacula
>-DISTVERSION=	3.0.1
>+DISTVERSION=	3.0.2
> CATEGORIES?=	sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	bacula
>diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo
>--- /usr/ports/sysutils/bacula-server/distinfo	Sat Jul  4 19:32:30 2009
>+++ bacula-server/distinfo	Sun Jul 26 19:52:22 2009
>@@ -1,3 +1,3 @@
>-MD5 (bacula-3.0.1.tar.gz) = 173ef4d07ff10dfdbcc1142d8be21f17
>-SHA256 (bacula-3.0.1.tar.gz) = 310ad1d9fb97b5eaf78cae6de47219d485a6762b523753415bbced5dca41dd2c
>-SIZE (bacula-3.0.1.tar.gz) = 3842746
>+MD5 (bacula-3.0.2.tar.gz) = 52f4bc25d8988dffcff429bb5e1ee81b
>+SHA256 (bacula-3.0.2.tar.gz) = 8f5e0bf4734c21949f83129209e0109acf054a362b4fce7cb87a87f1815904a5
>+SIZE (bacula-3.0.2.tar.gz) = 3910414
>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 Apr 12 22:38:39 2009
>+++ bacula-server/files/patch-scripts-Makefile.in	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- scripts/Makefile.in.orig	Tue Sep 12 12:03:08 2006
>-+++ scripts/Makefile.in	Tue Sep 12 12:03:08 2006
>-@@ -139,8 +139,6 @@
>- 	$(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
>diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src_cats_sql.c bacula-server/files/patch-src_cats_sql.c
>--- /usr/ports/sysutils/bacula-server/files/patch-src_cats_sql.c	Sun Apr 12 22:38:39 2009
>+++ bacula-server/files/patch-src_cats_sql.c	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- src/cats/sql.c.orig	2009-04-12 11:07:46.218959381 -0400
>-+++ src/cats/sql.c	2009-04-12 11:08:15.509974021 -0400
>-@@ -759,7 +759,7 @@
>-    if (mdb->lock.valid == RWLOCK_VALID) { 
>-       fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
>- #ifndef HAVE_WIN32
>--      fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
>-+      fprintf(fp, "\t\tthreadid=0x%lx mutex=%p\n", (long)mdb->lock.writer_id, &mdb->lock.mutex);
>- #endif
>-    }
>- }
>diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src_lib_jcr.c bacula-server/files/patch-src_lib_jcr.c
>--- /usr/ports/sysutils/bacula-server/files/patch-src_lib_jcr.c	Sun Apr 12 22:38:39 2009
>+++ bacula-server/files/patch-src_lib_jcr.c	Wed Dec 31 19:00:00 1969
>@@ -1,13 +0,0 @@
>---- src/lib/jcr.c.orig	2009-04-12 11:07:07.079940037 -0400
>-+++ src/lib/jcr.c	2009-04-12 11:07:20.116947254 -0400
>-@@ -1063,8 +1063,8 @@
>-       fprintf(fp, "\tuse_count=%i\n",
>-               jcr->use_count());
>- #else
>--      fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
>--              jcr->use_count(), (int)jcr->my_thread_id);
>-+      fprintf(fp, "\tuse_count=%i threadid=0x%lx\n",
>-+              jcr->use_count(), (long)jcr->my_thread_id);
>- #endif
>-       fprintf(fp, "\tJobType=%c JobLevel=%c\n",
>-               jcr->get_JobType(), jcr->get_JobLevel());

Actions: View | Diff

Attachments on bug 137160: 98293 | 98294