fake
20 years ago
3 changed files with 219 additions and 6 deletions
Unified View
Diff Options
-
+96 -0package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch
-
+118 -0package/jsaw/multisync/ldap-sasl-2-loc.patch
-
+5 -6package/jsaw/multisync/multisync.conf
@ -0,0 +1,96 @@ |
|||||
|
--- ./plugins/irmc_sync/configure.in.orig 2004-08-26 16:10:55.663700216 +0200
|
||||
|
+++ ./plugins/irmc_sync/configure.in 2004-08-26 16:22:42.186292456 +0200
|
||||
|
@@ -23,12 +23,12 @@
|
||||
|
CPPFLAGS="${PACKAGE_CFLAGS}" |
||||
|
AC_CHECK_LIB(bluetooth,baswap,BLUETOOTH=1,BLUETOOTH=0) |
||||
|
SDP=0 |
||||
|
-AC_CHECK_LIB(sdp,sdp_list_free,SDP=1,BLUETOOTH=0)
|
||||
|
+dnl AC_CHECK_LIB(sdp,sdp_record_alloc,SDP=1,BLUETOOTH=0)
|
||||
|
AC_MSG_CHECKING(for correct SDP lib version) |
||||
|
AC_TRY_COMPILE([ |
||||
|
#include <bluetooth/sdp.h> |
||||
|
#include <bluetooth/sdp_lib.h> |
||||
|
-],[sdp_record_t t;],AC_MSG_RESULT(yes),BLUETOOTH=0;AC_MSG_RESULT(no))
|
||||
|
+],[sdp_record_t t;],AC_MSG_RESULT(yes),SDP=1,BLUETOOTH=0;AC_MSG_RESULT(no))
|
||||
|
AM_CONDITIONAL(BLUETOOTH,test "${BLUETOOTH}" = "1") |
||||
|
if test "x${BLUETOOTH}" = "x0"; then |
||||
|
echo "Bluetooth is DISABLED. You must have bluez-libs and bluez-kernel >= 2.3 and bluez-sdp >= 1.0-pre1." |
||||
|
--- ./plugins/irmc_sync/configure.orig 2004-08-26 16:10:46.630073536 +0200
|
||||
|
+++ ./plugins/irmc_sync/configure 2004-08-26 16:26:08.325954464 +0200
|
||||
|
@@ -4307,67 +4307,6 @@
|
||||
|
BLUETOOTH=0 |
||||
|
fi |
||||
|
|
||||
|
-SDP=0
|
||||
|
-echo "$as_me:$LINENO: checking for sdp_list_free in -lsdp" >&5
|
||||
|
-echo $ECHO_N "checking for sdp_list_free in -lsdp... $ECHO_C" >&6
|
||||
|
-if test "${ac_cv_lib_sdp_sdp_list_free+set}" = set; then
|
||||
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
|
-else
|
||||
|
- ac_check_lib_save_LIBS=$LIBS
|
||||
|
-LIBS="-lsdp $LIBS"
|
||||
|
-cat >conftest.$ac_ext <<_ACEOF
|
||||
|
-#line $LINENO "configure"
|
||||
|
-/* confdefs.h. */
|
||||
|
-_ACEOF
|
||||
|
-cat confdefs.h >>conftest.$ac_ext
|
||||
|
-cat >>conftest.$ac_ext <<_ACEOF
|
||||
|
-/* end confdefs.h. */
|
||||
|
-
|
||||
|
-/* Override any gcc2 internal prototype to avoid an error. */
|
||||
|
-#ifdef __cplusplus
|
||||
|
-extern "C"
|
||||
|
-#endif
|
||||
|
-/* We use char because int might match the return type of a gcc2
|
||||
|
- builtin and then its argument prototype would still apply. */
|
||||
|
-char sdp_list_free ();
|
||||
|
-int
|
||||
|
-main ()
|
||||
|
-{
|
||||
|
-sdp_list_free ();
|
||||
|
- ;
|
||||
|
- return 0;
|
||||
|
-}
|
||||
|
-_ACEOF
|
||||
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
|
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
|
- (eval $ac_link) 2>&5
|
||||
|
- ac_status=$?
|
||||
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
- (exit $ac_status); } &&
|
||||
|
- { ac_try='test -s conftest$ac_exeext'
|
||||
|
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
|
- (eval $ac_try) 2>&5
|
||||
|
- ac_status=$?
|
||||
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
- (exit $ac_status); }; }; then
|
||||
|
- ac_cv_lib_sdp_sdp_list_free=yes
|
||||
|
-else
|
||||
|
- echo "$as_me: failed program was:" >&5
|
||||
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
-
|
||||
|
-ac_cv_lib_sdp_sdp_list_free=no
|
||||
|
-fi
|
||||
|
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
|
-LIBS=$ac_check_lib_save_LIBS
|
||||
|
-fi
|
||||
|
-echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_list_free" >&5
|
||||
|
-echo "${ECHO_T}$ac_cv_lib_sdp_sdp_list_free" >&6
|
||||
|
-if test $ac_cv_lib_sdp_sdp_list_free = yes; then
|
||||
|
- SDP=1
|
||||
|
-else
|
||||
|
- BLUETOOTH=0
|
||||
|
-fi
|
||||
|
-
|
||||
|
echo "$as_me:$LINENO: checking for correct SDP lib version" >&5 |
||||
|
echo $ECHO_N "checking for correct SDP lib version... $ECHO_C" >&6 |
||||
|
cat >conftest.$ac_ext <<_ACEOF |
||||
|
@@ -4401,7 +4340,7 @@
|
||||
|
ac_status=$? |
||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
||||
|
(exit $ac_status); }; }; then |
||||
|
- echo "$as_me:$LINENO: result: yes" >&5
|
||||
|
+ SDP=1 ; echo "$as_me:$LINENO: result: yes" >&5
|
||||
|
echo "${ECHO_T}yes" >&6 |
||||
|
else |
||||
|
echo "$as_me: failed program was:" >&5 |
||||
@ -0,0 +1,118 @@ |
|||||
|
--- ./plugins/ldap_plugin/configure.orig 2004-08-25 20:36:29.566175336 +0200
|
||||
|
+++ ./plugins/ldap_plugin/configure 2004-08-25 20:41:52.658057904 +0200
|
||||
|
@@ -8815,8 +8815,8 @@
|
||||
|
fi |
||||
|
|
||||
|
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
||||
|
- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
|
||||
|
-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
|
||||
|
+ echo "$as_me:$LINENO: checking for sasl2/sasl.h" >&5
|
||||
|
+echo $ECHO_N "checking for sasl2/sasl.h... $ECHO_C" >&6
|
||||
|
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6 |
||||
|
fi |
||||
|
@@ -8824,8 +8824,8 @@
|
||||
|
echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 |
||||
|
else |
||||
|
# Is the header compilable? |
||||
|
-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
|
||||
|
-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
|
||||
|
+echo "$as_me:$LINENO: checking sasl2/sasl.h usability" >&5
|
||||
|
+echo $ECHO_N "checking sasl2/sasl.h usability... $ECHO_C" >&6
|
||||
|
cat >conftest.$ac_ext <<_ACEOF |
||||
|
#line $LINENO "configure" |
||||
|
/* confdefs.h. */ |
||||
|
@@ -8834,7 +8834,7 @@
|
||||
|
cat >>conftest.$ac_ext <<_ACEOF |
||||
|
/* end confdefs.h. */ |
||||
|
$ac_includes_default |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
_ACEOF |
||||
|
rm -f conftest.$ac_objext |
||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
||||
|
@@ -8860,8 +8860,8 @@
|
||||
|
echo "${ECHO_T}$ac_header_compiler" >&6 |
||||
|
|
||||
|
# Is the header present? |
||||
|
-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
|
||||
|
-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
|
||||
|
+echo "$as_me:$LINENO: checking sasl2/sasl.h presence" >&5
|
||||
|
+echo $ECHO_N "checking sasl2/sasl.h presence... $ECHO_C" >&6
|
||||
|
cat >conftest.$ac_ext <<_ACEOF |
||||
|
#line $LINENO "configure" |
||||
|
/* confdefs.h. */ |
||||
|
@@ -8869,7 +8869,7 @@
|
||||
|
cat confdefs.h >>conftest.$ac_ext |
||||
|
cat >>conftest.$ac_ext <<_ACEOF |
||||
|
/* end confdefs.h. */ |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
_ACEOF |
||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
||||
|
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
||||
|
@@ -8902,10 +8902,10 @@
|
||||
|
# So? What about this header? |
||||
|
case $ac_header_compiler:$ac_header_preproc in |
||||
|
yes:no ) |
||||
|
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
|
-echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
|
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
|
||||
|
-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
|
||||
|
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
|
+echo "$as_me: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
|
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&5
|
||||
|
+echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&2;}
|
||||
|
( |
||||
|
cat <<\_ASBOX |
||||
|
## ------------------------------------ ## |
||||
|
@@ -8916,12 +8916,12 @@
|
||||
|
sed "s/^/$as_me: WARNING: /" >&2 |
||||
|
;; |
||||
|
no:yes ) |
||||
|
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
|
||||
|
-echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
|
||||
|
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5
|
||||
|
-echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;}
|
||||
|
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
|
||||
|
-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
|
||||
|
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: present but cannot be compiled" >&5
|
||||
|
+echo "$as_me: WARNING: sasl2/sasl.h: present but cannot be compiled" >&2;}
|
||||
|
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&5
|
||||
|
+echo "$as_me: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&2;}
|
||||
|
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&5
|
||||
|
+echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&2;}
|
||||
|
( |
||||
|
cat <<\_ASBOX |
||||
|
## ------------------------------------ ## |
||||
|
@@ -8932,8 +8932,8 @@
|
||||
|
sed "s/^/$as_me: WARNING: /" >&2 |
||||
|
;; |
||||
|
esac |
||||
|
-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
|
||||
|
-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
|
||||
|
+echo "$as_me:$LINENO: checking for sasl2/sasl.h" >&5
|
||||
|
+echo $ECHO_N "checking for sasl2/sasl.h... $ECHO_C" >&6
|
||||
|
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6 |
||||
|
else |
||||
|
--- ./plugins/ldap_plugin/configure.in.orig 2004-08-25 20:36:19.699675272 +0200
|
||||
|
+++ ./plugins/ldap_plugin/configure.in 2004-08-25 20:37:11.541794072 +0200
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
AC_PROG_LIBTOOL |
||||
|
|
||||
|
AC_CHECK_LIB(ldap,ldap_init,,AC_MSG_ERROR(You must have openldap libraries installed.)) |
||||
|
-AC_CHECK_HEADER(sasl/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed))
|
||||
|
+AC_CHECK_HEADER(sasl2/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed))
|
||||
|
|
||||
|
dnl Info for the RPM |
||||
|
MULTISYNC_TOP="../.." |
||||
|
--- ./plugins/ldap_plugin/src/ldap.c.orig 2003-12-03 02:24:07.000000000 +0100
|
||||
|
+++ ./plugins/ldap_plugin/src/ldap.c 2004-08-25 21:05:03.364638368 +0200
|
||||
|
@@ -1,5 +1,5 @@
|
||||
|
#include "ldap_plugin.h" |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
|
||||
|
int lutil_sasl_interact( |
||||
|
LDAP *ld, |
||||