Attachment #98293 for bug #137160

Lines 6-12 Link Here

(-)bacula-server/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= bacula	8	PORTNAME= bacula
9	DISTVERSION= 3.0.1	9	DISTVERSION= 3.0.2
10	CATEGORIES?= sysutils	10	CATEGORIES?= sysutils
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= bacula	12	MASTER_SITE_SUBDIR= bacula

Lines 1-3 Link Here

(-)bacula-server/distinfo (-3 / +3 lines)
1	MD5 (bacula-3.0.1.tar.gz) = 173ef4d07ff10dfdbcc1142d8be21f17	1	MD5 (bacula-3.0.2.tar.gz) = 52f4bc25d8988dffcff429bb5e1ee81b
2	SHA256 (bacula-3.0.1.tar.gz) = 310ad1d9fb97b5eaf78cae6de47219d485a6762b523753415bbced5dca41dd2c	2	SHA256 (bacula-3.0.2.tar.gz) = 8f5e0bf4734c21949f83129209e0109acf054a362b4fce7cb87a87f1815904a5
3	SIZE (bacula-3.0.1.tar.gz) = 3842746	3	SIZE (bacula-3.0.2.tar.gz) = 3910414

Lines 1-11 Link Here

(-)bacula-server/files/patch-scripts-Makefile.in (-11 lines)
1	--- scripts/Makefile.in.orig Tue Sep 12 12:03:08 2006
2	+++ scripts/Makefile.in Tue Sep 12 12:03:08 2006
3	@@ -139,8 +139,6 @@
4	$(MKDIR) $(DESTDIR)$(mandir)
5
6	install: installdirs
7	- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
8	- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
9	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
10	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
11	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula

Lines 1-11 Link Here

(-)bacula-server/files/patch-src_cats_sql.c (-11 lines)
1	--- src/cats/sql.c.orig 2009-04-12 11:07:46.218959381 -0400
2	+++ src/cats/sql.c 2009-04-12 11:08:15.509974021 -0400
3	@@ -759,7 +759,7 @@
4	if (mdb->lock.valid == RWLOCK_VALID) {
5	fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
6	#ifndef HAVE_WIN32
7	- fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
8	+ fprintf(fp, "\t\tthreadid=0x%lx mutex=%p\n", (long)mdb->lock.writer_id, &mdb->lock.mutex);
9	#endif
10	}
11	}




--- 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());

Return to bug 137160

Lines 1-13 Link Here

(-)bacula-server/files/patch-src_lib_jcr.c (-13 lines)
1	--- src/lib/jcr.c.orig 2009-04-12 11:07:07.079940037 -0400
2	+++ src/lib/jcr.c 2009-04-12 11:07:20.116947254 -0400
3	@@ -1063,8 +1063,8 @@
4	fprintf(fp, "\tuse_count=%i\n",
5	jcr->use_count());
6	#else
7	- fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
8	- jcr->use_count(), (int)jcr->my_thread_id);
9	+ fprintf(fp, "\tuse_count=%i threadid=0x%lx\n",
10	+ jcr->use_count(), (long)jcr->my_thread_id);
11	#endif
12	fprintf(fp, "\tJobType=%c JobLevel=%c\n",
13	jcr->get_JobType(), jcr->get_JobLevel());