From: Dietmar Maurer Date: Sat, 28 Feb 2015 06:38:22 +0000 (+0100) Subject: new upstream, updates for debian jessie X-Git-Url: https://git.proxmox.com/?p=pve-libspice-server.git;a=commitdiff_plain;h=86cdaac65e02a9a6ad3f250f5b4dab47d3804530;ds=sidebyside new upstream, updates for debian jessie --- diff --git a/Makefile b/Makefile index 2ecbb9a..5edb51e 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -RELEASE=3.1 +RELEASE=4.0 PACKAGE=pve-libspice-server1 -PKGVERSION=0.12.4 -PKGRELEASE=3 +PKGVERSION=0.12.5 +PKGRELEASE=1 PKGDIR=spice-${PKGVERSION} PKGSRC=${PKGDIR}.tar.bz2 diff --git a/debian/changelog b/debian/changelog index ef47b8c..92ff74e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pve-libspice-server (0.12.5-1) unstable; urgency=medium + + * new upstream + + * compile for debian jessie + + -- Proxmox Support Team Sat, 28 Feb 2015 07:37:45 +0100 + pve-libspice-server (0.12.4-3) unstable; urgency=low * use quilt for patch management diff --git a/debian/control b/debian/control index a39fdd5..00f534d 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: pve-libspice-server Priority: extra Maintainer: Proxmox Support Team -Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libjpeg-dev, zlib1g-dev, python-pyparsing, libpixman-1-dev (>= 0.17.7~) +Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libjpeg-dev, zlib1g-dev, python-pyparsing, libpixman-1-dev (>= 0.17.7~), libogg-dev, libsasl2-dev Standards-Version: 3.9.3 Section: libs diff --git a/debian/patches/allow-to-set-sasl-callbacks.patch b/debian/patches/allow-to-set-sasl-callbacks.patch index dae41dd..f2eaa2d 100644 --- a/debian/patches/allow-to-set-sasl-callbacks.patch +++ b/debian/patches/allow-to-set-sasl-callbacks.patch @@ -1,60 +1,20 @@ -Index: new/server/reds.c -=================================================================== ---- new.orig/server/reds.c 2013-10-22 10:08:45.000000000 +0200 -+++ new/server/reds.c 2013-10-22 12:10:15.000000000 +0200 -@@ -108,6 +108,7 @@ - static int sasl_enabled = 0; // sasl disabled by default - #if HAVE_SASL - static char *sasl_appname = NULL; // default to "spice" if NULL -+static sasl_callback_t *sasl_callbacks = NULL; - #endif - static char *spice_name = NULL; - static bool spice_uuid_is_set = FALSE; -@@ -2540,7 +2541,7 @@ - NULL, /* User realm */ - localAddr, - remoteAddr, -- NULL, /* Callbacks, not needed */ -+ sasl_callbacks, - SASL_SUCCESS_DATA, - &sasl->conn); - free(localAddr); -@@ -4104,6 +4105,17 @@ - return 0; - #else - return -1; -+#endif -+} -+ -+SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb) -+{ -+ spice_assert(reds == s); -+#if HAVE_SASL -+ sasl_callbacks = (sasl_callback_t *)saslcb; -+ return 0; -+#else -+ return -1; - #endif - } - Index: new/server/spice-server.syms =================================================================== ---- new.orig/server/spice-server.syms 2013-10-17 13:37:05.000000000 +0200 -+++ new/server/spice-server.syms 2013-10-22 12:08:39.000000000 +0200 -@@ -145,3 +145,8 @@ +--- new.orig/server/spice-server.syms ++++ new/server/spice-server.syms +@@ -148,6 +148,7 @@ global: + + SPICE_SERVER_0.12.5 { global: - spice_server_set_agent_file_xfer; - } SPICE_SERVER_0.12.3; -+ -+SPICE_SERVER_0.12.5 { -+global: + spice_server_set_sasl_callbacks; -+} SPICE_SERVER_0.12.4; + spice_server_get_best_playback_rate; + spice_server_set_playback_rate; + spice_server_get_best_record_rate; Index: new/server/spice.h =================================================================== ---- new.orig/server/spice.h 2013-10-21 07:33:01.000000000 +0200 -+++ new/server/spice.h 2013-10-22 12:03:36.000000000 +0200 -@@ -446,6 +446,7 @@ +--- new.orig/server/spice.h ++++ new/server/spice.h +@@ -457,6 +457,7 @@ int spice_server_set_exit_on_disconnect( int spice_server_set_noauth(SpiceServer *s); int spice_server_set_sasl(SpiceServer *s, int enabled); int spice_server_set_sasl_appname(SpiceServer *s, const char *appname); @@ -62,3 +22,35 @@ Index: new/server/spice.h int spice_server_set_ticket(SpiceServer *s, const char *passwd, int lifetime, int fail_if_connected, int disconnect_if_connected); int spice_server_set_tls(SpiceServer *s, int port, +Index: new/server/reds_stream.c +=================================================================== +--- new.orig/server/reds_stream.c ++++ new/server/reds_stream.c +@@ -48,6 +48,18 @@ extern SpiceCoreInterface *core; + #if HAVE_SASL + #include + ++static sasl_callback_t *sasl_callbacks = NULL; ++ ++SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb) ++{ ++#if HAVE_SASL ++ sasl_callbacks = (sasl_callback_t *)saslcb; ++ return 0; ++#else ++ return -1; ++#endif ++} ++ + typedef struct RedsSASL { + sasl_conn_t *conn; + +@@ -966,7 +978,7 @@ bool reds_sasl_start_auth(RedsStream *st + NULL, /* User realm */ + localAddr, + remoteAddr, +- NULL, /* Callbacks, not needed */ ++ sasl_callbacks, + SASL_SUCCESS_DATA, + &sasl->conn); + free(localAddr); diff --git a/spice-0.12.4.tar.bz2 b/spice-0.12.4.tar.bz2 deleted file mode 100644 index d6b716b..0000000 Binary files a/spice-0.12.4.tar.bz2 and /dev/null differ diff --git a/spice-0.12.5.tar.bz2 b/spice-0.12.5.tar.bz2 new file mode 100644 index 0000000..bb8046a Binary files /dev/null and b/spice-0.12.5.tar.bz2 differ