March 2015 - openSUSE Commits - openSUSE Mailing Lists

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '15

01 Apr '15

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2015-04-01 01:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old) and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bundle-lang-common" Changes: -------- --- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes 2014-12-10 12:33:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes 2015-04-01 01:14:07.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 31 23:11:10 UTC 2015 - dimstar(a)opensuse.org + +- Update package list + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 717 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.spec ++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.spec bundle-lang-gnome.spec: same change ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.DjcOeN/_old 2015-04-01 01:14:09.000000000 +0200 +++ /var/tmp/diff_new_pack.DjcOeN/_new 2015-04-01 01:14:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bundle-lang-kde # -# Copyright (c) 2014 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 bundle-lang-other.spec: same change ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.DjcOeN/_old 2015-04-01 01:14:09.000000000 +0200 +++ /var/tmp/diff_new_pack.DjcOeN/_new 2015-04-01 01:14:09.000000000 +0200 @@ -1,7 +1,8 @@ ModemManager-lang gnome-extras NetworkManager-gnome-lang gnome NetworkManager-lang common -NetworkManager-openconnect-lang gnome-extras +NetworkManager-openconnect-lang gnome +NetworkManager-openswan-lang gnome-extras NetworkManager-openvpn-lang common NetworkManager-pptp-lang common NetworkManager-strongswan-lang gnome-extras @@ -15,13 +16,13 @@ amarok-lang kde anjuta-extras-lang gnome-extras anjuta-lang gnome-extras -appdata-tools-lang gnome-extras apper-lang kde appstream-glib-lang gnome-extras arista-lang gnome-extras at-spi-lang gnome-extras at-spi2-core-lang gnome-extras atk-lang gnome-extras +atomix-lang gnome-extras audio-recorder-lang gnome-extras avahi-lang common balsa-lang gnome-extras @@ -34,9 +35,7 @@ blueproximity-lang gnome-extras brasero-lang gnome byzanz-lang gnome-extras -caffeine-lang gnome-extras cairo-clock-lang gnome-extras -california-lang gnome-extras caribou-lang gnome cheese-lang gnome cherrytree-lang gnome-extras @@ -56,7 +55,7 @@ cups-pk-helper-lang common d-feet-lang gnome-extras dasher-lang gnome-extras -dconf-lang common +dconf-editor-lang gnome-extras decibel-audio-player-lang gnome-extras deja-dup-lang gnome devhelp-lang gnome-extras @@ -87,7 +86,7 @@ frogr-lang gnome-extras gDesklets-lang gnome-extras gbrainy-lang gnome-extras -gcab-lang gnome-extras +gcab-lang gnome gconf-editor-lang gnome-extras gconf2-lang common gcr-lang common @@ -102,6 +101,7 @@ gedit-plugins-lang gnome-extras geeqie-lang gnome-extras gegl-0_2-lang gnome +gegl-0_3-lang gnome-extras genius-lang gnome-extras gftp-common-lang gnome-extras ghex-lang gnome-extras @@ -110,6 +110,7 @@ gimp-lang gnome gimp-plugin-lqr-lang gnome-extras gimp-save-for-web-lang gnome-extras +girl-lang gnome-extras gitg-lang gnome-extras giver-lang gnome-extras gkrellm-lang gnome-extras @@ -127,7 +128,11 @@ gnome-blog-lang gnome-extras gnome-bluetooth-lang gnome gnome-boxes-lang gnome-extras +gnome-break-timer-lang gnome-extras +gnome-builder-lang gnome-extras gnome-calculator-lang gnome +gnome-calendar-lang gnome-extras +gnome-characters-lang gnome-extras gnome-chess-lang gnome gnome-clocks-lang gnome gnome-color-chooser-lang gnome-extras @@ -147,6 +152,7 @@ gnome-documents-lang gnome gnome-dvb-daemon-lang gnome-extras gnome-font-viewer-lang gnome +gnome-getting-started-docs-lang gnome-extras gnome-gmail-lang gnome-extras gnome-gmail-notifier-lang gnome-extras gnome-initial-setup-lang gnome-extras @@ -157,6 +163,7 @@ gnome-maps-lang gnome-extras gnome-menus-lang gnome gnome-mines-lang gnome +gnome-multi-writer-lang gnome-extras gnome-music-lang gnome gnome-nettool-lang gnome gnome-nibbles-lang gnome-extras @@ -179,6 +186,7 @@ gnome-sudoku-lang gnome gnome-system-log-lang gnome-extras gnome-system-monitor-lang gnome +gnome-taquin-lang gnome-extras gnome-terminal-lang gnome gnome-tetravex-lang gnome-extras gnome-themes-lang gnome-extras @@ -222,12 +230,13 @@ gsynaptics-lang gnome-extras gtg-lang gnome-extras gthumb-lang gnome-extras +gtick-lang gnome-extras gtk-doc-lang gnome-extras gtk-recordMyDesktop-lang gnome-extras gtk-vnc-lang gnome-extras gtk2-lang common gtk3-lang common -gtkhtml-4_0-lang gnome +gtkhtml-4_0-lang gnome-extras gtkmm2-tutorial-lang gnome-extras gtkmm3-tutorial-lang gnome-extras gtkpod-lang gnome-extras @@ -250,7 +259,7 @@ iso-codes-lang gnome istanbul-lang gnome-extras jhbuild-lang gnome-extras -json-glib-lang gnome +json-glib-lang common k3b-lang kde kde-gtk-config-lang kde kdebase4-openSUSE-lang kde @@ -304,6 +313,7 @@ libwnck2-lang gnome-extras liferea-lang gnome lightsoff-lang gnome +m17n-db-lang gnome meld-lang gnome-extras memprof-lang gnome-extras metacity-lang gnome-extras

1 0

commit gd for openSUSE:13.1:Update
by root＠hilbert.suse.de 31 Mar '15

31 Mar '15

Hello community, here is the log from the commit of package gd for openSUSE:13.1:Update checked in at 2015-03-31 12:57:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/gd (Old) and /work/SRC/openSUSE:13.1:Update/.gd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='gd.3660' cicount='copy' />

1 0

commit seamonkey for openSUSE:13.2:Update
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package seamonkey for openSUSE:13.2:Update checked in at 2015-03-30 22:30:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/seamonkey (Old) and /work/SRC/openSUSE:13.2:Update/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.EUEuec/_old 2015-03-30 22:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.EUEuec/_new 2015-03-30 22:30:54.000000000 +0200 @@ -1 +1 @@ -<link package='seamonkey.3631' cicount='copy' /> +<link package='seamonkey.3656' cicount='copy' />

1 0

commit seamonkey for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package seamonkey for openSUSE:13.1:Update checked in at 2015-03-30 22:30:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/seamonkey (Old) and /work/SRC/openSUSE:13.1:Update/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.j2e4EQ/_old 2015-03-30 22:30:49.000000000 +0200 +++ /var/tmp/diff_new_pack.j2e4EQ/_new 2015-03-30 22:30:49.000000000 +0200 @@ -1 +1 @@ -<link package='seamonkey.3631' cicount='copy' /> +<link package='seamonkey.3656' cicount='copy' />

1 0

commit xcb-util-cursor for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package xcb-util-cursor for openSUSE:Factory checked in at 2015-03-30 19:34:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-util-cursor (Old) and /work/SRC/openSUSE:Factory/.xcb-util-cursor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcb-util-cursor" Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-util-cursor/xcb-util-cursor.changes 2014-02-07 13:49:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xcb-util-cursor.new/xcb-util-cursor.changes 2015-03-30 19:34:13.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Mar 30 09:32:56 UTC 2015 - sndirsch(a)suse.com + +- added baselibs.conf as source to specfile + +------------------------------------------------------------------- +Fri Mar 27 14:51:02 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to version 0.1.2: + + Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac OS X + to implement le32toh. + + Check submodules before running autoconf. + + darwin: Use OSByteOrder.h rather than CF. + + Perform safety check before trying to load glyph cursor + +------------------------------------------------------------------- Old: ---- xcb-util-cursor-0.1.1.tar.bz2 New: ---- xcb-util-cursor-0.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-util-cursor.spec ++++++ --- /var/tmp/diff_new_pack.7F1ZNK/_old 2015-03-30 19:34:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7F1ZNK/_new 2015-03-30 19:34:13.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xcb-util-renderutil +# spec file for package xcb-util-cursor # -# 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 @@ -18,7 +18,7 @@ Name: xcb-util-cursor %define lname libxcb-cursor0 -Version: 0.1.1 +Version: 0.1.2 Release: 0 Summary: XCB cursor library (libxcursor port) License: MIT @@ -28,18 +28,19 @@ #Git-Clone: git://anongit.freedesktop.org/xcb/util-cursor #Git-Web: http://cgit.freedesktop.org/xcb/util-cursor/ Source: http://xcb.freedesktop.org/dist/%name-%version.tar.bz2 +Source1: baselibs.conf Patch11: u_fix-issue-with-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool BuildRequires: gperf +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(xcb) >= 1.4 +BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-proto) >= 1.6 BuildRequires: pkgconfig(xcb-render) BuildRequires: pkgconfig(xcb-renderutil) -BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xorg-macros) >= 1.6.0 %description ++++++ xcb-util-cursor-0.1.1.tar.bz2 -> xcb-util-cursor-0.1.2.tar.bz2 ++++++ ++++ 7581 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/xcb-util-cursor-0.1.1/ChangeLog new/xcb-util-cursor-0.1.2/ChangeLog --- old/xcb-util-cursor-0.1.1/ChangeLog 2013-11-12 21:59:38.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/ChangeLog 2015-03-25 23:08:32.000000000 +0100 @@ -1,3 +1,51 @@ +commit 8eb844d39a06f42019dede515c70e7a0b155357d +Author: Michael Stapelberg <michael(a)stapelberg.de> +Date: Wed Mar 25 23:06:23 2015 +0100 + + set version to 0.1.2 + +commit cf26479ece9ab9e04616bc10ba674d88a284e5b0 +Author: Martin Gräßlin <mgraesslin(a)kde.org> +Date: Tue Mar 17 18:41:07 2015 +0100 + + Perform safety check before trying to load glyph cursor + + The passed in cursor name to xcb_cursor_load_cursor might not match + one of the predefined font cursor values. Without the check the + call to create glyph cursor will fail with a BadValue error, but + the library returns the id allocated for the xcb_cursor_t. A user + of the library gets a value which looks like a valid cursor, but + when using it for e.g. a cursor value in xcb_create_window it raises + a BadCursor error. + +commit f03cc278c6cce0cf721adf9c3764d3c5fba63392 +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Sat Apr 5 15:50:28 2014 -0700 + + darwin: Use OSByteOrder.h rather than CF. + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + +commit a08bbf0e20995d29cbf890957c898059d4a9ece2 +Author: Niclas Zeising <zeising(a)daemonic.se> +Date: Mon Aug 12 13:53:10 2013 +0200 + + Check submodules before running autoconf. + + Exit early with an informative message if the submodules are missing, + since they are needed. Without this autoconf throws a bunch of + uninformative errors which does not point to the actual problem. + This was taken from util-keysyms. + + Signed-off-by: Niclas Zeising <zeising(a)daemonic.se> + Reviewed-By: Arnaud Fontaine <arnau(a)debian.org> + +commit d25806902ee6050ec3d52480d0bc8f4889942350 +Author: Marcus Crestani <crestani(a)informatik.uni-tuebingen.de> +Date: Mon Dec 23 23:30:04 2013 +0100 + + Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac OS X to implement le32toh. + commit f557760c56ba4eb44063936d8fa49473532e21c6 Author: Michael Stapelberg <michael(a)stapelberg.de> Date: Tue Nov 12 21:47:50 2013 +0100 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/xcb-util-cursor-0.1.1/INSTALL new/xcb-util-cursor-0.1.2/INSTALL --- old/xcb-util-cursor-0.1.1/INSTALL 2013-11-12 21:59:38.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/INSTALL 2015-03-25 23:08:32.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/xcb-util-cursor-0.1.1/NEWS new/xcb-util-cursor-0.1.2/NEWS --- old/xcb-util-cursor-0.1.1/NEWS 2013-11-12 21:47:34.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/NEWS 2015-03-25 23:06:10.000000000 +0100 @@ -1,3 +1,12 @@ +Release 0.1.2 (2015-03-35) +=========================== + +- Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac OS X to implement + le32toh. +- Check submodules before running autoconf. +- darwin: Use OSByteOrder.h rather than CF. +- Perform safety check before trying to load glyph cursorHEADmaster + Release 0.1.1 (2013-11-12) =========================== 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/xcb-util-cursor-0.1.1/autogen.sh new/xcb-util-cursor-0.1.2/autogen.sh --- old/xcb-util-cursor-0.1.1/autogen.sh 2013-01-05 16:45:49.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/autogen.sh 2015-03-25 23:03:22.000000000 +0100 @@ -6,6 +6,21 @@ ORIGDIR=`pwd` cd $srcdir +# If this is a git checkout, verify that the submodules are initialized, +# otherwise autotools will just fail with an unhelpful error message. +if [ -d ".git" ] && [ -r ".gitmodules" ] +then + # If git is not in PATH, this will not return 0, thus not keeping us + # from building. Since the message is worthless when git is not + # installed, this is what we want. + if git submodule status 2>/dev/null | grep -q '^-' + then + echo "You have uninitialized git submodules." >&2 + echo "Please run: git submodule update --init" >&2 + exit 1 + fi +fi + autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? 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/xcb-util-cursor-0.1.1/compile new/xcb-util-cursor-0.1.2/compile --- old/xcb-util-cursor-0.1.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/compile 2015-03-25 23:04:34.000000000 +0100 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)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-automake(a)gnu.org> or send patches to +# <automake-patches(a)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-automake(a)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/xcb-util-cursor-0.1.1/configure.ac new/xcb-util-cursor-0.1.2/configure.ac --- old/xcb-util-cursor-0.1.1/configure.ac 2013-11-12 21:47:47.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/configure.ac 2015-03-25 23:06:21.000000000 +0100 @@ -1,6 +1,6 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62 AC_PREREQ(2.62) -AC_INIT([xcb-util-cursor],0.1.1,[xcb(a)lists.freedesktop.org]) +AC_INIT([xcb-util-cursor],0.1.2,[xcb(a)lists.freedesktop.org]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) @@ -19,7 +19,7 @@ AM_MISSING_PROG([GPERF], [gperf]) -AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h], [break]) +AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h libkern/OSByteOrder.h], [break]) AC_CHECK_FUNCS([le32toh]) PKG_CHECK_MODULES(XCB_RENDER, xcb-render) 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/xcb-util-cursor-0.1.1/cursor/load_cursor.c new/xcb-util-cursor-0.1.2/cursor/load_cursor.c --- old/xcb-util-cursor-0.1.1/cursor/load_cursor.c 2013-09-20 06:19:58.000000000 +0200 +++ new/xcb-util-cursor-0.1.2/cursor/load_cursor.c 2015-03-25 23:03:22.000000000 +0100 @@ -207,6 +207,8 @@ if (fd == -1 || core_char > -1) { if (core_char == -1) core_char = cursor_shape_to_id(name); + if (core_char == -1) + return XCB_NONE; cid = xcb_generate_id(c->conn); xcb_create_glyph_cursor(c->conn, cid, c->cursor_font, c->cursor_font, core_char, core_char + 1, 0, 0, 0, 65535, 65535, 65535); 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/xcb-util-cursor-0.1.1/cursor/parse_cursor_file.c new/xcb-util-cursor-0.1.2/cursor/parse_cursor_file.c --- old/xcb-util-cursor-0.1.1/cursor/parse_cursor_file.c 2013-11-09 11:15:12.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/cursor/parse_cursor_file.c 2015-03-25 23:03:22.000000000 +0100 @@ -48,6 +48,9 @@ # ifndef HAVE_LE32TOH # define le32toh(x) LE_32(x) # endif +#elif defined(HAVE_LIBKERN_OSBYTEORDER_H) +#include <libkern/OSByteOrder.h> +#define le32toh(x) OSSwapLittleToHostInt32(x) #endif #include <xcb/xcb.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/xcb-util-cursor-0.1.1/cursor/shape_to_id.c new/xcb-util-cursor-0.1.2/cursor/shape_to_id.c --- old/xcb-util-cursor-0.1.1/cursor/shape_to_id.c 2013-11-12 21:48:44.000000000 +0100 +++ new/xcb-util-cursor-0.1.2/cursor/shape_to_id.c 2015-03-25 23:04:46.000000000 +0100 @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.4 */ /* Command-line: gperf --includes --struct-type --language=ANSI-C --switch=1 shape_to_id.gperf */ /* Computed positions: -k'1-2,4,$' */ @@ -100,7 +100,7 @@ #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ __attribute__ ((__gnu_inline__)) #endif #endif 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/xcb-util-cursor-0.1.1/m4/libtool.m4 new/xcb-util-cursor-0.1.2/m4/libtool.m4 --- old/xcb-util-cursor-0.1.1/m4/libtool.m4 2013-07-13 08:19:39.000000000 +0200 +++ new/xcb-util-cursor-0.1.2/m4/libtool.m4 2015-03-25 23:04:31.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -2512,6 +2518,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2628,7 +2645,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2658,10 +2675,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2673,18 +2694,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3244,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3282,11 +3295,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4034,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4098,7 +4111,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4333,7 +4346,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4575,9 +4588,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4640,9 +4650,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4864,7 +4871,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5041,7 +5048,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5346,7 +5352,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6226,6 +6232,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6387,7 +6396,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler 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/xcb-util-cursor-0.1.1/missing new/xcb-util-cursor-0.1.2/missing --- old/xcb-util-cursor-0.1.1/missing 2013-07-13 08:19:42.000000000 +0200 +++ new/xcb-util-cursor-0.1.2/missing 2015-03-25 23:04:34.000000000 +0100 @@ -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=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)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,68 +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 - 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-automake(a)gnu.org>." exit $? @@ -99,228 +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. - ;; +# 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 - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - 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 - ;; - - 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 - ;; - - *) - 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)

1 0

commit colordiff for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2015-03-30 19:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colordiff" Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2012-02-16 14:55:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2015-03-30 19:34:14.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 28 13:59:38 UTC 2015 - mpluskal(a)suse.com + +- Update to 1.0.13 + * see attached CHANGES for details +- Cleanup spec-file with spec-cleaner +- Update project url +- Use url for source + +------------------------------------------------------------------- Old: ---- colordiff-1.0.9.tar.bz2 New: ---- colordiff-1.0.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.sqfioe/_old 2015-03-30 19:34:14.000000000 +0200 +++ /var/tmp/diff_new_pack.sqfioe/_new 2015-03-30 19:34:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2012 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,15 +17,15 @@ Name: colordiff -Url: http://colordiff.sourceforge.net/ -Version: 1.0.9 +Version: 1.0.13 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Colour-highlighted 'diff' output License: GPL-2.0+ Group: Productivity/Text/Utilities -Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.bz2 +Url: http://www.colordiff.org +Source0: http://www.colordiff.org/%{name}-%{version}.tar.gz Patch0: colordiff-fix-permission.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -40,20 +40,20 @@ %build %install -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/etc -make INSTALL_DIR=$RPM_BUILD_ROOT/%{_bindir} \ - MAN_DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \ - ETC_DIR=$RPM_BUILD_ROOT/etc install -gzip $RPM_BUILD_ROOT/%{_mandir}/man1/*.1 -sed -i -e "s@$RPM_BUILD_ROOT@@" $RPM_BUILD_ROOT/%{_bindir}/colordiff -chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man1/colordiff.* +mkdir -p %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/etc +make INSTALL_DIR=%{buildroot}/%{_bindir} \ + MAN_DIR=%{buildroot}/%{_mandir}/man1 \ + ETC_DIR=%{buildroot}/etc install +gzip %{buildroot}/%{_mandir}/man1/*.1 +sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff +chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* %files %defattr(-,root,root) -%doc README TODO COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg +%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg %{_bindir}/* %{_mandir}/man1/* -%config /etc/colordiffrc +%config %{_sysconfdir}/colordiffrc %changelog ++++++ colordiff-fix-permission.diff ++++++ --- /var/tmp/diff_new_pack.sqfioe/_old 2015-03-30 19:34:14.000000000 +0200 +++ /var/tmp/diff_new_pack.sqfioe/_new 2015-03-30 19:34:14.000000000 +0200 @@ -1,6 +1,8 @@ ---- Makefile +Index: Makefile +=================================================================== +--- Makefile.orig +++ Makefile -@@ -36,9 +36,7 @@ +@@ -35,9 +35,7 @@ install: else \ install -d ${DESTDIR}${ETC_DIR}; \ fi

1 0

commit RemoteBox for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package RemoteBox for openSUSE:Factory checked in at 2015-03-30 19:34:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/RemoteBox (Old) and /work/SRC/openSUSE:Factory/.RemoteBox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "RemoteBox" Changes: -------- --- /work/SRC/openSUSE:Factory/RemoteBox/RemoteBox.changes 2014-11-10 17:28:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.RemoteBox.new/RemoteBox.changes 2015-03-30 19:34:06.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 29 22:38:23 UTC 2015 - dimstar(a)opensuse.org + +- Install upstream provided appdata.xml file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ RemoteBox.spec ++++++ --- /var/tmp/diff_new_pack.qeW9Qq/_old 2015-03-30 19:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.qeW9Qq/_new 2015-03-30 19:34:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package RemoteBox # -# Copyright (c) 2014 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 @@ -54,6 +54,8 @@ # Set the locations of Remotebox's files sed -i 's|\$Bin/share/remotebox|%{_datadir}/%{name}|g' remotebox sed -i 's|\$Bin/docs|%{_docdir}/%{name}|g' remotebox +# We need to update the reference to the .desktop file, as this package provides RemoteBox, instead of remotebox +sed -i 's|remotebox.desktop|RemoteBox.desktop|' packagers-readme/remotebox.appdata.xml %build # Create a desktop file @@ -72,7 +74,7 @@ EOF %install -mkdir -p -m0755 %{buildroot}%{_datadir}/{%{name},pixmaps,applications} +mkdir -p -m0755 %{buildroot}%{_datadir}/{%{name},pixmaps,applications,appdata} mkdir -m0755 %{buildroot}%{_bindir} install -p -m0755 remotebox %{buildroot}%{_bindir}/%{name} cp -a share/remotebox/* %{buildroot}%{_datadir}/%{name} @@ -83,6 +85,9 @@ # Install an icon for the desktop file install -p -m0644 share/remotebox/icons/remotebox.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +# Install upstream provided appdata.xml +install -p -m0644 packagers-readme/remotebox.appdata.xml %{buildroot}%{_datadir}/appdata/RemoteBox.appdata.xml + %fdupes -s %{buildroot} %check @@ -91,6 +96,8 @@ %files %defattr(-,root,root,-) %doc docs/changelog.txt docs/remotebox.pdf docs/COPYING +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/%{name}

1 0

commit armagetron for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2015-03-30 19:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armagetron (Old) and /work/SRC/openSUSE:Factory/.armagetron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armagetron" Changes: -------- --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2015-03-18 13:08:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2015-03-30 19:34:04.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Mar 29 16:56:55 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 0.2.8.3.3: + + security fix: do not read ahead of the beginning of network + buffer. + + security fix: don't attribute network errors from processing + random packets to the connection to the server. + + security fix: while at it, don't process random packets unless + they may be important. + + fix for potential crash with friend list filtering. + + intel driver compatibility. + + fix for rare crash with sound lock. + + fix for camera turning for bizarre axis configurations. +- Install appdata.xml in order to be shown in AppStream based + software centers. +- Drop armagetron-configure.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- armagetron-configure.patch armagetronad-0.2.8.3.2.src.tar.bz2 New: ---- armagetronad-0.2.8.3.3.src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armagetron.spec ++++++ --- /var/tmp/diff_new_pack.9CAEHW/_old 2015-03-30 19:34:05.000000000 +0200 +++ /var/tmp/diff_new_pack.9CAEHW/_new 2015-03-30 19:34:05.000000000 +0200 @@ -25,12 +25,11 @@ Summary: OpenGL Game Similar to the Film Tron License: GPL-2.0+ Group: Amusements/Games -Version: 0.2.8.3.2 +Version: 0.2.8.3.3 Release: 0 Url: http://armagetronad.sourceforge.net -Source: %{name}ad-%{version}.src.tar.bz2 +Source: http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armage… Source1: armagetron_add.tar.gz -Patch0: armagetron-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,11 +44,6 @@ %prep %setup -q -a 1 -n armagetronad-%version -%patch0 -p1 -#patch1 -#patch2 -#patch3 -#patch4 %build autoreconf -fi @@ -68,6 +62,8 @@ make DESTDIR=%buildroot install uninstall_location=foobar mkdir -p %{buildroot}%{_datadir}/applications/ install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/ +mkdir -p %{buildroot}%{_datadir}/appdata +install armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/ mkdir -p %{buildroot}%{_datadir}/pixmaps/ pushd %buildroot mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png @@ -87,6 +83,8 @@ %config %{_sysconfdir}/armagetronad %{_bindir}/armagetronad %{_datadir}/armagetronad +%dir %{_datadir}/appdata +%{_datadir}/appdata/Armagetron.appdata.xml %attr(644,root,root) %{_datadir}/applications/* %{_datadir}/pixmaps/%{name}.png ++++++ armagetron_add.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/Armagetron.desktop new/armagetron_add/Armagetron.desktop --- old/armagetron_add/Armagetron.desktop 2005-04-14 16:24:32.000000000 +0200 +++ new/armagetron_add/Armagetron.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Armagetron -GenericName=A fast OpenGL racer with walls -Exec=armagetronad -Icon=armagetron diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/README.SuSE new/armagetron_add/README.SuSE --- old/armagetron_add/README.SuSE 2002-07-23 00:02:16.000000000 +0200 +++ new/armagetron_add/README.SuSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -Armagetron - A 3D Tron-like high speed game. - - The rules are simple: you ride a light cycle (a kind of motorbike that can - only turn 90 degrees at a time, leaves a wall behind and cannot be - stopped) and have to avoid running into walls while at the same time you - have to try to get your opponnet to run into them. - - The idea is based on the Disney movie from 1982 called "Tron". If you - ever wanted to take a try at one of those speed demons features in the - movie, this is your chance. Of all the Tron clones out there, I think one - is the one that comes closest to the feeling the movie tries to express. - This is in part thanks to the sophisticated camera motions, in part to the - superb modelling work and in part to the fabulous sound effects. To add - some extra fascination into the game, unlike to other Tron clones, in - armagetron you can accelerate. Alas, there's no accelerate button. If - you want to drive fast, you have to drive good -- and really really close - to the walls. - - Armagetron can be played against AI opponents, against other humans over - the network, or a mixture of both. - - Still not convinced? http://armagetron.sourceforge.net - --------- - -The html doc starts at: - - /usr/share/doc/packages/armagetron/index.html - -The default config(for hardware rendering), is: - - /usr/share/games/armagetron/config/default.cfg - -Example config for 3D Hardware Support: - - /usr/share/games/armagetron/hardware.ArmageTronrc - -Example config for no 3D Hardware Support: - - /usr/share/games/armagetron/software.ArmageTronrc - -If a user want to try it, he should backup his ~/.armagetron/user.cfg and -replace it with hardware.ArmageTronrc. - -To make it the default for new users without an ~/.armagetron/user.cfg -replace /usr/share/games/armagetron/config/default.cfg with it. - -------- - -Armagetron is written by and copyright Manuel Moss <manuel(a)moosnet.de> -The copyright of this package is GPL, version 2 or later. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/armagetron-server.6 new/armagetron_add/armagetron-server.6 --- old/armagetron_add/armagetron-server.6 2002-07-22 23:56:51.000000000 +0200 +++ new/armagetron_add/armagetron-server.6 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.TH ARMAGETRON 6 "July 30, 2000" -.SH NAME -armagetron-master \- armagetron master game server -.SH SYNOPSIS -.B armagetron-master -.SH DESCRIPTION -The master program will read the normal configuration file -\fB~/.armagetron/user.cfg\fP and set up a network game according to the -settings in the game menu (Number of AI players, game mode and finish -mode), and it will limit its output badwidth to the value set in the -network game menu. A dedicated server takes input from the keyboard and -interprets it just the way it does with the configuration files; -additionally to the usual configuration files, the dedicated server will -read the file everytime.cfg before each round; it may be comfortable to -place quickly changing settings there. -.SH SEE ALSO -armagetron(6). -.P -Armagetron is documented fully by the provided HTML docs, found under -/usr/share/doc/packages/armagetron/ or the armagetron website, -\fIhttp://armagetron.sourceforge.net/\fP. -.SH AUTHOR -Armagetron was written by Manuel Moos <manuel(a)moosnet.de> -.P -This manual page was adapted from the original HTML version by Marcelo -E. Magallon <mmagallo(a)debian.org>, and changed by Berhard Kaindl for -SuSE Linux 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/armagetron.6 new/armagetron_add/armagetron.6 --- old/armagetron_add/armagetron.6 2002-07-22 23:58:03.000000000 +0200 +++ new/armagetron_add/armagetron.6 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.TH ARMAGETRON 6 "July 30, 2000" -.SH NAME -armagetron \- A 3D Tron-like high speed game -.SH SYNOPSIS -.B armagetron -.SH DESCRIPTION -The rules are simple: you ride a lightcycle (a kind of motorbike that -can only turn 90 degrees at a time, leaves a wall behind and cannot be -stopped). Avoid running into a wall. Make your opponent run into a -wall. (Just in case you do not know: this idea is stolen from the -Disney movie "Tron" from 1982 (did they steal the idea from someone -else? I don't know).) -.PP -One thing is different than in other Tron-Clones: You can accelerate. -Oh, not by pressing an acceleration button, that would not be new. You -accelerate by driving close to walls (Only player walls count, the rim -has no such effect.) That allows some interesting tactics (of course, -the AI players are not smart enough for that). Every time you make a -turn, you loose 5% of your speed, so don't be to nervous; speed is your -only resource against other players! -.PP -First thing you shold do is go into the "Player Menu", set your name and -your keyboard and mouse configuration. Then, go into the "Game Menu" and -start a single player game against one AI opponent (the game mode does -not really matter here). Then, get some friends together and try the -multiplayer modes! -.PP -\fBSHIFT-ESC\fP is the "boss key" and quits Armagetron as fast as -possible. -.SH SEE ALSO -Armagetron is documented fully by the provided HTML docs, found under -/usr/share/doc/packages/armagetron/ or the armagetron website, -\fIhttp://armagetron.sourceforge.net/\fP. -.SH AUTHOR -Armagetron was written by Manuel Moos <manuel(a)moosnet.de> -.P -This manual page was adapted from the original HTML version by Marcelo -E. Magallon <mmagallo(a)debian.org>, and updated for SuSE Linux 8 by -Bernhard Kaindl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/default.cfg new/armagetron_add/default.cfg --- old/armagetron_add/default.cfg 2002-07-22 23:48:43.000000000 +0200 +++ new/armagetron_add/default.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,149 +0,0 @@ - COLOR_R_1 15 - COLOR_G_1 3 - COLOR_B_1 3 - FAV_NUM_PER_TEAM_PLAYER_1 3 - NAME_TEAM_AFTER_PLAYER_1 0 - SPECTATOR_MODE_1 0 - INSTANT_CHAT_STRING_1_1 LOL! - INSTANT_CHAT_STRING_1_2 :-) - INSTANT_CHAT_STRING_1_3 :-( - INSTANT_CHAT_STRING_1_4 Well done! - INSTANT_CHAT_STRING_1_5 Almost got you... - INSTANT_CHAT_STRING_1_6 Hehe! - INSTANT_CHAT_STRING_1_7 Got one! - INSTANT_CHAT_STRING_1_8 - INSTANT_CHAT_STRING_1_9 - INSTANT_CHAT_STRING_1_10 - INSTANT_CHAT_STRING_1_11 - INSTANT_CHAT_STRING_1_12 - ALLOW_CAM_1_0 1 - ALLOW_CAM_1_1 1 - ALLOW_CAM_1_2 1 - ALLOW_CAM_1_3 1 - ALLOW_CAM_1_4 1 - ALLOW_CAM_1_5 1 - START_FOV_1 90 - START_CAM_1 4 - CAMCENTER_1 1 - PLAYER_1 Player 1 - PING_CHARITY 0 - MAX_IN_RATE 4 - MAX_OUT_RATE 4 - CUSTOM_SERVER_NAME - SP_EXPLOSION_RADIUS 4 - SP_WALLS_LENGTH -1 - SP_WALLS_STAY_UP_DELAY 0 - SP_TEAM_BALLACNE_ON_QUIT 0 - SP_TEAM_BALLACNE_WITH_AIS 1 - SP_TEAM_MAX_INBALLANCE_PERM 1 - SP_TEAM_MAX_INBALLANCE 2 - SP_TEAM_MAX_PLAYERS 5 - SP_TEAM_MIN_PLAYERS 0 - SP_TEAMS_MAX 10 - SP_TEAMS_MIN 0 - SP_FINISH_TYPE 1 - SP_GAME_TYPE 1 - SP_SIZE_FACTOR -3 - SP_SPEED_FACTOR 0 - SP_AUTO_AIS 1 - SP_MIN_PLAYERS 0 - EXPLOSION_RADIUS 4 - WALLS_LENGTH -1 - WALLS_STAY_UP_DELAY 0 - TEAM_BALLACNE_ON_QUIT 0 - TEAM_BALLACNE_WITH_AIS 1 - TEAM_MAX_INBALLANCE_PERM 1 - TEAM_MAX_INBALLANCE 2 - TEAM_MAX_PLAYERS 5 - TEAM_MIN_PLAYERS 0 - TEAMS_MAX 10 - TEAMS_MIN 2 - FINISH_TYPE 1 - GAME_TYPE 1 - SIZE_FACTOR -3 - SPEED_FACTOR 0 - AUTO_IQ 0 - AUTO_AIS 0 - AI_IQ 100 - MIN_PLAYERS 4 - NUM_AIS 0 - MOVIEPACK 1 - MOUSE_GRAB 0 - WRAP_MENU 1 - SPARKS 1 - TEXTURES_HI 0 - PREDICT_OBJECTS 1 - LAG_O_METER 1 - INFINITY_PLANE 0 - SKY_WOBBLE 1 - LOWER_SKY 0 - UPPER_SKY 0 - DITHER 1 - HIGH_RIM 1 - FLOOR_MIRROR 0 - SHOW_FPS 1 - SMOOTH_SHADING 1 - ALPHA_BLEND 1 - PERSP_CORRECT 0 - POLY_ANTIALIAS 0 - LINE_ANTIALIAS 0 - ARMAGETRON_VERSION 0.2.0 RC - SOUND_SOURCES 10 - SOUND_QUALITY 2 - SOUND_BUFFER_SHIFT 0 - CLIENT_PORT 4534 - SERVER_PORT 4534 - SERVER_NAME Unnamed Server - BIG_BROTHER 1 - KEYBOARD 333 PLAYER_BIND ZOOM_OUT 1 -KEYBOARD 332 PLAYER_BIND ZOOM_IN 1 -KEYBOARD 327 PLAYER_BIND BANK_DOWN 1 -KEYBOARD 326 PLAYER_BIND BANK_UP 1 -KEYBOARD 325 PLAYER_BIND LOOK_LEFT 1 -KEYBOARD 324 PLAYER_BIND LOOK_RIGHT 1 -KEYBOARD 293 PLAYER_BIND INSTANT_CHAT_12 1 -KEYBOARD 292 PLAYER_BIND INSTANT_CHAT_11 1 -KEYBOARD 291 PLAYER_BIND INSTANT_CHAT_10 1 -KEYBOARD 290 PLAYER_BIND INSTANT_CHAT_9 1 -KEYBOARD 289 PLAYER_BIND INSTANT_CHAT_8 1 -KEYBOARD 288 PLAYER_BIND INSTANT_CHAT_7 1 -KEYBOARD 287 PLAYER_BIND INSTANT_CHAT_6 1 -KEYBOARD 286 PLAYER_BIND INSTANT_CHAT_5 1 -KEYBOARD 285 PLAYER_BIND INSTANT_CHAT_4 1 -KEYBOARD 284 PLAYER_BIND INSTANT_CHAT_3 1 -KEYBOARD 283 PLAYER_BIND INSTANT_CHAT_2 1 -KEYBOARD 282 PLAYER_BIND INSTANT_CHAT_1 1 -KEYBOARD 281 PLAYER_BIND GLANCE_RIGHT 1 -KEYBOARD 280 PLAYER_BIND MESS_UP 0 -KEYBOARD 279 PLAYER_BIND GLANCE_BACK 1 -KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 274 PLAYER_BIND CYCLE_BRAKE 1 -KEYBOARD 273 PLAYER_BIND CYCLE_BRAKE 1 -KEYBOARD 271 PLAYER_BIND MOVE_DOWN 1 -KEYBOARD 270 PLAYER_BIND MOVE_UP 1 -KEYBOARD 261 PLAYER_BIND MOVE_FORWARD 1 -KEYBOARD 259 PLAYER_BIND MOVE_RIGHT 1 -KEYBOARD 258 PLAYER_BIND MOVE_BACK 1 -KEYBOARD 257 PLAYER_BIND MOVE_LEFT 1 -KEYBOARD 127 PLAYER_BIND GLANCE_LEFT 1 -KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 121 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 115 PLAYER_BIND CHAT 1 -KEYBOARD 113 PLAYER_BIND BANK_UP 1 -KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1 -KEYBOARD 97 PLAYER_BIND BANK_DOWN 1 -KEYBOARD 9 PLAYER_BIND SCORE 0 - COLOR_STRINGS 1 - USE_DISPLAYLISTS 0 - SOFTWARE_RENDERER 0 - FAILED_ATTEMPTS 0 - CHECK_ERRORS 1 - COLORDEPTH 1 - FULLSCREEN 0 - CUSTOM_SCREEN_ASPECT 1 - CUSTOM_SCREEN_WIDTH 800 - CUSTOM_SCREEN_HEIGHT 600 - ARMAGETRON_SCREENMODE 5 - VIEWPORT_CONF 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/hardware.ArmageTronrc new/armagetron_add/hardware.ArmageTronrc --- old/armagetron_add/hardware.ArmageTronrc 2002-03-18 13:25:13.000000000 +0100 +++ new/armagetron_add/hardware.ArmageTronrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,188 +0,0 @@ - PING_CHARITY 0 - MAX_IN_RATE 4 - MAX_OUT_RATE 4 - SERVER_NAME - FINISH_TYPE 1 - GAME_TYPE 1 - AUTO_AIS 1 - NUM_AIS 6 - MOVIEPACK 1 - ZTRICK 0 - MOUSE_GRAB 0 - WRAP_MENU 1 - SPARKS 1 - TEXTURES_HI 0 - PREDICT_OBJECTS 1 - LAG_O_METER 1 - INFINITY_PLANE 0 - SKY_WOBBLE 1 - LOWER_SKY 1 - UPPER_SKY 1 - DITHER 0 - HIGH_RIM 1 - FLOOR_DETAIL 3 - FLOOR_MIRROR 2 - SHOW_FPS 1 - TEXT_OUT 1 - SMOOTH_SHADING 1 - ALPHA_BLEND 1 - PERSP_CORRECT -1 - POLY_ANITALIAS -1 - LINE_ANITALIAS -1 - MESSAGE_OF_DAY_4 - MESSAGE_OF_DAY_3 - MESSAGE_OF_DAY_2 - MESSAGE_OF_DAY_1 - ARMAGETRON_VERSION UNKNOWN - GL_VENDOR VA Linux Systems Inc. - GL_RENDERER Mesa DRI G400 20010622 AGP 1x x86 - GL_VERSION 1.2 Mesa 3.4.2 - GL_EXTENSIONS GL_ARB_multitexture GL_ARB_transpose_matrix GL_EXT_abgr GL_EXT_blend_func_separate GL_EXT_clip_volume_hint GL_EXT_compiled_vertex_array GL_EXT_histogram GL_EXT_packed_pixels GL_EXT_polygon_offset GL_EXT_rescale_normal GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_env_add GL_EXT_texture_object GL_EXT_vertex_array GL_MESA_window_pos GL_MESA_resize_buffers GL_NV_texgen_reflection GL_PGI_misc_hints GL_SGIS_pixel_texture GL_SGIS_texture_edge_clamp - TEXTURE_MODE_3 9987 - TEXTURE_MODE_2 9987 - TEXTURE_MODE_1 9987 - TEXTURE_MODE_0 9987 - COLOR_R_4 15 - COLOR_G_4 15 - COLOR_B_4 3 - CAMWOBBLE_4 0 - AUTO_INCAM_4 0 - SPECTATOR_MODE_4 0 - INSTANT_CHAT_STRING_4_1 LOL! - INSTANT_CHAT_STRING_4_2 :-) - INSTANT_CHAT_STRING_4_3 :-( - INSTANT_CHAT_STRING_4_4 Well done! - INSTANT_CHAT_STRING_4_5 Almost got you... - INSTANT_CHAT_STRING_4_6 Hehe! - INSTANT_CHAT_STRING_4_7 Got one! - INSTANT_CHAT_STRING_4_8 - INSTANT_CHAT_STRING_4_9 - INSTANT_CHAT_STRING_4_10 - INSTANT_CHAT_STRING_4_11 - INSTANT_CHAT_STRING_4_12 - ALLOW_CAM_4_0 1 - ALLOW_CAM_4_1 1 - ALLOW_CAM_4_2 1 - ALLOW_CAM_4_3 1 - ALLOW_CAM_4_4 1 - START_FOV_4 90 - START_CAM_4 3 - CAMCENTER_4 1 - PLAYER_4 Player 4 - COLOR_R_3 3 - COLOR_G_3 3 - COLOR_B_3 15 - CAMWOBBLE_3 0 - AUTO_INCAM_3 0 - SPECTATOR_MODE_3 0 - INSTANT_CHAT_STRING_3_1 LOL! - INSTANT_CHAT_STRING_3_2 :-) - INSTANT_CHAT_STRING_3_3 :-( - INSTANT_CHAT_STRING_3_4 Well done! - INSTANT_CHAT_STRING_3_5 Almost got you... - INSTANT_CHAT_STRING_3_6 Hehe! - INSTANT_CHAT_STRING_3_7 Got one! - INSTANT_CHAT_STRING_3_8 - INSTANT_CHAT_STRING_3_9 - INSTANT_CHAT_STRING_3_10 - INSTANT_CHAT_STRING_3_11 - INSTANT_CHAT_STRING_3_12 - ALLOW_CAM_3_0 1 - ALLOW_CAM_3_1 1 - ALLOW_CAM_3_2 1 - ALLOW_CAM_3_3 1 - ALLOW_CAM_3_4 1 - START_FOV_3 90 - START_CAM_3 3 - CAMCENTER_3 1 - PLAYER_3 Player 3 - COLOR_R_2 3 - COLOR_G_2 15 - COLOR_B_2 3 - CAMWOBBLE_2 0 - AUTO_INCAM_2 0 - SPECTATOR_MODE_2 0 - INSTANT_CHAT_STRING_2_1 LOL! - INSTANT_CHAT_STRING_2_2 :-) - INSTANT_CHAT_STRING_2_3 :-( - INSTANT_CHAT_STRING_2_4 Well done! - INSTANT_CHAT_STRING_2_5 Almost got you... - INSTANT_CHAT_STRING_2_6 Hehe! - INSTANT_CHAT_STRING_2_7 Got one! - INSTANT_CHAT_STRING_2_8 - INSTANT_CHAT_STRING_2_9 - INSTANT_CHAT_STRING_2_10 - INSTANT_CHAT_STRING_2_11 - INSTANT_CHAT_STRING_2_12 - ALLOW_CAM_2_0 1 - ALLOW_CAM_2_1 1 - ALLOW_CAM_2_2 1 - ALLOW_CAM_2_3 1 - ALLOW_CAM_2_4 1 - START_FOV_2 90 - START_CAM_2 3 - CAMCENTER_2 1 - PLAYER_2 Player 2 - COLOR_R_1 15 - COLOR_G_1 3 - COLOR_B_1 3 - CAMWOBBLE_1 0 - AUTO_INCAM_1 0 - SPECTATOR_MODE_1 0 - INSTANT_CHAT_STRING_1_1 LOL! - INSTANT_CHAT_STRING_1_2 :-) - INSTANT_CHAT_STRING_1_3 :-( - INSTANT_CHAT_STRING_1_4 Well done! - INSTANT_CHAT_STRING_1_5 Almost got you... - INSTANT_CHAT_STRING_1_6 Hehe! - INSTANT_CHAT_STRING_1_7 Got one! - INSTANT_CHAT_STRING_1_8 - INSTANT_CHAT_STRING_1_9 - INSTANT_CHAT_STRING_1_10 - INSTANT_CHAT_STRING_1_11 - INSTANT_CHAT_STRING_1_12 - ALLOW_CAM_1_0 1 - ALLOW_CAM_1_1 1 - ALLOW_CAM_1_2 1 - ALLOW_CAM_1_3 1 - ALLOW_CAM_1_4 1 - START_FOV_1 90 - START_CAM_1 3 - CAMCENTER_1 1 - PLAYER_1 Player 1 - VIEWPORT_TO_PLAYER_1 0 - VIEWPORT_TO_PLAYER_2 1 - VIEWPORT_TO_PLAYER_3 2 - VIEWPORT_TO_PLAYER_4 3 - SOUND_SOURCES 10 - SOUND_QUALITY 2 - SOUND_BUFFER_SHIFT 0 - BIG_BROTHER 1 - KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 273 PLAYER_BIND MOVE_FORWARD 1 -KEYBOARD 271 PLAYER_BIND GLANCE_BACK 1 -KEYBOARD 264 PLAYER_BIND BANK_UP 1 -KEYBOARD 262 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 261 PLAYER_BIND CYCLE_BRAKE 1 -KEYBOARD 260 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 259 PLAYER_BIND GLANCE_RIGHT 1 -KEYBOARD 258 PLAYER_BIND BANK_DOWN 1 -KEYBOARD 257 PLAYER_BIND GLANCE_LEFT 1 -KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1 -KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1 - COLOR_STRINGS 1 - SOFTWARE_RENDERER 0 - FAILED_ATTEMPTS 0 - LAST_TRUECOLOR 0 - TRUECOLOR 0 - LAST_FULLSCREEN 0 - FULLSCREEN 0 - ARMAGETRON_LAST_SCREENMODE 6 - ARMAGETRON_SCREENMODE 6 - CUSTOM_SCREEN_WIDTH 800 - CUSTOM_SCREEN_HEIGHT 600 - VIEWPORT_CONF 0 - FIRST_USE 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/software.Armagetronrc new/armagetron_add/software.Armagetronrc --- old/armagetron_add/software.Armagetronrc 2002-03-18 13:25:06.000000000 +0100 +++ new/armagetron_add/software.Armagetronrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,188 +0,0 @@ - PING_CHARITY 0 - MAX_IN_RATE 4 - MAX_OUT_RATE 4 - SERVER_NAME - FINISH_TYPE 1 - GAME_TYPE 1 - AUTO_AIS 1 - NUM_AIS 4 - MOVIEPACK 1 - ZTRICK 0 - MOUSE_GRAB 0 - WRAP_MENU 1 - SPARKS 1 - TEXTURES_HI 0 - PREDICT_OBJECTS 1 - LAG_O_METER 1 - INFINITY_PLANE 0 - SKY_WOBBLE 1 - LOWER_SKY 0 - UPPER_SKY 0 - DITHER 0 - HIGH_RIM 0 - FLOOR_DETAIL 1 - FLOOR_MIRROR 0 - SHOW_FPS 1 - TEXT_OUT 1 - SMOOTH_SHADING 1 - ALPHA_BLEND 0 - PERSP_CORRECT -1 - POLY_ANITALIAS -1 - LINE_ANITALIAS -1 - MESSAGE_OF_DAY_4 - MESSAGE_OF_DAY_3 - MESSAGE_OF_DAY_2 - MESSAGE_OF_DAY_1 - ARMAGETRON_VERSION UNKNOWN - GL_VENDOR Brian Paul - GL_RENDERER Mesa X11 - GL_VERSION 1.3 Mesa 4.0.1 - GL_EXTENSIONS GL_ARB_imaging GL_ARB_multisample GL_ARB_multitexture GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_texture_env_combine GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_transpose_matrix GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_func_separate GL_EXT_blend_logic_op GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_clip_volume_hint GL_EXT_convolution GL_EXT_compiled_vertex_array GL_EXT_fog_coord GL_EXT_histogram GL_EXT_packed_pixels GL_EXT_paletted_texture GL_EXT_point_parameters GL_EXT_polygon_offset GL_EXT_rescale_normal GL_EXT_secondary_color GL_EXT_shared_texture_palette GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_edge_clamp GL_EXT_texture_env_add GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_EXT_texture_object GL_EXT_texture_lod_bias GL_EXT_vertex_array GL_HP_occlusion_test GL_IBM_rasterpos_clip GL_INGR_blend_func_separate GL_MESA_resize_buffers GL_MESA_window_pos GL_NV_blend_squ¿pöÿ¿ - TEXTURE_MODE_3 9728 - TEXTURE_MODE_2 9984 - TEXTURE_MODE_1 -1 - TEXTURE_MODE_0 -1 - COLOR_R_4 15 - COLOR_G_4 15 - COLOR_B_4 3 - CAMWOBBLE_4 0 - AUTO_INCAM_4 0 - SPECTATOR_MODE_4 0 - INSTANT_CHAT_STRING_4_1 LOL! - INSTANT_CHAT_STRING_4_2 :-) - INSTANT_CHAT_STRING_4_3 :-( - INSTANT_CHAT_STRING_4_4 Well done! - INSTANT_CHAT_STRING_4_5 Almost got you... - INSTANT_CHAT_STRING_4_6 Hehe! - INSTANT_CHAT_STRING_4_7 Got one! - INSTANT_CHAT_STRING_4_8 - INSTANT_CHAT_STRING_4_9 - INSTANT_CHAT_STRING_4_10 - INSTANT_CHAT_STRING_4_11 - INSTANT_CHAT_STRING_4_12 - ALLOW_CAM_4_0 1 - ALLOW_CAM_4_1 1 - ALLOW_CAM_4_2 1 - ALLOW_CAM_4_3 1 - ALLOW_CAM_4_4 1 - START_FOV_4 90 - START_CAM_4 3 - CAMCENTER_4 1 - PLAYER_4 Player 4 - COLOR_R_3 3 - COLOR_G_3 3 - COLOR_B_3 15 - CAMWOBBLE_3 0 - AUTO_INCAM_3 0 - SPECTATOR_MODE_3 0 - INSTANT_CHAT_STRING_3_1 LOL! - INSTANT_CHAT_STRING_3_2 :-) - INSTANT_CHAT_STRING_3_3 :-( - INSTANT_CHAT_STRING_3_4 Well done! - INSTANT_CHAT_STRING_3_5 Almost got you... - INSTANT_CHAT_STRING_3_6 Hehe! - INSTANT_CHAT_STRING_3_7 Got one! - INSTANT_CHAT_STRING_3_8 - INSTANT_CHAT_STRING_3_9 - INSTANT_CHAT_STRING_3_10 - INSTANT_CHAT_STRING_3_11 - INSTANT_CHAT_STRING_3_12 - ALLOW_CAM_3_0 1 - ALLOW_CAM_3_1 1 - ALLOW_CAM_3_2 1 - ALLOW_CAM_3_3 1 - ALLOW_CAM_3_4 1 - START_FOV_3 90 - START_CAM_3 3 - CAMCENTER_3 1 - PLAYER_3 Player 3 - COLOR_R_2 3 - COLOR_G_2 15 - COLOR_B_2 3 - CAMWOBBLE_2 0 - AUTO_INCAM_2 0 - SPECTATOR_MODE_2 0 - INSTANT_CHAT_STRING_2_1 LOL! - INSTANT_CHAT_STRING_2_2 :-) - INSTANT_CHAT_STRING_2_3 :-( - INSTANT_CHAT_STRING_2_4 Well done! - INSTANT_CHAT_STRING_2_5 Almost got you... - INSTANT_CHAT_STRING_2_6 Hehe! - INSTANT_CHAT_STRING_2_7 Got one! - INSTANT_CHAT_STRING_2_8 - INSTANT_CHAT_STRING_2_9 - INSTANT_CHAT_STRING_2_10 - INSTANT_CHAT_STRING_2_11 - INSTANT_CHAT_STRING_2_12 - ALLOW_CAM_2_0 1 - ALLOW_CAM_2_1 1 - ALLOW_CAM_2_2 1 - ALLOW_CAM_2_3 1 - ALLOW_CAM_2_4 1 - START_FOV_2 90 - START_CAM_2 3 - CAMCENTER_2 1 - PLAYER_2 Player 2 - COLOR_R_1 15 - COLOR_G_1 3 - COLOR_B_1 3 - CAMWOBBLE_1 0 - AUTO_INCAM_1 0 - SPECTATOR_MODE_1 0 - INSTANT_CHAT_STRING_1_1 LOL! - INSTANT_CHAT_STRING_1_2 :-) - INSTANT_CHAT_STRING_1_3 :-( - INSTANT_CHAT_STRING_1_4 Well done! - INSTANT_CHAT_STRING_1_5 Almost got you... - INSTANT_CHAT_STRING_1_6 Hehe! - INSTANT_CHAT_STRING_1_7 Got one! - INSTANT_CHAT_STRING_1_8 - INSTANT_CHAT_STRING_1_9 - INSTANT_CHAT_STRING_1_10 - INSTANT_CHAT_STRING_1_11 - INSTANT_CHAT_STRING_1_12 - ALLOW_CAM_1_0 1 - ALLOW_CAM_1_1 1 - ALLOW_CAM_1_2 1 - ALLOW_CAM_1_3 1 - ALLOW_CAM_1_4 1 - START_FOV_1 90 - START_CAM_1 3 - CAMCENTER_1 1 - PLAYER_1 Player 1 - VIEWPORT_TO_PLAYER_1 0 - VIEWPORT_TO_PLAYER_2 1 - VIEWPORT_TO_PLAYER_3 2 - VIEWPORT_TO_PLAYER_4 3 - SOUND_SOURCES 10 - SOUND_QUALITY 2 - SOUND_BUFFER_SHIFT 0 - BIG_BROTHER 1 - KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 273 PLAYER_BIND MOVE_FORWARD 1 -KEYBOARD 271 PLAYER_BIND GLANCE_BACK 1 -KEYBOARD 264 PLAYER_BIND BANK_UP 1 -KEYBOARD 262 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 261 PLAYER_BIND CYCLE_BRAKE 1 -KEYBOARD 260 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 259 PLAYER_BIND GLANCE_RIGHT 1 -KEYBOARD 258 PLAYER_BIND BANK_DOWN 1 -KEYBOARD 257 PLAYER_BIND GLANCE_LEFT 1 -KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1 -KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1 -KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1 -KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1 - COLOR_STRINGS 1 - SOFTWARE_RENDERER 1 - FAILED_ATTEMPTS 0 - LAST_TRUECOLOR 0 - TRUECOLOR 0 - LAST_FULLSCREEN 0 - FULLSCREEN 0 - ARMAGETRON_LAST_SCREENMODE 4 - ARMAGETRON_SCREENMODE 4 - CUSTOM_SCREEN_WIDTH 800 - CUSTOM_SCREEN_HEIGHT 600 - VIEWPORT_CONF 0 - FIRST_USE 0 ++++++ armagetronad-0.2.8.3.2.src.tar.bz2 -> armagetronad-0.2.8.3.3.src.tar.bz2 ++++++ ++++ 14701 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/armagetronad-0.2.8.3.2/ChangeLog new/armagetronad-0.2.8.3.3/ChangeLog --- old/armagetronad-0.2.8.3.2/ChangeLog 2011-09-11 12:48:28.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/ChangeLog 2015-02-01 10:25:17.000000000 +0100 @@ -1,7 +1,35 @@ ------------------------------------------------------------------------ -r9916 | z-man | 2011-09-11 12:41:12 +0200 (Sun, 11 Sep 2011) | 2 lines +r10712 | z-man | 2015-01-29 23:53:15 +0100 (Thu, 29 Jan 2015) | 2 lines -Injecting source again. +Tagging 0.2.8.3.3_rc1 + +------------------------------------------------------------------------ +r10706 | z-man | 2015-01-29 23:39:48 +0100 (Thu, 29 Jan 2015) | 1 line + +Merging fixes for various potential bugs from 0.2.8. +------------------------------------------------------------------------ +r10505 | z-man | 2013-01-29 23:12:03 +0100 (Tue, 29 Jan 2013) | 2 lines + +Fixing possible crash due to friends list buffer overrun; no exploit potential. + +------------------------------------------------------------------------ +r10495 | z-man | 2013-01-27 16:37:31 +0100 (Sun, 27 Jan 2013) | 2 lines + +Fixed custom and internal camera turns when axes have angles > 90 degrees between them. + +------------------------------------------------------------------------ +r10393 | z-man | 2012-03-31 17:59:04 +0200 (Sat, 31 Mar 2012) | 2 lines + +Backporting rare crashfix: Adding sound lock when alpha objects get resorted. + +------------------------------------------------------------------------ +r10262 | z-man | 2011-11-20 12:28:42 +0100 (Sun, 20 Nov 2011) | 1 line + +Backport fix: Switching to glColor4f because Intel drivers don't like it if you alternate between them and glColor3f in different glBegin()/glEnd() blocks. +------------------------------------------------------------------------ +r10004 | z-man | 2011-10-11 11:45:06 +0200 (Tue, 11 Oct 2011) | 2 lines + +Clearing display lists if moviepack seting changed to flush out all texture changes. ------------------------------------------------------------------------ r9914 | z-man | 2011-09-11 12:40:11 +0200 (Sun, 11 Sep 2011) | 2 lines 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/armagetronad-0.2.8.3.2/INSTALL new/armagetronad-0.2.8.3.3/INSTALL --- old/armagetronad-0.2.8.3.2/INSTALL 2010-02-02 01:59:15.000000000 +0100 +++ new/armagetronad-0.2.8.3.3/INSTALL 2014-01-02 20:14:59.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - 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/armagetronad-0.2.8.3.2/NEWS new/armagetronad-0.2.8.3.3/NEWS --- old/armagetronad-0.2.8.3.2/NEWS 2011-09-11 12:41:55.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/NEWS 2015-02-26 20:33:16.000000000 +0100 @@ -1,3 +1,14 @@ +Changes since 0.2.8.3.2: +- security fix: do not read ahead of the beginning of network buffer. +- security fix: don't attribute network errors from processing random + packets to the connection to the server +- security fix: while at it, don't process random packets unless they + may be important +- fix for potential crash with friend list filtering +- intel driver compatibility +- fix for rare crash with sound lock +- fix for camera turning for bizarre axis configurations + Changes since 0.2.8.3.1: - security fix: old style action commands from clients no loger cause hangs and crashes - security fix: oversized packets are ignored properly 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/armagetronad-0.2.8.3.2/compile new/armagetronad-0.2.8.3.3/compile --- old/armagetronad-0.2.8.3.2/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/armagetronad-0.2.8.3.3/compile 2014-01-02 20:14:59.000000000 +0100 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)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-automake(a)gnu.org> or send patches to +# <automake-patches(a)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-automake(a)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/armagetronad-0.2.8.3.2/configure.ac new/armagetronad-0.2.8.3.3/configure.ac --- old/armagetronad-0.2.8.3.2/configure.ac 2011-09-11 12:50:26.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/configure.ac 2015-02-26 20:38:05.000000000 +0100 @@ -8,7 +8,7 @@ m4_include(accustomdir.m4) dnl Process this file with autoconf to produce a configure script. -AC_INIT(armagetronad,0.2.8.3.2) +AC_INIT(armagetronad,0.2.8.3.3) dnl FIXME: remove this in the future, when automake decides to actually set datarootdir by default dnl http://www.gnu.org/software/hello/manual/autoconf/Changed-Directory-Variabl… @@ -241,14 +241,14 @@ AC_ARG_ENABLE(uninstall, AC_HELP_STRING([--enable-uninstall@<:@=cmd@:>@], - [will install an uninstaller script (default=enabled)]), + [will install an uninstaller script [BROKEN] (default=disabled)]), if test "$enableval" = "no"; then enable_uninstall=no else enable_uninstall=yes external_uninstall_cmd=$enableval fi, -enable_uninstall=yes) +enable_uninstall=no) AC_SUBST(external_uninstall_cmd) AC_ARG_ENABLE(multiver, @@ -731,7 +731,7 @@ CPPFLAGS="$CPPFLAGS `libpng-config --cflags`" LIBS="$LIBS $PNGLIBS" -AC_CHECK_FUNC(png_check_sig, +AC_CHECK_FUNC(png_sig_cmp, , AC_MSG_ERROR([You need libpng to compile Armagetron.])) 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/armagetronad-0.2.8.3.2/fingerprint new/armagetronad-0.2.8.3.3/fingerprint --- old/armagetronad-0.2.8.3.2/fingerprint 2011-09-11 12:50:18.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/fingerprint 2015-02-26 20:37:41.000000000 +0100 @@ -1,11 +1,13 @@ -Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.2/armagetronad -URL: https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/armagetronad/… -Repository Root: https://armagetronad.svn.sourceforge.net/svnroot/armagetronad +Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.3/armagetronad +Working Copy Root Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.3 +URL: https://svn.code.sf.net/p/armagetronad/code/armagetronad/tags/0.2.8.3.3/arm… +Relative URL: ^/armagetronad/tags/0.2.8.3.3/armagetronad +Repository Root: https://svn.code.sf.net/p/armagetronad/code Repository UUID: 7d95bf1e-0414-0410-9756-b78462a59f44 -Revision: 9917 +Revision: 10741 Node Kind: directory Schedule: normal Last Changed Author: z-man -Last Changed Rev: 9916 -Last Changed Date: 2011-09-11 12:41:12 +0200 (Sun, 11 Sep 2011) +Last Changed Rev: 10740 +Last Changed Date: 2015-02-26 20:28:18 +0100 (Thu, 26 Feb 2015) 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/armagetronad-0.2.8.3.2/missing new/armagetronad-0.2.8.3.3/missing --- old/armagetronad-0.2.8.3.2/missing 2010-02-02 01:59:15.000000000 +0100 +++ new/armagetronad-0.2.8.3.3/missing 2014-01-02 20:14:59.000000000 +0100 @@ -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 <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)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-automake(a)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/armagetronad-0.2.8.3.2/src/config_ide.h new/armagetronad-0.2.8.3.3/src/config_ide.h --- old/armagetronad-0.2.8.3.2/src/config_ide.h 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/config_ide.h 2015-02-26 20:37:49.000000000 +0100 @@ -99,4 +99,4 @@ #define HAVE_WMEMSET 1 // define version -#define VERSION "0.2.8.3.2" +#define VERSION "0.2.8.3.3" 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/armagetronad-0.2.8.3.2/src/doc/bugs.html new/armagetronad-0.2.8.3.3/src/doc/bugs.html --- old/armagetronad-0.2.8.3.2/src/doc/bugs.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/bugs.html 2015-02-26 20:37:49.000000000 +0100 @@ -62,7 +62,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -310,7 +310,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/changelog.html new/armagetronad-0.2.8.3.3/src/doc/changelog.html --- old/armagetronad-0.2.8.3.2/src/doc/changelog.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/changelog.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -447,7 +447,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/commands.html new/armagetronad-0.2.8.3.3/src/doc/commands.html --- old/armagetronad-0.2.8.3.2/src/doc/commands.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/commands.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -899,7 +899,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/compile.html new/armagetronad-0.2.8.3.3/src/doc/compile.html --- old/armagetronad-0.2.8.3.2/src/doc/compile.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/compile.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -200,7 +200,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/config.html new/armagetronad-0.2.8.3.3/src/doc/config.html --- old/armagetronad-0.2.8.3.2/src/doc/config.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/config.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -660,7 +660,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/faq.html new/armagetronad-0.2.8.3.3/src/doc/faq.html --- old/armagetronad-0.2.8.3.2/src/doc/faq.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/faq.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -397,7 +397,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/index.html new/armagetronad-0.2.8.3.3/src/doc/index.html --- old/armagetronad-0.2.8.3.2/src/doc/index.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/index.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -344,7 +344,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/install_linux.html new/armagetronad-0.2.8.3.3/src/doc/install_linux.html --- old/armagetronad-0.2.8.3.2/src/doc/install_linux.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/install_linux.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -188,7 +188,7 @@ make; however, only GNU make is supported. To build the dedicated server, add the option --disable-glout to the configure script. To change the installation path, use the option --prefix=new_path. -Type <pre>uninstall-armagetronad(-dedicated)-0.2.8.3.2</pre> to uninstall. +Type <pre>uninstall-armagetronad(-dedicated)-0.2.8.3.3</pre> to uninstall. @@ -236,7 +236,7 @@ <a name=multiple><h3 align=left>Multiple versions</h3></a> If you give the additional option --enable-multiver to configure, all installation -directories and executables will get the suffix 0.2.8.3.2. Symbolic links will be created to +directories and executables will get the suffix 0.2.8.3.3. Symbolic links will be created to your convenience. This allows to install multiple versions in parallel, where armagetronad(-dedicated) will always start the last installed version. @@ -281,7 +281,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/install_macosx.html new/armagetronad-0.2.8.3.3/src/doc/install_macosx.html --- old/armagetronad-0.2.8.3.2/src/doc/install_macosx.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/install_macosx.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> 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/armagetronad-0.2.8.3.2/src/doc/install_windows.html new/armagetronad-0.2.8.3.3/src/doc/install_windows.html --- old/armagetronad-0.2.8.3.2/src/doc/install_windows.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/install_windows.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -294,7 +294,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/net/index.html new/armagetronad-0.2.8.3.3/src/doc/net/index.html --- old/armagetronad-0.2.8.3.2/src/doc/net/index.html 2011-09-11 12:50:24.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/net/index.html 2015-02-26 20:37:47.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:47+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron: network code documentation</title> @@ -178,7 +178,7 @@ Manuel Moos( <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ). -Last modification: Sun Sep 11 12:50:24 CEST 2011 +Last modification: Thu Feb 26 20:37:47 CET 2015 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/armagetronad-0.2.8.3.2/src/doc/net/lower.html new/armagetronad-0.2.8.3.3/src/doc/net/lower.html --- old/armagetronad-0.2.8.3.2/src/doc/net/lower.html 2011-09-11 12:50:24.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/net/lower.html 2015-02-26 20:37:47.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:47+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron: network code documentation</title> @@ -208,7 +208,7 @@ Manuel Moos( <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ). -Last modification: Sun Sep 11 12:50:24 CEST 2011 +Last modification: Thu Feb 26 20:37:47 CET 2015 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/armagetronad-0.2.8.3.2/src/doc/net/middle.html new/armagetronad-0.2.8.3.3/src/doc/net/middle.html --- old/armagetronad-0.2.8.3.2/src/doc/net/middle.html 2011-09-11 12:50:24.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/net/middle.html 2015-02-26 20:37:47.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:47+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron: network code documentation</title> @@ -329,7 +329,7 @@ Manuel Moos( <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ). -Last modification: Sun Sep 11 12:50:24 CEST 2011 +Last modification: Thu Feb 26 20:37:47 CET 2015 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/armagetronad-0.2.8.3.2/src/doc/net/upper.html new/armagetronad-0.2.8.3.3/src/doc/net/upper.html --- old/armagetronad-0.2.8.3.2/src/doc/net/upper.html 2011-09-11 12:50:24.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/net/upper.html 2015-02-26 20:37:47.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:24+01:00"> + <meta name="date" content="2015-02-26T20:37:47+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron: network code documentation</title> @@ -523,7 +523,7 @@ Manuel Moos( <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ). -Last modification: Sun Sep 11 12:50:24 CEST 2011 +Last modification: Thu Feb 26 20:37:47 CET 2015 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/armagetronad-0.2.8.3.2/src/doc/network.html new/armagetronad-0.2.8.3.3/src/doc/network.html --- old/armagetronad-0.2.8.3.2/src/doc/network.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/network.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -579,7 +579,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/readme_macosx.html new/armagetronad-0.2.8.3.3/src/doc/readme_macosx.html --- old/armagetronad-0.2.8.3.2/src/doc/readme_macosx.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/readme_macosx.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> 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/armagetronad-0.2.8.3.2/src/doc/todo.html new/armagetronad-0.2.8.3.3/src/doc/todo.html --- old/armagetronad-0.2.8.3.2/src/doc/todo.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/todo.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:48+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -146,7 +146,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/doc/versions.html new/armagetronad-0.2.8.3.3/src/doc/versions.html --- old/armagetronad-0.2.8.3.2/src/doc/versions.html 2011-09-11 12:50:25.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/doc/versions.html 2015-02-26 20:37:49.000000000 +0100 @@ -61,7 +61,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="date" content="2011-09-11T12:50:25+01:00"> + <meta name="date" content="2015-02-26T20:37:49+01:00"> <meta name="author" content="Manuel Moos"> <title>Armagetron Advanced: Documentation</title> @@ -172,7 +172,7 @@ -Last modification: Sep 11 2011 +Last modification: Jan 29 2015  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/armagetronad-0.2.8.3.2/src/engine/eCamera.cpp new/armagetronad-0.2.8.3.3/src/engine/eCamera.cpp --- old/armagetronad-0.2.8.3.2/src/engine/eCamera.cpp 2011-09-11 12:41:53.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/engine/eCamera.cpp 2015-01-29 23:53:56.000000000 +0100 @@ -1765,7 +1765,18 @@ if ( Center() && wrongDirection > 0 ) { // if so, turn to the side using the last driving direction - newdir = newdir + Center()->LastDirection()*(wrongDirection*ts*turnSpeed*customTurnSpeed180); + eCoord normedLastDir = Center()->LastDirection(); + REAL wrongWrongDirection = -eCoord::F(cycleDir, normedLastDir); + if( wrongWrongDirection > 0) + { + normedLastDir = normedLastDir + cycleDir * (wrongWrongDirection/cycleDir.NormSquared()); + REAL n = normedLastDir.NormSquared(); + if(n > 0) + { + normedLastDir *= 1/sqrt(n); + } + } + newdir = newdir + normedLastDir*(wrongDirection*ts*turnSpeed*customTurnSpeed180); } } else 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/armagetronad-0.2.8.3.2/src/engine/eGameObject.cpp new/armagetronad-0.2.8.3.3/src/engine/eGameObject.cpp --- old/armagetronad-0.2.8.3.2/src/engine/eGameObject.cpp 2011-09-11 12:41:53.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/engine/eGameObject.cpp 2015-01-29 23:53:56.000000000 +0100 @@ -880,6 +880,9 @@ // but the small flickering error is to be tolerated, especially // since alpha blended game objects tend to gently fade in. int firstAlphaID = firstAlpha->id; + + eSoundLocker locker; + grid->gameObjects.Remove(firstAlpha,firstAlpha->id); grid->gameObjects.Add(firstAlpha,firstAlpha->id); grid->gameObjects.Remove(object,object->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/armagetronad-0.2.8.3.2/src/macosx/config_common.h.in new/armagetronad-0.2.8.3.3/src/macosx/config_common.h.in --- old/armagetronad-0.2.8.3.2/src/macosx/config_common.h.in 2011-09-11 12:50:26.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/macosx/config_common.h.in 2015-02-26 20:38:05.000000000 +0100 @@ -163,7 +163,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.2.8.3.2" +#define VERSION "0.2.8.3.3" /* Windows 9x/NT/2k/XP */ /* #undef WIN32 */ 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/armagetronad-0.2.8.3.2/src/network/nNetwork.cpp new/armagetronad-0.2.8.3.3/src/network/nNetwork.cpp --- old/armagetronad-0.2.8.3.2/src/network/nNetwork.cpp 2011-09-11 12:41:48.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/network/nNetwork.cpp 2015-01-29 23:53:54.000000000 +0100 @@ -1413,6 +1413,10 @@ } void login_deny_handler(nMessage &m){ + // only the server is allowed to send this + if(m.SenderID() != 0) + return; + if ( !m.End() ) { // tOutput output; @@ -1908,6 +1912,11 @@ unsigned short id = m.SenderID(); //m.Read(id); + // only the server or legal clients are allowed to send this + // (client check comes later) + if(sn_GetNetState() == nCLIENT && id != 0) + return; + if (sn_Connections[id].socket) { tOutput o; @@ -2266,7 +2275,7 @@ nAddress addrFrom; // the sender of the current packet len = sn_Connections[peer].socket->Read( reinterpret_cast<int8 *>(buff),maxrec*2, addrFrom); - if (len>0){ + if (len>=2){ if ( len >= maxrec*2 ) { #ifndef DEDICATED @@ -2360,6 +2369,10 @@ } else { + // logged in clients should ignore packets from unknown sources + if(sn_GetNetState() != nSERVER && sn_myNetID != 0) + continue; + // assume it's a new connection id = MAXCLIENTS+1; peers[ MAXCLIENTS+1 ] = addrFrom; @@ -2491,7 +2504,7 @@ catch(nKillHim) { con << "nKillHim signal caught: "; - sn_DisconnectUser(peer, "$network_kill_error"); + sn_DisconnectUser(id, "$network_kill_error"); } #endif } @@ -3332,9 +3345,9 @@ } // clients can only disconnect from the server - if ( i != 0 && sn_GetNetState() == nCLIENT ) + if ( i != 0 && i <= MAXCLIENTS && sn_GetNetState() == nCLIENT ) { - tERR_ERROR( "Client tried to disconnect from another client: impossible and a bad idea." ); + tERR_WARN( "Client tried to disconnect from another client: impossible and a bad idea." ); return; } 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/armagetronad-0.2.8.3.2/src/tron/gGame.cpp new/armagetronad-0.2.8.3.3/src/tron/gGame.cpp --- old/armagetronad-0.2.8.3.2/src/tron/gGame.cpp 2011-09-11 12:41:47.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/tron/gGame.cpp 2015-01-29 23:53:54.000000000 +0100 @@ -1794,6 +1794,13 @@ #ifndef DEDICATED if (sr_glOut){ + static bool lastMoviePack=sg_MoviePack(); + if(lastMoviePack!=sg_MoviePack()) + { + lastMoviePack=sg_MoviePack(); + rDisplayList::ClearAll(); + } + RenderAllViewports(grid); sr_ResetRenderState(true); 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/armagetronad-0.2.8.3.2/src/tron/gServerBrowser.cpp new/armagetronad-0.2.8.3.3/src/tron/gServerBrowser.cpp --- old/armagetronad-0.2.8.3.2/src/tron/gServerBrowser.cpp 2011-09-11 12:41:47.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/tron/gServerBrowser.cpp 2015-01-29 23:53:54.000000000 +0100 @@ -392,7 +392,7 @@ int i; tString userNames = run->UserNames(); tString* friends = getFriends(); - for (i = MAX_FRIENDS; i>=0; i--) + for (i = MAX_FRIENDS-1; i>=0; i--) { if (run->Users() > 0 && friends[i].Len() > 1 && userNames.StrPos(friends[i]) >= 0) { 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/armagetronad-0.2.8.3.2/src/tron/gWall.cpp new/armagetronad-0.2.8.3.3/src/tron/gWall.cpp --- old/armagetronad-0.2.8.3.2/src/tron/gWall.cpp 2011-09-11 12:41:47.000000000 +0200 +++ new/armagetronad-0.2.8.3.3/src/tron/gWall.cpp 2015-01-29 23:53:54.000000000 +0100 @@ -1114,19 +1114,19 @@ { BeginQuads(); - glColor3f(r,g,b); + glColor4f(r,g,b,1); glTexCoord2f(ta,hfrac); glVertex3f(p1.x,p1.y,extrarise); - glColor3f(r,g,b); + glColor4f(r,g,b,1); glTexCoord2f(ta,0); glVertex3f(p1.x,p1.y,extrarise + h*hfrac); - glColor3f(r,g,b); + glColor4f(r,g,b,1); glTexCoord2f(te,0); glVertex3f(p2.x,p2.y,extrarise + h*hfrac); - glColor3f(r,g,b); + glColor4f(r,g,b,1); glTexCoord2f(te,hfrac); glVertex3f(p2.x,p2.y,extrarise);

1 0

commit python-stevedore for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package python-stevedore for openSUSE:Factory checked in at 2015-03-30 19:33:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-stevedore (Old) and /work/SRC/openSUSE:Factory/.python-stevedore.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-stevedore" Changes: -------- --- /work/SRC/openSUSE:Factory/python-stevedore/python-stevedore.changes 2015-02-25 02:18:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-stevedore.new/python-stevedore.changes 2015-03-30 19:34:03.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Mar 30 06:16:47 UTC 2015 - tbechtold(a)suse.com + +- update to 1.3.0: + * Updated from global requirements + * Fix test for finding multiple drivers + * ignore .testrepository directory created by testr + * clean up default environments run by tox +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- stevedore-1.2.0.tar.gz New: ---- stevedore-1.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-stevedore.spec ++++++ --- /var/tmp/diff_new_pack.CbZm9j/_old 2015-03-30 19:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.CbZm9j/_new 2015-03-30 19:34:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-stevedore -Version: 1.2.0 +Version: 1.3.0 Release: 0 Summary: Manage dynamic plugins for Python applications License: Apache-2.0 @@ -34,7 +34,7 @@ #BuildRequires: python-mock #BuildRequires: python-nose Requires: python-argparse -Requires: python-six >= 1.7 +Requires: python-six >= 1.9 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ stevedore-1.2.0.tar.gz -> stevedore-1.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/ChangeLog new/stevedore-1.3.0/ChangeLog --- old/stevedore-1.2.0/ChangeLog 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/ChangeLog 2015-03-09 15:41:44.000000000 +0100 @@ -1,6 +1,14 @@ CHANGES ======= +1.3.0 +----- + +* Updated from global requirements +* Fix test for finding multiple drivers +* ignore .testrepository directory created by testr +* clean up default environments run by tox + 1.2.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/PKG-INFO new/stevedore-1.3.0/PKG-INFO --- old/stevedore-1.2.0/PKG-INFO 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/PKG-INFO 2015-03-09 15:41:45.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: stevedore -Version: 1.2.0 +Version: 1.3.0 Summary: Manage dynamic plugins for Python applications Home-page: https://github.com/dreamhost/stevedore Author: Doug Hellmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/requirements.txt new/stevedore-1.3.0/requirements.txt --- old/stevedore-1.2.0/requirements.txt 2015-01-06 15:42:50.000000000 +0100 +++ new/stevedore-1.3.0/requirements.txt 2015-03-09 15:41:00.000000000 +0100 @@ -4,4 +4,4 @@ pbr>=0.6,!=0.7,<1.0 argparse -six>=1.7.0 +six>=1.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/setup.cfg new/stevedore-1.3.0/setup.cfg --- old/stevedore-1.2.0/setup.cfg 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/setup.cfg 2015-03-09 15:41:45.000000000 +0100 @@ -45,7 +45,7 @@ universal = true [egg_info] +tag_svn_revision = 0 tag_date = 0 tag_build = -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/stevedore/tests/test_driver.py new/stevedore-1.3.0/stevedore/tests/test_driver.py --- old/stevedore-1.2.0/stevedore/tests/test_driver.py 2015-01-06 15:42:50.000000000 +0100 +++ new/stevedore-1.3.0/stevedore/tests/test_driver.py 2015-03-09 15:41:00.000000000 +0100 @@ -1,10 +1,10 @@ """Tests for stevedore.extension """ -import mock import pkg_resources from stevedore import driver +from stevedore import extension from stevedore.tests import test_extension from stevedore.tests import utils @@ -52,17 +52,25 @@ def test_multiple_drivers(self): # The idea for this test was contributed by clayg: # https://gist.github.com/clayg/6311348 - fep_name = 'stevedore.extension.ExtensionManager._find_entry_points' - with mock.patch(fep_name) as fep: - fep.return_value = [ + extensions = [ + extension.Extension( + 'backend', pkg_resources.EntryPoint.parse('backend = pkg1:driver'), + 'pkg backend', + None, + ), + extension.Extension( + 'backend', pkg_resources.EntryPoint.parse('backend = pkg2:driver'), - ] - for ep in fep.return_value: - ep.load = lambda *args, **kwds: 'pkg backend' - try: - driver.DriverManager('stevedore.test.multiple_drivers', - 'backend') - except RuntimeError as err: - self.assertIn("Multiple", str(err)) - fep.assert_called_with('stevedore.test.multiple_drivers') + 'pkg backend', + None, + ), + ] + try: + dm = driver.DriverManager.make_test_instance(extensions[0]) + # Call the initialization code that verifies the extension + dm._init_plugins(extensions) + except RuntimeError as err: + self.assertIn("Multiple", str(err)) + else: + self.fail('Should have had an error') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/stevedore.egg-info/PKG-INFO new/stevedore-1.3.0/stevedore.egg-info/PKG-INFO --- old/stevedore-1.2.0/stevedore.egg-info/PKG-INFO 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/stevedore.egg-info/PKG-INFO 2015-03-09 15:41:44.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: stevedore -Version: 1.2.0 +Version: 1.3.0 Summary: Manage dynamic plugins for Python applications Home-page: https://github.com/dreamhost/stevedore Author: Doug Hellmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/stevedore.egg-info/pbr.json new/stevedore-1.3.0/stevedore.egg-info/pbr.json --- old/stevedore-1.2.0/stevedore.egg-info/pbr.json 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/stevedore.egg-info/pbr.json 2015-03-09 15:41:44.000000000 +0100 @@ -1 +1 @@ -{"git_version": "37c94cd", "is_release": true} \ No newline at end of file +{"git_version": "218e95d", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/stevedore.egg-info/requires.txt new/stevedore-1.3.0/stevedore.egg-info/requires.txt --- old/stevedore-1.2.0/stevedore.egg-info/requires.txt 2015-01-06 15:43:25.000000000 +0100 +++ new/stevedore-1.3.0/stevedore.egg-info/requires.txt 2015-03-09 15:41:44.000000000 +0100 @@ -1,3 +1,3 @@ pbr>=0.6,!=0.7,<1.0 argparse -six>=1.7.0 +six>=1.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stevedore-1.2.0/tox.ini new/stevedore-1.3.0/tox.ini --- old/stevedore-1.2.0/tox.ini 2015-01-06 15:42:50.000000000 +0100 +++ new/stevedore-1.3.0/tox.ini 2015-03-09 15:41:00.000000000 +0100 @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py32,py33,py34,pypy,pep8,docs +envlist = py33,py34,py26,py27,pypy,pep8,docs [testenv] deps =

1 0

commit alpine for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '15

30 Mar '15

Hello community, here is the log from the commit of package alpine for openSUSE:Factory checked in at 2015-03-30 19:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alpine (Old) and /work/SRC/openSUSE:Factory/.alpine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alpine" Changes: -------- --- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2014-03-12 14:45:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alpine.new/alpine.changes 2015-03-30 19:33:59.000000000 +0200 @@ -1,0 +2,48 @@ +Wed Mar 25 16:59:29 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream release 2.20 +* Upgrade UW-IMAP to Panda IMAP from github.com/jonabbey/panda-imap +* S/MIME: Add screen to manage certificates. +* S/MIME: Signatures are validated using the user's certificates + instead of the ones included in the message. Behavior can be + disabled by disabling the option "Validate Using Certificate + Store Only" which is enabled by default. +* S/MIME: add the sender certificate to the list of certificates + in encrypted messages to make it possible for the sender to + decrypt the message they sent. +* S/MIME: Forwarding a message will include the signed part as part + of the text and not as a multipart message, just as the reply + command does. +* Add support to selective expunge through a subcommand of the + select-apply commands. +* Pico: New subcommand of the search command, allows to reverse the + direction of search. +* Add /tls1, /tls1_1, /tls1_2 and /dtls1 to the definition of a + server to use different ways to connect using ssl, for example + {server.com/tls1} will attempt to connect to server.com at the + ssl imap port (port 993) and establish a connection using TLSv1. + These flags can be used in conjunction with the /ssl flag, the + ssl flag is redundant. Conversely, however, the /ssl flag does + not imply any of these flags; the /ssl flag means SSLv3 or, if + not available, SSLv2 in the SSL port. +* Alpine does not attempt to automatically reopen a collection that + was not opened due to cancellation by the user. Instead, the user + must try to open it explicitly. +* Experimental: Write the content-type of a message in lowercase, + as some non-compliant servers do not understand uppercase + content-type. +* Opening a folder updates recent count in maildrops (this + already works for other types of folders) +* Pico: Justification works without need of a predefined quote + string. This allows justification of blocks of text that are + indented with spaces. +* Decode the name of attachment names, so they can be written as + part of the description of the part. +* Replace tabs by spaces in From and Subject fields to control for + size in screen of these fields. Change only in index screen + display. +- Drop alpine-month_name-utf8.patch (solved differently upstream), + drop alpine-mime-type-workaround.patch (merged upstream) +- Add lint.diff to workaround new source code problems + +------------------------------------------------------------------- Old: ---- alpine-2.11.tar.xz alpine-mime-type-workaround.patch alpine-month_name-utf8.patch New: ---- alpine-2.20.tar.xz lint.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:00.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alpine # -# Copyright (c) 2014 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 @@ -22,11 +22,13 @@ Summary: Mail User Agent License: Apache-2.0 Group: Productivity/Networking/Email/Clients -Version: 2.11 +Version: 2.20 Release: 0 Url: http://patches.freeiz.com/alpine/ -Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz +# direct download does not work for openSUSE:Factory +# Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz +Source: %name-%version.tar.xz Source1: %name.png Source2: %name.desktop Patch1: pine-nonvoid-function.patch @@ -34,12 +36,11 @@ Patch3: operation-may-be-undefined-warning.diff Patch4: fix-implicit.patch Patch5: alpine-gcc44.diff -Patch7: alpine-month_name-utf8.patch Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch40: pico-stripwhitespace.diff Patch60: signal-and-panic-improvements.diff -Patch61: alpine-mime-type-workaround.patch +Patch61: lint.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -64,8 +65,8 @@ BuildRequires: pam-devel BuildRequires: update-desktop-files BuildRequires: xz -# pgp4pine requires pine: -Provides: pine +# pgp4pine requires pine: (6.20 is what alpine writes to ~/.pinerc) +Provides: pine = 6.20 Obsoletes: pine4 Provides: pine4 @@ -134,7 +135,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 %patch10 -p1 %patch20 -p1 %patch40 -p1 @@ -275,7 +275,7 @@ %doc %{_mandir}/man1/rpload.* %doc %{_mandir}/man1/mailutil.* %doc README NOTICE LICENSE -%doc doc/mailcap.unx doc/mime.types doc/tech-notes.txt doc/tech-notes/*.html +%doc doc/mailcap.unx doc/mime.types doc/tech-notes/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine %{_bindir}/alpinef %{_bindir}/rp* ++++++ alpine-2.11.tar.xz -> alpine-2.20.tar.xz ++++++ ++++ 161922 lines of diff (skipped) ++++++ alpine-gcc44.diff ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -3,11 +3,11 @@ pith/send.c | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) -Index: alpine-2.11/imap/src/osdep/unix/dummy.c +Index: alpine-2.20/imap/src/osdep/unix/dummy.c =================================================================== ---- alpine-2.11.orig/imap/src/osdep/unix/dummy.c -+++ alpine-2.11/imap/src/osdep/unix/dummy.c -@@ -736,6 +736,17 @@ long dummy_copy (MAILSTREAM *stream,char +--- alpine-2.20.orig/imap/src/osdep/unix/dummy.c ++++ alpine-2.20/imap/src/osdep/unix/dummy.c +@@ -734,6 +734,17 @@ long dummy_copy (MAILSTREAM *stream,char return NIL; } @@ -25,7 +25,7 @@ /* Dummy append message string * Accepts: mail stream -@@ -755,8 +766,7 @@ long dummy_append (MAILSTREAM *stream,ch +@@ -753,8 +764,7 @@ long dummy_append (MAILSTREAM *stream,ch /* append to INBOX? */ if (!compare_cstring (mailbox,"INBOX")) { /* yes, if no empty proto try creating */ @@ -35,12 +35,12 @@ } else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) { if ((e = errno) == ENOENT) /* failed, was it no such file? */ -Index: alpine-2.11/pith/send.c +Index: alpine-2.20/pith/send.c =================================================================== ---- alpine-2.11.orig/pith/send.c -+++ alpine-2.11/pith/send.c -@@ -1570,6 +1570,7 @@ set_priority_header(METAENV *header, cha - pf->textbuf = cpystr(value); +--- alpine-2.20.orig/pith/send.c ++++ alpine-2.20/pith/send.c +@@ -4159,6 +4159,7 @@ set_parameter(PARAMETER **param, char *p + pm->value = cpystr(new_value); } } + return 0; ++++++ chappa-WrtAcc.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -8,11 +8,11 @@ pico/search.c | 6 - 7 files changed, 214 insertions(+), 8 deletions(-) -Index: alpine-2.11/pico/basic.c +Index: alpine-2.20/pico/basic.c =================================================================== ---- alpine-2.11.orig/pico/basic.c -+++ alpine-2.11/pico/basic.c -@@ -344,6 +344,189 @@ gotobop(int f, int n) +--- alpine-2.20.orig/pico/basic.c ++++ alpine-2.20/pico/basic.c +@@ -342,6 +342,189 @@ gotobop(int f, int n) return(TRUE); } @@ -202,10 +202,10 @@ /* * go forword to the end of the current paragraph -Index: alpine-2.11/pico/composer.c +Index: alpine-2.20/pico/composer.c =================================================================== ---- alpine-2.11.orig/pico/composer.c -+++ alpine-2.11/pico/composer.c +--- alpine-2.20.orig/pico/composer.c ++++ alpine-2.20/pico/composer.c @@ -2015,7 +2015,7 @@ LineEdit(int allowedit, UCS *lastch) tbufp = &strng[ods.p_len]; @@ -229,10 +229,10 @@ case (CTRL|KEY_LEFT): /* word skip left */ if(ods.p_ind > 0) /* Scoot one char left if possible */ ods.p_ind--; -Index: alpine-2.11/pico/display.c +Index: alpine-2.20/pico/display.c =================================================================== ---- alpine-2.11.orig/pico/display.c -+++ alpine-2.11/pico/display.c +--- alpine-2.20.orig/pico/display.c ++++ alpine-2.20/pico/display.c @@ -1751,6 +1751,11 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf b = &buf[ucs4_strlen(buf)]; continue; @@ -254,10 +254,10 @@ /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ -Index: alpine-2.11/pico/ebind.h +Index: alpine-2.20/pico/ebind.h =================================================================== ---- alpine-2.11.orig/pico/ebind.h -+++ alpine-2.11/pico/ebind.h +--- alpine-2.20.orig/pico/ebind.h ++++ alpine-2.20/pico/ebind.h @@ -61,7 +61,7 @@ KEYTAB keytab[NBINDS] = { #ifdef MOUSE {KEY_MOUSE, mousepress}, @@ -287,10 +287,10 @@ #endif #endif {CTRL|'A', gotobol}, -Index: alpine-2.11/pico/efunc.h +Index: alpine-2.20/pico/efunc.h =================================================================== ---- alpine-2.11.orig/pico/efunc.h -+++ alpine-2.11/pico/efunc.h +--- alpine-2.20.orig/pico/efunc.h ++++ alpine-2.20/pico/efunc.h @@ -54,6 +54,9 @@ extern int forwline(int, int); extern int backline(int, int); extern int gotobop(int, int); @@ -301,10 +301,10 @@ extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); -Index: alpine-2.11/pico/main.c +Index: alpine-2.20/pico/main.c =================================================================== ---- alpine-2.11.orig/pico/main.c -+++ alpine-2.11/pico/main.c +--- alpine-2.20.orig/pico/main.c ++++ alpine-2.20/pico/main.c @@ -416,6 +416,12 @@ main(int argc, char *argv[]) emlwrite(_("You may possibly have new mail."), NULL); } @@ -318,21 +318,21 @@ if(km_popped) switch(c){ case NODATA: -Index: alpine-2.11/pico/search.c +Index: alpine-2.20/pico/search.c =================================================================== ---- alpine-2.11.orig/pico/search.c -+++ alpine-2.11/pico/search.c -@@ -278,7 +278,7 @@ forwsearch(int f, int n) +--- alpine-2.20.orig/pico/search.c ++++ alpine-2.20/pico/search.c +@@ -291,7 +291,7 @@ forwsearch(int f, int n) } if(status + curwp->w_doto >= llength(curwp->w_dotp) || - !eq(defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) -+ !eq((unsigned char)defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) - break; /* do nothing! */ ++ !eq((unsigned char) defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) + break; status++; } -@@ -931,7 +931,7 @@ forscan(int *wrapt, /* boolean indicatin - c = lgetc(curline, curoff++).c; /* get the char */ +@@ -1096,7 +1096,7 @@ forscan(int *wrapt, /* boolean indicatin + c = lgetc(curline, curoff++).c; /* get the char */ /* test it against first char in pattern */ - if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/ @@ -340,7 +340,7 @@ /* setup match pointers */ matchline = curline; matchoff = curoff; -@@ -952,7 +952,7 @@ forscan(int *wrapt, /* boolean indicatin +@@ -1117,7 +1117,7 @@ forscan(int *wrapt, /* boolean indicatin return(FALSE); /* and test it against the pattern */ ++++++ chappa-colortext.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -11,11 +11,11 @@ pith/text.c | 9 ++ 10 files changed, 308 insertions(+) -Index: alpine-2.11/alpine/confscroll.c +Index: alpine-2.20/alpine/confscroll.c =================================================================== ---- alpine-2.11.orig/alpine/confscroll.c -+++ alpine-2.11/alpine/confscroll.c -@@ -5183,6 +5183,9 @@ fix_side_effects(struct pine *ps, struct +--- alpine-2.20.orig/alpine/confscroll.c ++++ alpine-2.20/alpine/confscroll.c +@@ -5196,6 +5196,9 @@ fix_side_effects(struct pine *ps, struct clear_index_cache(ps->mail_stream, 0); } @@ -25,10 +25,10 @@ else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, -Index: alpine-2.11/pith/conf.c +Index: alpine-2.20/pith/conf.c =================================================================== ---- alpine-2.11.orig/pith/conf.c -+++ alpine-2.11/pith/conf.c +--- alpine-2.20.orig/pith/conf.c ++++ alpine-2.20/pith/conf.c @@ -228,6 +228,8 @@ CONF_TXT_T cf_text_deadlets[] = "Specif CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap."; @@ -38,7 +38,7 @@ CONF_TXT_T cf_text_replystr[] = "Specifies the string to insert when replying to a message."; CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; -@@ -560,6 +562,8 @@ static struct variable variables[] = { +@@ -562,6 +564,8 @@ static struct variable variables[] = { NULL, cf_text_speller}, {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_fillcol}, @@ -47,7 +47,7 @@ {"reply-indent-string", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, NULL, cf_text_replystr}, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, -@@ -817,6 +821,8 @@ static struct variable variables[] = { +@@ -821,6 +825,8 @@ static struct variable variables[] = { {"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, @@ -56,7 +56,7 @@ {"prompt-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, -@@ -1985,6 +1991,8 @@ init_vars(struct pine *ps, void (*cmds_f +@@ -1990,6 +1996,8 @@ init_vars(struct pine *ps, void (*cmds_f set_current_val(&vars[V_FORM_FOLDER], TRUE, TRUE); set_current_val(&vars[V_EDITOR], TRUE, TRUE); set_current_val(&vars[V_SPELLER], TRUE, TRUE); @@ -65,7 +65,7 @@ set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); set_current_val(&vars[V_BROWSER], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); -@@ -6483,6 +6491,7 @@ set_current_color_vals(struct pine *ps) +@@ -6549,6 +6557,7 @@ set_current_color_vals(struct pine *ps) set_color_val(&vars[V_IND_OP_FORE_COLOR], 0); set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0); set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0); @@ -73,7 +73,7 @@ set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); -@@ -7664,6 +7673,8 @@ config_help(int var, int feature) +@@ -7732,6 +7741,8 @@ config_help(int var, int feature) return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); @@ -82,7 +82,7 @@ case V_FILLCOL : return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : -@@ -7829,6 +7840,9 @@ config_help(int var, int feature) +@@ -7897,6 +7908,9 @@ config_help(int var, int feature) case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); @@ -92,10 +92,10 @@ case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); -Index: alpine-2.11/pith/conf.h +Index: alpine-2.20/pith/conf.h =================================================================== ---- alpine-2.11.orig/pith/conf.h -+++ alpine-2.11/pith/conf.h +--- alpine-2.20.orig/pith/conf.h ++++ alpine-2.20/pith/conf.h @@ -161,6 +161,8 @@ #define GLO_EDITOR vars[V_EDITOR].global_val.l #define VAR_SPELLER vars[V_SPELLER].current_val.p @@ -105,7 +105,7 @@ #define VAR_FILLCOL vars[V_FILLCOL].current_val.p #define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p -@@ -456,6 +458,8 @@ +@@ -458,6 +460,8 @@ #define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p #define VAR_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].current_val.p #define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p @@ -114,10 +114,10 @@ #define VAR_PROMPT_FORE_COLOR vars[V_PROMPT_FORE_COLOR].current_val.p #define VAR_PROMPT_BACK_COLOR vars[V_PROMPT_BACK_COLOR].current_val.p #define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l -Index: alpine-2.11/pith/conftype.h +Index: alpine-2.20/pith/conftype.h =================================================================== ---- alpine-2.11.orig/pith/conftype.h -+++ alpine-2.11/pith/conftype.h +--- alpine-2.20.orig/pith/conftype.h ++++ alpine-2.20/pith/conftype.h @@ -80,6 +80,7 @@ typedef enum { V_PERSONAL_NAME = 0 , V_EDITOR , V_SPELLER @@ -126,7 +126,7 @@ , V_REPLY_STRING , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING -@@ -230,6 +231,8 @@ typedef enum { V_PERSONAL_NAME = 0 +@@ -231,6 +232,8 @@ typedef enum { V_PERSONAL_NAME = 0 , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR @@ -135,10 +135,10 @@ , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR -Index: alpine-2.11/pith/mailview.c +Index: alpine-2.20/pith/mailview.c =================================================================== ---- alpine-2.11.orig/pith/mailview.c -+++ alpine-2.11/pith/mailview.c +--- alpine-2.20.orig/pith/mailview.c ++++ alpine-2.20/pith/mailview.c @@ -282,6 +282,14 @@ format_body(long int msgno, BODY *body, if((flgs & FM_DISPLAY) && !(flgs & FM_NOCOLOR) @@ -345,10 +345,10 @@ /* * The argument fieldname is something like "Subject:..." or "Subject". -Index: alpine-2.11/pith/mailview.h +Index: alpine-2.20/pith/mailview.h =================================================================== ---- alpine-2.11.orig/pith/mailview.h -+++ alpine-2.11/pith/mailview.h +--- alpine-2.20.orig/pith/mailview.h ++++ alpine-2.20/pith/mailview.h @@ -30,6 +30,12 @@ #include "../pith/color.h" @@ -378,11 +378,11 @@ /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine -Index: alpine-2.11/pith/pine.hlp +Index: alpine-2.20/pith/pine.hlp =================================================================== ---- alpine-2.11.orig/pith/pine.hlp -+++ alpine-2.11/pith/pine.hlp -@@ -3563,6 +3563,7 @@ There are also additional details on +--- alpine-2.20.orig/pith/pine.hlp ++++ alpine-2.20/pith/pine.hlp +@@ -3833,6 +3833,7 @@ There are also additional details on <li><a href="h_config_print_cat">OPTION: </a> <li><a href="h_config_print_command">OPTION: </a> <li><a href="h_config_post_char_set">OPTION: </a> @@ -390,7 +390,7 @@ <li><a href="h_config_postponed_folder">OPTION: </a> <li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a> <li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a> -@@ -3591,6 +3592,7 @@ There are also additional details on +@@ -3861,6 +3862,7 @@ There are also additional details on <li><a href="h_config_sending_filter">OPTION: </a> <li><a href="h_config_sendmail_path">OPTION: </a> <li><a href="h_config_signature_color">OPTION: Signature Color</a> @@ -398,7 +398,7 @@ <li><a href="h_config_signature_file">OPTION: </a> <li><a href="h_config_smtp_server">OPTION: </a> <li><a href="h_config_sort_key">OPTION: </a> -@@ -22838,6 +22840,43 @@ That won't work because spell works in a +@@ -23234,6 +23236,43 @@ That won't work because spell works in a <End of help on this topic> </BODY> </HTML> @@ -442,7 +442,7 @@ ====== h_config_display_filters ===== <HTML> <HEAD> -@@ -31455,6 +31494,30 @@ the Quote3 Color is black characters on +@@ -31851,6 +31890,30 @@ the Quote3 Color is black characters on <A HREF="h_color_setup">Descriptions of the available commands</A> @@ -473,10 +473,10 @@ Look <A HREF="h_edit_nav_cmds">here</A> to see the available Editing and Navigation commands. -Index: alpine-2.11/pith/state.c +Index: alpine-2.20/pith/state.c =================================================================== ---- alpine-2.11.orig/pith/state.c -+++ alpine-2.11/pith/state.c +--- alpine-2.20.orig/pith/state.c ++++ alpine-2.20/pith/state.c @@ -131,6 +131,9 @@ free_pine_struct(struct pine **pps) if((*pps)->folders_dir != NULL) fs_give((void **)&(*pps)->folders_dir); @@ -487,11 +487,11 @@ if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); -Index: alpine-2.11/pith/state.h +Index: alpine-2.20/pith/state.h =================================================================== ---- alpine-2.11.orig/pith/state.h -+++ alpine-2.11/pith/state.h -@@ -326,6 +326,8 @@ struct pine { +--- alpine-2.20.orig/pith/state.h ++++ alpine-2.20/pith/state.h +@@ -331,6 +331,8 @@ struct pine { char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; @@ -500,10 +500,10 @@ char *posting_charmap; /* needs to be freed */ -Index: alpine-2.11/pith/text.c +Index: alpine-2.20/pith/text.c =================================================================== ---- alpine-2.11.orig/pith/text.c -+++ alpine-2.11/pith/text.c +--- alpine-2.20.orig/pith/text.c ++++ alpine-2.20/pith/text.c @@ -171,6 +171,15 @@ decode_text(ATTACH_S *att, gf_url_hilite_opt(&uh,handlesp,0)); } ++++++ chappa-fancy.patch ++++++ ++++ 810 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-fancy.patch ++++++ chappa-ignoresize.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -6,11 +6,11 @@ pith/save.c | 1 + 5 files changed, 42 insertions(+) -Index: alpine-2.11/alpine/mailcmd.c +Index: alpine-2.20/alpine/mailcmd.c =================================================================== ---- alpine-2.11.orig/alpine/mailcmd.c -+++ alpine-2.11/alpine/mailcmd.c -@@ -3368,6 +3368,9 @@ save_size_changed_prompt(long msgno, int +--- alpine-2.20.orig/alpine/mailcmd.c ++++ alpine-2.20/alpine/mailcmd.c +@@ -3491,6 +3491,9 @@ save_size_changed_prompt(long msgno, int {-1, 0, NULL, NULL} }; @@ -20,11 +20,11 @@ if(flags & SSCP_INIT || flags & SSCP_END){ if(flags & SSCP_END && possible_corruption) q_status_message(SM_ORDER, 3, 3, "There is possible data corruption, check the results"); -Index: alpine-2.11/pith/conf.c +Index: alpine-2.20/pith/conf.c =================================================================== ---- alpine-2.11.orig/pith/conf.c -+++ alpine-2.11/pith/conf.c -@@ -3123,6 +3123,8 @@ feature_list(int index) +--- alpine-2.20.orig/pith/conf.c ++++ alpine-2.20/pith/conf.c +@@ -3140,6 +3140,8 @@ feature_list(int index) F_FULL_AUTO_EXPUNGE, h_config_full_auto_expunge, PREF_MISC, 0}, {"force-arrow-cursor", NULL, F_FORCE_ARROW, h_config_force_arrow, PREF_MISC, 0}, @@ -33,11 +33,11 @@ {"maildrops-preserve-state", NULL, F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state, PREF_MISC, 0}, -Index: alpine-2.11/pith/conftype.h +Index: alpine-2.20/pith/conftype.h =================================================================== ---- alpine-2.11.orig/pith/conftype.h -+++ alpine-2.11/pith/conftype.h -@@ -346,6 +346,7 @@ typedef enum { +--- alpine-2.20.orig/pith/conftype.h ++++ alpine-2.20/pith/conftype.h +@@ -347,6 +347,7 @@ typedef enum { F_FORCE_ARROW, F_PRUNE_USES_ISO, F_ALT_ED_NOW, @@ -45,11 +45,11 @@ F_SHOW_DELAY_CUE, F_CANCEL_CONFIRM, F_AUTO_OPEN_NEXT_UNREAD, -Index: alpine-2.11/pith/pine.hlp +Index: alpine-2.20/pith/pine.hlp =================================================================== ---- alpine-2.11.orig/pith/pine.hlp -+++ alpine-2.11/pith/pine.hlp -@@ -3296,6 +3296,7 @@ There are also additional details on +--- alpine-2.20.orig/pith/pine.hlp ++++ alpine-2.20/pith/pine.hlp +@@ -3565,6 +3565,7 @@ There are also additional details on <li><a href="h_config_full_auto_expunge">FEATURE: </a> <li><a href="h_config_no_fcc_attach">FEATURE: </a> <li><a href="h_config_force_arrow">FEATURE: </a> @@ -57,7 +57,7 @@ <li><a href="h_config_forward_as_attachment">FEATURE: </a> <li><a href="h_config_preserve_field">FEATURE: </a> <li><a href="h_config_quell_empty_dirs">FEATURE: </a> -@@ -30787,6 +30788,40 @@ but that is not implemented. +@@ -31183,6 +31184,40 @@ but that is not implemented. <End of help on this topic> @@ -98,10 +98,10 @@ </BODY> </HTML> ====== h_config_force_low_speed ===== -Index: alpine-2.11/pith/save.c +Index: alpine-2.20/pith/save.c =================================================================== ---- alpine-2.11.orig/pith/save.c -+++ alpine-2.11/pith/save.c +--- alpine-2.20.orig/pith/save.c ++++ alpine-2.20/pith/save.c @@ -1157,6 +1157,7 @@ long save_fetch_append_cb(MAILSTREAM *st snprintf(buf, sizeof(buf), "Message to save shrank: source msg # %ld may be saved incorrectly", ++++++ chappa-insertpat.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -3,10 +3,10 @@ pico/search.c | 4 ++++ 2 files changed, 16 insertions(+) -Index: alpine-2.11/pico/display.c +Index: alpine-2.20/pico/display.c =================================================================== ---- alpine-2.11.orig/pico/display.c -+++ alpine-2.11/pico/display.c +--- alpine-2.20.orig/pico/display.c ++++ alpine-2.20/pico/display.c @@ -1760,6 +1760,18 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf continue; @@ -26,11 +26,11 @@ case (CTRL|'G') : /* CTRL-G help */ if(term.t_mrow == 0 && km_popped == 0){ movecursor(term.t_nrow-2, 0); -Index: alpine-2.11/pico/search.c +Index: alpine-2.20/pico/search.c =================================================================== ---- alpine-2.11.orig/pico/search.c -+++ alpine-2.11/pico/search.c -@@ -76,6 +76,10 @@ N_(" brackets. This string is th +--- alpine-2.20.orig/pico/search.c ++++ alpine-2.20/pico/search.c +@@ -81,6 +81,10 @@ N_(" brackets. This string is th N_("~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"), N_(" search to be made with the default value."), " ", ++++++ chappa-maildir.patch ++++++ ++++ 669 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch ++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-maildir.patch ++++++ chappa-unixnullbug.patch ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -2,11 +2,11 @@ imap/src/c-client/mail.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -Index: alpine-2.11/imap/src/c-client/mail.c +Index: alpine-2.20/imap/src/c-client/mail.c =================================================================== ---- alpine-2.11.orig/imap/src/c-client/mail.c -+++ alpine-2.11/imap/src/c-client/mail.c -@@ -3361,13 +3361,13 @@ unsigned long mail_filter (char *text,un +--- alpine-2.20.orig/imap/src/c-client/mail.c ++++ alpine-2.20/imap/src/c-client/mail.c +@@ -3400,13 +3400,13 @@ unsigned long mail_filter (char *text,un long flags) { STRINGLIST *hdrs; @@ -22,7 +22,7 @@ while (src < end) { /* process header */ /* slurp header line name */ for (s = src,e = s + MAILTMPLEN - 1,e = (e < end ? e : end),t = tmp; -@@ -3406,6 +3406,10 @@ unsigned long mail_filter (char *text,un +@@ -3447,6 +3447,10 @@ unsigned long mail_filter (char *text,un } } *dst = '\0'; /* tie off destination */ ++++++ lint.diff ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2015-03-25 18:25:22.663262139 +0100 rpmlint: W: alpine implicit-pointer-decl dmail.c:160 W: alpine implicit-pointer-decl mlock.c:114 W: alpine implicit-pointer-decl tmail.c:168 E: alpine no-return-in-nonvoid-function imap.c:2790 gcc: dmail.c:160:5: warning: implicit declaration of function 'isdigit' [-Wimplicit-function-declaration] mlock.c:114:5: warning: implicit declaration of function 'time' [-Wimplicit-function-declaration] tmail.c:168:7: warning: implicit declaration of function 'isdigit' [-Wimplicit-function-declaration] imap.c:2790:1: warning: control reaches end of non-void function [-Wreturn-type] --- alpine/imap.c | 1 + imap/src/dmail/dmail.c | 1 + imap/src/mlock/mlock.c | 1 + imap/src/tmail/tmail.c | 1 + 4 files changed, 4 insertions(+) Index: alpine-2.20/alpine/imap.c =================================================================== --- alpine-2.20.orig/alpine/imap.c +++ alpine-2.20/alpine/imap.c @@ -2786,6 +2786,7 @@ if(F_OFF(F_DISABLE_PASSWORD_FILE_SAVING, return(want_to(_("Preserve password on DISK for next login"), 'y', 'x', NO_HELP, WT_NORM) == 'y'); +return 0; #endif /* PASSFILE */ } Index: alpine-2.20/imap/src/dmail/dmail.c =================================================================== --- alpine-2.20.orig/imap/src/dmail/dmail.c +++ alpine-2.20/imap/src/dmail/dmail.c @@ -24,6 +24,7 @@ * */ +#include <ctype.h> #include <stdio.h> #include <pwd.h> #include <errno.h> Index: alpine-2.20/imap/src/mlock/mlock.c =================================================================== --- alpine-2.20.orig/imap/src/mlock/mlock.c +++ alpine-2.20/imap/src/mlock/mlock.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <sysexits.h> #include <syslog.h> +#include <time.h> #include <grp.h> #include <sys/types.h> #include <sys/file.h> Index: alpine-2.20/imap/src/tmail/tmail.c =================================================================== --- alpine-2.20.orig/imap/src/tmail/tmail.c +++ alpine-2.20/imap/src/tmail/tmail.c @@ -23,6 +23,7 @@ * */ +#include <ctype.h> #include <stdio.h> #include <pwd.h> #include <errno.h> ++++++ operation-may-be-undefined-warning.diff ++++++ --- /var/tmp/diff_new_pack.uOcWEr/_old 2015-03-30 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.uOcWEr/_new 2015-03-30 19:34:03.000000000 +0200 @@ -1,26 +1,12 @@ --- - alpine/folder.c | 2 +- imap/src/c-client/mail.c | 10 ++++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 2 deletions(-) -Index: alpine-2.11/alpine/folder.c +Index: alpine-2.20/imap/src/c-client/mail.c =================================================================== ---- alpine-2.11.orig/alpine/folder.c -+++ alpine-2.11/alpine/folder.c -@@ -6132,7 +6132,7 @@ folder_select_count(long int *count, int - continue; - - case 14 : /* toggle comparison */ -- *cmp = ++(*cmp) % 3; -+ *cmp = ((*cmp) + 1) % 3; - continue; - - case -1 : /* cancel */ -Index: alpine-2.11/imap/src/c-client/mail.c -=================================================================== ---- alpine-2.11.orig/imap/src/c-client/mail.c -+++ alpine-2.11/imap/src/c-client/mail.c -@@ -2940,8 +2940,14 @@ long mail_parse_date (MESSAGECACHE *elt, +--- alpine-2.20.orig/imap/src/c-client/mail.c ++++ alpine-2.20/imap/src/c-client/mail.c +@@ -2979,8 +2979,14 @@ long mail_parse_date (MESSAGECACHE *elt, /* parse time */ d = strtoul (s+1,(char **) &s,10); if (*s != ':') return NIL;

1 0