Date: Sat, 4 Sep 2010 02:01:41 +0200 (CEST) From: Olli Hauer <ohauer@FreeBSD.org> To: <FreeBSD-gnats-submit@FreeBSD.org> Cc: Dan Langille <dan@langille.org> Subject: ports/150263: [patch] port sysutils/bacula-server update to 5.0.3 Message-ID: <20100904000141.80C6920387@u18-124.dsl.vianetworks.de> Resent-Message-ID: <201009040010.o840A1wo046564@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150263
>Category: ports
>Synopsis: [patch] port sysutils/bacula-server update to 5.0.3
>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: Sat Sep 04 00:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer <ohauer@FreeBSD.org>
>Release:
>Organization:
>Environment:
>Description:
Update bacula to version 5.0.3
- bacula-5.0.3 builds per default with openssl, reflect this in OPTIONS
- make sure port builds with openssl from OS and ports
- make postgresql the default database
- replace static entries in pkg-(de)install scripts with PLIST_SUB entries
- remove unused file bacula-sd.conf.in
- small fixes to make portlint happy
>How-To-Repeat:
>Fix:
--- patch_bacula-server-5.0.3.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- Makefile 3 Sep 2010 22:13:23 -0000 1.126
+++ Makefile 3 Sep 2010 23:47:22 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= bacula
-DISTVERSION= 5.0.2
+DISTVERSION= 5.0.3
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
@@ -20,6 +20,7 @@
PLIST_SUB+= MAJOR=${PORTVERSION:R:R}
GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -46,13 +47,9 @@
SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server
.endif
-# The user/group IDs below are registered, see
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
-#
-BACULA_DIR?=/var/db/bacula
#
MANCOMPRESSED= yes
-CONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \
+CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
--enable-smartalloc \
--with-working-dir=${BACULA_DIR} \
--with-scriptdir=${PREFIX}/share/${PORTNAME} \
@@ -70,12 +67,12 @@
--with-baseport=9101
.if defined(WITH_CLIENT_ONLY)
-CONFIGURE_ARGS+= --with-fd-user=root \
+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 \
+CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \
+ --with-dir-group=${BACULA_GROUP} \
+ --with-sd-user=${BACULA_USER} \
--with-sd-group=operator
.endif
@@ -83,19 +80,34 @@
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
-OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off
+OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" on
+
+# The user/group IDs below are registered, see
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
+#
+BACULA_USER?= bacula
+BACULA_GROUP?= ${BACULA_USER}
+BACULA_UID?= 910
+BACULA_GID?= ${BACULA_UID}
+BACULA_DIR?= /var/db/bacula
PLIST_SUB+= BACULA_DIR=${BACULA_DIR}
+SUB_LIST= BACULA_USER=${BACULA_USER} \
+ BACULA_GROUP=${BACULA_GROUP} \
+ BACULA_UID=${BACULA_UID} \
+ BACULA_GID=${BACULA_GID} \
+ BACULA_DIR=${BACULA_DIR}
+
.include <bsd.port.pre.mk>
-.if defined(WITH_NLS)
+.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls
.else
@@ -130,27 +142,28 @@
CONFIGURE_ENV+= WXCONFIG="${WX_CONFIG}"
PLIST_SUB+= WXCONS=""
.else
-PLIST_SUB+= WXCONS="@comment "
+PLIST_SUB+= WXCONS="@comment "
.endif
.else
# Server only Options
-PLIST_SUB+= WXCONS="@comment "
+PLIST_SUB+= WXCONS="@comment "
CONFFILES= sd dir
+# Server default database
.if defined(WITH_MYSQL)
CONFIGURE_ARGS+= --with-mysql=yes
USE_MYSQL= yes
DBTYPE= mysql
SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
-.elif defined(WITH_POSTGRESQL)
+.elif defined(WITH_SQLITE)
+CONFIGURE_ARGS+= --with-sqlite3=yes
+LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
+DBTYPE= sqlite3
+.else
DEFAULT_PGSQL_VER?= 83
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgresql=yes
DBTYPE= postgresql
SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
-.else
-CONFIGURE_ARGS+= --with-sqlite3=yes
-LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
-DBTYPE= sqlite3
.endif
PLIST_SUB+= DBTYPE=${DBTYPE}
# Install mtx
@@ -160,7 +173,10 @@
.endif
.if defined(WITH_OPENSSL)
-CONFIGURE_ARGS+= --with-openssl
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+= --with-openssl="no"
.endif
.if defined(WITH_CLIENT_ONLY)
@@ -180,12 +196,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} ""
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/distinfo,v
retrieving revision 1.52
diff -u -r1.52 distinfo
--- distinfo 17 Jul 2010 01:00:46 -0000 1.52
+++ distinfo 3 Sep 2010 23:47:22 -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist 17 Jul 2010 01:00:46 -0000 1.25
+++ pkg-plist 3 Sep 2010 23:47:22 -0000
@@ -36,6 +36,7 @@
%%DATADIR%%/bconsole
%%DATADIR%%/btraceback.dbx
%%DATADIR%%/btraceback.gdb
+%%DATADIR%%/btraceback.mdb
%%DATADIR%%/create_bacula_database
%%DATADIR%%/create_%%DBTYPE%%_database
%%DATADIR%%/delete_catalog_backup
Index: files/bacula-sd.conf.in
===================================================================
RCS file: files/bacula-sd.conf.in
diff -N files/bacula-sd.conf.in
--- files/bacula-sd.conf.in 14 Feb 2007 20:31:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/stored/bacula-sd.conf.in.org Tue Feb 13 18:56:09 2007
-+++ src/stored/bacula-sd.conf.in Tue Feb 13 18:56:16 2007
-@@ -152,6 +152,7 @@
- #Device {
- # Name = "DVD-Writer"
- # Media Type = DVD
-+# Device Type = DVD
- # Archive Device = /dev/hdc
- # LabelMedia = yes; # lets Bacula label unlabeled media
- # Random Access = Yes;
-@@ -162,7 +163,9 @@
- # RequiresMount = yes;
- # MountPoint = /mnt/cdrom;
- # MountCommand = "/bin/mount -t iso9660 -o ro %a %m";
-+# MountCommand = "/sbin/mount -t cd9660 -o ro %a %m"; # FreeBSD
- # UnmountCommand = "/bin/umount %m";
-+# UnmountCommand = "/sbin/umount %m"; # FreeBSD
- # SpoolDirectory = /tmp/backup;
- # WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v"
- # FreeSpaceCommand = "/etc/bacula/dvd-handler %a free"
Index: files/patch-src-lib-crypto.c
===================================================================
RCS file: files/patch-src-lib-crypto.c
diff -N files/patch-src-lib-crypto.c
--- files/patch-src-lib-crypto.c 17 Jul 2010 01:00:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
---- src/lib/crypto.c.orig 2010-05-20 20:15:22.000000000 +0300
-+++ src/lib/crypto.c 2010-05-20 20:16:39.000000000 +0300
-@@ -316,7 +316,11 @@
- */
- static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
- X509_EXTENSION *ext;
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
- const X509V3_EXT_METHOD *method;
-+#else
-+ const X509V3_EXT_METHOD *method;
-+#endif
- ASN1_OCTET_STRING *keyid;
- int i;
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
-@@ -980,6 +984,10 @@
- free (sig);
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
-+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
-+#endif
- /*
- * Create a new encryption session.
- * Returns: A pointer to a CRYPTO_SESSION object on success.
Index: files/patch-src-lib-tls.c
===================================================================
RCS file: files/patch-src-lib-tls.c
diff -N files/patch-src-lib-tls.c
--- files/patch-src-lib-tls.c 17 Jul 2010 01:00:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/lib/tls.c.orig 2010-05-20 20:34:49.000000000 +0300
-+++ src/lib/tls.c 2010-05-20 20:35:19.000000000 +0300
-@@ -315,7 +315,7 @@
- extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
-
- if (strcmp(extname, "subjectAltName") == 0) {
--#ifdef HAVE_OPENSSLv1
-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- const X509V3_EXT_METHOD *method;
- #else
- X509V3_EXT_METHOD *method;
Index: files/patch-src__cats__Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/patch-src__cats__Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 patch-src__cats__Makefile.in
--- files/patch-src__cats__Makefile.in 17 Jul 2010 01:00:46 -0000 1.6
+++ files/patch-src__cats__Makefile.in 3 Sep 2010 23:47:22 -0000
@@ -4,8 +4,8 @@
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)
+- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g) $(DB_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
Index: files/patch-src__dird__Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/patch-src__dird__Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-src__dird__Makefile.in
--- files/patch-src__dird__Makefile.in 21 Jul 2010 16:59:10 -0000 1.1
+++ files/patch-src__dird__Makefile.in 3 Sep 2010 23:47:22 -0000
@@ -1,6 +1,6 @@
--- src/dird/Makefile.in.orig 2010-07-20 21:01:56.000000000 -0400
+++ src/dird/Makefile.in 2010-07-20 21:04:19.000000000 -0400
-@@ -63,12 +63,13 @@
+@@ -63,12 +63,12 @@
bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
@@ -10,7 +10,7 @@
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
-lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
Index: files/patch-src__findlib__Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/patch-src__findlib__Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-src__findlib__Makefile.in
--- files/patch-src__findlib__Makefile.in 17 Jul 2010 01:00:47 -0000 1.1
+++ files/patch-src__findlib__Makefile.in 3 Sep 2010 23:47:22 -0000
@@ -4,8 +4,8 @@
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)
+- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_RELEASE:S/./:/g)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
Index: files/patch-src__lib__Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/patch-src__lib__Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-src__lib__Makefile.in
--- files/patch-src__lib__Makefile.in 17 Jul 2010 01:00:47 -0000 1.1
+++ files/patch-src__lib__Makefile.in 3 Sep 2010 23:47:22 -0000
@@ -4,8 +4,8 @@
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)
+- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_RELEASE:S/./:/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
libbaccfg.a: $(LIBBACCFG_OBJS)
@echo "Making $@ ..."
@@ -13,8 +13,8 @@
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)
+- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_RELEASE:S/./:/g)
libbacpy.a: $(LIBBACPY_OBJS)
@echo "Making $@ ..."
@@ -22,8 +22,8 @@
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)
+- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_RELEASE:S/./:/g) $(PYTHON_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
Index: files/pkg-deinstall.client.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/pkg-deinstall.client.in,v
retrieving revision 1.4
diff -u -r1.4 pkg-deinstall.client.in
--- files/pkg-deinstall.client.in 21 Jul 2010 16:59:10 -0000 1.4
+++ files/pkg-deinstall.client.in 3 Sep 2010 23:47:22 -0000
@@ -1,10 +1,15 @@
#!/bin/sh
PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
TMPFILE=/tmp/services-$RANDOM-$$
-if [ -z "${BACULA_DIR}" ]; then
- BACULA_DIR=/var/db/bacula
-fi
case "$2" in
"DEINSTALL")
@@ -21,9 +26,6 @@
echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
fi
- # Note how to delete UID/GID
- USER=bacula
- GROUP=${USER}
if pw groupshow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
fi
Index: files/pkg-deinstall.server.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/pkg-deinstall.server.in,v
retrieving revision 1.3
diff -u -r1.3 pkg-deinstall.server.in
--- files/pkg-deinstall.server.in 21 Jul 2010 16:59:10 -0000 1.3
+++ files/pkg-deinstall.server.in 3 Sep 2010 23:47:22 -0000
@@ -1,10 +1,15 @@
#!/bin/sh
PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
TMPFILE=/tmp/services-$RANDOM-$$
-if [ -z "${BACULA_DIR}" ]; then
- BACULA_DIR=/var/db/bacula
-fi
case "$2" in
"DEINSTALL")
@@ -21,9 +26,6 @@
echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
fi
- # Note how to delete UID/GID
- USER=bacula
- GROUP=${USER}
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
Index: files/pkg-install.client.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/pkg-install.client.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-install.client.in
--- files/pkg-install.client.in 4 Jan 2007 23:22:30 -0000 1.2
+++ files/pkg-install.client.in 3 Sep 2010 23:47:22 -0000
@@ -1,9 +1,14 @@
#!/bin/sh
PATH=/bin:/usr/bin:/usr/sbin
-if [ -z "${BACULA_DIR}" ]; then
- BACULA_DIR=/var/db/bacula
-fi
+
+# Install UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
# Always add lines in /etc/services
grep -q "bacula-dir" /etc/services
@@ -17,12 +22,6 @@
case $2 in
PRE-INSTALL)
- # Install UID/GID
- USER=bacula
- GROUP=${USER}
- UID=910
- GID=${UID}
-
if [ ! -d ${BACULA_DIR} ]; then
mkdir -p ${BACULA_DIR}
fi
Index: files/pkg-install.server.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/pkg-install.server.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.server.in
--- files/pkg-install.server.in 24 Sep 2007 03:05:51 -0000 1.1
+++ files/pkg-install.server.in 3 Sep 2010 23:47:22 -0000
@@ -1,9 +1,13 @@
#!/bin/sh
PATH=/bin:/usr/bin:/usr/sbin
-if [ -z "${BACULA_DIR}" ]; then
- BACULA_DIR=/var/db/bacula
-fi
+
+# Install UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
# Always add lines in /etc/services
grep -q "bacula-dir" /etc/services
@@ -17,12 +21,6 @@
case $2 in
PRE-INSTALL)
- # Install UID/GID
- USER=bacula
- GROUP=${USER}
- UID=910
- GID=${UID}
-
if [ ! -d ${BACULA_DIR} ]; then
mkdir -p ${BACULA_DIR}
fi
--- patch_bacula-server-5.0.3.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100904000141.80C6920387>