Hello community,
here is the log from the commit of package proxymngr for openSUSE:Factory
checked in at 2015-04-25 09:53:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/proxymngr (Old)
and /work/SRC/openSUSE:Factory/.proxymngr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proxymngr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/proxymngr/proxymngr.changes 2013-02-28
10:21:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.proxymngr.new/proxymngr.changes 2015-04-25
11:26:12.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Apr 24 13:59:23 UTC 2015 - sndir...@suse.com
+
+- Update to version 1.0.4:
+ * This minor maintenance release includes various build
+ improvements, cleanups, portability tweaks, and bug fixes,
+ but nothing exciting.
+
+-------------------------------------------------------------------
Old:
----
proxymngr-1.0.3.tar.bz2
New:
----
proxymngr-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ proxymngr.spec ++++++
--- /var/tmp/diff_new_pack.oVyg4V/_old 2015-04-25 11:26:13.000000000 +0200
+++ /var/tmp/diff_new_pack.oVyg4V/_new 2015-04-25 11:26:13.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package proxymngr
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: proxymngr
-Version: 1.0.3
+Version: 1.0.4
Release: 0
Summary: X proxy manager service
License: MIT
@@ -54,7 +54,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc ChangeLog COPYING README
%config %{_sysconfdir}/X11/proxymngr/
%{_bindir}/proxymngr
%{_mandir}/man1/proxymngr.1%{?ext_man}
++++++ proxymngr-1.0.3.tar.bz2 -> proxymngr-1.0.4.tar.bz2 ++++++
++++ 7941 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/ChangeLog new/proxymngr-1.0.4/ChangeLog
--- old/proxymngr-1.0.3/ChangeLog 2013-02-11 02:25:22.000000000 +0100
+++ new/proxymngr-1.0.4/ChangeLog 2015-04-17 07:21:35.000000000 +0200
@@ -1,3 +1,112 @@
+commit 7e9c8369b90333b2102e90a4d95046cf73bcc416
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Apr 16 22:19:44 2015 -0700
+
+ proxymngr 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit be8a5fbefcd6d3bee5e55283e06e255003b376b4
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 8 16:05:52 2014 -0800
+
+ Stop checking if pointers are NULL before passing them to free()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit f391fa1f55436ec2e4f7de4c4734fcd89cdbe250
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 8 15:47:43 2014 -0800
+
+ Stop casting results of malloc calls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 5d5a7f80d905d58530c8473bc7ec0b0b3b165658
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 8 15:45:00 2014 -0800
+
+ Replace last strcpy call + manual append with snprintf call
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 9a17f21de44bcfe1493e9d10ae2354c2a3b496b1
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 8 15:42:03 2014 -0800
+
+ Replace malloc(strlen)+strcpy sets with strdup calls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 333085a276a2bb2b156339cd9f8caa658ef4d1b6
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 8 15:32:42 2014 -0800
+
+ Ensure memory is initialized before use in PushRequestorQueue
+
+ If authLen <= 0, then we weren't initializing the authName & authData
+ pointers until after checking if all the allocations succeeded, but
+ if any allocations failed, we'd then try to free them before that.
+
+ Error: Uninitialised memory (CWE 456)
+ Possible access to uninitialised memory '&newreq->authData'
+ at line 590 of pmdb.c in function 'PushRequestorQueue'.
+ &newreq->authData allocated at line 559.
+ &newreq->authData uninitialised when authLen <= 0 at line 568.
+ at line 591 of pmdb.c in function 'PushRequestorQueue'.
+ &newreq->authData allocated at line 559.
+ &newreq->authData uninitialised when authLen <= 0 at line 568
+ and newreq->authName == NULL at line 574.
+ Possible access to uninitialised memory '&newreq->authName'
+ at line 588 of pmdb.c in function 'PushRequestorQueue'.
+ &newreq->authName allocated at line 559.
+ &newreq->authName uninitialised when authLen <= 0 at line 568.
+ at line 589 of pmdb.c in function 'PushRequestorQueue'.
+ &newreq->authName allocated at line 559.
+ &newreq->authName uninitialised when authLen <= 0 at line 568
+ and newreq->authName != NULL at line 574.
+
+ [ This bug was found by the Parfait 1.5.1 bug checking tool.
+ http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3735919092d164a5d4a76a47e6ae8281fbf89be1
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Jun 2 21:03:45 2014 -0700
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit af7fd61a9b53f4e7e433c17292df55ae55fee2fa
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Jun 2 21:03:45 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e6d92a4bd724db15eff286eb975df0baaa99313c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jun 1 00:30:41 2014 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 29d85cd3abd884022b67ea26c011fc06109242ac
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Apr 1 21:50:37 2013 -0700
+
+ Assume signal handlers return void, as C89 requires
+
+ Drops use of Imake's obsolete SIGNALRETURNSINT.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 173166cff3d37a71098bf9b194b0cbe8dae0564c
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sun Feb 10 17:21:40 2013 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/compile new/proxymngr-1.0.4/compile
--- old/proxymngr-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/proxymngr-1.0.4/compile 2015-04-17 07:20:08.000000000 +0200
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tro...@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-autom...@gnu.org> or send patches to
+# <automake-patc...@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-autom...@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/config.c new/proxymngr-1.0.4/config.c
--- old/proxymngr-1.0.3/config.c 2013-02-11 02:21:47.000000000 +0100
+++ new/proxymngr-1.0.4/config.c 2015-04-17 07:20:02.000000000 +0200
@@ -49,9 +49,9 @@
else
*plen = BUFSIZ;
if (*pbuf)
- *pbuf = (char *) realloc (*pbuf, *plen + 1);
+ *pbuf = realloc (*pbuf, *plen + 1);
else
- *pbuf = (char *) malloc (*plen + 1);
+ *pbuf = malloc (*plen + 1);
if (! *pbuf) {
fprintf (stderr, "Memory allocation failure reading config
file\n");
return 0;
@@ -158,35 +158,31 @@
if (*managed)
{
- n = strlen (p);
- *startCommand = (char *) malloc (n + 2);
+ n = strlen (p) + 2;
+ *startCommand = malloc (n);
if (! *startCommand) {
fprintf (stderr,
"Memory allocation failed for service \"%s\"\n",
serviceName);
break;
}
- strcpy (*startCommand, p);
- (*startCommand)[n] = '&';
- (*startCommand)[n + 1] = '\0';
+ snprintf(*startCommand, n, "%s&", p);
}
else
{
- *proxyAddress = (char *) malloc (strlen (p) + 1);
+ *proxyAddress = strdup (p);
if (! *proxyAddress) {
fprintf (stderr,
"Memory allocation failed for service \"%s\" at %s\n",
serviceName, p);
break;
}
- strcpy (*proxyAddress, p);
}
found = 1;
}
- if (buf)
- free (buf);
+ free (buf);
fclose (fp);
return found;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/configure.ac new/proxymngr-1.0.4/configure.ac
--- old/proxymngr-1.0.3/configure.ac 2013-02-11 02:21:47.000000000 +0100
+++ new/proxymngr-1.0.4/configure.ac 2015-04-17 07:20:02.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([proxymngr], [1.0.3],
+AC_INIT([proxymngr], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [proxymngr])
AC_CONFIG_SRCDIR([Makefile.am])
# The program itself has a header called config.h so
@@ -31,8 +31,7 @@
AC_CONFIG_HEADERS([xconfig.h])
# Initialize Automake
-AM_INIT_AUTOMAKE([dist-bzip2])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/main.c new/proxymngr-1.0.4/main.c
--- old/proxymngr-1.0.3/main.c 2013-02-11 02:21:47.000000000 +0100
+++ new/proxymngr-1.0.4/main.c 2015-04-17 07:20:02.000000000 +0200
@@ -177,7 +177,7 @@
}
networkIds = IceComposeNetworkIdList (numTransports, listenObjs);
- p = (char *) malloc(sizeof ("PROXY_MANAGER") + strlen(networkIds) + 2);
+ p = malloc (sizeof ("PROXY_MANAGER") + strlen(networkIds) + 2);
sprintf (p, "PROXY_MANAGER=%s", networkIds);
putenv (p);
printf ("%s\n", p);
@@ -275,7 +275,7 @@
static char standardError[] = "Could not allocate memory for new client";
PMconn *pmConn;
- if ((pmConn = (PMconn *) malloc (sizeof (PMconn))) == NULL)
+ if ((pmConn = malloc (sizeof (PMconn))) == NULL)
{
if (verbose)
fprintf (stderr, "%s\n", standardError);
@@ -449,7 +449,7 @@
if (authLen > 0)
{
EXTRACT_STRING (pData, swap, authName);
- authData = (char *) malloc (authLen);
+ authData = malloc (authLen);
memcpy (authData, pData, authLen);
}
@@ -513,7 +513,7 @@
char * pch = strdup (tmpName);
len = strlen(canonname) + strlen(tmpName) + 1;
- serverAddress = (char *) realloc (serverAddress, len);
+ serverAddress = realloc (serverAddress, len);
sprintf (serverAddress, "%s%s", canonname, pch);
free (pch);
}
@@ -539,18 +539,12 @@
ForwardRequest (pmConn, serviceName, serverAddress, hostAddress,
startOptions, authLen, authName, authData);
- if (serviceName)
- free (serviceName);
- if (serverAddress)
- free (serverAddress);
- if (hostAddress)
- free (hostAddress);
- if (startOptions)
- free (startOptions);
- if (authName)
- free (authName);
- if (authData)
- free (authData);
+ free (serviceName);
+ free (serverAddress);
+ free (hostAddress);
+ free (startOptions);
+ free (authName);
+ free (authData);
break;
}
@@ -793,10 +787,8 @@
}
}
- if (startCommand)
- free (startCommand);
- if (proxyAddress)
- free (proxyAddress);
+ free (startCommand);
+ free (proxyAddress);
PopRequestorQueue (pmConn, False,
runningProxy ? False : True /* free proxy list */);
@@ -836,10 +828,8 @@
}
}
- if (addr)
- free (addr);
- if (error)
- free (error);
+ free (addr);
+ free (error);
break;
}
@@ -976,10 +966,8 @@
}
}
- if (startCommand)
- free (startCommand);
- if (proxyAddress)
- free (proxyAddress);
+ free (startCommand);
+ free (proxyAddress);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/missing new/proxymngr-1.0.4/missing
--- old/proxymngr-1.0.3/missing 2013-02-11 02:21:54.000000000 +0100
+++ new/proxymngr-1.0.4/missing 2015-04-17 07:20:08.000000000 +0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-autom...@gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'autom4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/pmdb.c new/proxymngr-1.0.4/pmdb.c
--- old/proxymngr-1.0.3/pmdb.c 2013-02-11 02:21:47.000000000 +0100
+++ new/proxymngr-1.0.4/pmdb.c 2015-04-17 07:20:02.000000000 +0200
@@ -33,12 +33,7 @@
#include <stdlib.h>
#include <signal.h>
-#if defined(X_NOT_POSIX) && defined(SIGNALRETURNSINT)
-#define SIGVAL int
-#else
-#define SIGVAL void
-#endif
-typedef SIGVAL (*Signal_Handler)(int);
+typedef void (*Signal_Handler)(int);
static proxy_service *proxyServiceList = NULL;
@@ -77,18 +72,17 @@
}
if (createIf) {
- service = (proxy_service *) malloc (sizeof (proxy_service));
+ service = malloc (sizeof (proxy_service));
if (!service)
return NULL;
- service->serviceName = (char *) malloc (nameLen + 1);
+ service->serviceName = strdup (serviceName);
if (!service->serviceName)
{
free (service);
return NULL;
}
- strcpy (service->serviceName, serviceName);
service->proxyCount = 0;
service->proxyList = NULL;
@@ -121,7 +115,7 @@
if (!service)
return NULL;
- proxy = (running_proxy *) malloc (sizeof (running_proxy));
+ proxy = malloc (sizeof (running_proxy));
if (!proxy)
return NULL;
@@ -216,7 +210,7 @@
SetCloseOnExec (IceConnectionNumber (proxy_iceConn));
/* See PMprotocolSetupProc */
- pmConn = (PMconn *) malloc (sizeof (PMconn));
+ pmConn = malloc (sizeof (PMconn));
if (pmConn == NULL) {
IceCloseConnection (proxy_iceConn);
@@ -245,7 +239,7 @@
pmConn->release = release;
}
- proxy = (running_proxy *) malloc (sizeof (running_proxy));
+ proxy = malloc (sizeof (running_proxy));
if (!proxy) {
IceCloseConnection (proxy_iceConn);
free (pmConn);
@@ -378,20 +372,13 @@
req->authLen, req->authName,
req->authData);
}
- if (req->serviceName)
- free (req->serviceName);
- if (req->serverAddress)
- free (req->serverAddress);
- if (req->hostAddress)
- free (req->hostAddress);
- if (req->startOptions)
- free (req->startOptions);
- if (req->listData)
- free (req->listData); /* proxyList */
- if (req->authName)
- free (req->authName);
- if (req->authData)
- free (req->authData);
+ free (req->serviceName);
+ free (req->serverAddress);
+ free (req->hostAddress);
+ free (req->startOptions);
+ free (req->listData); /* proxyList */
+ free (req->authName);
+ free (req->authData);
free (req);
req = nextreq;
}
@@ -424,20 +411,13 @@
*prev_reqP = req->next;
- if (req->serviceName)
- free (req->serviceName);
- if (req->serverAddress)
- free (req->serverAddress);
- if (req->hostAddress)
- free (req->hostAddress);
- if (req->startOptions)
- free (req->startOptions);
- if (req->listData)
- free (req->listData); /* proxyList */
- if (req->authName)
- free (req->authName);
- if (req->authData)
- free (req->authData);
+ free (req->serviceName);
+ free (req->serverAddress);
+ free (req->hostAddress);
+ free (req->startOptions);
+ free (req->listData); /* proxyList */
+ free (req->authName);
+ free (req->authData);
free (req);
/* return; */ /* should but only one req, but... */
@@ -479,7 +459,7 @@
if (!service || !service->proxyCount)
return NULL;
- runList = (running_proxy_list *) malloc (sizeof (running_proxy_list) +
+ runList = malloc (sizeof (running_proxy_list) +
service->proxyCount * sizeof (running_proxy *));
if (!runList)
@@ -561,20 +541,22 @@
char *authData)
{
- request_list *newreq = (request_list *) malloc (sizeof (request_list));
+ request_list *newreq = malloc (sizeof (request_list));
if (!newreq)
return 0;
- newreq->serviceName = (char *) malloc (strlen (serviceName) + 1);
- newreq->serverAddress = (char *) malloc (strlen (serverAddress) + 1);
- newreq->hostAddress = (char *) malloc (strlen (hostAddress) + 1);
- newreq->startOptions = (char *) malloc (strlen (startOptions) + 1);
+ newreq->serviceName = strdup (serviceName);
+ newreq->serverAddress = strdup (serverAddress);
+ newreq->hostAddress = strdup (hostAddress);
+ newreq->startOptions = strdup (startOptions);
if (authLen > 0)
{
- newreq->authName = (char *) malloc (strlen (authName) + 1);
- newreq->authData = (char *) malloc (authLen);
+ newreq->authName = strdup (authName);
+ newreq->authData = malloc (authLen);
}
+ else
+ newreq->authName = newreq->authData = NULL;
if (!newreq->serviceName ||
!newreq->serverAddress ||
@@ -582,35 +564,20 @@
!newreq->startOptions ||
(authLen > 0 && (!newreq->authName || !newreq->authData)))
{
- if (newreq->serviceName)
- free (newreq->serviceName);
- if (newreq->serverAddress)
- free (newreq->serverAddress);
- if (newreq->hostAddress)
- free (newreq->hostAddress);
- if (newreq->startOptions)
- free (newreq->startOptions);
- if (newreq->authName)
- free (newreq->authName);
- if (newreq->authData)
- free (newreq->authData);
+ free (newreq->serviceName);
+ free (newreq->serverAddress);
+ free (newreq->hostAddress);
+ free (newreq->startOptions);
+ free (newreq->authName);
+ free (newreq->authData);
free (newreq);
return 0;
}
- strcpy (newreq->serviceName, serviceName);
- strcpy (newreq->serverAddress, serverAddress);
- strcpy (newreq->hostAddress, hostAddress);
- strcpy (newreq->startOptions, startOptions);
if (authLen > 0)
{
- strcpy (newreq->authName, authName);
memcpy (newreq->authData, authData, authLen);
}
- else
- {
- newreq->authName = newreq->authData = NULL;
- }
newreq->requestor = requestor;
newreq->listData = (char *) runList;
@@ -733,7 +700,7 @@
if (newServer)
{
- server = (server_list *) malloc (sizeof (server_list));
+ server = malloc (sizeof (server_list));
server->serverAddress = proxy->requests->serverAddress;
server->next = proxy->servers;
proxy->servers = server;
@@ -743,18 +710,12 @@
if (!newServer)
free (proxy->requests->serverAddress);
- if (proxy->requests->serviceName)
- free (proxy->requests->serviceName);
- if (proxy->requests->hostAddress)
- free (proxy->requests->hostAddress);
- if (proxy->requests->startOptions)
- free (proxy->requests->startOptions);
- if (freeProxyList && proxy->requests->listData)
- free (proxy->requests->listData); /* proxyList */
- if (proxy->requests->authName)
- free (proxy->requests->authName);
- if (proxy->requests->authData)
- free (proxy->requests->authData);
+ free (proxy->requests->serviceName);
+ free (proxy->requests->hostAddress);
+ free (proxy->requests->startOptions);
+ free (proxy->requests->listData); /* proxyList */
+ free (proxy->requests->authName);
+ free (proxy->requests->authData);
requestor = proxy->requests->requestor;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/pmint.h new/proxymngr-1.0.4/pmint.h
--- old/proxymngr-1.0.3/pmint.h 2013-02-11 02:21:47.000000000 +0100
+++ new/proxymngr-1.0.4/pmint.h 2015-04-17 07:20:02.000000000 +0200
@@ -147,7 +147,7 @@
{ \
CARD16 _len; \
EXTRACT_CARD16 (_pBuf, _swap, _len); \
- _string = (char *) malloc (_len + 1); \
+ _string = malloc (_len + 1); \
memcpy (_string, _pBuf, _len); \
_string[_len] = '\0'; \
_pBuf += _len; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/proxymngr-1.0.3/xconfig.h.in new/proxymngr-1.0.4/xconfig.h.in
--- old/proxymngr-1.0.3/xconfig.h.in 2013-02-11 02:21:53.000000000 +0100
+++ new/proxymngr-1.0.4/xconfig.h.in 2015-04-17 07:20:07.000000000 +0200
@@ -77,3 +77,6 @@
/* Version number of package */
#undef VERSION
+
+/* Defined if needed to expose struct msghdr.msg_control */
+#undef _XOPEN_SOURCE
