diff -Nru myproxy-6.1.15/configure myproxy-6.1.16/configure --- myproxy-6.1.15/configure 2015-07-24 20:10:37.000000000 +0000 +++ myproxy-6.1.16/configure 2015-12-04 16:46:33.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for myproxy 6.1.15. +# Generated by GNU Autoconf 2.69 for myproxy 6.1.16. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='myproxy' PACKAGE_TARNAME='myproxy' -PACKAGE_VERSION='6.1.15' -PACKAGE_STRING='myproxy 6.1.15' +PACKAGE_VERSION='6.1.16' +PACKAGE_STRING='myproxy 6.1.16' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1338,7 +1338,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 myproxy 6.1.15 to adapt to many kinds of systems. +\`configure' configures myproxy 6.1.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of myproxy 6.1.15:";; + short | recursive ) echo "Configuration of myproxy 6.1.16:";; esac cat <<\_ACEOF @@ -1527,7 +1527,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -myproxy configure 6.1.15 +myproxy configure 6.1.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1992,7 +1992,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by myproxy $as_me 6.1.15, which was +It was created by myproxy $as_me 6.1.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2855,7 +2855,7 @@ # Define the identity of the package. PACKAGE='myproxy' - VERSION='6.1.15' + VERSION='6.1.16' cat >>confdefs.h <<_ACEOF @@ -11883,7 +11883,7 @@ PACKAGE_DEPS="globus-common >= 14, globus-usage >= 3, globus-gssapi-gsi >= 9, globus-gss-assist >= 8, globus-gsi-sysconfig >= 5, globus-gsi-cert-utils >= 8, globus-gsi-proxy-core >= 6, globus-gsi-credential >= 5, globus-gsi-callback >= 4" -MYPROXY_DATE="Jul 2015" +MYPROXY_DATE="Dec 2015" @@ -13865,7 +13865,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by myproxy $as_me 6.1.15, which was +This file was extended by myproxy $as_me 6.1.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13922,7 +13922,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -myproxy config.status 6.1.15 +myproxy config.status 6.1.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru myproxy-6.1.15/configure.ac myproxy-6.1.16/configure.ac --- myproxy-6.1.15/configure.ac 2015-07-24 12:58:52.000000000 +0000 +++ myproxy-6.1.16/configure.ac 2015-12-04 15:38:52.000000000 +0000 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([myproxy],[6.1.15]) +AC_INIT([myproxy],[6.1.16]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) LT_INIT([dlopen win32-dll]) diff -Nru myproxy-6.1.15/debian/changelog myproxy-6.1.16/debian/changelog --- myproxy-6.1.15/debian/changelog 2015-08-12 08:35:32.000000000 +0000 +++ myproxy-6.1.16/debian/changelog 2015-12-10 13:57:38.000000000 +0000 @@ -1,8 +1,8 @@ -myproxy (6.1.15-1build1) wily; urgency=medium +myproxy (6.1.16-1) unstable; urgency=medium - * No-change rebuild against libvomsapi1v5 + * Update to 6.1.16 (handle invalid proxy_req type) - -- Martin Pitt Wed, 12 Aug 2015 10:35:32 +0200 + -- Mattias Ellert Thu, 10 Dec 2015 14:55:54 +0100 myproxy (6.1.15-1) unstable; urgency=medium @@ -60,7 +60,7 @@ myproxy (6.0-1) unstable; urgency=medium * Update to 6.0, adapt to Globus Toolkit 6 - * Drop GPT build system oand GPT packaging metadata + * Drop GPT build system and GPT packaging metadata * Enable hardening flags -- Mattias Ellert Sat, 27 Sep 2014 10:55:32 +0200 diff -Nru myproxy-6.1.15/debian/copyright myproxy-6.1.16/debian/copyright --- myproxy-6.1.15/debian/copyright 2015-07-29 15:29:07.000000000 +0000 +++ myproxy-6.1.16/debian/copyright 2015-12-10 13:53:52.000000000 +0000 @@ -4,7 +4,7 @@ MyProxy Team National Center for Supercomputing Applications University of Illinois -Source: http://www.globus.org/ftppub/gt6/packages/myproxy-6.1.15.tar.gz +Source: http://www.globus.org/ftppub/gt6/packages/myproxy-6.1.16.tar.gz Files: * Copyright: diff -Nru myproxy-6.1.15/myproxy-date.inc myproxy-6.1.16/myproxy-date.inc --- myproxy-6.1.15/myproxy-date.inc 2015-07-24 20:10:28.000000000 +0000 +++ myproxy-6.1.16/myproxy-date.inc 2015-12-04 16:46:23.000000000 +0000 @@ -1 +1 @@ -Jul 2015 \ No newline at end of file +Dec 2015 \ No newline at end of file diff -Nru myproxy-6.1.15/ssl_utils.c myproxy-6.1.16/ssl_utils.c --- myproxy-6.1.15/ssl_utils.c 2015-07-24 12:58:52.000000000 +0000 +++ myproxy-6.1.16/ssl_utils.c 2015-12-04 15:38:52.000000000 +0000 @@ -1373,6 +1373,8 @@ globus_gsi_proxy_handle_attrs_init(&proxy_handle_attrs); globus_gsi_proxy_handle_attrs_set_keybits(proxy_handle_attrs, keybits); + /* globus_gsi_proxy_handle_init() initializes proxy_req->type, which is used + * when the GT_PROXY_MODE environment variable is unset */ local_result = globus_gsi_proxy_handle_init(&(*new_creds)->proxy_req, proxy_handle_attrs); /* done with proxy_handle_attrs now */ @@ -1394,13 +1396,18 @@ globus_gsi_proxy_handle_set_type((*new_creds)->proxy_req, GLOBUS_GSI_CERT_UTILS_TYPE_RFC_IMPERSONATION_PROXY); #endif + } else { + verror_put_string("Unsupported value for GT_PROXY_MODE: %s", + GT_PROXY_MODE); + globus_error_to_verror(GLOBUS_FAILURE); + goto error; } - } if (local_result != GLOBUS_SUCCESS) { verror_put_string("globus_gsi_proxy_handle_set_type() failed"); globus_error_to_verror(local_result); goto error; - } + } + } bio = BIO_new(BIO_s_mem()); if (bio == NULL) { verror_put_string("BIO_new() failed");