Bacula 5.0.3

Sat Aug 14 18:48:03 UTC 2010

On 8/8/2010 10:59 PM, Dan Langille wrote:
> Allan:
>
> For Bacula 5.0.2 you submitted patches which included:
>
> patch-src-cats-Makefile.in
> patch-src-findlib-Makefile.in
> patch-src-lib-Makefile.in
>
> In particular, I'm interested in things like this (hugely condensed for
> clarity):
>
> - -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE)
> + -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_A
>
> Of note, 5.0.3 uses this:
>
> -release $(LIBBAC_LT_RELEASE)
>
> I am not sure how best to patch for 5.0.3.
>
> I first tried: version-info $(LIBBAC_LT_RELEASE)
>
> But encountered this error:
>
> Making libbac.la ...
> /var/ports/usr/home/dan/src/sysutils/bacula-server/work/bacula-5.0.3/libtool
> --silent --tag=CXX --mode=link /usr/bin/c++ -L/usr/local/lib -o
> libbac.la attr.lo base64.lo berrno.lo bsys.lo bget_msg.lo bnet.lo
> bnet_server.lo runscript.lo bsock.lo bpipe.lo bsnprintf.lo btime.lo
> cram-md5.lo crc32.lo crypto.lo daemon.lo edit.lo fnmatch.lo
> guid_to_name.lo hmac.lo jcr.lo lex.lo alist.lo dlist.lo md5.lo
> message.lo mem_pool.lo openssl.lo plugins.lo priv.lo queue.lo bregex.lo
> rwlock.lo scan.lo serial.lo sha1.lo signal.lo smartall.lo rblist.lo
> tls.lo tree.lo util.lo var.lo watchdog.lo workq.lo btimers.lo
> address_conf.lo breg.lo htable.lo lockmgr.lo -export-dynamic -rpath
> /usr/local/lib -version-info 5.0.3 -lwrap -lz
> libtool: link: CURRENT `5.0.3' must be a nonnegative integer
> libtool: link: `5.0.3' is not valid version information
> *** Error code 1
>
>
> I don't know enough about your patch to proceed with confidence.

I tried this solution:

cd files
rm patch-src-lib-Makefile.in patch-src-findlib-Makefile.in 
patch-src-cats-Makefile.in

Then I removed all lib/* entries from pkg-plist and pkg-plist.client

A sample test job ran just fine.

However, this seems to undo the advances made in 5.0.2 regarding 
libaries.  In 5.0.3 the libraries are named:

libbac-5.0.3.so
libbacpy-5.0.3.so

etc.

Whereas, the 5.0.2 port assumes they are named like libbacpy-5.so

So far, I see no reason not to proceed with my attached diff.  But I 
welcome different opinions, if they have suggestions for patches.

-- 
Dan Langille - http://langille.org/
-------------- next part --------------
diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile

--- /usr/ports/sysutils/bacula-server/Makefile	2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/Makefile	2010-08-14 18:12:32.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-DISTVERSION=	5.0.2
+DISTVERSION=	5.0.3
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 
@@ -83,9 +83,9 @@
 OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
 OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
 .else
-OPTIONS=	SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
-OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
-OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
+OPTIONS=	SQLITE3 "Use SQLite-3 database" off
+OPTIONS+=	MYSQL "Use MySQL database" off
+OPTIONS+=	POSTGRESQL "Use PostgreSQL database" off
 OPTIONS+=	MTX "Install mtx for control of autochanger devices" off
 .endif
 OPTIONS+=	NLS "Native Language Support via gettext utilities" on
@@ -180,12 +180,12 @@
 	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
 	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
 	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
-	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
+	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SQLite-3 as the database (not recommended)."
 .if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
-	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
-	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
+	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL as the database."
+	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL as the database."
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "The default DB is SQLite-2!"
+	@${ECHO_MSG} "The default DB is PostgreSQL!"
 .endif
 	@${ECHO_MSG} "  WITH_OPENSSL=yes  	Enable OpenSSL for encrypted communication."
 	@${ECHO_MSG} ""
diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo
--- /usr/ports/sysutils/bacula-server/distinfo	2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/distinfo	2010-08-14 18:13:14.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (bacula-5.0.2.tar.gz) = e9204d2e772f12662de28da3327853de
-SHA256 (bacula-5.0.2.tar.gz) = c465d00dd968832d129ba68eea59714357605a461d745cef7e802978c453c3fb
-SIZE (bacula-5.0.2.tar.gz) = 4189272
+MD5 (bacula-5.0.3.tar.gz) = 9de254ae39cab0587fdb2f5d8d90b03b
+SHA256 (bacula-5.0.3.tar.gz) = 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4
+SIZE (bacula-5.0.3.tar.gz) = 3800556
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-cats-Makefile.in bacula-server/files/patch-src-cats-Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src-cats-Makefile.in	2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/files/patch-src-cats-Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- src/cats/Makefile.in.orig	2010-05-19 17:13:07.000000000 +0300
-+++ src/cats/Makefile.in	2010-05-19 17:15:47.000000000 +0300
-@@ -69,7 +69,7 @@
- 
- libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
- 	@echo "Making $@ ..."	  
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_CURRENT).$(LIBBACSQL_LT_REVISION).$(LIBBACSQL_LT_AGE) $(DB_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(DB_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-findlib-Makefile.in bacula-server/files/patch-src-findlib-Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src-findlib-Makefile.in	2010-07-17 01:00:47.000000000 +0000
+++ bacula-server/files/patch-src-findlib-Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- src/findlib/Makefile.in.orig	2010-05-19 17:13:20.000000000 +0300
-+++ src/findlib/Makefile.in	2010-05-19 17:15:21.000000000 +0300
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-lib-Makefile.in bacula-server/files/patch-src-lib-Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src-lib-Makefile.in	2010-07-17 01:00:47.000000000 +0000
+++ bacula-server/files/patch-src-lib-Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
---- src/lib/Makefile.in.orig	2010-05-19 14:26:03.000000000 +0300
-+++ src/lib/Makefile.in	2010-05-19 17:14:18.000000000 +0300
-@@ -126,7 +126,7 @@
- 
- libbac.la: Makefile $(LIBBAC_LOBJS)
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
- 
- libbaccfg.a: $(LIBBACCFG_OBJS) 
- 	@echo "Making $@ ..."
-@@ -135,7 +135,7 @@
- 
- libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE)
- 
- libbacpy.a: $(LIBBACPY_OBJS) 
- 	@echo "Making $@ ..."
-@@ -144,7 +144,7 @@
- 
- libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist
--- /usr/ports/sysutils/bacula-server/pkg-plist	2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/pkg-plist	2010-08-14 18:36:27.000000000 +0000
@@ -1,19 +1,3 @@
-lib/libbac.la
-lib/libbac.so
-lib/libbac.so.%%MAJOR%%
-lib/libbaccfg.la
-lib/libbaccfg.so
-lib/libbaccfg.so.%%MAJOR%%
-lib/libbacfind.la
-lib/libbacfind.so
-lib/libbacfind.so.%%MAJOR%%
-lib/libbacpy.la
-lib/libbacpy.so
-lib/libbacpy.so.%%MAJOR%%
-lib/libbacsql.la
-lib/libbacsql.so
-lib/libbacsql.so.%%MAJOR%%
-lib/bpipe-fd.so
 sbin/bacula
 sbin/bacula-dir
 sbin/bacula-sd
diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist.client bacula-server/pkg-plist.client
--- /usr/ports/sysutils/bacula-server/pkg-plist.client	2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/pkg-plist.client	2010-08-14 18:40:15.000000000 +0000
@@ -1,16 +1,3 @@
-%%NOSF%%lib/libbac.la
-%%NOSF%%lib/libbac.so
-%%NOSF%%lib/libbac.so.%%MAJOR%%
-%%NOSF%%lib/libbaccfg.la
-%%NOSF%%lib/libbaccfg.so
-%%NOSF%%lib/libbaccfg.so.%%MAJOR%%
-%%NOSF%%lib/libbacfind.la
-%%NOSF%%lib/libbacfind.so
-%%NOSF%%lib/libbacfind.so.%%MAJOR%%
-%%NOSF%%lib/libbacpy.la
-%%NOSF%%lib/libbacpy.so
-%%NOSF%%lib/libbacpy.so.%%MAJOR%%
-%%NOSF%%lib/bpipe-fd.so
 %%SFDAEMON%%sbin/static-bacula-fd
 sbin/bacula-fd
 sbin/bconsole
