1 This patch should fix the Mac OS X build problem on the latest
2 Darwin, where sys/types.h was not included correctly (apparently
3 due to a change in the Mac headers). The solution was to explicitly
4 ensure that it is defined for the ./configure.
5 This patch fixes bug #1020.
7 This patch also has a rebuild of configure that includes the Debian
8 qt4 kludge (look for alternate qt4 names).
10 Apply it to 2.2.6 (and possibly previous 2.2.x versions) with:
13 patch -p0 <2.2.6-mac-build.patch
14 ./configure <your-options>
21 ===================================================================
22 --- configure (revision 5979)
23 +++ configure (working copy)
28 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir archivedir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TOP_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password db_name db_user dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_TYPE GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
29 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TOP_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG QMAKE QMAKEQT4 WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password db_name db_user dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_TYPE GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
30 ac_subst_files='MCOMMON'
32 # Initialize some variables set by options.
34 infodir='${prefix}/info'
35 mandir='${prefix}/man'
46 - -archivedir | --archivedir | --archivedi | --archived | --archive | --archiv \
47 - | --archi | --arch | --arc | --ar | --a)
48 - ac_prev=archivedir ;;
49 - -archivedir=* | --archivedir=* | --archivedi=* | --archived=* | --archive=* \
50 - | --archiv=* | --archi=* | --arch=* | --arc=* | --ar=* | --a=*)
51 - archivedir=$ac_optarg ;;
53 -sharedstatedir | --sharedstatedir | --sharedstatedi \
54 | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
55 | --sharedst | --shareds | --shared | --share | --shar \
59 # Be sure to have absolute paths.
60 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir archivedir \
61 +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
62 localstatedir libdir includedir oldincludedir infodir mandir
64 eval ac_val=$`echo $ac_var`
66 --oldincludedir=DIR C header files for non-gcc [/usr/include]
67 --infodir=DIR info documentation [PREFIX/info]
68 --mandir=DIR man documentation [PREFIX/man]
69 - --archivedir=DIR archive destination for disk-based backups [/tmp]
73 @@ -4116,7 +4106,87 @@
74 echo "${ECHO_T}no" >&6
77 +# Extract the first word of "qmake", so it can be a program name with args.
78 +set dummy qmake; ac_word=$2
79 +echo "$as_me:$LINENO: checking for $ac_word" >&5
80 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
81 +if test "${ac_cv_path_QMAKE+set}" = set; then
82 + echo $ECHO_N "(cached) $ECHO_C" >&6
86 + ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
89 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
93 + test -z "$as_dir" && as_dir=.
94 + for ac_exec_ext in '' $ac_executable_extensions; do
95 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
96 + ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
97 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
103 + test -z "$ac_cv_path_QMAKE" && ac_cv_path_QMAKE="none"
107 +QMAKE=$ac_cv_path_QMAKE
109 +if test -n "$QMAKE"; then
110 + echo "$as_me:$LINENO: result: $QMAKE" >&5
111 +echo "${ECHO_T}$QMAKE" >&6
113 + echo "$as_me:$LINENO: result: no" >&5
114 +echo "${ECHO_T}no" >&6
117 +# Extract the first word of "qmake-qt4", so it can be a program name with args.
118 +set dummy qmake-qt4; ac_word=$2
119 +echo "$as_me:$LINENO: checking for $ac_word" >&5
120 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
121 +if test "${ac_cv_path_QMAKEQT4+set}" = set; then
122 + echo $ECHO_N "(cached) $ECHO_C" >&6
126 + ac_cv_path_QMAKEQT4="$QMAKEQT4" # Let the user override the test with a path.
129 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
133 + test -z "$as_dir" && as_dir=.
134 + for ac_exec_ext in '' $ac_executable_extensions; do
135 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
136 + ac_cv_path_QMAKEQT4="$as_dir/$ac_word$ac_exec_ext"
137 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
143 + test -z "$ac_cv_path_QMAKEQT4" && ac_cv_path_QMAKEQT4="none"
147 +QMAKEQT4=$ac_cv_path_QMAKEQT4
149 +if test -n "$QMAKEQT4"; then
150 + echo "$as_me:$LINENO: result: $QMAKEQT4" >&5
151 +echo "${ECHO_T}$QMAKEQT4" >&6
153 + echo "$as_me:$LINENO: result: no" >&5
154 +echo "${ECHO_T}no" >&6
158 if test "x$WXCONFIG" = x; then
161 @@ -6776,8 +6846,8 @@
162 # ------------------------------------------------------------------
163 # If the user has not set --archivedir, we set our default as /tmp
164 # ------------------------------------------------------------------
165 -if test x$archivedir = x'/tmp' ; then
167 +if test x$archivedir = x'${archivedir}' ; then
168 + archivedir=${archivedir}
170 archivedir=`eval echo ${archivedir}`
172 @@ -19273,6 +19343,9 @@
182 @@ -19284,6 +19357,7 @@
190 @@ -19292,9 +19366,11 @@
203 @@ -31173,7 +31249,6 @@
204 s,@program_transform_name@,$program_transform_name,;t t
205 s,@bindir@,$bindir,;t t
206 s,@sbindir@,$sbindir,;t t
207 -s,@archivedir@,$archivedir,;t t
208 s,@libexecdir@,$libexecdir,;t t
209 s,@datadir@,$datadir,;t t
210 s,@sysconfdir@,$sysconfdir,;t t
211 @@ -31233,6 +31308,8 @@
212 s,@DVDRWMEDIAINFO@,$DVDRWMEDIAINFO,;t t
213 s,@DVDRWFORMAT@,$DVDRWFORMAT,;t t
214 s,@PKGCONFIG@,$PKGCONFIG,;t t
215 +s,@QMAKE@,$QMAKE,;t t
216 +s,@QMAKEQT4@,$QMAKEQT4,;t t
217 s,@WXCONFIG@,$WXCONFIG,;t t
218 s,@WXFLAGS@,$WXFLAGS,;t t
219 s,@CDRECORD@,$CDRECORD,;t t
220 @@ -32122,10 +32199,23 @@
223 if test "${support_bat}" = "yes" ; then
224 + if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then
225 + echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation"
231 + if test "x$QMAKEQT4" != "xnone"; then
238 chmod 755 install_conf_file build-depkgs-qt-console
239 echo "Creating bat Makefile"
245 Index: src/bc_types.h
246 ===================================================================
247 --- src/bc_types.h (revision 5979)
248 +++ src/bc_types.h (working copy)
252 # if (SIZEOF_CHAR == 1)
253 -typedef char int8_t;
254 +typedef signed char int8_t;
256 # error "8 bit int type not found."
258 Index: patches/2.2.6-queued-msg.patch
259 ===================================================================
260 --- patches/2.2.6-queued-msg.patch (revision 0)
261 +++ patches/2.2.6-queued-msg.patch (revision 0)
263 + This patch should ensure that queued messages to the console are
264 + displayed as soon as possible. It should fix bug 1007, but has been
265 + reported not to work.
267 + Apply it to version 2.2.6 (or any prior 2.2.x) with:
270 + ./configure <your-options>
271 + patch -p0 <2.2.6-queued-msg.patch
276 +Index: src/dird/ua_server.c
277 +===================================================================
278 +--- src/dird/ua_server.c (revision 5979)
279 ++++ src/dird/ua_server.c (working copy)
282 + do_a_command(ua, ua->cmd);
284 ++ dequeue_messages(ua->jcr);
286 + if (console_msg_pending && acl_access_ok(ua, Command_ACL, "messages", 8)) {
287 + if (ua->auto_display_messages) {
288 Index: autoconf/configure.in
289 ===================================================================
290 --- autoconf/configure.in (revision 5979)
291 +++ autoconf/configure.in (working copy)
292 @@ -1394,6 +1394,7 @@
300 @@ -1402,9 +1403,11 @@