September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit linux-glibc-devel for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package linux-glibc-devel for openSUSE:Factory checked in at Mon Sep 27 10:34:01 CEST 2010. -------- --- linux-glibc-devel/linux-glibc-devel.changes 2010-07-04 15:57:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/linux-glibc-devel/linux-glibc-devel.changes 2010-09-13 16:23:42.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 13 14:16:42 UTC 2010 - coolo(a)novell.com + +- update kernel headers to 2.6.35 for xtables ALIGN + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linux-glibc-devel-2.6.34.tar.bz2 New: ---- linux-glibc-devel-2.6.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-glibc-devel.spec ++++++ --- /var/tmp/diff_new_pack.W2gzjh/_old 2010-09-27 10:33:36.000000000 +0200 +++ /var/tmp/diff_new_pack.W2gzjh/_new 2010-09-27 10:33:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linux-glibc-devel (Version 2.6.34) +# spec file for package linux-glibc-devel (Version 2.6.35) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ Group: Development/Libraries/C and C++ BuildArch: noarch # this confusing version number has no meaning -Version: 2.6.34 -Release: 2 +Version: 2.6.35 +Release: 1 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kernel-headers ++++++ install_all.sh ++++++ --- /var/tmp/diff_new_pack.W2gzjh/_old 2010-09-27 10:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.W2gzjh/_new 2010-09-27 10:33:37.000000000 +0200 @@ -7,6 +7,11 @@ echo "Usage: ${0##*/} linux-1.2.3.tar.gz" exit 1 fi +if echo $PWD | grep -q :; then + echo "do not call this in a directory with : - make will fail" + exit 1 +fi + kernel_dir="`tar -tf $1 | sed '1 {s@^.*[[:blank:]]@@;s@linux-@@;s@/.*$@@;s@^$[0-9]\+\.[0-9]\+\.[0-9]\+$$.*$@\1@;p;Q}'`" header_dir="$PWD/linux-glibc-devel-$kernel_dir" if test -d "$kernel_dir" ++++++ linux-glibc-devel-2.6.34.tar.bz2 -> linux-glibc-devel-2.6.35.tar.bz2 ++++++ ++++ 3408 lines of diff (skipped) ++++++ linux-glibc-devel.SuSE.TIOCGDEV.patch ++++++ --- /var/tmp/diff_new_pack.W2gzjh/_old 2010-09-27 10:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.W2gzjh/_new 2010-09-27 10:33:37.000000000 +0200 @@ -10,20 +10,20 @@ Index: usr/include/asm-arm/ioctls.h =================================================================== ---- usr/include/asm-arm/ioctls.h.orig -+++ usr/include/asm-arm/ioctls.h +--- usr/include/asm-arm/ioctls.h.orig 2010-09-13 16:01:32.000000000 +0200 ++++ usr/include/asm-arm/ioctls.h 2010-09-13 16:22:48.439806545 +0200 @@ -52,6 +52,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */ - #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ - #define FIOCLEX 0x5451 + #define TIOCGRS485 0x542E + #define TIOCSRS485 0x542F Index: usr/include/asm-generic/ioctls.h =================================================================== ---- usr/include/asm-generic/ioctls.h.orig -+++ usr/include/asm-generic/ioctls.h +--- usr/include/asm-generic/ioctls.h.orig 2010-09-13 16:11:55.000000000 +0200 ++++ usr/include/asm-generic/ioctls.h 2010-09-13 16:22:48.455841012 +0200 @@ -65,6 +65,7 @@ #define TIOCSRS485 0x542F #define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -34,8 +34,8 @@ #define TCSETXF 0x5434 Index: usr/include/asm-ia64/ioctls.h =================================================================== ---- usr/include/asm-ia64/ioctls.h.orig -+++ usr/include/asm-ia64/ioctls.h +--- usr/include/asm-ia64/ioctls.h.orig 2010-09-13 16:05:02.000000000 +0200 ++++ usr/include/asm-ia64/ioctls.h 2010-09-13 16:22:48.455841012 +0200 @@ -59,6 +59,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -46,8 +46,8 @@ #define FIOCLEX 0x5451 Index: usr/include/asm-parisc/ioctls.h =================================================================== ---- usr/include/asm-parisc/ioctls.h.orig -+++ usr/include/asm-parisc/ioctls.h +--- usr/include/asm-parisc/ioctls.h.orig 2010-09-13 16:08:11.000000000 +0200 ++++ usr/include/asm-parisc/ioctls.h 2010-09-13 16:22:48.456816994 +0200 @@ -52,6 +52,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -58,8 +58,8 @@ #define FIOCLEX 0x5451 Index: usr/include/asm-powerpc/ioctls.h =================================================================== ---- usr/include/asm-powerpc/ioctls.h.orig -+++ usr/include/asm-powerpc/ioctls.h +--- usr/include/asm-powerpc/ioctls.h.orig 2010-09-13 16:08:42.000000000 +0200 ++++ usr/include/asm-powerpc/ioctls.h 2010-09-13 16:22:48.456816994 +0200 @@ -93,6 +93,7 @@ #define TIOCSRS485 0x542f #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -70,8 +70,8 @@ #define TIOCSERGWILD 0x5454 Index: usr/include/asm-s390/ioctls.h =================================================================== ---- usr/include/asm-s390/ioctls.h.orig -+++ usr/include/asm-s390/ioctls.h +--- usr/include/asm-s390/ioctls.h.orig 2010-09-13 16:09:16.000000000 +0200 ++++ usr/include/asm-s390/ioctls.h 2010-09-13 16:22:48.474625906 +0200 @@ -60,6 +60,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -82,8 +82,8 @@ #define FIOCLEX 0x5451 Index: usr/include/asm-sparc/ioctls.h =================================================================== ---- usr/include/asm-sparc/ioctls.h.orig -+++ usr/include/asm-sparc/ioctls.h +--- usr/include/asm-sparc/ioctls.h.orig 2010-09-13 16:10:54.000000000 +0200 ++++ usr/include/asm-sparc/ioctls.h 2010-09-13 16:22:48.474806773 +0200 @@ -80,6 +80,7 @@ /* Get minor device of a pty master's FD -- Solaris equiv is ISPTM */ #define TIOCGPTN _IOR('t', 134, unsigned int) /* Get Pty Number */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbusmenu-qt for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at Mon Sep 27 10:32:39 CEST 2010. -------- --- KDE/libdbusmenu-qt/libdbusmenu-qt.changes 2010-08-13 11:48:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdbusmenu-qt/libdbusmenu-qt.changes 2010-09-14 19:46:18.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 14 19:46:03 CEST 2010 - dmueller(a)suse.de + +- fix runtime dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu-qt.spec ++++++ --- /var/tmp/diff_new_pack.3gT6WS/_old 2010-09-27 10:32:31.000000000 +0200 +++ /var/tmp/diff_new_pack.3gT6WS/_new 2010-09-27 10:32:31.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: dbus-1-devel pkg-config Summary: This library provides a Qt implementation of the DBusMenu protocol. Version: 0.5.2 -Release: 1 +Release: 2 License: GPL Group: System/GUI/KDE Source0: %{name}-%{version}.tar.bz2 @@ -68,6 +68,7 @@ Summary: Development package for dbusmenu-qt License: GPL Group: Development/Libraries/Other +%requires_ge libqt4-x11 %description -n libdbusmenu-qt2 This library provides a Qt implementation of the DBusMenu protocol. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libapr1 for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at Mon Sep 27 10:32:19 CEST 2010. -------- --- libapr1/libapr1.changes 2010-07-28 16:09:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/libapr1/libapr1.changes 2010-09-06 23:40:40.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Sep 6 21:40:06 UTC 2010 - poeml(a)cmdline.net + +- fix build on CentOS5 (see below) + +------------------------------------------------------------------- +Mon Sep 6 19:17:08 UTC 2010 - poeml(a)cmdline.net + +- fix build on SLE10 + - don't run testatomic.c testcase, which fails only in the OBS, as it seems. + Run manually, it works. Must be either Xen- or ulimit-related. (It doesn't + seem to be possible to increase ulimit -v in the OBS, unfortunately.) + - don't run autoconf +- fix build on SLES9 + - remove build dep on non-existing pkg-config + - don't run autoconf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.XC0yHe/_old 2010-09-27 10:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XC0yHe/_new 2010-09-27 10:31:53.000000000 +0200 @@ -19,7 +19,10 @@ Name: libapr1 %if %{?suse_version:1}0 -BuildRequires: doxygen pkg-config +BuildRequires: doxygen +%endif +%if %{?suse_version:1}0 && 0%{?sles_version} != 9 +BuildRequires: pkg-config %endif Url: http://apr.apache.org/ License: Other uncritical OpenSource License ; Apache Software License .. @@ -34,7 +37,7 @@ %endif # Version: 1.4.2 -Release: 1 +Release: 2 Summary: Apache Portable Runtime (APR) Library Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2: baselibs.conf @@ -110,6 +113,13 @@ %endif %endif # +# this test also fails on sles10, both 32 and 64 bit. But only in the OBS. +# Run manually, it works. Must be either Xen- or ulimit-related. (It doesn't +# seem to be possible to increase ulimit -v in the OBS, unfortunately.) +%if 0%{?sles_version} == 10 || %{?centos_version:1}0 +sed -i '/testatomic/ d' test/abts_tests.h +%endif +# # the following test currently is broken on hppa: %ifarch hppa sed -i '/testatomic/ d' test/abts_tests.h @@ -120,7 +130,9 @@ # rm -rf aclocal.m4 autom4te*.cache autoheader +%if %{?suse_version:1}0 && 0%{?sles_version} != 9 && 0%{?sles_version} != 10 autoconf +%endif # # --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all] %configure \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpsdrive for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package gpsdrive for openSUSE:Factory checked in at Mon Sep 27 10:31:39 CEST 2010. -------- --- gpsdrive/gpsdrive.changes 2010-04-08 16:07:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/gpsdrive/gpsdrive.changes 2010-09-27 10:28:45.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 20 12:00:00 CEST 2010 - opensuse(a)dstoecker.de + +- update to 2.11 (no upstream changelog provided whatsoever) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gpsdrive-2.10pre4-overflow.patch gpsdrive-2.10pre4.tar.bz2 gpsdrive-fgets.patch gpsdrive-libpng14.patch mapnik-handler.patch New: ---- gpsdrive-2.11-fgets.patch gpsdrive-2.11-overflow.patch gpsdrive-2.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsdrive.spec ++++++ --- /var/tmp/diff_new_pack.mm7dYz/_old 2010-09-27 10:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.mm7dYz/_new 2010-09-27 10:30:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gpsdrive (Version 2.10pre4) +# spec file for package gpsdrive (Version 2.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,28 @@ Name: gpsdrive -BuildRequires: gcc-c++ gtk2-devel libart_lgpl-devel libpng14-devel libxml2-devel mysql-devel pcre-devel perl-libwww-perl update-desktop-files +BuildRequires: gcc-c++ update-desktop-files +BuildRequires: cmake +BuildRequires: gtk2-devel libpng-devel +BuildRequires: libxml2-devel +BuildRequires: mapnik-devel +BuildRequires: libcurl-devel +BuildRequires: postgresql-devel +BuildRequires: boost-devel +BuildRequires: sqlite3-devel +BuildRequires: speechd-devel +BuildRequires: gpsd-devel Url: http://www.kraftvoll.at/software/ License: GPLv2+ Group: Productivity/Graphics/Other AutoReqProv: on -Version: 2.10pre4 -Release: 93 +Version: 2.11 +Release: 1 Summary: Navigation via a GPS Receiver Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop -Patch: mapnik-handler.patch -Patch1: gpsdrive-fgets.patch -Patch2: gpsdrive-2.10pre4-overflow.patch -Patch3: gpsdrive-libpng14.patch +Patch1: gpsdrive-2.11-fgets.patch +Patch2: gpsdrive-2.11-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,72 +48,36 @@ navigate using maps from http://www.mapblast.com or http://www.expedia.com. Refer to the copyright of the maps. - - -Authors: --------- - Fritz Ganter <ganter(a)ganter.at> - A. Burak Ilgicioglu <ilgici(a)ttnet.net.tr> - Alexander Wigen - Andreas Hinz <news1(a)acci.dk> - Christopher Jastram <cjastram(a)gmail.com> - Damien Prat <Damien.Prat(a)cnet.com> - Dan Egnor <egnor(a)ofb.net> - Dirk-Jan Faber <dirk-jan(a)selwerd.nl> - Douglas S. J. De Couto <decouto(a)lcs.mit.edu> - Emese Kovacs <emese(a)gnome.hu> - F�lix Martos <pakito(a)asinkecualo.org> - Jaap Hogenberg <hogenberg11(a)zonnet.nl> - Jacky Francois <jfrancois(a)free.fr> - Joerg Ostertag <joerg_ostertag(a)ostertag.name> - Kevin Stephens <gps(a)suburbialost.com> - Manfred Caruso <bertoz(a)bertoz.com> - Marco Molteni <molter(a)tin.it> - Martin Sjoegren <md9ms(a)mdstud.chalmers.se> - Remco Treffkorn <remco(a)rvt.com> - Richard Scheffenegger <rscheff(a)chello.at> - Russell Harding <hardingr(a)billingside.com> - Stephen Wood <saw2(a)home.com> - Sven Fichtner - Timothy Witham <twitham(a)surewest.net> - Wernle Daniel <wernle(a)quant-x.com> - Yiannis Pailas <johntop(a)pathfinder.gr> - Zdeno Podobny <zdpo(a)mailbox.sk> - <maruyama(a)sh.rim.or.jp> - %prep %setup -q -%patch -p0 -%patch1 -p0 -%patch2 -%patch3 -p1 +%patch1 -p1 +%patch2 -p1 %build -# This package failed when testing with -Wl,-as-needed being default. -# So we disable it here, if you want to retest, just delete this comment and the line below. -export SUSE_ASNEEDED=0 -CFLAGS=$RPM_OPT_FLAGS ./configure --disable-mapnik --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} +pushd .. +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DDOC_INSTALL_DIR=%{_docdir} \ + -DLIBGPS_OLD=off \ + gpsdrive-2.11 make %install +pushd .. make DESTDIR=$RPM_BUILD_ROOT install -# I said: --disable-mapnik! -rm -rf $RPM_BUILD_ROOT/usr/share/mapnik -# Docs -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive -mv $RPM_BUILD_ROOT/usr/share/gpsdrive/Documentation $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive -mv $RPM_BUILD_ROOT/usr/share/gpsdrive/DSL $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive/ -# Cleanup perl -rm -rf $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl/*/Utils -# More cleanup -rm -rf $RPM_BUILD_ROOT/usr/share/gpsdrive/gentoo -rm -f $RPM_BUILD_ROOT/usr/share/gpsdrive/gpsdrive.desktop -rm -f $RPM_BUILD_ROOT/usr/bin/geo-code $RPM_BUILD_ROOT/%{_mandir}/man1/geo-code.1 +popd + +# there must be a better way for this! +mv $RPM_BUILD_ROOT/usr/lib/perl5/site_perl $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl + # desktop link -mkdir $RPM_BUILD_ROOT/usr/share/pixmaps -cp data/pixmaps/gpsicon.png $RPM_BUILD_ROOT/usr/share/pixmaps/gpsdrive.png +mv $RPM_BUILD_ROOT/usr/share/icons $RPM_BUILD_ROOT/usr/share/pixmaps %suse_update_desktop_file -i %name Utility DesktopUtility +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -113,9 +85,9 @@ %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc README ChangeLog AUTHORS COPYING +%doc ABOUT-NLS README ChangeLog AUTHORS COPYING Documentation DEVPACKAGES %{_mandir}/man1/* %{_mandir}/de/man1/* %{_mandir}/es/man1/* @@ -124,14 +96,11 @@ %dir /usr/share/gpsdrive %dir /usr/share/gpsdrive/maps %dir /usr/share/gpsdrive/pixmaps -%dir /usr/share/gpsdrive/poi +/usr/share/gpsdrive/osm-template.xml +/usr/share/gpsdrive/pixmaps/gpsicon.xpm /usr/share/gpsdrive/map_koord.txt /usr/share/gpsdrive/pixmaps/*png -/usr/share/gpsdrive/pixmaps/*gif /usr/share/gpsdrive/maps/* -/usr/share/gpsdrive/poi/* -%dir /usr/share/map-icons -/usr/share/map-icons/* /usr/share/pixmaps/gpsdrive.png %dir /usr/lib/perl5/*/*/Geo %dir /usr/lib/perl5/*/*/Geo/Filter @@ -145,5 +114,6 @@ /usr/lib/perl5/*/*/Geo/Gpsdrive/* /usr/lib/perl5/*/*/Geo/OSM/* /usr/lib/perl5/*/*/Geo/Tracks/* +%exclude /usr/lib/perl5/*/*/Utils %changelog ++++++ gpsdrive-2.11-fgets.patch ++++++ diff -ur gpsdrive-2.11//src/map_handler.c gpsdrive-2.11_f/src/map_handler.c --- gpsdrive-2.11//src/map_handler.c 2010-07-20 11:24:33.000000000 +0200 +++ gpsdrive-2.11_f/src/map_handler.c 2010-06-24 21:53:32.000000000 +0200 @@ -393,7 +393,7 @@ gint max_nrmaps = 1000; gchar buf[1512], center_lat[40], center_lon[40], scale_factor[40], filename[100], minlat[40], minlon[40], maxlat[40], maxlon[40]; - gint p, e; + gint e; if (mapconfig_active) return FALSE; @@ -434,7 +434,7 @@ maps = g_new (mapsstruct, max_nrmaps); i = nrmaps = 0; havenasa = -1; - while ((p = fgets (buf, 1512, st) != 0)) + while (fgets (buf, 1512, st)) { if ((buf[0] == '#') || (buf[0] == '\0')) { continue; /* line is a comment or blank */ diff -ur gpsdrive-2.11//src/waypoint.c gpsdrive-2.11_f/src/waypoint.c --- gpsdrive-2.11//src/waypoint.c 2010-07-20 11:26:36.000000000 +0200 +++ gpsdrive-2.11_f/src/waypoint.c 2010-06-24 21:53:32.000000000 +0200 @@ -660,7 +660,7 @@ { gchar fn_way_txt[2048]; FILE *st; - gint i, e, p, wlan, action, proximity, tmp; + gint i, e, wlan, action, proximity, tmp; gchar buf[512], slat[80], slong[80], typ[40]; struct stat stat_buf; @@ -694,7 +694,7 @@ } i = 0; - while ((p = fgets (buf, 512, st) != 0)) + while (fgets (buf, 512, st)) { e = sscanf (buf, "%s %s %s %s %d %d %d %d %79s", (wayp + i)->name, slat, slong, typ, ++++++ gpsdrive-2.10pre4-overflow.patch -> gpsdrive-2.11-overflow.patch ++++++ --- gpsdrive/gpsdrive-2.10pre4-overflow.patch 2010-03-02 01:11:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/gpsdrive/gpsdrive-2.11-overflow.patch 2010-07-20 13:31:18.000000000 +0200 @@ -1,6 +1,7 @@ ---- src/friendsd.c -+++ src/friendsd.c -@@ -168,7 +168,7 @@ +diff -ur gpsdrive-2.11//src/friendsd.c gpsdrive-2.11_f/src/friendsd.c +--- gpsdrive-2.11//src/friendsd.c 2010-07-20 11:30:13.000000000 +0200 ++++ gpsdrive-2.11_f/src/friendsd.c 2010-06-24 21:53:32.000000000 +0200 +@@ -170,7 +170,7 @@ struct { char id[31]; ++++++ gpsdrive-2.10pre4.tar.bz2 -> gpsdrive-2.11.tar.bz2 ++++++ ++++ 276084 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache2-mod_fcgid for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package apache2-mod_fcgid for openSUSE:Factory checked in at Mon Sep 27 10:30:39 CEST 2010. -------- --- apache2-mod_fcgid/apache2-mod_fcgid.changes 2008-03-07 17:09:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/apache2-mod_fcgid/apache2-mod_fcgid.changes 2010-08-05 03:10:57.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 5 01:06:32 UTC 2010 - mrueckert(a)suse.de + +- update to version 2.3.5 + mod_fcgid is now an official apache project. During the migration + the name of the configuration directives has changed. Please see + + /usr/share/doc/packages/apache2-mod_fcgid/CHANGES-FCGID + + to update your config to the new version. +- adapted config to the new directives + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docs.tar.bz2 mod_fcgid.2.0-suse_paths.patch mod_fcgid.2.1-warnings.patch mod_fcgid.2.2.tgz New: ---- mod_fcgid-2.3.5.tar.bz2 mod_fcgid-2.3.5_suse_paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_fcgid.spec ++++++ --- /var/tmp/diff_new_pack.C3oQb1/_old 2010-09-27 10:30:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C3oQb1/_new 2010-09-27 10:30:29.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package apache2-mod_fcgid (Version 2.2) +# spec file for package apache2-mod_fcgid (Version 2.3.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,25 +24,20 @@ %define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) # -Version: 2.2 -Release: 95 +Version: 2.3.5 +Release: 1 # Group: Productivity/Networking/Web/Servers -License: GPL v2 or later +License: GPLv2+ # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2-devel Requires: apache2 %{apache_mmn} # -Url: http://fastcgi.coremail.cn/ -# gz2bz2 from Source: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz -Source: http://prdownloads.sourceforge.net/mod-fcgid/mod_fcgid.%{version}.tgz -# wget --accept='.htm' -rkmp -np http://fastcgi.coremail.cn && \ -# mv fastcgi.coremail.cn docs && dos2unix docs/* && tar cfj docs{.tar.bz2,} -Source1: docs.tar.bz2 -Source2: apache2-mod_fcgid.conf -Patch0: mod_fcgid.2.1-warnings.patch -Patch1: mod_fcgid.2.0-suse_paths.patch +Url: http://httpd.apache.org/mod_fcgid/ +Source: http://mirror.synyx.de/apache/httpd/mod_fcgid/mod_fcgid-2.3.5.tar.bz2 +Source1: apache2-mod_fcgid.conf +Patch: mod_fcgid-2.3.5_suse_paths.patch # Summary: Alternative FastCGI module for Apache2 @@ -67,17 +62,16 @@ Pan qingfeng <pqf(a)tebie.com> %prep -%setup -n mod_fcgid.%{version} -a 1 -%patch0 -%patch1 +%setup -n mod_fcgid-%{version} +%patch %build -# we dont need to pass the CFLAGS. apxs2 will do that. +APXS="%{apxs}-prefork" ./configure.apxs %{__make} %install -%{__install} -D -m 0755 .libs/mod_fcgid.so %{buildroot}%{apache_libexecdir}/mod_fcgid.so -%{__install} -D -m 0644 %{S:2} %{buildroot}%{apache_sysconfdir}/conf.d/mod_fcgid.conf +%makeinstall +%{__install} -D -m 0644 %{S:1} %{buildroot}%{apache_sysconfdir}/conf.d/mod_fcgid.conf %{__install} -d -m 0755 %{buildroot}/var/lib/apache2/fcgid/ %clean @@ -87,7 +81,10 @@ %defattr(-,root,root) %{apache_libexecdir}/mod_fcgid.so %config(noreplace) %{apache_sysconfdir}/conf.d/mod_fcgid.conf -%doc ChangeLog docs/* +%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID +%dir %{_datadir}/apache2/manual/ +%dir %{_datadir}/apache2/manual/mod/ +%{_datadir}/apache2/manual/mod/mod_fcgid* %attr(750,wwwrun,www) /var/lib/apache2/fcgid/ %changelog ++++++ apache2-mod_fcgid.conf ++++++ --- /var/tmp/diff_new_pack.C3oQb1/_old 2010-09-27 10:30:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C3oQb1/_new 2010-09-27 10:30:29.000000000 +0200 @@ -9,51 +9,51 @@ ## ## An idle fastcgi application will be terminated after IdleTimeout seconds. ## -#IdleTimeout 300 +#FcgidIdleTimeout 300 ## ## The scan interval for idle fastcgi applications in seconds. ## -#IdleScanInterval 120 +#FcgidIdleScanInterval 120 ## ## a fastcgi application will be terminated if handing a single request longer ## than busy timeout. Value in seconds. ## -#BusyTimeout 300 +#FcgidBusyTimeout 300 ## ## The scan interval for busy timeout fastcgi applications. Value in seconds. ## -#BusyScanInterval 120 +#FcgidBusyScanInterval 120 ## ## The scan interval for exit pending fastcgi applications. fastcgi applications ## will be terminated within this scanning. Value in seconds. ## -#ErrorScanInterval 3 +#FcgidErrorScanInterval 3 ## ## The scan interval for zombie process. Value in seconds. ## -#ZombieScanInterval 3 +#FcgidZombieScanInterval 3 ## ## ## A fastcgi application will be terminated if lifetime expired, even no error ## is detected. Value in seconds. ## -#ProcessLifeTime 3600 +#FcgidProcessLifeTime 3600 ## ## The directory to put the UNIX domain socket. (UNIX only) ## -SocketPath /var/lib/apache2/fcgid/ +FcgidIPCDir /var/lib/apache2/fcgid/ ## ## The share memory file path. ## -SharememPath /var/lib/apache2/fcgid/shm +FcgidProcessTableFile /var/lib/apache2/fcgid/shm ## ## The spawn-speed control score up water limit. Score increases while a process @@ -61,45 +61,45 @@ ## higher than SpawnScoreUpLimit, the spawning will be held for a while. The ## higher this number is, the higher speed of the spawning can be. ## -#SpawnScoreUpLimit n (10) +#FcgidSpawnScoreUpLimit n (10) ## ## The weight of spawning. This weight will be plused to the spawn-control ## score on every spawn. The higher this number is, the lower speed of spawning ## can be. ## -#SpawnScore n (1) +#FcgidSpawnScore n (1) ## ## The weight of termination. This weight will be plused to the score while ## fastcgi process terminates. The higher this number is, the lower speed of ## spawning can be. ## -#TerminationScore n (2) +#FcgidTerminationScore n (2) ## ## The max count of total fastcgi process count. ## -#MaxProcessCount n (1000) +#FcgidMaxProcesses n (1000) ## ## The maximum number of fastcgi application instances allowed to run for any ## one fastcgi application. ## -#DefaultMaxClassProcessCount n (100) +#FcgidMaxProcessesPerClass n (100) ## ## The default environment variables before a fastcgi application is spawned. ## You can set this configuration more than once. ## -#DefaultInitEnv env_name env_value +#FcgidInitialEnv env_name env_value ## ## The connect timeout to a fastcgi application. Value in seconds. ## ## Default value: 2 ## -IPCConnectTimeout 10 +FcgidConnectTimeout 10 ## ## The communication timeout to a fastcgi application. Please increase this @@ -108,12 +108,12 @@ ## ## Default value: 5 ## -IPCCommTimeout 40 +FcgidIOTimeout 40 ## ## CGI output cache buffer size. Value in kilobytes. ## -#OutputBufferSize 64 +#FcgidOutputBufferSize 64 ## ## Associate .fcgi files with mod_fcgid @@ -127,7 +127,7 @@ ## #<FilesMatch "\.php$"> # AddHandler fcgid-script .php -# FCGIWrapper /srv/www/cgi-bin/php5 .php +# FcgidWrapper /srv/www/cgi-bin/php5 .php # Options +ExecCGI #</FilesMatch> ## ++++++ mod_fcgid-2.3.5_suse_paths.patch ++++++ Index: configure.apxs =================================================================== --- configure.apxs.orig +++ configure.apxs @@ -39,6 +39,7 @@ rel_libexecdir=`$APXS -q exp_libexecdir rel_sysconfdir=`$APXS -q exp_sysconfdir | sed -e "s#^$rel_fix_prefix/##;"` rel_logfiledir=`$APXS -q exp_logfiledir | sed -e "s#^$rel_fix_prefix/##;"` httpd_conffile=`$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf +mpm_includedir=`$APXS -q exp_includedir` if test -z "$AWK"; then AWK=`$APXS -q AWK` @@ -55,6 +56,7 @@ for i in Makefile build/Makefile modules -e "s#^$srcdir$=.*#\1=$srcdir$l_r#;" \ -e "s#^$builddir$=.*#\1=$builddir$l_r#;" \ -e "s#^$rel_libexecdir$=.*#\1=$rel_libexecdir#;" \ + -e "s#^$mpm_includedir$=.*#\1=$mpm_includedir#;" \ -e "s#^$rel_sysconfdir$=.*#\1=$rel_sysconfdir#;" \ -e "s#^$rel_logfiledir$=.*#\1=$rel_logfiledir#;" \ -e "s#^$httpd_conffile$=.*#\1=$httpd_conffile#;" \ Index: modules/fcgid/Makefile.apxs =================================================================== --- modules/fcgid/Makefile.apxs.orig +++ modules/fcgid/Makefile.apxs @@ -15,7 +15,7 @@ fcgid_builddir=../.. fcgid_srcdir=../.. builddir=. srcdir=. - +mpm_includedir="$(shell $(APXS) -q exp_includedir)" CLEAN_TARGETS = *.loT include $(exp_installbuilddir)/special.mk @@ -23,6 +23,6 @@ all: local-shared-build all-recursive # additional defines, includes and libraries DEFS=-DFCGID_APXS_BUILD -INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include +INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include -I$(mpm_includedir) #LIBS=-Lmy/lib/dir -lmylib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit trousers for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package trousers for openSUSE:Factory checked in at Mon Sep 27 10:29:08 CEST 2010. -------- --- trousers/trousers.changes 2010-08-11 10:59:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/trousers/trousers.changes 2010-09-27 01:39:02.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 01:38:35 CEST 2010 - ro(a)suse.de + +- fix patch to apply + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trousers.spec ++++++ --- /var/tmp/diff_new_pack.X261j8/_old 2010-09-27 10:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.X261j8/_new 2010-09-27 10:29:00.000000000 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Security AutoReqProv: on Version: 0.3.6 -Release: 1 +Release: 2 Summary: TSS (TCG Software Stack) access daemon for a TPM chip Source0: %name-%version.tar.bz2 Source1: tcsd.init ++++++ trousers-0.3.6.diff ++++++ --- /var/tmp/diff_new_pack.X261j8/_old 2010-09-27 10:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.X261j8/_new 2010-09-27 10:29:00.000000000 +0200 @@ -1,14 +1,14 @@ --- configure.in +++ configure.in -@@ -347,7 +347,7 @@ - AC_PROG_CC - AC_PROG_LIBTOOL +@@ -355,7 +355,7 @@ + AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ]) + + if test "x${GCC}" = "xyes"; then +- CFLAGS="$CFLAGS -W -Wall -Werror -Wno-unused-parameter -Wsign-compare" ++ CFLAGS="$CFLAGS -W -Wall -Wno-unused-parameter -Wsign-compare" + fi --CFLAGS="$CFLAGS -W -Wall -Werror -Wno-unused-parameter -Wsign-compare \ -+CFLAGS="$CFLAGS -W -Wall -Wno-unused-parameter -Wsign-compare \ - -DTCSD_DEFAULT_PORT=${TCSD_DEFAULT_PORT} -DTSS_VER_MAJOR=${TSS_VER_MAJOR} \ - -DTSS_VER_MINOR=${TSS_VER_MINOR} -DTSS_SPEC_MAJOR=${TSS_SPEC_MAJOR} \ - -DTSS_SPEC_MINOR=${TSS_SPEC_MINOR}" + CFLAGS="$CFLAGS -I../include \ --- dist/Makefile.am +++ dist/Makefile.am @@ -2,16 +2,16 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_log for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libnetfilter_log for openSUSE:Factory checked in at Mon Sep 27 10:28:46 CEST 2010. -------- --- libnetfilter_log/libnetfilter_log.changes 2010-02-23 23:23:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnetfilter_log/libnetfilter_log.changes 2010-07-16 12:52:39.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 16 10:51:21 UTC 2010 - jengelh(a)medozas.de + +- New upstream release 1.0.0 + * This releases contains a new function to print logs in XML + format and the doxygen-based documentation. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnetfilter_log-0.0.16.tar.bz2 New: ---- libnetfilter_log-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_log.spec ++++++ --- /var/tmp/diff_new_pack.lj5u44/_old 2010-09-27 10:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lj5u44/_new 2010-09-27 10:28:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libnetfilter_log (Version 0.0.16) +# spec file for package libnetfilter_log (Version 1.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ %define soname 1 Name: libnetfilter_log -Version: 0.0.16 +Version: 1.0.0 Release: 1 License: GNU GPL v2 Group: Productivity/Networking/Security @@ -41,6 +41,7 @@ %package -n %{name}%{soname} + Group: System/Libraries PreReq: glibc Summary: Userspace library for accessing logged packets @@ -53,6 +54,7 @@ %package -n %{name}-devel + Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} libnfnetlink-devel Summary: Userspace library for accessing logged packets ++++++ libnetfilter_log-0.0.16.tar.bz2 -> libnetfilter_log-1.0.0.tar.bz2 ++++++ ++++ 58793 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/libnetfilter_log-0.0.16/Makefile.am new/libnetfilter_log-1.0.0/Makefile.am --- old/libnetfilter_log-0.0.16/Makefile.am 2008-05-16 17:30:13.000000000 +0200 +++ new/libnetfilter_log-1.0.0/Makefile.am 2010-07-15 12:50:03.000000000 +0200 @@ -4,6 +4,8 @@ SUBDIRS = include src utils LINKOPTS = -lnfnetlink +ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = $(man_MANS) man_MANS = #nfnetlink_log.3 nfnetlink_log.7 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/libnetfilter_log-0.0.16/configure.in new/libnetfilter_log-1.0.0/configure.in --- old/libnetfilter_log-0.0.16/configure.in 2009-03-06 17:06:32.000000000 +0100 +++ new/libnetfilter_log-1.0.0/configure.in 2010-07-15 14:06:32.000000000 +0200 @@ -3,8 +3,9 @@ AC_INIT AC_CANONICAL_SYSTEM +AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libnetfilter_log, 0.0.16) +AM_INIT_AUTOMAKE(libnetfilter_log, 1.0.0) AC_PROG_CC AM_PROG_LIBTOOL @@ -30,5 +31,5 @@ AC_SUBST(LIBNFLOG_LIBS) dnl Output the makefile -AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc) +AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc doxygen.cfg) 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/libnetfilter_log-0.0.16/doxygen.cfg.in new/libnetfilter_log-1.0.0/doxygen.cfg.in --- old/libnetfilter_log-0.0.16/doxygen.cfg.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libnetfilter_log-1.0.0/doxygen.cfg.in 2010-07-14 18:56:41.000000000 +0200 @@ -0,0 +1,184 @@ +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = @PACKAGE@ +PROJECT_NUMBER = @VERSION@ +OUTPUT_DIRECTORY = doxygen +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = NO +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +TYPEDEF_HIDES_STRUCT = NO +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = NO +FILE_VERSION_FILTER = +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +INPUT = . +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = *.c +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +SOURCE_BROWSER = YES +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_BUNDLE_ID = org.doxygen.Project +HTML_DYNAMIC_SECTIONS = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +GENERATE_MAN = YES +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +GENERATE_AUTOGEN_DEF = NO +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +CLASS_DIAGRAMS = YES +MSCGEN_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = YES +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = YES +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +SEARCHENGINE = NO 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/libnetfilter_log-0.0.16/include/libnetfilter_log/libnetfilter_log.h new/libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h --- old/libnetfilter_log-0.0.16/include/libnetfilter_log/libnetfilter_log.h 2008-07-21 01:04:31.000000000 +0200 +++ new/libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h 2010-05-27 14:24:42.000000000 +0200 @@ -67,4 +67,17 @@ extern int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq); extern int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq); +enum { + NFLOG_XML_PREFIX = (1 << 0), + NFLOG_XML_HW = (1 << 1), + NFLOG_XML_MARK = (1 << 2), + NFLOG_XML_DEV = (1 << 3), + NFLOG_XML_PHYSDEV = (1 << 4), + NFLOG_XML_PAYLOAD = (1 << 5), + NFLOG_XML_TIME = (1 << 6), + NFLOG_XML_ALL = ~0U, +}; + +extern int nflog_snprintf_xml(char *buf, size_t len, struct nflog_data *tb, int flags); + #endif /* __LIBNETFILTER_LOG_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/libnetfilter_log-0.0.16/missing new/libnetfilter_log-1.0.0/missing --- old/libnetfilter_log-0.0.16/missing 2008-02-10 03:55:24.000000000 +0100 +++ new/libnetfilter_log-1.0.0/missing 2010-01-18 07:28:57.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# 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. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# 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 @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +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 $? ;; @@ -106,15 +107,22 @@ 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). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + 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 @@ -240,7 +248,7 @@ fi ;; - lex|flex) + 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 @@ -263,7 +271,7 @@ fi ;; - help2man) + 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 @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + 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 @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# 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/libnetfilter_log-0.0.16/src/Makefile.am new/libnetfilter_log-1.0.0/src/Makefile.am --- old/libnetfilter_log-0.0.16/src/Makefile.am 2008-05-16 17:30:13.000000000 +0200 +++ new/libnetfilter_log-1.0.0/src/Makefile.am 2010-07-15 14:06:52.000000000 +0200 @@ -1,5 +1,23 @@ # This is _NOT_ the library release version, it's an API version. -# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +# Extracted from Chapter 6 "Library interface versions" of the libtool docs. +# +# <snippet> +# Here are a set of rules to help you update your library version information: +# +# 1. Start with version information of `0:0:0' for each libtool library. +# 2. Update the version information only immediately before a public release +# of your software. More frequent updates are unnecessary, and only guarantee +# that the current interface number gets larger faster. +# 3. If the library source code has changed at all since the last update, +# then increment revision (`c:r:a' becomes `c:r+1:a'). +# 4. If any interfaces have been added, removed, or changed since the last +# update, increment current, and set revision to 0. +# 5. If any interfaces have been added since the last public release, then +# increment age. +# 6. If any interfaces have been removed since the last public release, then +# set age to 0. +# </snippet> +# LIBVERSION=2:0:1 INCLUDES = $(all_includes) -I$(top_srcdir)/include 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/libnetfilter_log-0.0.16/src/libnetfilter_log.c new/libnetfilter_log-1.0.0/src/libnetfilter_log.c --- old/libnetfilter_log-0.0.16/src/libnetfilter_log.c 2009-02-17 21:12:10.000000000 +0100 +++ new/libnetfilter_log-1.0.0/src/libnetfilter_log.c 2010-07-15 11:02:58.000000000 +0200 @@ -1,6 +1,7 @@ /* libnetfilter_log.c: generic library for access to NFLOG * * (C) 2005 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2005, 2008-2010 by Pablo Neira Ayuso <pablo(a)netfilter.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -31,6 +32,35 @@ #include <libnfnetlink/libnfnetlink.h> #include <libnetfilter_log/libnetfilter_log.h> +/** + * \mainpage + * + * libnetfilter_log is a userspace library providing interface to packets + * that have been logged by the kernel packet filter. It is is part of a + * system that deprecates the old syslog/dmesg based packet logging. + * + * libnetfilter_log homepage is: + * http://netfilter.org/projects/libnetfilter_log/ + * + * \section Dependencies + * libnetfilter_log requires libnfnetlink and a kernel that includes the + * nfnetlink_log subsystem (i.e. 2.6.14 or later). + * + * \section Main Features + * - receiving to-be-logged packets from the kernel nfnetlink_log subsystem + * + * \section Git Tree + * The current development version of libnetfilter_log can be accessed + * at https://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_log.git + * + * \section Using libnetfilter_log + * + * To write your own program using libnetfilter_log, you should start by + * reading the doxygen documentation (start by \link LibrarySetup \endlink + * page) and nfulnl_test.c source file. + * + */ + struct nflog_handle { struct nfnl_handle *nfnlh; @@ -144,11 +174,69 @@ return h->nfnlh; } +/** + * + * \defgroup Log Group handling + * + * Once libnetfilter_log library has been initialised (See + * \link LibrarySetup \endlink), it is possible to bind the program to + * a specific group. This can be done using nflog_bind_group(). + * + * The group can then be tuned via nflog_set_mode() among many others. + * + * Here's a little code snippet that binds to the group 100: + * \verbatim + printf("binding this socket to group 0\n"); + qh = nflog_bind_group(h, 0); + if (!qh) { + fprintf(stderr, "no handle for grup 0\n"); + exit(1); + } + + printf("setting copy_packet mode\n"); + if (nflog_set_mode(qh, NFULNL_COPY_PACKET, 0xffff) < 0) { + fprintf(stderr, "can't set packet copy mode\n"); + exit(1); + } +\endverbatim + * + * Next step is the handling of incoming packets which can be done via a loop: + * + * \verbatim + fd = nflog_fd(h); + + while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) { + printf("pkt received (len=%u)\n", rv); + nflog_handle_packet(h, buf, rv); + } +\endverbatim + * + * Data and information about the packet can be fetch by using message parsing + * functions (See \link Parsing \endlink). + * @{ + */ + +/** + * nflog_fd - get the file descriptor associated with the nflog handler + * \param log handler obtained via call to nflog_open() + * + * \return a file descriptor for the netlink connection associated with the + * given log connection handle. The file descriptor can then be used for + * receiving the logged packets for processing. + * + * This function returns a file descriptor that can be used for communication + * over the netlink connection associated with the given log connection + * handle. + */ int nflog_fd(struct nflog_handle *h) { return nfnl_fd(nflog_nfnlh(h)); } +/** + * @} + */ + struct nflog_handle *nflog_open_nfnl(struct nfnl_handle *nfnlh) { struct nflog_handle *h; @@ -183,6 +271,21 @@ return NULL; } +/** + * \addtogroup LibrarySetup + * @{ + */ + +/** + * nflog_open - open a nflog handler + * + * This function obtains a netfilter log connection handle. When you are + * finished with the handle returned by this function, you should destroy + * it by calling nflog_close(). A new netlink connection is obtained internally + * and associated with the log connection handle returned. + * + * \return a pointer to a new log handle or NULL on failure. + */ struct nflog_handle *nflog_open(void) { struct nfnl_handle *nfnlh; @@ -204,6 +307,10 @@ return lh; } +/** + * @} + */ + int nflog_callback_register(struct nflog_g_handle *gh, nflog_callback *cb, void *data) { @@ -218,6 +325,23 @@ return nfnl_handle_packet(h->nfnlh, buf, len); } +/** + * \addtogroup LibrarySetup + * + * When the program has finished with libnetfilter_log, it has to call + * the nflog_close() function to release all associated resources. + * + * @{ + */ + +/** + * nflog_close - close a nflog handler + * \param h Netfilter log handle obtained via call to nflog_open() + * + * This function closes the nflog handler and free associated resources. + * + * \return 0 on success, non-zero on failure. + */ int nflog_close(struct nflog_handle *h) { int ret = nfnl_close(h->nfnlh); @@ -225,19 +349,51 @@ return ret; } -/* bind nf_log from a specific protocol family */ +/** + * nflog_bind_pf - bind a nflog handler to a given protocol family + * \param h Netfilter log handle obtained via call to nflog_open() + * \param pf protocol family to bind to nflog handler obtained from nflog_open() + * + * Binds the given log connection handle to process packets belonging to + * the given protocol family (ie. PF_INET, PF_INET6, etc). + * + * \return integer inferior to 0 in case of failure + */ int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf) { return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_BIND, 0, pf); } -/* unbind nf_log from a specific protocol family */ + +/** + * nflog_unbind_pf - unbind nflog handler from a protocol family + * \param h Netfilter log handle obtained via call to nflog_open() + * \param pf protocol family to unbind family from + * + * Unbinds the given nflog handle from processing packets belonging + * to the given protocol family. + */ int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf) { return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_UNBIND, 0, pf); } -/* bind this socket to a specific group number */ +/** + * @} + */ + +/** + * \addtogroup Log Group handling + * @{ + */ + +/** + * nflog_bind_group - bind a new handle to a specific group number. + * \param h Netfilter log handle obtained via call to nflog_open() + * \param num the number of the group to bind to + * + * \return a nflog_g_handle pointing to the newly created group + */ struct nflog_g_handle * nflog_bind_group(struct nflog_handle *h, u_int16_t num) { @@ -263,7 +419,21 @@ return gh; } -/* unbind this socket from a specific group number */ +/** + * @} + */ + +/** + * \addtogroup Log Group handling + * @{ + */ + +/** + * nflog_unbind_group - unbind a group handle. + * \param gh Netfilter log group handle obtained via nflog_bind_group() + * + * \return -1 in case of error and errno is explicity in case of error. + */ int nflog_unbind_group(struct nflog_g_handle *gh) { int ret = __build_send_cfg_msg(gh->h, NFULNL_CFG_CMD_UNBIND, gh->id, 0); @@ -275,6 +445,21 @@ return ret; } +/** + * nflog_set_mode - set the amount of packet data that nflog copies to userspace + * \param qh Netfilter log handle obtained by call to nflog_bind_group(). + * \param mode the part of the packet that we are interested in + * \param range size of the packet that we want to get + * + * Sets the amount of data to be copied to userspace for each packet logged + * to the given group. + * + * - NFULNL_COPY_NONE - do not copy any data + * - NFULNL_COPY_META - copy only packet metadata + * - NFULNL_COPY_PACKET - copy entire packet + * + * \return -1 on error; >= otherwise. + */ int nflog_set_mode(struct nflog_g_handle *gh, u_int8_t mode, u_int32_t range) { @@ -296,6 +481,18 @@ return nfnl_query(gh->h->nfnlh, &u.nmh); } +/** + * nflog_set_timeout - set the maximum time to push log buffer for this group + * \param gh Netfilter log handle obtained by call to nflog_bind_group(). + * \param timeout Time to wait until the log buffer is pushed to userspace + * + * This function allows to set the maximum time that nflog waits until it + * pushes the log buffer to userspace if no new logged packets have occured. + * Basically, nflog implements a buffer to reduce the computational cost + * of delivering the log message to userspace. + * + * \return -1 in case of error and errno is explicity set. + */ int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout) { union { @@ -311,6 +508,16 @@ return nfnl_query(gh->h->nfnlh, &u.nmh); } +/** + * nflog_set_qthresh - set the maximum amount of logs in buffer for this group + * \param gh Netfilter log handle obtained by call to nflog_bind_group(). + * \param qthresh Maximum number of log entries + * + * This function determines the maximum number of log entries in the buffer + * until it is pushed to userspace. + * + * \return -1 in case of error and errno is explicity set. + */ int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh) { union { @@ -326,6 +533,16 @@ return nfnl_query(gh->h->nfnlh, &u.nmh); } +/** + * nflog_set_nlbufsiz - set the size of the nflog buffer for this group + * \param gh Netfilter log handle obtained by call to nflog_bind_group(). + * \param nlbufsiz Size of the nflog buffer + * + * This function sets the size (in bytes) of the buffer that is used to + * stack log messages in nflog. + * + * \return -1 in case of error and errno is explicity set. + */ int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz) { union { @@ -348,6 +565,18 @@ return status; } +/** + * nflog_set_flags - set the nflog flags for this group + * \param gh Netfilter log handle obtained by call to nflog_bind_group(). + * \param flags Flags that you want to set + * + * There are two existing flags: + * + * - NFULNL_CFG_F_SEQ: This enables local nflog sequence numbering. + * - NFULNL_CFG_F_SEQ_GLOBAL: This enables global nflog sequence numbering. + * + * \return -1 in case of error and errno is explicity set. + */ int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags) { union { @@ -363,34 +592,91 @@ return nfnl_query(gh->h->nfnlh, &u.nmh); } +/** + * @} + */ + +/** + * \defgroup Parsing Message parsing functions + * @{ + */ +/** + * nflog_get_msg_packet_hdr - return the metaheader that wraps the packet + * \param nfad Netlink packet data handle passed to callback function + * + * \return the netfilter log netlink packet header for the given nflog_data + * argument. Typically, the nflog_data value is passed as the 3rd parameter + * to the callback function set by a call to nflog_callback_register(). + * + * The nfulnl_msg_packet_hdr structure is defined in libnetfilter_log.h as: + *\verbatim + struct nfulnl_msg_packet_hdr { + u_int16_t hw_protocol; // hw protocol (network order) + u_int8_t hook; // netfilter hook + u_int8_t _pad; + } __attribute__ ((packed)); +\endverbatim + */ struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad) { return nfnl_get_pointer_to_data(nfad->nfa, NFULA_PACKET_HDR, struct nfulnl_msg_packet_hdr); } - +/** + * nflog_get_hwtype - get the hardware link layer type from logging data + * \param nfad pointer to logging data + * + * \return the hardware link layer type. + */ u_int16_t nflog_get_hwtype(struct nflog_data *nfad) { return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWTYPE, u_int16_t)); } +/** + * nflog_get_hwhdrlen - get the length of the hardware link layer header + * \param nfad pointer to logging data + * + * \return the size of the hardware link layer header + */ u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad) { return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWLEN, u_int16_t)); } +/** + * nflog_get_msg_packet_hwhdr - get the hardware link layer header + * \param nfad pointer to logging data + * + * \return the hardware link layer header + */ char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad) { return nfnl_get_pointer_to_data(nfad->nfa, NFULA_HWHEADER, char); } +/** + * nflog_get_nfmark - get the packet mark + * \param nfad Netlink packet data handle passed to callback function + * + * \return the netfilter mark currently assigned to the logged packet. + */ u_int32_t nflog_get_nfmark(struct nflog_data *nfad) { return ntohl(nfnl_get_data(nfad->nfa, NFULA_MARK, u_int32_t)); } +/** + * nflog_get_timestamp - get the packet timestamp + * \param nfad Netlink packet data handle passed to callback function + * \param tv structure to fill with timestamp info + * + * Retrieves the received timestamp when the given logged packet. + * + * \return 0 on success, a negative value on failure. + */ int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv) { struct nfulnl_msg_packet_timestamp *uts; @@ -406,32 +692,100 @@ return 0; } +/** + * nflog_get_indev - get the interface that the packet was received through + * \param nfad Netlink packet data handle passed to callback function + * + * \return The index of the device the packet was received via. If the + * returned index is 0, the packet was locally generated or the input + * interface is not known (ie. POSTROUTING?). + * + * \warning all nflog_get_dev() functions return 0 if not set, since linux + * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) + */ u_int32_t nflog_get_indev(struct nflog_data *nfad) { return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_INDEV, u_int32_t)); } +/** + * nflog_get_physindev - get the physical interface that the packet was received + * \param nfad Netlink packet data handle passed to callback function + * + * \return The index of the physical device the packet was received via. + * If the returned index is 0, the packet was locally generated or the + * physical input interface is no longer known (ie. POSTROUTING?). + */ u_int32_t nflog_get_physindev(struct nflog_data *nfad) { return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSINDEV, u_int32_t)); } +/** + * nflog_get_outdev - gets the interface that the packet will be routed out + * \param nfad Netlink packet data handle passed to callback function + * + * \return The index of the device the packet will be sent out. If the + * returned index is 0, the packet is destined for localhost or the output + * interface is not yet known (ie. PREROUTING?). + */ u_int32_t nflog_get_outdev(struct nflog_data *nfad) { return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_OUTDEV, u_int32_t)); } +/** + * nflog_get_physoutdev - get the physical interface that the packet output + * \param nfad Netlink packet data handle passed to callback function + * + * The index of the physical device the packet will be sent out. If the + * returned index is 0, the packet is destined for localhost or the + * physical output interface is not yet known (ie. PREROUTING?). + * + * \return The index of physical interface that the packet output will be + * routed out. + */ u_int32_t nflog_get_physoutdev(struct nflog_data *nfad) { return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSOUTDEV, u_int32_t)); } +/** + * nflog_get_packet_hw - get hardware address + * \param nfad Netlink packet data handle passed to callback function + * + * Retrieves the hardware address associated with the given packet. + * For ethernet packets, the hardware address returned (if any) will be the + * MAC address of the packet source host. The destination MAC address is not + * known until after POSTROUTING and a successful ARP request, so cannot + * currently be retrieved. + * + * The nfulnl_msg_packet_hw structure is defined in libnetfilter_log.h as: + * \verbatim + struct nfulnl_msg_packet_hw { + u_int16_t hw_addrlen; + u_int16_t _pad; + u_int8_t hw_addr[8]; + } __attribute__ ((packed)); +\endverbatim + */ struct nfulnl_msg_packet_hw *nflog_get_packet_hw(struct nflog_data *nfad) { return nfnl_get_pointer_to_data(nfad->nfa, NFULA_HWADDR, struct nfulnl_msg_packet_hw); } +/** + * nflog_get_payload - get payload of the logged packet + * \param nfad Netlink packet data handle passed to callback function + * \param data Pointer of pointer that will be pointed to the payload + * + * Retrieve the payload for a logged packet. The actual amount and type of + * data retrieved by this function will depend on the mode set with the + * nflog_set_mode() function. + * + * \return -1 on error, otherwise > 0. + */ int nflog_get_payload(struct nflog_data *nfad, char **data) { *data = nfnl_get_pointer_to_data(nfad->nfa, NFULA_PAYLOAD, char); @@ -441,11 +795,24 @@ return -1; } +/** + * nflog_get_prefix - get the logging string prefix + * \param nfad Netlink packet data handle passed to callback function + * + * \return the string prefix that is specified as argument to the iptables' + * NFLOG target. + */ char *nflog_get_prefix(struct nflog_data *nfad) { return nfnl_get_pointer_to_data(nfad->nfa, NFULA_PREFIX, char); } +/** + * nflog_get_uid - get the UID of the user that has generated the packet + * \param nfad Netlink packet data handle passed to callback function + * + * \return the UID of the user that has genered the packet, if any. + */ int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid) { if (!nfnl_attr_present(nfad->nfa, NFULA_UID)) @@ -455,6 +822,12 @@ return 0; } +/** + * nflog_get_gid - get the GID of the user that has generated the packet + * \param nfad Netlink packet data handle passed to callback function + * + * \return the GID of the user that has genered the packet, if any. + */ int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid) { if (!nfnl_attr_present(nfad->nfa, NFULA_GID)) @@ -464,6 +837,14 @@ return 0; } +/** + * nflog_get_seq - get the local nflog sequence number + * \param nfad Netlink packet data handle passed to callback function + * + * You must enable this via nflog_set_flags(). + * + * \return the local nflog sequence number. + */ int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq) { if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ)) @@ -473,6 +854,14 @@ return 0; } +/** + * nflog_get_seq_global - get the global nflog sequence number + * \param nfad Netlink packet data handle passed to callback function + * + * You must enable this via nflog_set_flags(). + * + * \return the global nflog sequence number. + */ int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq) { if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ_GLOBAL)) @@ -481,3 +870,198 @@ *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ_GLOBAL, u_int32_t)); return 0; } + +/** + * @} + */ + +#define SNPRINTF_FAILURE(ret, rem, offset, len) \ +do { \ + if (ret < 0) \ + return ret; \ + len += ret; \ + if (ret > rem) \ + ret = rem; \ + offset += ret; \ + rem -= ret; \ +} while (0) + +/** + * \defgroup Printing + * @{ + */ + +/** + * nflog_snprintf_xml - print the logged packet in XML format into a buffer + * \param buf The buffer that you want to use to print the logged packet + * \param rem The size of the buffer that you have passed + * \param tb Netlink packet data handle passed to callback function + * \param flags The flag that tell what to print into the buffer + * + * This function supports the following flags: + * + * - NFLOG_XML_PREFIX: include the string prefix + * - NFLOG_XML_HW: include the hardware link layer address + * - NFLOG_XML_MARK: include the packet mark + * - NFLOG_XML_DEV: include the device information + * - NFLOG_XML_PHYSDEV: include the physical device information + * - NFLOG_XML_PAYLOAD: include the payload (in hexadecimal) + * - NFLOG_XML_TIME: include the timestamp + * - NFLOG_XML_ALL: include all the logging information (all flags set) + * + * You can combine this flags with an binary OR. + * + * \return -1 in case of failure, otherwise the length of the string that + * would have been printed into the buffer (in case that there is enough + * room in it). See snprintf() return value for more information. + */ +int nflog_snprintf_xml(char *buf, size_t rem, struct nflog_data *tb, int flags) +{ + struct nfulnl_msg_packet_hdr *ph; + struct nfulnl_msg_packet_hw *hwph; + u_int32_t mark, ifi; + int size, offset = 0, len = 0, ret; + char *data; + + size = snprintf(buf + offset, rem, "<log>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + if (flags & NFLOG_XML_TIME) { + time_t t; + struct tm tm; + + t = time(NULL); + if (localtime_r(&t, &tm) == NULL) + return -1; + + size = snprintf(buf + offset, rem, "<when>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, + "<hour>%d</hour>", tm.tm_hour); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, + rem, "<min>%02d</min>", tm.tm_min); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, + rem, "<sec>%02d</sec>", tm.tm_sec); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<wday>%d</wday>", + tm.tm_wday + 1); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<day>%d</day>", tm.tm_mday); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<month>%d</month>", + tm.tm_mon + 1); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<year>%d</year>", + 1900 + tm.tm_year); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "</when>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + data = nflog_get_prefix(tb); + if (data && (flags & NFLOG_XML_PREFIX)) { + size = snprintf(buf + offset, rem, "<prefix>%s</prefix>", data); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ph = nflog_get_msg_packet_hdr(tb); + if (ph) { + size = snprintf(buf + offset, rem, "<hook>%u</hook>", ph->hook); + SNPRINTF_FAILURE(size, rem, offset, len); + + hwph = nflog_get_packet_hw(tb); + if (hwph && (flags & NFLOG_XML_HW)) { + int i, hlen = ntohs(hwph->hw_addrlen); + + size = snprintf(buf + offset, rem, "<hw><proto>%04x" + "</proto>", + ntohs(ph->hw_protocol)); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<src>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + for (i=0; i<hlen; i++) { + size = snprintf(buf + offset, rem, "%02x", + hwph->hw_addr[i]); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</src></hw>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } else if (flags & NFLOG_XML_HW) { + size = snprintf(buf + offset, rem, "<hw><proto>%04x" + "</proto></hw>", + ntohs(ph->hw_protocol)); + SNPRINTF_FAILURE(size, rem, offset, len); + } + } + + mark = nflog_get_nfmark(tb); + if (mark && (flags & NFLOG_XML_MARK)) { + size = snprintf(buf + offset, rem, "<mark>%u</mark>", mark); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nflog_get_indev(tb); + if (ifi && (flags & NFLOG_XML_DEV)) { + size = snprintf(buf + offset, rem, "<indev>%u</indev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nflog_get_outdev(tb); + if (ifi && (flags & NFLOG_XML_DEV)) { + size = snprintf(buf + offset, rem, "<outdev>%u</outdev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nflog_get_physindev(tb); + if (ifi && (flags & NFLOG_XML_PHYSDEV)) { + size = snprintf(buf + offset, rem, + "<physindev>%u</physindev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nflog_get_physoutdev(tb); + if (ifi && (flags & NFLOG_XML_PHYSDEV)) { + size = snprintf(buf + offset, rem, + "<physoutdev>%u</physoutdev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ret = nflog_get_payload(tb, &data); + if (ret >= 0 && (flags & NFLOG_XML_PAYLOAD)) { + int i; + + size = snprintf(buf + offset, rem, "<payload>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + for (i=0; i<ret; i++) { + size = snprintf(buf + offset, rem, "%02x", + data[i] & 0xff); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</payload>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</log>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + return len; +} + +/** + * @} + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_log-0.0.16/utils/nfulnl_test.c new/libnetfilter_log-1.0.0/utils/nfulnl_test.c --- old/libnetfilter_log-0.0.16/utils/nfulnl_test.c 2009-02-17 20:57:20.000000000 +0100 +++ new/libnetfilter_log-1.0.0/utils/nfulnl_test.c 2010-07-11 16:48:53.000000000 +0200 @@ -13,8 +13,8 @@ u_int32_t indev = nflog_get_indev(ldata); u_int32_t outdev = nflog_get_outdev(ldata); char *prefix = nflog_get_prefix(ldata); - void *payload; - int payload_len = nflog_get_payload(ldata, payload); + char *payload; + int payload_len = nflog_get_payload(ldata, &payload); if (ph) { printf("hw_protocol=0x%04x hook=%u ", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libktorrent for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libktorrent for openSUSE:Factory checked in at Mon Sep 27 10:28:29 CEST 2010. -------- --- libktorrent/libktorrent.changes 2010-07-09 11:12:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/libktorrent/libktorrent.changes 2010-08-31 12:06:21.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 31 10:06:20 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- +Mon Aug 30 17:39:28 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 1.0.3: Fixing several bugs and rare crashes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libktorrent-1.0.2.tar.bz2 New: ---- libktorrent-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libktorrent.spec ++++++ --- /var/tmp/diff_new_pack.SevzwC/_old 2010-09-27 10:27:48.000000000 +0200 +++ /var/tmp/diff_new_pack.SevzwC/_new 2010-09-27 10:27:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libktorrent (Version 1.0.2) +# spec file for package libktorrent (Version 1.0.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KTorrent Downloading Library -Version: 1.0.2 +Version: 1.0.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 @@ -62,7 +62,7 @@ License: GPLv2+ Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client Build Environment -Requires: libktorrent2-lang = %{version} +Recommends: libktorrent2-lang = %{version} %description -n libktorrent2 This package includes the ktorrent donwloading library ++++++ libktorrent-1.0.2.tar.bz2 -> libktorrent-1.0.3.tar.bz2 ++++++ ++++ 11744 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit capi4hylafax for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package capi4hylafax for openSUSE:Factory checked in at Mon Sep 27 10:27:36 CEST 2010. -------- --- capi4hylafax/capi4hylafax.changes 2009-08-26 13:06:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/capi4hylafax/capi4hylafax.changes 2010-09-27 01:02:43.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 01:02:16 CEST 2010 - ro(a)suse.de + +- fix grep syntax in configure for new grep(1) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- capi4hylafax-configure.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ capi4hylafax.spec ++++++ --- /var/tmp/diff_new_pack.83tFWf/_old 2010-09-27 10:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.83tFWf/_new 2010-09-27 10:27:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package capi4hylafax (Version 01.03.00) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,16 @@ Requires: hylafax tiff gs_lib smtp_daemon a2ps hylafax-client AutoReqProv: on Version: 01.03.00 -Release: 147 +Release: 155 Source: %{name}-%{version}.tar.bz2 Patch0: capi4hylafax-suse.diff Patch1: capi4hylafax-secfix.diff Patch2: capi4hylafax-secfix2.diff +Patch3: capi4hylafax-configure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Adds a faxcapi modem for hylafax PreReq: sh-utils fileutils %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/usermod -License: GPL v2 or later +License: GPLv2+ Url: http://www.avm.de Summary: Adds a faxcapi modem for hylafax @@ -53,6 +54,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 find ../ -name .cvsignore -exec rm {} \; %build ++++++ capi4hylafax-configure.diff ++++++ --- configure +++ configure @@ -6342,7 +6342,7 @@ exit 1 fi gentoo_lt_version="1.5.18" -gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` +gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11 for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '10

26 Sep '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Mon Sep 27 00:50:38 CEST 2010. -------- --- xorg-x11/xorg-x11.changes 2010-09-24 09:04:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-25 05:59:57.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Sep 24 23:18:42 CEST 2010 - sndirsch(a)suse.de + +- xmodmap 1.0.5 + * This minor maintenance release features improvements to the + man page, as well as the usual recent rounds of build + configuration improvements and janitorial cleanups. + +------------------------------------------------------------------- +Fri Sep 24 18:08:03 UTC 2010 - sndirsch(a)novell.com + +- xlsclients 1.1.1 + * This minor maintenance release ensures the tarballs correctly + include the strnlen.h header for systems without that function + provided in the system libraries, and updates the build + configuration to the latest X.Org standards. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xlsclients-1.1.0.tar.bz2 xmodmap-1.0.4.tar.bz2 New: ---- xlsclients-1.1.1.tar.bz2 xmodmap-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.PFxUgA/_old 2010-09-27 00:50:10.000000000 +0200 +++ /var/tmp/diff_new_pack.PFxUgA/_new 2010-09-27 00:50:10.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 21 +Release: 22 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -94,13 +94,13 @@ Source61: xload-1.0.2.tar.bz2 Source62: xlogo-1.0.2.tar.bz2 Source63: xlsatoms-1.1.0.tar.bz2 -Source64: xlsclients-1.1.0.tar.bz2 +Source64: xlsclients-1.1.1.tar.bz2 Source65: xlsfonts-1.0.3.tar.bz2 Source66: xmag-1.0.3.tar.bz2 Source67: xman-1.1.0.tar.bz2 Source68: xmessage-1.0.3.tar.bz2 Source69: xmh-X11R7.0-1.0.1.tar.bz2 -Source70: xmodmap-1.0.4.tar.bz2 +Source70: xmodmap-1.0.5.tar.bz2 Source71: xmore-1.0.2.tar.bz2 Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2 Source74: xpr-1.0.3.tar.bz2 ++++++ xlsclients-1.1.0.tar.bz2 -> xlsclients-1.1.1.tar.bz2 ++++++ ++++ 2837 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/xlsclients-1.1.0/ChangeLog new/xlsclients-1.1.1/ChangeLog --- old/xlsclients-1.1.0/ChangeLog 2010-06-04 01:06:00.000000000 +0200 +++ new/xlsclients-1.1.1/ChangeLog 2010-09-24 18:44:48.000000000 +0200 @@ -1,3 +1,69 @@ +commit 29ad1d40dbd77d6efedd5d7db53e35650732dd6e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 09:43:42 2010 -0700 + + xlsclients 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 050eb2ca576e11cf5781af38db1442f2c9dd2f56 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 09:23:51 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ca8d92fe63776474f3aa166bbedd9220ec560177 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 09:11:05 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ffdf25c57b0e1b040523789b1e21fb24c0ec2e07 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit a8bd97c46f9671a02ad0d436142c9ff80cd5bc15 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 23 21:07:39 2010 -0700 + + strnlen.h should be added to EXTRA_DIST, not overwrite it + + Fixes 'make distcheck' failure found by tinderbox: + make[2]: *** No rule to make target `xlsclients.1', needed by `all-am'. Stop. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f30f41b8dc37e775279835c97f2bea83a513dc10 +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Fri Jun 4 22:14:23 2010 -0700 + + Add strnlen.h to EXTRA_DIST + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + commit cc6dbd2c1e7966b32e333142ab7630ed19700414 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Thu Jun 3 16:05:20 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/Makefile.am new/xlsclients-1.1.1/Makefile.am --- old/xlsclients-1.1.0/Makefile.am 2009-11-30 08:03:39.000000000 +0100 +++ new/xlsclients-1.1.1/Makefile.am 2010-09-24 18:11:05.000000000 +0200 @@ -39,27 +39,9 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ @@ -73,3 +55,5 @@ $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST += strnlen.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/xlsclients-1.1.0/configure.ac new/xlsclients-1.1.1/configure.ac --- old/xlsclients-1.1.0/configure.ac 2010-06-04 01:04:50.000000000 +0200 +++ new/xlsclients-1.1.1/configure.ac 2010-09-24 18:42:23.000000000 +0200 @@ -21,23 +21,20 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xlsclients, [1.1.0], +AC_PREREQ([2.60]) +AC_INIT([xlsclients], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] - xlsclients) + [xlsclients]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - # Check for functional strnlen AC_USE_SYSTEM_EXTENSIONS AC_FUNC_STRNLEN @@ -49,7 +46,5 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XLSCLIENTS, xcb xcb-atom) -AC_SUBST(XLSCLIENTS_CFLAGS) -AC_SUBST(XLSCLIENTS_LIBS) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsclients-1.1.0/strnlen.h new/xlsclients-1.1.1/strnlen.h --- old/xlsclients-1.1.0/strnlen.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xlsclients-1.1.1/strnlen.h 2009-10-21 21:53:34.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2009 Apple Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + /* + * Author: Jeremy Huddleston, Apple Inc. + */ + +#ifndef __STRNLEN_H__ +#define __STRNLEN_H__ 1 +#include <stdlib.h> + +extern size_t strnlen(const char *s, size_t maxlen); +#endif /* __STRNLEN_H__ */ ++++++ xmodmap-1.0.4.tar.bz2 -> xmodmap-1.0.5.tar.bz2 ++++++ ++++ 10546 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/xmodmap-1.0.4/COPYING new/xmodmap-1.0.5/COPYING --- old/xmodmap-1.0.4/COPYING 2006-07-11 04:53:47.000000000 +0200 +++ new/xmodmap-1.0.5/COPYING 2010-09-22 03:11:04.000000000 +0200 @@ -1,3 +1,24 @@ +Copyright (c) 1987, 2010, Oracle and/or its affiliates. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + Copyright 1988, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -21,33 +42,3 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - - - -Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright no- -tice appear in all copies and that both that copyright no- -tice and this permission notice appear in supporting docu- -mentation, and that the name of Sun not be used in -advertising or publicity pertaining to distribution of the -software without specific prior written permission. Sun -makes no representations about the suitability of this -software for any purpose. It is provided "as is" without any -express or implied warranty. - -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- -ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH -THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Author: Jim Fulton, MIT X Consortium; derived from parts of the -original xmodmap, written by David Rosenthal, of Sun Microsystems. 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/xmodmap-1.0.4/ChangeLog new/xmodmap-1.0.5/ChangeLog --- old/xmodmap-1.0.4/ChangeLog 2009-10-06 05:42:36.000000000 +0200 +++ new/xmodmap-1.0.5/ChangeLog 2010-09-24 20:54:34.000000000 +0200 @@ -1,3 +1,186 @@ +commit 3fe64746bb6c3ede67c9967ebd216a8a39cdb2ea +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 11:53:40 2010 -0700 + + xmodmap 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f6919f5958acc59d0b1936cc49900ea781bf2355 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 11:52:18 2010 -0700 + + man page: Add setxkbmap & XStringToKeysym to the See Also list + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 663b798d1464be003b9659bbd00112d8b63f6f6f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 11:43:33 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 7ff4acd4c8cf2d97d321276d2616d199f81c7e16 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 22189c5be96e864b60f9c4cb8a0d9c3f142e849a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Sep 21 18:12:09 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d1091f9fee901b5cdc589aa544c0a5616bf99d9d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Sep 14 00:45:57 2010 -0700 + + Attempt to further improve keysym name info in man page + + - Move it to the top of the grammar section since it applies to + multiple commands, not just the keysym KEYSYMNAME = KEYSYMNAME command + - Note that XKeysymDB supplements keysymdef.h, doesn't stand in place + of it. + - Add note about automatic mapping of Unicode characters to keysyms + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ffadc2376ede14285e2df8c43230d0d4ecca354f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Aug 20 10:53:44 2010 -0400 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Use the appropriate platform version of sed + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 5b493fd2d6edfca06113b09e6cbd6d6f1776399a +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Fri Jan 15 13:08:54 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit bca4e6fdbe0e4f43c1c57dd9434c42741061407a +Author: Julien Cristau <jcristau(a)debian.org> +Date: Sun Dec 6 14:00:34 2009 +0100 + + Fix XKeysymDB path in manpage again + + commit 4da097462b0b899e1790fd5a5f5e8ec811623c3d "Bug 21675 xmodmap + manpage states the wrong path to XKeysymDB" made it use the right path, + but had trailing whitespace in Makefile.am so the manpage ended up with + "/usr/share/X11 /XKeysymDB". + +commit 584cc13735613f7788e033707ff756937a787bfa +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 27388cde37b85a4efe1e19715de4b574e350b81e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 817f5345cf42ba4c903c62b5ff814e9c9e3fed3f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 775727681868d51ba82b7da429ca91f3af3783a0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit ea18aba03dc1a8f14d63b43e1ce960f3cda2d7ea +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 16:14:12 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + +commit 719ab352112d53c113b45ed691e39c4411b8f653 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 10:16:12 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 3a95c2e779ab94ad76a35f5800d2b72b5b73da45 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Sat Nov 7 15:11:33 2009 -0800 + + Add note to man page about mapping pointer buttons to 0 to disable + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 95af7f0fa995ef1dd3a770c48ee3442f6279e936 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:21 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 3f5223b0bc87b0b55d91ba8f1a8cedce0e25f974 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Oct 5 20:41:49 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/INSTALL new/xmodmap-1.0.5/INSTALL --- old/xmodmap-1.0.4/INSTALL 2009-10-06 05:42:12.000000000 +0200 +++ new/xmodmap-1.0.5/INSTALL 2010-09-24 20:54:34.000000000 +0200 @@ -2,7 +2,7 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +2006, 2007, 2008 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -159,7 +159,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + ./configure CC="cc -Ae" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,16 +174,6 @@ ./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 ========================== @@ -199,8 +189,7 @@ 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 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/xmodmap-1.0.4/Makefile.am new/xmodmap-1.0.5/Makefile.am --- old/xmodmap-1.0.4/Makefile.am 2009-10-06 05:35:18.000000000 +0200 +++ new/xmodmap-1.0.5/Makefile.am 2010-09-14 09:49:23.000000000 +0200 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS=man bin_PROGRAMS = xmodmap AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) @@ -32,56 +33,21 @@ xmodmap.c \ xmodmap.h -appman_PRE = \ - xmodmap.man - EXTRA_DIST = \ - ChangeLog \ - autogen.sh \ + autogen.sh \ swap.km -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -CLEANFILES = $(appman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -X11_DATADIR=$(datadir)/X11 # Where libX11 installs XKeysymDB - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__X11datadir__|$(X11_DATADIR)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +MAINTAINERCLEANFILES = ChangeLog INSTALL -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 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/xmodmap-1.0.4/config.h.in new/xmodmap-1.0.5/config.h.in --- old/xmodmap-1.0.4/config.h.in 2009-10-06 05:42:10.000000000 +0200 +++ new/xmodmap-1.0.5/config.h.in 2010-09-24 20:54:15.000000000 +0200 @@ -45,6 +45,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.4/configure.ac new/xmodmap-1.0.5/configure.ac --- old/xmodmap-1.0.4/configure.ac 2009-10-06 05:41:33.000000000 +0200 +++ new/xmodmap-1.0.5/configure.ac 2010-09-24 20:53:10.000000000 +0200 @@ -21,30 +21,30 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xmodmap,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xmodmap], + [1.0.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [xmodmap]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_DEFAULT_OPTIONS - AC_CHECK_FUNCS([strncasecmp]) # Checks for pkg-config packages PKG_CHECK_MODULES(XMODMAP, x11) -AC_SUBST(XMODMAP_CFLAGS) -AC_SUBST(XMODMAP_LIBS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([Makefile + man/Makefile]) +AC_OUTPUT 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/xmodmap-1.0.4/exec.c new/xmodmap-1.0.5/exec.c --- old/xmodmap-1.0.4/exec.c 2006-07-11 04:53:47.000000000 +0200 +++ new/xmodmap-1.0.5/exec.c 2010-09-22 03:11:23.000000000 +0200 @@ -29,31 +29,29 @@ */ /* - * Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. + * Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved. * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this - * software and its documentation for any purpose and without - * fee is hereby granted, provided that the above copyright no- - * tice appear in all copies and that both that copyright no- - * tice and this permission notice appear in supporting docu- - * mentation, and that the name of Sun not be used in - * advertising or publicity pertaining to distribution of the - * software without specific prior written permission. Sun - * makes no representations about the suitability of this - * software for any purpose. It is provided "as is" without any - * express or implied warranty. - * - * SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- - * NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- - * ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR - * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - * THE USE OR PERFORMANCE OF THIS SOFTWARE. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* * Author: Jim Fulton, MIT X Consortium; derived from parts of the * original xmodmap, written by David Rosenthal, of Sun Microsystems. */ 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/xmodmap-1.0.4/man/Makefile.am new/xmodmap-1.0.5/man/Makefile.am --- old/xmodmap-1.0.4/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xmodmap-1.0.5/man/Makefile.am 2010-09-14 09:49:23.000000000 +0200 @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +appmandir = $(APP_MAN_DIR) +appman_PRE = xmodmap.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# Where libX11 installs XKeysymDB +# Assuming both xmodmap and libX11 are installed under the same $prefix +X11_DATADIR=$(datadir)/X11 + +MAN_SUBSTS += -e 's|__X11datadir__|$(X11_DATADIR)|g' + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xmodmap-1.0.4/man/xmodmap.man new/xmodmap-1.0.5/man/xmodmap.man --- old/xmodmap-1.0.4/man/xmodmap.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xmodmap-1.0.5/man/xmodmap.man 2010-09-24 20:50:25.000000000 +0200 @@ -0,0 +1,339 @@ +.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ +.\" +.\" Copyright (c) 1987, 2010, Oracle and/or its affiliates. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. +.\" +.\" Copyright 1988, 1989, 1990, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +.\" OTHER DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $ +.\" +.de EX \"Begin example +.ne 5 +.if n .sp 1 +.if t .sp .5 +.nf +.in +.5i +.. +.de EE +.fi +.in -.5i +.if n .sp 1 +.if t .sp .5 +.. +.TH XMODMAP 1 __xorgversion__ +.SH NAME +xmodmap - utility for modifying keymaps and pointer button mappings in X +.SH SYNOPSIS +.B xmodmap +[-options ...] [filename] +.SH DESCRIPTION +.PP +The \fIxmodmap\fP program is used to edit and display the +keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client +applications to convert event keycodes into keysyms. It is usually run from +the user's session startup script to configure the keyboard according to +personal tastes. +.SH OPTIONS +.PP +The following options may be used with \fIxmodmap\fP: +.TP 8 +.B \-display \fIdisplay\fP +This option specifies the host and display to use. +.TP 8 +.B \-help +This option indicates that a brief description of the command line arguments +should be printed on the standard error channel. This will be done whenever an +unhandled argument is given to +.I xmodmap. +.TP 8 +.B \-grammar +This option indicates that a help message describing the expression grammar +used in files and with \-e expressions should be printed on the standard error. +.TP 8 +.B \-verbose +This option indicates that +.I xmodmap +should print logging information as it parses its input. +.TP 8 +.B \-quiet +This option turns off the verbose logging. This is the default. +.TP 8 +.B \-n +This option indicates that +.I xmodmap +should not change the mappings, but should display what it would do, like +\fImake(1)\fP does when given this option. +.TP 8 +.B \-e \fIexpression\fB +This option specifies an expression to be executed. Any number of expressions +may be specified from the command line. +.TP 8 +.B \-pm +This option indicates that the current modifier map should be printed on the +standard output. This is the default mode of operation if no other mode +options are specified. +.TP 8 +.B \-pk +This option indicates that the current keymap table should be printed on the +standard output. +.TP 8 +.B \-pke +This option indicates that the current keymap table should be printed on the +standard output in the form of expressions that can be fed back to +\fIxmodmap\fP. +.TP 8 +.B \-pp +This option indicates that the current pointer map should be printed on the +standard output. +.TP 8 +.B \- +A lone dash means that the standard input should be used as the input file. +.PP +The \fIfilename\fP specifies a file containing \fIxmodmap\fP expressions +to be executed. This file is usually kept in the user's home directory with +a name like \fI.xmodmaprc\fP. +.SH EXPRESSION GRAMMAR +.PP +The +.I xmodmap +program reads a list of expressions and parses them all before attempting +to execute any of them. This makes it possible to refer to keysyms that are +being redefined in a natural way without having to worry as much about name +conflicts. +.PP +The list of keysym names may be found in the header file +\fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix), +supplemented by the keysym database \fI __X11datadir__/XKeysymDB\fP. +Keysyms matching Unicode characters may be specified as "U0020" to "U007E" +and "U00A0" to "U10FFFF" for all possible Unicode characters. +.TP 8 +.B keycode \fINUMBER\fP = \fIKEYSYMNAME ...\fP +The list of keysyms is assigned to the indicated keycode +(which may be specified in decimal, hex or octal and can be determined by +running the +.I xev +program). Up to eight keysyms may be attached to a key, however the last four +are not used in any major X server implementation. The first keysym is used +when no modifier key is pressed in conjunction with this key, the second with +Shift, the third when the Mode_switch key is used with this key and the fourth +when both the Mode_switch and Shift keys are used. +.TP 8 +.B keycode any = \fIKEYSYMNAME ...\fP +If no existing key has the specified list of keysyms assigned to it, +a spare key on the keyboard is selected and the keysyms are assigned to it. +The list of keysyms may be specified in decimal, hex or octal. +.TP 8 +.B keysym \fIKEYSYMNAME\fP = \fIKEYSYMNAME ...\fP +The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes +used to perform the corresponding set of \fBkeycode\fP expressions. Note that +if the same keysym is bound to multiple keys, the expression is executed +for each matching keycode. +.TP 8 +.B clear \fIMODIFIERNAME\fP +This removes all entries in the modifier map for the given modifier, where +valid name are: +.BR Shift , +.BR Lock , +.BR Control , +.BR Mod1 , +.BR Mod2 , +.BR Mod3 , +.BR Mod4 , +and \fBMod5\fP (case +does not matter in modifier names, although it does matter for all other +names). For example, ``clear Lock'' will remove +all any keys that were bound to the shift lock modifier. +.TP 8 +.B add \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP +This adds all keys containing the given keysyms to the indicated modifier map. +The keysym names +are evaluated after all input expressions are read to make it easy to write +expressions to swap keys (see the EXAMPLES section). +.TP 8 +.B remove \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP +This removes all keys containing the given keysyms from the indicated +modifier map. Unlike +.B add, +the keysym names are evaluated as the line is read in. This allows you to +remove keys from a modifier without having to worry about whether or not they +have been reassigned. +.TP 8 +.B "pointer = default" +This sets the pointer map back to its default settings (button 1 generates a +code of 1, button 2 generates a 2, etc.). +.TP 8 +.B pointer = \fINUMBER ...\fP +This sets the pointer map to contain the indicated button codes. The list +always starts with the first physical button. Setting a button code to 0 +disables events from that button. +.PP +Lines that begin with an exclamation point (!) are taken as comments. +.PP +If you want to change the binding of a modifier key, you must also remove it +from the appropriate modifier map. +.SH EXAMPLES +.PP +Many pointers are designed such that the first button is pressed using the +index finger of the right hand. People who are left-handed frequently find +that it is more comfortable to reverse the button codes that get generated +so that the primary button is pressed using the index finger of the left hand. +This could be done on a 3 button pointer as follows: +.EX +% xmodmap -e "pointer = 3 2 1" +.EE +.PP +Many applications support the notion of Meta keys (similar to Control +keys except that Meta is held down instead of Control). However, +some servers do not have a Meta keysym in the default keymap table, so one +needs to be added by hand. +The following command will attach Meta to the Multi-language key (sometimes +labeled Compose Character). It also takes advantage of the fact that +applications that need a Meta key simply need to get the keycode and don't +require the keysym to be in the first column of the keymap table. This +means that applications that are looking for a Multi_key (including the +default modifier map) won't notice any change. +.EX +% xmodmap -e "keysym Multi_key = Multi_key Meta_L" +.EE +.PP +Similarly, some keyboards have an Alt key but no Meta key. +In that case the following may be useful: +.EX +% xmodmap -e "keysym Alt_L = Meta_L Alt_L" +.EE +.PP +One of the more simple, yet convenient, uses of \fIxmodmap\fP is to set the +keyboard's "rubout" key to generate an alternate keysym. This frequently +involves exchanging Backspace with Delete to be more comfortable to the user. +If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal +emulator windows will use the same key for erasing characters: +.EX +% xmodmap -e "keysym BackSpace = Delete" +% echo "XTerm*ttyModes: erase ^?" | xrdb -merge +.EE +.PP +Some keyboards do not automatically generate less than and greater than +characters when the comma and period keys are shifted. This can be remedied +with \fIxmodmap\fP by resetting the bindings for the comma and period with +the following scripts: +.EX +! +! make shift-, be < and shift-. be > +! +keysym comma = comma less +keysym period = period greater +.EE +.PP +One of the more irritating differences between keyboards is the location of the +Control and Shift Lock keys. A common use of \fIxmodmap\fP is to swap these +two keys as follows: +.EX +! +! Swap Caps_Lock and Control_L +! +remove Lock = Caps_Lock +remove Control = Control_L +keysym Control_L = Caps_Lock +keysym Caps_Lock = Control_L +add Lock = Caps_Lock +add Control = Control_L +.EE +.PP +This example can be run again to swap the keys back to their previous +assignments. +.PP +The \fIkeycode\fP command is useful for assigning the same keysym to +multiple keycodes. Although unportable, it also makes it possible to write +scripts that can reset the keyboard to a known state. The following script +sets the backspace key to generate Delete (as shown above), flushes all +existing caps lock bindings, makes the CapsLock +key be a control key, make F5 generate Escape, and makes Break/Reset be a +shift lock. +.EX +! +! On the HP, the following keycodes have key caps as listed: +! +! 101 Backspace +! 55 Caps +! 14 Ctrl +! 15 Break/Reset +! 86 Stop +! 89 F5 +! +keycode 101 = Delete +keycode 55 = Control_R +clear Lock +add Control = Control_R +keycode 89 = Escape +keycode 15 = Caps_Lock +add Lock = Caps_Lock +.EE +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +to get default host and display number. +.SH SEE ALSO +X(__miscmansuffix__), xev(__appmansuffix__), setxkbmap(__appmansuffix__), +XStringToKeysym(__libmansuffix__), +\fIXlib\fP documentation on key and pointer events +.SH BUGS +.PP +Every time a \fBkeycode\fP expression is evaluated, the server generates +a \fIMappingNotify\fP event on every client. This can cause some thrashing. +All of the changes should be batched together and done at once. +Clients that receive keyboard input and ignore \fIMappingNotify\fP events +will not notice any changes made to keyboard mappings. +.PP +.I Xmodmap +should generate "add" and "remove" expressions automatically +whenever a keycode that is already bound to a modifier is changed. +.PP +There should be a way to have the +.I remove +expression accept keycodes as well as keysyms for those times when you really +mess up your mappings. +.SH AUTHOR +Jim Fulton, MIT X Consortium, rewritten from an earlier version by +David Rosenthal of Sun Microsystems. + 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/xmodmap-1.0.4/xmodmap.man new/xmodmap-1.0.5/xmodmap.man --- old/xmodmap-1.0.4/xmodmap.man 2009-05-11 19:11:44.000000000 +0200 +++ new/xmodmap-1.0.5/xmodmap.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,312 +0,0 @@ -.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ -.\" Copyright 1988, 1989, 1990, 1998 The Open Group -.\" Copyright 1987 Sun Microsystems, Inc. -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $ -.\" -.de EX \"Begin example -.ne 5 -.if n .sp 1 -.if t .sp .5 -.nf -.in +.5i -.. -.de EE -.fi -.in -.5i -.if n .sp 1 -.if t .sp .5 -.. -.TH XMODMAP 1 __xorgversion__ -.SH NAME -xmodmap - utility for modifying keymaps and pointer button mappings in X -.SH SYNOPSIS -.B xmodmap -[-options ...] [filename] -.SH DESCRIPTION -.PP -The \fIxmodmap\fP program is used to edit and display the -keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client -applications to convert event keycodes into keysyms. It is usually run from -the user's session startup script to configure the keyboard according to -personal tastes. -.SH OPTIONS -.PP -The following options may be used with \fIxmodmap\fP: -.TP 8 -.B \-display \fIdisplay\fP -This option specifies the host and display to use. -.TP 8 -.B \-help -This option indicates that a brief description of the command line arguments -should be printed on the standard error channel. This will be done whenever an -unhandled argument is given to -.I xmodmap. -.TP 8 -.B \-grammar -This option indicates that a help message describing the expression grammar -used in files and with \-e expressions should be printed on the standard error. -.TP 8 -.B \-verbose -This option indicates that -.I xmodmap -should print logging information as it parses its input. -.TP 8 -.B \-quiet -This option turns off the verbose logging. This is the default. -.TP 8 -.B \-n -This option indicates that -.I xmodmap -should not change the mappings, but should display what it would do, like -\fImake(1)\fP does when given this option. -.TP 8 -.B \-e \fIexpression\fB -This option specifies an expression to be executed. Any number of expressions -may be specified from the command line. -.TP 8 -.B \-pm -This option indicates that the current modifier map should be printed on the -standard output. This is the default mode of operation if no other mode -options are specified. -.TP 8 -.B \-pk -This option indicates that the current keymap table should be printed on the -standard output. -.TP 8 -.B \-pke -This option indicates that the current keymap table should be printed on the -standard output in the form of expressions that can be fed back to -\fIxmodmap\fP. -.TP 8 -.B \-pp -This option indicates that the current pointer map should be printed on the -standard output. -.TP 8 -.B \- -A lone dash means that the standard input should be used as the input file. -.PP -The \fIfilename\fP specifies a file containing \fIxmodmap\fP expressions -to be executed. This file is usually kept in the user's home directory with -a name like \fI.xmodmaprc\fP. -.SH EXPRESSION GRAMMAR -.PP -The -.I xmodmap -program reads a list of expressions and parses them all before attempting -to execute any of them. This makes it possible to refer to keysyms that are -being redefined in a natural way without having to worry as much about name -conflicts. -.TP 8 -.B keycode \fINUMBER\fP = \fIKEYSYMNAME ...\fP -The list of keysyms is assigned to the indicated keycode -(which may be specified in decimal, hex or octal and can be determined by -running the -.I xev -program). Up to eight keysyms may be attached to a key, however the last four -are not used in any major X server implementation. The first keysym is used -when no modifier key is pressed in conjunction with this key, the second with -Shift, the third when the Mode_switch key is used with this key and the fourth -when both the Mode_switch and Shift keys are used. -.TP 8 -.B keycode any = \fIKEYSYMNAME ...\fP -If no existing key has the specified list of keysyms assigned to it, -a spare key on the keyboard is selected and the keysyms are assigned to it. -The list of keysyms may be specified in decimal, hex or octal. -.TP 8 -.B keysym \fIKEYSYMNAME\fP = \fIKEYSYMNAME ...\fP -The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes -used to perform the corresponding set of \fBkeycode\fP expressions. -The list of keysym names may be -found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix) -or the keysym database \fI __X11datadir__/XKeysymDB\fP. Note that -if the same keysym is bound to multiple keys, the expression is executed -for each matching keycode. -.TP 8 -.B clear \fIMODIFIERNAME\fP -This removes all entries in the modifier map for the given modifier, where -valid name are: -.BR Shift , -.BR Lock , -.BR Control , -.BR Mod1 , -.BR Mod2 , -.BR Mod3 , -.BR Mod4 , -and \fBMod5\fP (case -does not matter in modifier names, although it does matter for all other -names). For example, ``clear Lock'' will remove -all any keys that were bound to the shift lock modifier. -.TP 8 -.B add \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP -This adds all keys containing the given keysyms to the indicated modifier map. -The keysym names -are evaluated after all input expressions are read to make it easy to write -expressions to swap keys (see the EXAMPLES section). -.TP 8 -.B remove \fIMODIFIERNAME\fP = \fIKEYSYMNAME ...\fP -This removes all keys containing the given keysyms from the indicated -modifier map. Unlike -.B add, -the keysym names are evaluated as the line is read in. This allows you to -remove keys from a modifier without having to worry about whether or not they -have been reassigned. -.TP 8 -.B "pointer = default" -This sets the pointer map back to its default settings (button 1 generates a -code of 1, button 2 generates a 2, etc.). -.TP 8 -.B pointer = \fINUMBER ...\fP -This sets the pointer map to contain the indicated button codes. The list -always starts with the first physical button. -.PP -Lines that begin with an exclamation point (!) are taken as comments. -.PP -If you want to change the binding of a modifier key, you must also remove it -from the appropriate modifier map. -.SH EXAMPLES -.PP -Many pointers are designed such that the first button is pressed using the -index finger of the right hand. People who are left-handed frequently find -that it is more comfortable to reverse the button codes that get generated -so that the primary button is pressed using the index finger of the left hand. -This could be done on a 3 button pointer as follows: -.EX -% xmodmap -e "pointer = 3 2 1" -.EE -.PP -Many applications support the notion of Meta keys (similar to Control -keys except that Meta is held down instead of Control). However, -some servers do not have a Meta keysym in the default keymap table, so one -needs to be added by hand. -The following command will attach Meta to the Multi-language key (sometimes -labeled Compose Character). It also takes advantage of the fact that -applications that need a Meta key simply need to get the keycode and don't -require the keysym to be in the first column of the keymap table. This -means that applications that are looking for a Multi_key (including the -default modifier map) won't notice any change. -.EX -% xmodmap -e "keysym Multi_key = Multi_key Meta_L" -.EE -.PP -Similarly, some keyboards have an Alt key but no Meta key. -In that case the following may be useful: -.EX -% xmodmap -e "keysym Alt_L = Meta_L Alt_L" -.EE -.PP -One of the more simple, yet convenient, uses of \fIxmodmap\fP is to set the -keyboard's "rubout" key to generate an alternate keysym. This frequently -involves exchanging Backspace with Delete to be more comfortable to the user. -If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal -emulator windows will use the same key for erasing characters: -.EX -% xmodmap -e "keysym BackSpace = Delete" -% echo "XTerm*ttyModes: erase ^?" | xrdb -merge -.EE -.PP -Some keyboards do not automatically generate less than and greater than -characters when the comma and period keys are shifted. This can be remedied -with \fIxmodmap\fP by resetting the bindings for the comma and period with -the following scripts: -.EX -! -! make shift-, be < and shift-. be > -! -keysym comma = comma less -keysym period = period greater -.EE -.PP -One of the more irritating differences between keyboards is the location of the -Control and Shift Lock keys. A common use of \fIxmodmap\fP is to swap these -two keys as follows: -.EX -! -! Swap Caps_Lock and Control_L -! -remove Lock = Caps_Lock -remove Control = Control_L -keysym Control_L = Caps_Lock -keysym Caps_Lock = Control_L -add Lock = Caps_Lock -add Control = Control_L -.EE -.PP -This example can be run again to swap the keys back to their previous -assignments. -.PP -The \fIkeycode\fP command is useful for assigning the same keysym to -multiple keycodes. Although unportable, it also makes it possible to write -scripts that can reset the keyboard to a known state. The following script -sets the backspace key to generate Delete (as shown above), flushes all -existing caps lock bindings, makes the CapsLock -key be a control key, make F5 generate Escape, and makes Break/Reset be a -shift lock. -.EX -! -! On the HP, the following keycodes have key caps as listed: -! -! 101 Backspace -! 55 Caps -! 14 Ctrl -! 15 Break/Reset -! 86 Stop -! 89 F5 -! -keycode 101 = Delete -keycode 55 = Control_R -clear Lock -add Control = Control_R -keycode 89 = Escape -keycode 15 = Caps_Lock -add Lock = Caps_Lock -.EE -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -to get default host and display number. -.SH SEE ALSO -X(__miscmansuffix__), xev(1), \fIXlib\fP documentation on key and pointer events -.SH BUGS -.PP -Every time a \fBkeycode\fP expression is evaluated, the server generates -a \fIMappingNotify\fP event on every client. This can cause some thrashing. -All of the changes should be batched together and done at once. -Clients that receive keyboard input and ignore \fIMappingNotify\fP events -will not notice any changes made to keyboard mappings. -.PP -.I Xmodmap -should generate "add" and "remove" expressions automatically -whenever a keycode that is already bound to a modifier is changed. -.PP -There should be a way to have the -.I remove -expression accept keycodes as well as keysyms for those times when you really -mess up your mappings. -.SH AUTHOR -Jim Fulton, MIT X Consortium, rewritten from an earlier version by -David Rosenthal of Sun Microsystems. - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0