Hello community, here is the log from the commit of package rgb for openSUSE:Factory checked in at 2013-01-22 17:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rgb (Old) and /work/SRC/openSUSE:Factory/.rgb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rgb", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rgb/rgb.changes 2012-05-08 12:00:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rgb.new/rgb.changes 2013-01-22 17:47:34.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Jan 20 21:25:08 UTC 2013 - zai...@opensuse.org + +- Update to version 1.0.5: + + Replace unbounded strcpy/strcat pairs with snprintf calls. + + Add const attributes to fix gcc -Wwrite-strings warnings. + + man: replace hard coded section number (1) and (3) with + variables. + + config: + - Add missing AC_CONFIG_SRCDIR. + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Replace deprecated AC_HELP_STRING with AS_HELP_STRING. + - Remove unrequired AC_SUBST([*_CFLAGS]). + +------------------------------------------------------------------- Old: ---- rgb-1.0.4.tar.bz2 New: ---- rgb-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rgb.spec ++++++ --- /var/tmp/diff_new_pack.M02ksd/_old 2013-01-22 17:47:35.000000000 +0100 +++ /var/tmp/diff_new_pack.M02ksd/_new 2013-01-22 17:47:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rgb # -# 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,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rgb -Version: 1.0.4 +Version: 1.0.5 Release: 0 -License: MIT Summary: X color name database -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 BuildRequires: pkg-config BuildRequires: pkgconfig(xorg-macros) >= 1.8 ++++++ rgb-1.0.4.tar.bz2 -> rgb-1.0.5.tar.bz2 ++++++ ++++ 9591 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/rgb-1.0.4/ChangeLog new/rgb-1.0.5/ChangeLog --- old/rgb-1.0.4/ChangeLog 2010-10-07 05:18:06.000000000 +0200 +++ new/rgb-1.0.5/ChangeLog 2013-01-20 01:17:55.000000000 +0100 @@ -1,3 +1,82 @@ +commit c78228c3948966c3dc8cdaa9ed68449c64150fbd +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Jan 19 16:16:39 2013 -0800 + + rgb 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit c0fea07b26943cbb7eb9947b90013d77f73e573a +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Jan 19 16:07:56 2013 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 318ba2333984a7cadfba6ffc269427c61966b0f4 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Jan 11 21:30:37 2013 -0800 + + Replace unbounded strcpy/strcat pairs with snprintf calls + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit c7af632206a794407dd5ee52fc0b18b2478668b4 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Jun 5 18:05:41 2012 -0700 + + unifdef __UNIXOS2__ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit e7d3ef457bff9d14b308b88d88f7942eca1cabb8 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Sep 26 15:57:02 2011 -0700 + + Add const attributes to fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 37e97808cae61b7488ba0b3dfb9e7f66cbee1874 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Mar 4 20:22:38 2011 -0500 + + man: replace hard coded section number (1) and (3) with variables + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 54bf7707422b51e0b28ec9e968e2eac85cbd0932 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + +commit dcfac7570f8f92dfe3b79338439461c0d32567a1 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 15:29:49 2011 -0500 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences an Automake warning. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 20600faa8d0d44c0aeeb370d321da8a405fc0743 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 13:33:47 2011 -0500 + + config: remove unrequired AC_SUBST([*_CFLAGS]) + + This macro is called by PKG_CHECK_MODULES + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit 9c6cb7bd5dfec4aedb943f618730c6235d84a740 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Oct 6 20:17:27 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/rgb-1.0.4/configure.ac new/rgb-1.0.5/configure.ac --- old/rgb-1.0.4/configure.ac 2010-10-07 05:17:16.000000000 +0200 +++ new/rgb-1.0.5/configure.ac 2013-01-20 01:17:38.000000000 +0100 @@ -21,12 +21,16 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([rgb], [1.0.4], +AC_INIT([rgb], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [rgb]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -38,7 +42,7 @@ AC_MSG_CHECKING([for rgb database location]) AC_ARG_WITH([rgb-db-dir], - AC_HELP_STRING([--with-rgb-db-dir=<path>], + AS_HELP_STRING([--with-rgb-db-dir=<path>], [rgb database location (default is ${datadir}/X11/rgb)]), [db_path=$withval], [db_path=${datadir}/X11/rgb]) AC_MSG_RESULT([$db_path]) @@ -50,7 +54,7 @@ AC_MSG_CHECKING([for rgb database format]) AC_ARG_WITH([rgb-db-type], - AC_HELP_STRING([--with-rgb-db-type=(text|dbm|ndbm)], + AS_HELP_STRING([--with-rgb-db-type=(text|dbm|ndbm)], [rgb database type (default is text)]), [db_type=$withval], [db_type="text"]) AC_MSG_RESULT([$db_type]) @@ -92,7 +96,6 @@ AC_SUBST([RGB_DB_TYPE]) AC_SUBST([RGB_DB_FILES]) AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext]) -AC_SUBST(RGB_CFLAGS) AC_CONFIG_FILES([Makefile man/Makefile]) 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/rgb-1.0.4/man/rgb.man new/rgb-1.0.5/man/rgb.man --- old/rgb-1.0.4/man/rgb.man 2010-09-23 05:34:57.000000000 +0200 +++ new/rgb-1.0.5/man/rgb.man 2013-01-20 01:17:38.000000000 +0100 @@ -81,5 +81,5 @@ __RGB_DB_TYPE__ files containing color name to RGB mapping. .PD .SH SEE ALSO -.BR cat (1), -.BR __RGB_DB_TYPE__ (3) +.BR cat (__appmansuffix__), +.BR __RGB_DB_TYPE__ (__libmansuffix__) 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/rgb-1.0.4/rgb.c new/rgb-1.0.5/rgb.c --- old/rgb-1.0.4/rgb.c 2009-10-16 23:38:27.000000000 +0200 +++ new/rgb-1.0.5/rgb.c 2013-01-20 01:17:38.000000000 +0100 @@ -80,8 +80,7 @@ else dbname = RGB_DB; - strcpy (name, dbname); - strcat (name, ".dir"); + snprintf (name, sizeof(name), "%s.dir", dbname); fd = open (name, O_WRONLY|O_CREAT, 0666); if (fd < 0) { fprintf (stderr, @@ -91,8 +90,7 @@ } (void) close (fd); - strcpy (name, dbname); - strcat (name, ".pag"); + snprintf (name, sizeof(name), "%s.pag", dbname); fd = open (name, O_WRONLY|O_CREAT, 0666); if (fd < 0) { fprintf (stderr, 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/rgb-1.0.4/showrgb.c new/rgb-1.0.5/showrgb.c --- old/rgb-1.0.4/showrgb.c 2009-10-16 23:38:27.000000000 +0200 +++ new/rgb-1.0.5/showrgb.c 2013-01-20 01:17:38.000000000 +0100 @@ -49,12 +49,12 @@ #include <X11/Xfuncs.h> static char *ProgramName; -static void dumprgb(char *filename); +static void dumprgb(const char *filename); int main (int argc, char *argv[]) { - char *dbname = RGB_DB; + const char *dbname = RGB_DB; ProgramName = argv[0]; if (argc == 2) @@ -66,7 +66,7 @@ #ifndef USE_RGB_TXT static void -dumprgb (char *filename) +dumprgb (const char *filename) { #ifdef NDBM DBM *rgb_dbm; @@ -115,7 +115,7 @@ #else /* USE_RGB_TXT */ static void -dumprgb (char *filename) +dumprgb (const char *filename) { FILE *rgb; char *path; @@ -124,16 +124,9 @@ int lineno = 0; int red, green, blue; -#ifdef __UNIXOS2__ - char *root = (char*)getenv("X11ROOT"); - sprintf(line,"%s%s.txt",root,filename); - path = (char *)malloc(strlen(line) + 1); - strcpy(path,line); -#else path = (char *)malloc(strlen(filename) + 5); strcpy(path, filename); strcat(path, ".txt"); -#endif if (!(rgb = fopen(path, "r"))) { fprintf (stderr, "%s: unable to open rgb database \"%s\"\n", @@ -144,11 +137,7 @@ while(fgets(line, sizeof(line), rgb)) { lineno++; -#ifndef __UNIXOS2__ if (sscanf(line, "%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) { -#else - if (sscanf(line, "%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4) { -#endif if (red >= 0 && red <= 0xff && green >= 0 && green <= 0xff && blue >= 0 && blue <= 0xff) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
