Hello community, here is the log from the commit of package proxymngr for openSUSE:Factory checked in at 2013-02-28 07:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proxymngr (Old) and /work/SRC/openSUSE:Factory/.proxymngr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proxymngr", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/proxymngr/proxymngr.changes 2012-05-08 12:00:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.proxymngr.new/proxymngr.changes 2013-02-28 10:21:03.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 26 20:07:56 UTC 2013 - [email protected] + +- Update to version 1.0.3: + + install: Use sysconfdir instead of libdir for config files. + + man: Set correct config file location in man page + + Mark Usage() with _X_NORETURN to silence gcc warning + + Add const qualifiers to clear gcc -Wwrite-strings warnings + + config: replace deprecated AM_CONFIG_HEADER with + AC_CONFIG_HEADERS + + Add $(AM_V_GEN) to silence pmconfig creation rule + + proxymngr depends on xproto, not x11 (Xlib) +- Drop proxymngr.diff patch, fixed upstream. +- Replace pkgconfig(x11) BuildRequires with pkgconfig(xproto) + BuildRequires, following upstream changes. + +------------------------------------------------------------------- Old: ---- proxymngr-1.0.2.tar.bz2 proxymngr.diff New: ---- proxymngr-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proxymngr.spec ++++++ --- /var/tmp/diff_new_pack.E25fmH/_old 2013-02-28 10:21:04.000000000 +0100 +++ /var/tmp/diff_new_pack.E25fmH/_new 2013-02-28 10:21:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package proxymngr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: proxymngr -Version: 1.0.2 +Version: 1.0.3 Release: 0 -License: MIT Summary: X proxy manager service -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 -# proxymngr.diff -- Change path to config file -Patch0: proxymngr.diff BuildRequires: lbxproxy -# needed for patch0 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xproxymngproto) BuildRequires: pkgconfig(xt) Requires: lbxproxy @@ -47,9 +44,6 @@ %prep %setup -q -%patch0 -p0 -# needed for patch0 -autoreconf -fi %build %configure ++++++ proxymngr-1.0.2.tar.bz2 -> proxymngr-1.0.3.tar.bz2 ++++++ ++++ 9521 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.2/ChangeLog new/proxymngr-1.0.3/ChangeLog --- old/proxymngr-1.0.2/ChangeLog 2010-10-30 22:29:56.000000000 +0200 +++ new/proxymngr-1.0.3/ChangeLog 2013-02-11 02:25:22.000000000 +0100 @@ -1,3 +1,85 @@ +commit 173166cff3d37a71098bf9b194b0cbe8dae0564c +Author: Alan Coopersmith <[email protected]> +Date: Sun Feb 10 17:21:40 2013 -0800 + + proxymngr 1.0.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 41a2f89c2644dc66fbddf84af7cf02f0be323059 +Author: Egbert Eich <[email protected]> +Date: Thu May 19 09:30:06 2011 +0200 + + install: Use sysconfdir instead of libdir for config files. + + Most X packages today install their config files in sysconfigdir, + only a few are left which still put their configuration in libdir. + + Signed-off-by: Egbert Eich <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 4e07066c12f2e2ef69ec4e56f702452c1216c035 +Author: Egbert Eich <[email protected]> +Date: Thu May 19 09:29:10 2011 +0200 + + man: Set correct config file location in man page + + Change the config file location from a hard coded path to what is + set during build. + + Signed-off-by: Egbert Eich <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit a636334182348da3b3f62012c1ae7690339ec620 +Author: Alan Coopersmith <[email protected]> +Date: Mon Apr 16 15:47:26 2012 -0700 + + Mark Usage() with _X_NORETURN to silence gcc warning + + main.c: In function ‘Usage’: + main.c:75:1: warning: function might be possible candidate for attribute ‘noreturn’ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 509bceb0f731f580903a32e4861b863a512dfd0b +Author: Alan Coopersmith <[email protected]> +Date: Mon Apr 16 15:45:01 2012 -0700 + + Add const qualifiers to clear gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2945c25a30029eded24abfe9ff0a2e30063b3b6b +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 18 20:02:47 2011 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e7678d9a965aeff60fb6e21409412d115f74bcb8 +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 18 20:00:59 2011 -0800 + + Add $(AM_V_GEN) to silence pmconfig creation rule + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d2c6b45582897ad73f6160dcec1e20162571d9f7 +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 18 19:55:14 2011 -0800 + + proxymngr depends on xproto, not x11 (Xlib) + + proxymngr doesn't include any Xlib headers or call any Xlib functions + directly, but does include Xos.h, Xfuncs.h & Xmd.h from xproto. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 3c65ddd9f0717ef330513bdabb7d3ce8bcd6dc32 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 13:29:13 2010 -0700 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.2/Makefile.am new/proxymngr-1.0.3/Makefile.am --- old/proxymngr-1.0.2/Makefile.am 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/Makefile.am 2013-02-11 02:21:47.000000000 +0100 @@ -21,7 +21,7 @@ bin_PROGRAMS = proxymngr -CONFIG_DIR = $(libdir)/X11/proxymngr +CONFIG_DIR = $(sysconfdir)/X11/proxymngr AM_CFLAGS = \ $(CWARNFLAGS) \ @@ -47,7 +47,7 @@ config_DATA = pmconfig pmconfig: pmconfig.cpp - $(SED) -e s/LBXPROXY/`echo @LBXPROXY@ | sed -e s/\\\\//\\\\\\\\\\\\//g`/ < $(srcdir)/pmconfig.cpp > $@ + $(AM_V_GEN)$(SED) -e s/LBXPROXY/`echo @LBXPROXY@ | sed -e s/\\\\//\\\\\\\\\\\\//g`/ < $(srcdir)/pmconfig.cpp > $@ EXTRA_DIST = pmconfig.cpp CLEANFILES = pmconfig @@ -59,6 +59,9 @@ EXTRA_DIST += $(appman_PRE) CLEANFILES += $(appman_DATA) +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS += -e 's|__configdir__|$(CONFIG_DIR)|g' + SUFFIXES = .$(APP_MAN_SUFFIX) .man # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure 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.2/config.c new/proxymngr-1.0.3/config.c --- old/proxymngr-1.0.2/config.c 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/config.c 2013-02-11 02:21:47.000000000 +0100 @@ -73,9 +73,7 @@ #ifdef NEED_STRCASECMP int -ncasecmp (str1, str2, n) - char *str1, *str2; - int n; +ncasecmp (const char *str1, const char *str2, int n) { char buf1[512],buf2[512]; char c, *s; @@ -104,8 +102,8 @@ Status GetConfig ( - char *configFile, - char *serviceName, + const char *configFile, + const char *serviceName, Bool *managed, char **startCommand, char **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.2/config.h new/proxymngr-1.0.3/config.h --- old/proxymngr-1.0.2/config.h 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/config.h 2013-02-11 02:21:47.000000000 +0100 @@ -28,8 +28,8 @@ Status GetConfig ( - char *configFile, - char *proxyService, + const char *configFile, + const char *serviceName, Bool *managed, char **startCommand, char **proxyAddress); @@ -37,8 +37,8 @@ #ifdef NEED_STRCASECMP int ncasecmp ( - char *str1, - char *str2, + const char *str1, + const char *str2, int n); #else #include <string.h> 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.2/configure.ac new/proxymngr-1.0.3/configure.ac --- old/proxymngr-1.0.2/configure.ac 2010-10-30 22:28:49.000000000 +0200 +++ new/proxymngr-1.0.3/configure.ac 2013-02-11 02:21:47.000000000 +0100 @@ -21,9 +21,16 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([proxymngr], [1.0.2], +AC_INIT([proxymngr], [1.0.3], [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 +# we have to choose a different name +AC_CONFIG_HEADERS([xconfig.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -33,10 +40,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# The program itself has a header called config.h so -# we have to choose a different name -AM_CONFIG_HEADER(xconfig.h) - +# Checks for programs AC_PROG_CPP AC_PATH_PROG(LBXPROXY, lbxproxy) @@ -45,7 +49,7 @@ fi # Checks for pkg-config packages -PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto) +PKG_CHECK_MODULES(PROXYMNGR, [ice xt xproto >= 7.0.17 xproxymngproto]) AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP],1, 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.2/main.c new/proxymngr-1.0.3/main.c --- old/proxymngr-1.0.2/main.c 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/main.c 2013-02-11 02:21:47.000000000 +0100 @@ -60,8 +60,8 @@ static IcePoVersionRec PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, PMSetupProcessMessages}}; -char *PM_VENDOR_STRING = XVENDORNAME; -char *PM_VENDOR_RELEASE = XORG_RELEASE; +const char *PM_VENDOR_STRING = XVENDORNAME; +const char *PM_VENDOR_RELEASE = XORG_RELEASE; int verbose = 0; @@ -69,7 +69,7 @@ #define PM_PORT "6500" -static char *configFile = NULL; +static const char *configFile = NULL; void Usage(void) @@ -355,8 +355,8 @@ SendGetProxyAddrReply ( PMconn *requestor, int status, - char *addr, - char *error) + const char *addr, + const char *error) { int len = STRING_BYTES (addr) + STRING_BYTES (error); 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.2/pmint.h new/proxymngr-1.0.3/pmint.h --- old/proxymngr-1.0.2/pmint.h 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/pmint.h 2013-02-11 02:21:47.000000000 +0100 @@ -41,8 +41,8 @@ #define True 1 #define False 0 -extern char *PM_VENDOR_STRING; -extern char *PM_VENDOR_RELEASE; +extern const char *PM_VENDOR_STRING; +extern const char *PM_VENDOR_RELEASE; extern int verbose; @@ -66,9 +66,9 @@ extern void NewConnectionXtProc ( XtPointer client_data, int *source, XtInputId *id ); extern void PMReplyProcessMessages ( IceConn iceConn, IcePointer clientData, int opcode, unsigned long length, int swap ); extern void PMSetupProcessMessages ( IceConn iceConn, IcePointer clientData, int opcode, unsigned long length, int swap, IceReplyWaitInfo *replyWait, int *replyReadyRet ); -extern void SendGetProxyAddrReply ( PMconn *requestor, int status, char *addr, char *error ); +extern void SendGetProxyAddrReply ( PMconn *requestor, int status, const char *addr, const char *error ); extern void SetCloseOnExec ( int fd ); -extern void Usage ( void ); +extern void Usage ( void ) _X_NORETURN; extern void _XtIceWatchProc ( IceConn ice_conn, IcePointer client_data, int opening, IcePointer *watch_data ); extern void _XtProcessIceMsgProc ( XtPointer client_data, int *source, XtInputId *id ); 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.2/proxymngr.man new/proxymngr-1.0.3/proxymngr.man --- old/proxymngr-1.0.2/proxymngr.man 2010-10-30 22:24:56.000000000 +0200 +++ new/proxymngr-1.0.3/proxymngr.man 2013-02-11 02:21:47.000000000 +0100 @@ -75,7 +75,7 @@ The proxy manager maintains a local configuration file describing the proxy services available. This configuration file is installed in -.I __projectroot__/lib/X11/proxymngr/pmconfig +.I __configdir__ during the installation of proxymngr. The location of the configuration file can be overwritten using the \fB\-config\fP command line option. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
