[meego-packaging] [meego-commits] 9607: Changes to Trunk:Netbook/meego-panel-networks
Yin, Yan
yan.yin at intel.com
Sun Nov 21 17:10:23 PST 2010
Hi jku, do you have a bug number or feature number for this?
I think it's okay for this package to not have the number as
it's totally specific to meego (e.g. not upstream package),
just want to be sure, thanks.
Regards,
Yin, Yan
> -----Original Message-----
> From: meego-commits-bounces at meego.com [mailto:meego-commits-
> bounces at meego.com] On Behalf Of Jussi Kukkonen
> Sent: Saturday, November 20, 2010 3:47 AM
> To: meego-commits at meego.com
> Subject: [meego-commits] 9607: Changes to Trunk:Netbook/meego-panel-
> networks
>
> Hi,
> I have made the following changes to meego-panel-networks in project
> Trunk:Netbook. Please review and accept ASAP.
>
> Thank You,
> Jussi Kukkonen
>
> [This message was auto-generated]
>
> ---
>
> Request #9607:
>
> submit: devel:ux:netbook/meego-panel-networks(r15) ->
> Trunk:Netbook/meego-panel-networks
>
>
> Message:
> * Fri Nov 19 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.19
> - Add support for OpenConnect.ServerCert option (BMC#8443)
>
> State: new 2010-11-19T11:46:35 jku
> Comment: None
>
>
>
> changes files:
> --------------
> --- meego-panel-networks.changes
> +++ meego-panel-networks.changes
> @@ -0,0 +1,3 @@
> +* Fri Nov 19 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.19
> +- Add support for OpenConnect.ServerCert option
> +
>
> old:
> ----
> meego-panel-networks-1.2.18.tar.gz
>
> new:
> ----
> meego-panel-networks-1.2.19.tar.gz
>
> spec files:
> -----------
> --- meego-panel-networks.spec
> +++ meego-panel-networks.spec
> @@ -7,7 +7,7 @@
>
> Name: meego-panel-networks
> Summary: Connection management panel
> -Version: 1.2.18
> +Version: 1.2.19
> Release: 1
> Group: Applications/Internet
> License: GPL 2
>
> other changes:
> --------------
>
> ++++++ meego-panel-networks-1.2.18.tar.gz -> meego-panel-networks-
> 1.2.19.tar.gz
> --- carrick/carrick-pane.c
> +++ carrick/carrick-pane.c
> @@ -1554,7 +1554,8 @@
> carrick_pane_connect_vpn (CarrickPane *self,
> const char *name,
> const char *gw,
> - const char *cookie)
> + const char *cookie,
> + const char *server_cert)
> {
> GHashTable *props;
> GValue *val;
> @@ -1584,6 +1585,14 @@
> g_value_set_string (val, g_strdup (cookie));
> g_hash_table_insert (props, g_strdup ("OpenConnect.Cookie"), val);
>
> + if (server_cert)
> + {
> + val = g_slice_new0 (GValue);
> + g_value_init (val, G_TYPE_STRING);
> + g_value_set_string (val, g_strdup (server_cert));
> + g_hash_table_insert (props, g_strdup ("OpenConnect.ServerCert"),
> val);
> + }
> +
> val = g_slice_new0 (GValue);
> g_value_init (val, G_TYPE_STRING);
> /* FIXME: VPN.Domain should be the domain to use for route splitting
> @@ -1622,8 +1631,9 @@
> auth_dialog_exit_cb (GPid pid, int status, auth_dialog_data *data)
> {
> char *line;
> - char *gw = NULL, *cookie = NULL;
> + char *gw = NULL, *cookie = NULL, *gw_cert = NULL;
> char *gw_term, *cookie_term;
> + char *gw_cert_term = NULL;
>
> g_spawn_close_pid (pid);
>
> @@ -1643,6 +1653,8 @@
> g_io_channel_read_line (data->io_out, &gw, NULL, NULL, NULL);
> else if (g_strcmp0 (line, "cookie\n") == 0)
> g_io_channel_read_line (data->io_out, &cookie, NULL, NULL,
> NULL);
> + else if (g_strcmp0 (line, "gwcert\n") == 0)
> + g_io_channel_read_line (data->io_out, &gw_cert, NULL, NULL,
> NULL);
>
> g_free (line);
> g_io_channel_read_line (data->io_out, &line, NULL, NULL, NULL);
> @@ -1653,21 +1665,33 @@
> {
> g_free (data->name);
> g_free (data);
> + g_free (gw);
> + g_free (cookie);
> + g_free (gw_cert);
> g_warning ("OpenConnect authentication did not return gateway
> and cookie\n");
> return;
> }
>
> /* remove linefeeds */
> gw_term = g_strndup (gw, strlen (gw) - 1);
> - cookie_term = g_strndup (cookie, strlen (cookie) - 1);
> g_free (gw);
> +
> + cookie_term = g_strndup (cookie, strlen (cookie) - 1);
> g_free (cookie);
>
> - carrick_pane_connect_vpn (data->self, data->name, gw_term,
> cookie_term);
> + if (gw_cert)
> + {
> + gw_cert_term = g_strndup (gw_cert, strlen (gw_cert) - 1);
> + g_free (gw_cert);
> + }
> +
> + carrick_pane_connect_vpn (data->self, data->name,
> + gw_term, cookie_term, gw_cert_term);
> g_free (data->name);
> g_free (data);
> g_free (gw_term);
> g_free (cookie_term);
> + g_free (gw_cert_term);
> }
>
> static void
> --- configure
> +++ configure
> @@ -1,6 +1,6 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.67 for meego-panel-networks 1.2.18.
> +# Generated by GNU Autoconf 2.67 for meego-panel-networks 1.2.19.
> #
> #
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
> @@ -698,8 +698,8 @@
> # Identity of this package.
> PACKAGE_NAME='meego-panel-networks'
> PACKAGE_TARNAME='meego-panel-networks'
> -PACKAGE_VERSION='1.2.18'
> -PACKAGE_STRING='meego-panel-networks 1.2.18'
> +PACKAGE_VERSION='1.2.19'
> +PACKAGE_STRING='meego-panel-networks 1.2.19'
> PACKAGE_BUGREPORT=''
> PACKAGE_URL=''
>
> @@ -1496,7 +1496,7 @@
> # Omit some internal or obsolete options to make the list less
> imposing.
> # This message is too long to be a string in the A/UX 3.1 sh.
> cat <<_ACEOF
> -\`configure' configures meego-panel-networks 1.2.18 to adapt to many
> kinds of systems.
> +\`configure' configures meego-panel-networks 1.2.19 to adapt to many
> kinds of systems.
>
> Usage: $0 [OPTION]... [VAR=VALUE]...
>
> @@ -1567,7 +1567,7 @@
>
> if test -n "$ac_init_help"; then
> case $ac_init_help in
> - short | recursive ) echo "Configuration of meego-panel-networks
> 1.2.18:";;
> + short | recursive ) echo "Configuration of meego-panel-networks
> 1.2.19:";;
> esac
> cat <<\_ACEOF
>
> @@ -1692,7 +1692,7 @@
> test -n "$ac_init_help" && exit $ac_status
> if $ac_init_version; then
> cat <<\_ACEOF
> -meego-panel-networks configure 1.2.18
> +meego-panel-networks configure 1.2.19
> generated by GNU Autoconf 2.67
>
> Copyright (C) 2010 Free Software Foundation, Inc.
> @@ -2057,7 +2057,7 @@
> This file contains any messages produced by compilers while
> running configure, to aid debugging if configure makes a mistake.
>
> -It was created by meego-panel-networks $as_me 1.2.18, which was
> +It was created by meego-panel-networks $as_me 1.2.19, which was
> generated by GNU Autoconf 2.67. Invocation command line was
>
> $ $0 $@
> @@ -2872,7 +2872,7 @@
>
> # Define the identity of the package.
> PACKAGE=meego-panel-networks
> - VERSION=1.2.18
> + VERSION=1.2.19
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -14520,7 +14520,7 @@
> # report actual input values of CONFIG_FILES etc. instead of their
> # values after options handling.
> ac_log="
> -This file was extended by meego-panel-networks $as_me 1.2.18, which
> was
> +This file was extended by meego-panel-networks $as_me 1.2.19, which
> was
> generated by GNU Autoconf 2.67. Invocation command line was
>
> CONFIG_FILES = $CONFIG_FILES
> @@ -14586,7 +14586,7 @@
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
> s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> -meego-panel-networks config.status 1.2.18
> +meego-panel-networks config.status 1.2.19
> configured by $0, generated by GNU Autoconf 2.67,
> with options \\"\$ac_cs_config\\"
>
> --- configure.ac
> +++ configure.ac
> @@ -1,5 +1,5 @@
> AC_PREREQ(2.53)
> -AC_INIT(meego-panel-networks, 1.2.18)
> +AC_INIT(meego-panel-networks, 1.2.19)
> AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
> AM_CONFIG_HEADER(config.h)
>
>
> ++++++ meego-panel-networks.yaml
> --- meego-panel-networks.yaml
> +++ meego-panel-networks.yaml
> @@ -1,6 +1,6 @@
> Name: meego-panel-networks
> Summary: Connection management panel
> -Version: 1.2.18
> +Version: 1.2.19
> Release: 1
> Group: Applications/Internet
> License: GPL 2
>
> _______________________________________________
> MeeGo-commits mailing list
> MeeGo-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-packaging
mailing list