Revision: 103298 https://trac.macports.org/changeset/103298 Author: macsforever2000@macports.org Date: 2013-02-20 13:29:48 -0800 (Wed, 20 Feb 2013) Log Message: ----------- bacula: Update to version 5.2.13. Remove workaround for openssl 1.0 bug which was fixed in 5.0.3. Remove old patches which have been incorporated already. Modified Paths: -------------- trunk/dports/sysutils/bacula/Portfile Removed Paths: ------------- trunk/dports/sysutils/bacula/files/patch-3.0.2-mac-path-len.diff trunk/dports/sysutils/bacula/files/patch-base64-typecast.diff trunk/dports/sysutils/bacula/files/patch-qt-console-osx.diff Modified: trunk/dports/sysutils/bacula/Portfile =================================================================== --- trunk/dports/sysutils/bacula/Portfile 2013-02-20 21:10:14 UTC (rev 103297) +++ trunk/dports/sysutils/bacula/Portfile 2013-02-20 21:29:48 UTC (rev 103298) @@ -4,7 +4,7 @@ PortSystem 1.0 name bacula -version 5.2.12 +version 5.2.13 categories sysutils platforms darwin license GPL @@ -18,8 +18,8 @@ homepage http://www.bacula.org/ master_sites sourceforge -checksums rmd160 dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a \ - sha256 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887 +checksums rmd160 bcc168143c0eec5cb5e983f765935534379f4fcf \ + sha256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 depends_build port:pkgconfig depends_lib port:gawk \ @@ -32,7 +32,6 @@ # Comment out patchfiles in case they are needed in the future or for the non-client version which is completely untested at this point # patch-configure.diff \ -# patch-base64-typecast.diff #post-patch { # reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure #} @@ -59,12 +58,8 @@ --disable-gnome \ --disable-wx-console \ --disable-tray-monitor \ - --with-tcp-wrappers \ - ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes + --with-tcp-wrappers -# The ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes line above is for openssl 1.0 -# to get around an apparent bug in bacula - configure.cppflags-append -I${prefix}/ncurses configure.ldflags "" @@ -88,7 +83,6 @@ } variant console_bat description "Install BAT console GUI application" { - patchfiles patch-qt-console-osx.diff depends_build-append port:tcp_wrappers \ port:makeicns depends_lib-append port:qt4-mac \ Deleted: trunk/dports/sysutils/bacula/files/patch-3.0.2-mac-path-len.diff =================================================================== --- trunk/dports/sysutils/bacula/files/patch-3.0.2-mac-path-len.diff 2013-02-20 21:10:14 UTC (rev 103297) +++ trunk/dports/sysutils/bacula/files/patch-3.0.2-mac-path-len.diff 2013-02-20 21:29:48 UTC (rev 103298) @@ -1,22 +0,0 @@ -diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c -index ac9e4ce..81e887a 100644 ---- src/findlib/find.c -+++ src/findlib/find.c -@@ -67,13 +67,13 @@ FF_PKT *init_find_files() - - /* Get system path and filename maximum lengths */ - path_max = pathconf(".", _PC_PATH_MAX); -- if (path_max < 1024) { -- path_max = 1024; -+ if (path_max < 2048) { -+ path_max = 2048; - } - - name_max = pathconf(".", _PC_NAME_MAX); -- if (name_max < 1024) { -- name_max = 1024; -+ if (name_max < 2048) { -+ name_max = 2048; - } - path_max++; /* add for EOS */ - name_max++; /* add for EOS */ Deleted: trunk/dports/sysutils/bacula/files/patch-base64-typecast.diff =================================================================== --- trunk/dports/sysutils/bacula/files/patch-base64-typecast.diff 2013-02-20 21:10:14 UTC (rev 103297) +++ trunk/dports/sysutils/bacula/files/patch-base64-typecast.diff 2013-02-20 21:29:48 UTC (rev 103298) @@ -1,81 +0,0 @@ -diff -ur src/lib/base64.c.orig src/lib/base64.c ---- src/lib/base64.c.orig 2010-01-25 08:56:28.000000000 +0100 -+++ src/lib/base64.c 2010-02-17 17:53:48.000000000 +0100 -@@ -74,9 +74,9 @@ - * stored (not including the EOS). - */ - int --to_base64(intmax_t value, char *where) -+to_base64(int64_t value, char *where) - { -- uintmax_t val; -+ uint64_t val; - int i = 0; - int n; - -@@ -98,7 +98,7 @@ - val = value; - where[i] = 0; - do { -- where[--i] = base64_digits[val & (uintmax_t)0x3F]; -+ where[--i] = base64_digits[val & (uint64_t)0x3F]; - val >>= 6; - } while (val); - return n; -@@ -112,9 +112,9 @@ - * Returns the value. - */ - int --from_base64(intmax_t *value, char *where) -+from_base64(int64_t *value, char *where) - { -- uintmax_t val = 0; -+ uint64_t val = 0; - int i, neg; - - if (!base64_inited) -@@ -131,7 +131,7 @@ - val += base64_map[(uint8_t)where[i++]]; - } - -- *value = neg ? -(intmax_t)val : (intmax_t)val; -+ *value = neg ? -(int64_t)val : (int64_t)val; - return i; - } - -diff -ur src/lib/protos.h.orig src/lib/protos.h ---- src/lib/protos.h.orig 2010-01-25 08:56:28.000000000 +0100 -+++ src/lib/protos.h 2010-02-17 17:54:49.000000000 +0100 -@@ -45,8 +45,8 @@ - - /* base64.c */ - void base64_init (void); --int to_base64 (intmax_t value, char *where); --int from_base64 (intmax_t *value, char *where); -+int to_base64 (int64_t value, char *where); -+int from_base64 (int64_t *value, char *where); - int bin_to_base64 (char *buf, int buflen, char *bin, int binlen, - int compatible); - -diff -ur src/filed/restore.c.orig src/files/restore.c ---- src/filed/restore.c.orig 2010-01-25 08:56:28.000000000 +0100 -+++ src/filed/restore.c 2010-02-17 17:43:47.000000000 +0100 -@@ -155,7 +155,7 @@ - char ec1[50]; /* Buffer printing huge values */ - uint32_t buf_size; /* client buffer size */ - int stat; -- intmax_t rsrc_len = 0; /* Original length of resource fork */ -+ int64_t rsrc_len = 0; /* Original length of resource fork */ - r_ctx rctx; - ATTR *attr; - /* ***FIXME*** make configurable */ -@@ -608,7 +608,7 @@ - continue; - } - -- rctx.fork_size = rsrc_len; -+ rctx.fork_size = (intmax_t)rsrc_len; - Dmsg0(130, "Restoring resource fork\n"); - } - - Deleted: trunk/dports/sysutils/bacula/files/patch-qt-console-osx.diff =================================================================== --- trunk/dports/sysutils/bacula/files/patch-qt-console-osx.diff 2013-02-20 21:10:14 UTC (rev 103297) +++ trunk/dports/sysutils/bacula/files/patch-qt-console-osx.diff 2013-02-20 21:29:48 UTC (rev 103298) @@ -1,15 +0,0 @@ -diff -ur src/qt-console/bat.pro.in.orig src/qt-console/bat.pro.in ---- src/qt-console/bat.pro.in.orig 2012-11-13 11:37:22.000000000 +0100 -+++ src/qt-console/bat.pro.in 2012-11-13 11:36:23.000000000 +0100 -@@ -31,6 +31,10 @@ - LIBS += @QWT_LDFLAGS@ @QWT_LIB@ - } - -+macx { -+ ICON = images/bat_icon.icns -+} -+ - RESOURCES = main.qrc - MOC_DIR = moc - OBJECTS_DIR = obj -