August 2012 - openSUSE Commits - openSUSE Mailing Lists

commit kvm for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2012-08-04 13:09:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvm (Old) and /work/SRC/openSUSE:Factory/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvm", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kvm/kvm.changes 2012-07-24 17:22:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2012-08-04 13:10:15.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 31 02:11:56 UTC 2012 - brogers(a)suse.com + +- eliminate warnings from ipxe build + +------------------------------------------------------------------- +Tue Jul 24 13:37:13 UTC 2012 - vuntz(a)opensuse.org + +- Add libcap-devel BuildRequires since it's needed to enable VirtFS + support. +- Add usbredir-devel BuildRequires on openSUSE 12.2 and later to + enable USB network redirection support. +- Pass --enable-virtfs to configure to detect changes that will + cause VirtFS support to not be built. +- Manually remove virtfs-proxy-helper in %install, as it will be + part of qemu-tools. + +------------------------------------------------------------------- New: ---- ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.PFnvbx/_old 2012-08-04 13:11:57.000000000 +0200 +++ /var/tmp/diff_new_pack.PFnvbx/_new 2012-08-04 13:11:57.000000000 +0200 @@ -55,6 +55,7 @@ %endif BuildRequires: libaio-devel BuildRequires: libattr-devel +BuildRequires: libcap-devel BuildRequires: libcurl-devel BuildRequires: libpulse-devel BuildRequires: ncurses-devel @@ -92,6 +93,9 @@ %endif %endif %endif +%if 0%{?suse_version} >= 1220 +BuildRequires: usbredir-devel >= 0.3.4 +%endif BuildRequires: pwdutils Requires: pwdutils Requires: python-curses @@ -121,6 +125,8 @@ # ipxe patches Patch01: ipxe-rom-settings.patch Patch02: ipxe-avoid-bad-array-reference.patch +Patch03: ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch +Patch04: ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch # seabios patches Patch20: seabios-sanitize-version.patch @@ -207,6 +213,8 @@ # ipxe patches %patch01 -p1 %patch02 -p1 +%patch03 -p1 +%patch04 -p1 %endif %setup -q -n qemu-%{name}-%{package_true_version} -a 6 -a 9 -a 10 %if %{build_fw_from_source} @@ -303,6 +311,7 @@ --enable-kvm-device-assignment \ --disable-user \ --enable-vde \ + --enable-virtfs \ %if %{build_fw_from_source} --disable-blobs \ %endif @@ -345,7 +354,7 @@ cp roms/vgabios/VGABIOS-lgpl-latest.vmware.bin pc-bios/vgabios-vmware.bin cp roms/vgabios/VGABIOS-lgpl-latest.qxl.bin pc-bios/vgabios-qxl.bin cd ../%{pxe_rom_id}/src -make NO_WERROR=1 bin/blib.a %{?_smp_mflags} +make bin/blib.a %{?_smp_mflags} make bin/8086100e.rom %{?_smp_mflags} make bin/10222000.rom %{?_smp_mflags} make bin/10500940.rom %{?_smp_mflags} @@ -379,7 +388,7 @@ install_rom 1af41000 pxe-virtio %endif cd %{buildroot} -rm .%_bindir/{qemu-img,qemu-io,qemu-ga,qemu-nbd} +rm .%_bindir/{qemu-img,qemu-io,qemu-ga,qemu-nbd,virtfs-proxy-helper} rm -r .{%_libexecdir/qemu-bridge-helper,%_datadir/doc/qemu} %if !%{build_fw_from_source} rm .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,bamboo.dtb,petalogix-ml605.dtb,petalogix-s3adsp1800.dtb} @@ -388,6 +397,7 @@ rm .%_datadir/qemu-kvm/bios.bin %endif rm -r .%_mandir/man1/qemu-img.1 +rm -r .%_mandir/man1/virtfs-proxy-helper.1 rm -r .%_mandir/man8/qemu-nbd.8 mv .%_bindir/{qemu-system*,qemu-kvm} mv .%_mandir/man1/{qemu.1,qemu-kvm.1} ++++++ ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch ++++++ >From a87c0c4f0f47f5dc4b4d7050b15713a9f7a52757 Mon Sep 17 00:00:00 2001 From: Michael Brown <mcb30(a)ipxe.org> Date: Fri, 20 Jul 2012 18:32:58 +0100 Subject: [PATCH] [isa] Avoid spurious compiler warning on gcc 4.7 gcc 4.7 produces a spurious warning about an array subscript being out of bounds. Use a pointer dereference instead of an array lookup to inhibit this spurious warning. Signed-off-by: Michael Brown <mcb30(a)ipxe.org> --- src/drivers/bus/isa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c index 9b562c6..da0c43c 100644 --- a/src/drivers/bus/isa.c +++ b/src/drivers/bus/isa.c @@ -46,9 +46,9 @@ static isa_probe_addr_t isa_extra_probe_addrs[] = { #endif #define ISA_IOADDR( driver, ioidx ) \ - ( ( (ioidx) < 0 ) ? \ - isa_extra_probe_addrs[ (ioidx) + ISA_EXTRA_PROBE_ADDR_COUNT ] : \ - (driver)->probe_addrs[(ioidx)] ) + ( ( (ioidx) >= 0 ) ? \ + (driver)->probe_addrs[(ioidx)] : \ + *( isa_extra_probe_addrs + (ioidx) + ISA_EXTRA_PROBE_ADDR_COUNT ) ) static void isabus_remove ( struct root_device *rootdev ); -- 1.7.7 ++++++ ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch ++++++ >From 1ac62b914ec9f478cc0ed63a45a87196a583b073 Mon Sep 17 00:00:00 2001 From: Michael Brown <mcb30(a)ipxe.org> Date: Fri, 20 Jul 2012 19:18:50 +0100 Subject: [PATCH] [qib7322] Fix compiler warning on gcc 4.7 Originally-fixed-by: Christian Hesse <list(a)eworm.de> Signed-off-by: Michael Brown <mcb30(a)ipxe.org> --- src/drivers/infiniband/qib7322.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/drivers/infiniband/qib7322.c b/src/drivers/infiniband/qib7322.c index b66f8ef..8b61b8d 100644 --- a/src/drivers/infiniband/qib7322.c +++ b/src/drivers/infiniband/qib7322.c @@ -2062,6 +2062,9 @@ static int qib7322_ahb_read ( struct qib7322 *qib7322, unsigned int location, struct QIB_7322_ahb_transaction_reg xact; int rc; + /* Avoid returning uninitialised data on error */ + *data = 0; + /* Initiate transaction */ memset ( &xact, 0, sizeof ( xact ) ); BIT_FILL_2 ( &xact, -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit guile1 for openSUSE:12.2
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package guile1 for openSUSE:12.2 checked in at 2012-08-04 13:09:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/guile1 (Old) and /work/SRC/openSUSE:12.2/.guile1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "guile1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/guile1/guile1.changes 2012-06-25 15:35:01.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.guile1.new/guile1.changes 2012-08-04 13:09:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 31 09:47:20 UTC 2012 - pgajdos(a)suse.com + +- move *.so files into main package [bnc#772490] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile1.spec ++++++ --- /var/tmp/diff_new_pack.2pe0D8/_old 2012-08-04 13:10:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2pe0D8/_new 2012-08-04 13:10:14.000000000 +0200 @@ -15,13 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define binpref guile1 Name: guile1 BuildRequires: automake BuildRequires: gc-devel BuildRequires: gmp-devel BuildRequires: libtool +%if 0%{?suse_version} BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif BuildRequires: readline-devel Version: 1.8.8 Release: 0 @@ -108,15 +113,18 @@ %package -n libguile1-devel Summary: GNU's Ubiquitous Intelligent Language for Extension Group: Development/Languages/Scheme -Requires: libguilereadline-v-17-17 = %{version}-%{release} -Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} +Requires: gmp-devel +Requires: guile1 Requires: libguile-srfi-srfi-1-v-3-3 = %{version}-%{release} -Requires: libguile-srfi-srfi-4-v-3-3 = %{version}-%{release} Requires: libguile-srfi-srfi-13-14-v-3-3 = %{version}-%{release} -Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libguile-srfi-srfi-4-v-3-3 = %{version}-%{release} +Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} Requires: libguile17 = %{version}-%{release} -Requires: gmp-devel readline-devel ncurses-devel libltdl-devel -Requires: guile1 +Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libltdl-devel +Requires: ncurses-devel +Requires: readline-devel %description -n libguile1-devel This is Guile, a portable, embeddable Scheme implementation written in @@ -230,11 +238,12 @@ %{_datadir}/guile/1.8 %dir %{_datadir}/guile/site %{_mandir}/man1/%{binpref}.1.gz +# please leave *.so files here [bnc#772490] +%{_libdir}/libguile*.so %files -n libguile1-devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_libdir}/pkgconfig/* %{_datadir}/aclocal/guile1.m4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit guile1 for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package guile1 for openSUSE:Factory checked in at 2012-08-04 13:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile1 (Old) and /work/SRC/openSUSE:Factory/.guile1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "guile1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/guile1/guile1.changes 2012-02-01 11:53:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.guile1.new/guile1.changes 2012-08-04 13:09:16.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 31 09:47:20 UTC 2012 - pgajdos(a)suse.com + +- move *.so files into main package [bnc#772490] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile1.spec ++++++ --- /var/tmp/diff_new_pack.6CQsMA/_old 2012-08-04 13:09:44.000000000 +0200 +++ /var/tmp/diff_new_pack.6CQsMA/_new 2012-08-04 13:09:44.000000000 +0200 @@ -15,13 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define binpref guile1 Name: guile1 BuildRequires: automake BuildRequires: gc-devel BuildRequires: gmp-devel BuildRequires: libtool +%if 0%{?suse_version} BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif BuildRequires: readline-devel Version: 1.8.8 Release: 0 @@ -108,15 +113,18 @@ %package -n libguile1-devel Summary: GNU's Ubiquitous Intelligent Language for Extension Group: Development/Languages/Scheme -Requires: libguilereadline-v-17-17 = %{version}-%{release} -Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} +Requires: gmp-devel +Requires: guile1 Requires: libguile-srfi-srfi-1-v-3-3 = %{version}-%{release} -Requires: libguile-srfi-srfi-4-v-3-3 = %{version}-%{release} Requires: libguile-srfi-srfi-13-14-v-3-3 = %{version}-%{release} -Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libguile-srfi-srfi-4-v-3-3 = %{version}-%{release} +Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} Requires: libguile17 = %{version}-%{release} -Requires: gmp-devel readline-devel ncurses-devel libltdl-devel -Requires: guile1 +Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libguilereadline-v-17-17 = %{version}-%{release} +Requires: libltdl-devel +Requires: ncurses-devel +Requires: readline-devel %description -n libguile1-devel This is Guile, a portable, embeddable Scheme implementation written in @@ -230,11 +238,12 @@ %{_datadir}/guile/1.8 %dir %{_datadir}/guile/site %{_mandir}/man1/%{binpref}.1.gz +# please leave *.so files here [bnc#772490] +%{_libdir}/libguile*.so %files -n libguile1-devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_libdir}/pkgconfig/* %{_datadir}/aclocal/guile1.m4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:12.2
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:12.2 checked in at 2012-08-04 13:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/gnome-control-center (Old) and /work/SRC/openSUSE:12.2/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/gnome-control-center/gnome-control-center.changes 2012-07-31 14:04:45.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.gnome-control-center.new/gnome-control-center.changes 2012-08-04 13:08:04.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Aug 2 13:50:51 UTC 2012 - badshah400(a)gmail.com + +- Add gnome-control-center-fix-screen-brightness.patch to fix + screen brightness slider not picking up the right value when + brightness is changed by some other means, e.g., Function keys + (bgo#662117, bnc#774190); patch came from upstream git and was + rebased to current version +- Add gnome-control-center-shortcut-assignment-fixes.patch to fix + user not being able to re-assign previously assigned shortcuts + like Ctrl+Q, etc (bgo#675475, bgo#671448); patch came from + upstream git +- Add gnome-control-center-allow-wallpapers-with-weird-names.patch + to allow setting wallpapers with weird names involving special + characters (bgo#673015); patch came from upstream git. + +------------------------------------------------------------------- New: ---- gnome-control-center-allow-wallpapers-with-weird-names.patch gnome-control-center-fix-screen-brightness.patch gnome-control-center-shortcut-assignment-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.EQRkBc/_old 2012-08-04 13:08:38.000000000 +0200 +++ /var/tmp/diff_new_pack.EQRkBc/_new 2012-08-04 13:08:38.000000000 +0200 @@ -43,6 +43,12 @@ Patch16: gnome-control-center-probe-radius-server-cert.patch # PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-on-hidden-ssid.patch glin(a)suse.com -- network: don't crash on hidden ssid Patch17: gnome-control-center-fix-crash-on-hidden-ssid.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-screen-brightness.patch bgo#662117 bnc#774190 badshah400(a)gmail.com -- Fix brightness slider not picking up right brightness settings values; patch came from upstream git +Patch18: gnome-control-center-fix-screen-brightness.patch +# PATCH-FIX-UPSTREAM gnome-control-center-shortcut-assignment-fixes.patch bgo#675475 bgo#671448 badshah400(a)gmail.com -- Fix not being able to assign odd keyboard shortcuts (Ctrl+Q, etc); patch came from upstream git +Patch19: gnome-control-center-shortcut-assignment-fixes.patch +# PATCH-FIX-UPSTREAM gnome-control-center-allow-wallpapers-with-weird-names.patch bgo#673015 badshah400(a)gmail.com -- Wallpapers with weird names involving special characters; patch came from upstream git +Patch20: gnome-control-center-allow-wallpapers-with-weird-names.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -168,6 +174,9 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh ++++++ gnome-control-center-allow-wallpapers-with-weird-names.patch ++++++ >From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001 From: Jon McCann <jmccann(a)redhat.com> Date: Wed, 28 Mar 2012 19:10:32 +0000 Subject: background: Escape wallpaper filename before display https://bugzilla.gnome.org/show_bug.cgi?id=673015 --- diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c index 1ec9188..47a920e 100644 --- a/panels/background/cc-background-panel.c +++ b/panels/background/cc-background-panel.c @@ -340,8 +340,12 @@ update_preview (CcBackgroundPanelPrivate *priv, if (priv->current_background) { GdkColor pcolor, scolor; + char *escaped; + + escaped = g_markup_escape_text (cc_background_item_get_name (priv->current_background), -1); + markup = g_strdup_printf ("%s", escaped); + g_free (escaped); - markup = g_strdup_printf ("%s", cc_background_item_get_name (priv->current_background)); gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup); g_free (markup); -- cgit v0.9.0.2 ++++++ gnome-control-center-fix-screen-brightness.patch ++++++ >From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <gcampagna(a)src.gnome.org> Date: Fri, 08 Jun 2012 21:01:10 +0000 Subject: screen: Fix for gnome-settings-daemon changes g-s-d changed its DBus interface, and that made all external changes to brightness invisible to the panel. Update accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=662117 --- Index: gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c =================================================================== --- gnome-control-center-3.4.2.orig/panels/screen/cc-screen-panel.c +++ gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c @@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen } static void -on_signal (GDBusProxy *proxy, - gchar *sender_name, - gchar *signal_name, - GVariant *parameters, - gpointer user_data) -{ - CcScreenPanel *self = CC_SCREEN_PANEL (user_data); - - if (g_strcmp0 (signal_name, "BrightnessChanged") == 0) - { - guint brightness; - GtkRange *range; - - /* changed, but ignoring */ - if (self->priv->setting_brightness) - return; - - /* update the bar */ - g_variant_get (parameters, - "(u)", - &brightness); - range = GTK_RANGE (WID ("screen_brightness_hscale")); - gtk_range_set_value (range, brightness); - } -} - -static void set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { GError *error = NULL; @@ -276,6 +249,34 @@ get_brightness_cb (GObject *source_objec } static void +on_signal (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + CcScreenPanel *self = CC_SCREEN_PANEL (user_data); + + if (g_strcmp0 (signal_name, "Changed") == 0) + { + /* changed, but ignoring */ + if (self->priv->setting_brightness) + return; + + /* retrieve the value again from g-s-d */ + g_dbus_proxy_call (self->priv->proxy, + "GetPercentage", + NULL, + G_DBUS_CALL_FLAGS_NONE, + 200, /* we don't want to randomly move the bar */ + self->priv->cancellable, + get_brightness_cb, + user_data); + } +} + + +static void got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { GError *error = NULL; ++++++ gnome-control-center-shortcut-assignment-fixes.patch ++++++ >From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Mon, 16 Jul 2012 16:03:36 +0000 Subject: shell: Fix not being able to assign Ctrl+Q to a shortcut Because the shell window was capturing it before the key editing cell had a change to get to it. s/g_signal_connect/g_signal_connect_after/ https://bugzilla.gnome.org/show_bug.cgi?id=671448 --- diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c index b1c66b3..d046033 100644 --- a/shell/gnome-control-center.c +++ b/shell/gnome-control-center.c @@ -1115,8 +1115,8 @@ gnome_control_center_init (GnomeControlCenter *self) /* connect various signals */ priv->window = W (priv->builder, "main-window"); g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self); - g_signal_connect (priv->window, "key_press_event", - G_CALLBACK (window_key_press_event), self); + g_signal_connect_after (priv->window, "key_press_event", + G_CALLBACK (window_key_press_event), self); priv->notebook = W (priv->builder, "notebook"); priv->scrolled_window = W (priv->builder, "scrolledwindow1"); -- cgit v0.9.0.2 >From e5bfcb23d31310e73dc73c2af5a6230e772d115f Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Mon, 16 Jul 2012 17:05:04 +0000 Subject: shell: Don't handle shortcuts with excess modifiers Ctrl+Alt+W shouldn't be handled the same way as Ctrl+W. https://bugzilla.gnome.org/show_bug.cgi?id=675475 --- diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c index d046033..195a0a1 100644 --- a/shell/gnome-control-center.c +++ b/shell/gnome-control-center.c @@ -1058,12 +1058,20 @@ window_key_press_event (GtkWidget *win, GdkEventKey *event, GnomeControlCenter *self) { + GdkKeymap *keymap; gboolean retval; + GdkModifierType state; + + if (event->state == 0) + return FALSE; retval = FALSE; + state = event->state; + keymap = gdk_keymap_get_default (); + gdk_keymap_add_virtual_modifiers (keymap, &state); + state = state & gtk_accelerator_get_default_mod_mask (); - if (event->state != 0 && - (event->state & GDK_CONTROL_MASK)) + if (state == GDK_CONTROL_MASK) { switch (event->keyval) { -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2012-08-04 13:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2012-07-02 10:49:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2012-08-04 13:07:28.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Aug 2 13:50:51 UTC 2012 - badshah400(a)gmail.com + +- Add gnome-control-center-fix-screen-brightness.patch to fix + screen brightness slider not picking up the right value when + brightness is changed by some other means, e.g., Function keys + (bgo#662117, bnc#774190); patch came from upstream git and was + rebased to current version +- Add gnome-control-center-shortcut-assignment-fixes.patch to fix + user not being able to re-assign previously assigned shortcuts + like Ctrl+Q, etc (bgo#675475, bgo#671448); patch came from + upstream git +- Add gnome-control-center-allow-wallpapers-with-weird-names.patch + to allow setting wallpapers with weird names involving special + characters (bgo#673015); patch came from upstream git. + +------------------------------------------------------------------- +Wed Jul 18 06:04:12 UTC 2012 - glin(a)suse.com + +- Add gnome-control-center-probe-radius-server-cert.patch to probe + the certificate of the RADIUS server (bnc#574266, bnc#771185) +- Add gnome-control-center-fix-crash-on-hidden-ssid.patch to fix + crash when the network panel receives a hidden ssid. + +------------------------------------------------------------------- New: ---- gnome-control-center-allow-wallpapers-with-weird-names.patch gnome-control-center-fix-crash-on-hidden-ssid.patch gnome-control-center-fix-screen-brightness.patch gnome-control-center-probe-radius-server-cert.patch gnome-control-center-shortcut-assignment-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.mIwYaE/_old 2012-08-04 13:08:03.000000000 +0200 +++ /var/tmp/diff_new_pack.mIwYaE/_new 2012-08-04 13:08:03.000000000 +0200 @@ -39,6 +39,16 @@ Patch14: gnome-control-center-system-proxy-configuration.patch # PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar(a)opensuse.org -- network: create private connections if the user if not authorized. Patch15: gcc-private-connection.patch +# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin(a)suse.com -- network: Probe the RADIUS server certificate +Patch16: gnome-control-center-probe-radius-server-cert.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-crash-on-hidden-ssid.patch glin(a)suse.com -- network: don't crash on hidden ssid +Patch17: gnome-control-center-fix-crash-on-hidden-ssid.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-screen-brightness.patch bgo#662117 bnc#774190 badshah400(a)gmail.com -- Fix brightness slider not picking up right brightness settings values; patch came from upstream git +Patch18: gnome-control-center-fix-screen-brightness.patch +# PATCH-FIX-UPSTREAM gnome-control-center-shortcut-assignment-fixes.patch bgo#675475 bgo#671448 badshah400(a)gmail.com -- Fix not being able to assign odd keyboard shortcuts (Ctrl+Q, etc); patch came from upstream git +Patch19: gnome-control-center-shortcut-assignment-fixes.patch +# PATCH-FIX-UPSTREAM gnome-control-center-allow-wallpapers-with-weird-names.patch bgo#673015 badshah400(a)gmail.com -- Wallpapers with weird names involving special characters; patch came from upstream git +Patch20: gnome-control-center-allow-wallpapers-with-weird-names.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -162,6 +172,11 @@ #NEEDS-REBASE #%patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh ++++++ gnome-control-center-allow-wallpapers-with-weird-names.patch ++++++ >From ae5b16f873869bce935cfaafad1964340f47e7d3 Mon Sep 17 00:00:00 2001 From: Jon McCann <jmccann(a)redhat.com> Date: Wed, 28 Mar 2012 19:10:32 +0000 Subject: background: Escape wallpaper filename before display https://bugzilla.gnome.org/show_bug.cgi?id=673015 --- diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c index 1ec9188..47a920e 100644 --- a/panels/background/cc-background-panel.c +++ b/panels/background/cc-background-panel.c @@ -340,8 +340,12 @@ update_preview (CcBackgroundPanelPrivate *priv, if (priv->current_background) { GdkColor pcolor, scolor; + char *escaped; + + escaped = g_markup_escape_text (cc_background_item_get_name (priv->current_background), -1); + markup = g_strdup_printf ("%s", escaped); + g_free (escaped); - markup = g_strdup_printf ("%s", cc_background_item_get_name (priv->current_background)); gtk_label_set_markup (GTK_LABEL (WID ("background-label")), markup); g_free (markup); -- cgit v0.9.0.2 ++++++ gnome-control-center-fix-crash-on-hidden-ssid.patch ++++++ commit 8631717b3d1cb85bf21b0e0d648b784e8e7c3f8f Author: Dan Williams <dcbw(a)redhat.com> Date: Fri Apr 20 11:48:17 2012 -0500 network: don't crash on hidden SSIDs APs that don't broadcast their SSID will return NULL from nm_access_point_get_ssid() (since that's easier to check in C using an if statement than returning a zero-length GByteArray). Thus the code shouldn't try to dereference the SSID byte array since it could be NULL. But in fact, the panel shouldn't be showing hidden APs anywhere in the UI, since the user needs to manually enter the SSID to connect to it anyway. So just ignore hidden APs like nm-applet does. Signed-off-by: Dan Williams <dcbw(a)redhat.com> Signed-off-by: Richard Hughes <richard(a)hughsie.com> diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index c8cbd78..d5ab951 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -1124,13 +1124,19 @@ panel_get_strongest_unique_aps (const GPtrArray *aps) if (aps != NULL) for (i = 0; i < aps->len; i++) { ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i)); + + /* Hidden SSIDs don't get shown in the list */ ssid = nm_access_point_get_ssid (ap); + if (!ssid) + continue; + add_ap = TRUE; /* get already added list */ for (j=0; j<aps_unique->len; j++) { ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j)); ssid_tmp = nm_access_point_get_ssid (ap_tmp); + g_assert (ssid_tmp); /* is this the same type and data? */ if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) { ++++++ gnome-control-center-fix-screen-brightness.patch ++++++ >From 570478bcae6c872a4903118fdae25cb72cb5a027 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <gcampagna(a)src.gnome.org> Date: Fri, 08 Jun 2012 21:01:10 +0000 Subject: screen: Fix for gnome-settings-daemon changes g-s-d changed its DBus interface, and that made all external changes to brightness invisible to the panel. Update accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=662117 --- Index: gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c =================================================================== --- gnome-control-center-3.4.2.orig/panels/screen/cc-screen-panel.c +++ gnome-control-center-3.4.2/panels/screen/cc-screen-panel.c @@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen } static void -on_signal (GDBusProxy *proxy, - gchar *sender_name, - gchar *signal_name, - GVariant *parameters, - gpointer user_data) -{ - CcScreenPanel *self = CC_SCREEN_PANEL (user_data); - - if (g_strcmp0 (signal_name, "BrightnessChanged") == 0) - { - guint brightness; - GtkRange *range; - - /* changed, but ignoring */ - if (self->priv->setting_brightness) - return; - - /* update the bar */ - g_variant_get (parameters, - "(u)", - &brightness); - range = GTK_RANGE (WID ("screen_brightness_hscale")); - gtk_range_set_value (range, brightness); - } -} - -static void set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { GError *error = NULL; @@ -276,6 +249,34 @@ get_brightness_cb (GObject *source_objec } static void +on_signal (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + CcScreenPanel *self = CC_SCREEN_PANEL (user_data); + + if (g_strcmp0 (signal_name, "Changed") == 0) + { + /* changed, but ignoring */ + if (self->priv->setting_brightness) + return; + + /* retrieve the value again from g-s-d */ + g_dbus_proxy_call (self->priv->proxy, + "GetPercentage", + NULL, + G_DBUS_CALL_FLAGS_NONE, + 200, /* we don't want to randomly move the bar */ + self->priv->cancellable, + get_brightness_cb, + user_data); + } +} + + +static void got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { GError *error = NULL; ++++++ gnome-control-center-probe-radius-server-cert.patch ++++++ diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index 0e5aae1..43fc119 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -153,6 +153,11 @@ wireless_dialog_response_cb (GtkDialog *foo, g_assert (connection); g_assert (device); + if (nma_wireless_dialog_need_cert_probe (dialog)) { + nma_wireless_dialog_probe_cert (dialog); + return; + } + /* Find a similar connection and use that instead */ all = nm_remote_settings_list_connections (closure->settings); for (iter = all; iter; iter = g_slist_next (iter)) { ++++++ gnome-control-center-shortcut-assignment-fixes.patch ++++++ >From 8560cf39a214d973e24667fcc82a192fd18251c4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Mon, 16 Jul 2012 16:03:36 +0000 Subject: shell: Fix not being able to assign Ctrl+Q to a shortcut Because the shell window was capturing it before the key editing cell had a change to get to it. s/g_signal_connect/g_signal_connect_after/ https://bugzilla.gnome.org/show_bug.cgi?id=671448 --- diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c index b1c66b3..d046033 100644 --- a/shell/gnome-control-center.c +++ b/shell/gnome-control-center.c @@ -1115,8 +1115,8 @@ gnome_control_center_init (GnomeControlCenter *self) /* connect various signals */ priv->window = W (priv->builder, "main-window"); g_signal_connect_swapped (priv->window, "delete-event", G_CALLBACK (g_object_unref), self); - g_signal_connect (priv->window, "key_press_event", - G_CALLBACK (window_key_press_event), self); + g_signal_connect_after (priv->window, "key_press_event", + G_CALLBACK (window_key_press_event), self); priv->notebook = W (priv->builder, "notebook"); priv->scrolled_window = W (priv->builder, "scrolledwindow1"); -- cgit v0.9.0.2 >From e5bfcb23d31310e73dc73c2af5a6230e772d115f Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Mon, 16 Jul 2012 17:05:04 +0000 Subject: shell: Don't handle shortcuts with excess modifiers Ctrl+Alt+W shouldn't be handled the same way as Ctrl+W. https://bugzilla.gnome.org/show_bug.cgi?id=675475 --- diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c index d046033..195a0a1 100644 --- a/shell/gnome-control-center.c +++ b/shell/gnome-control-center.c @@ -1058,12 +1058,20 @@ window_key_press_event (GtkWidget *win, GdkEventKey *event, GnomeControlCenter *self) { + GdkKeymap *keymap; gboolean retval; + GdkModifierType state; + + if (event->state == 0) + return FALSE; retval = FALSE; + state = event->state; + keymap = gdk_keymap_get_default (); + gdk_keymap_add_virtual_modifiers (keymap, &state); + state = state & gtk_accelerator_get_default_mod_mask (); - if (event->state != 0 && - (event->state & GDK_CONTROL_MASK)) + if (state == GDK_CONTROL_MASK) { switch (event->keyval) { -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit collectd for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2012-08-04 13:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectd", Maintainer is "schubi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2012-06-15 14:04:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2012-08-04 13:06:36.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 30 14:09:52 UTC 2012 - chris(a)computersalat.de + +- fix deps for iptables + * iptables-devel works for > 1020 + * > 12.1 'split iptables-devel into libiptc-devel and libxtables-devel' + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.Y1i22w/_old 2012-08-04 13:07:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Y1i22w/_new 2012-08-04 13:07:25.000000000 +0200 @@ -252,8 +252,15 @@ %if %protobuf BuildRequires: protobuf-c %endif -%if %suse_version >= 1210 +%if %suse_version < 1220 +%if %suse_version > 1020 +BuildRequires: iptables-devel +%endif +%else +BuildRequires: libiptc-devel BuildRequires: libxtables-devel +%endif +%if %suse_version >= 1210 %{perl_requires} %endif # in case we'd like to split it later: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit conntrack-tools for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package conntrack-tools for openSUSE:Factory checked in at 2012-08-04 11:55:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conntrack-tools (Old) and /work/SRC/openSUSE:Factory/.conntrack-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "conntrack-tools", Maintainer is "JShi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/conntrack-tools/conntrack-tools.changes 2012-06-01 07:19:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conntrack-tools.new/conntrack-tools.changes 2012-08-04 11:55:36.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 31 12:10:49 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 1.2.2 +* conntrackd: commit operation has to be synchronous +* conntrackd: implement selective flushing for -t and -F commands + +------------------------------------------------------------------- Old: ---- conntrack-tools-1.2.1.tar.bz2 conntrack-tools-1.2.1.tar.bz2.sig ct-null.diff New: ---- conntrack-tools-1.2.2.tar.bz2 conntrack-tools-1.2.2.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conntrack-tools.spec ++++++ --- /var/tmp/diff_new_pack.OymXgV/_old 2012-08-04 11:55:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OymXgV/_new 2012-08-04 11:55:41.000000000 +0200 @@ -17,25 +17,32 @@ Name: conntrack-tools -Version: 1.2.1 +Version: 1.2.2 Release: 0 Url: http://conntrack-tools.netfilter.org/ +Summary: Userspace tools for interacting with the Connection Tracking System +License: GPL-2.0+ +Group: Productivity/Networking/Security #Git-Clone: git://git.netfilter.org/conntrack-tools Source: http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2 Source2: http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2.… -Patch1: ct-null.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: flex >= 2.5.33 BuildRequires: pkgconfig >= 0.21 +%if 0%{?suse_version} >= 1140 BuildRequires: pkgconfig(libmnl) >= 1.0.0 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.1 BuildRequires: pkgconfig(libnetfilter_cttimeout) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 -Summary: Userspace tools for interacting with the Connection Tracking System -License: GPL-2.0+ -Group: Productivity/Networking/Security +%else +BuildRequires: libmnl-devel >= 1.0.0 +BuildRequires: libnetfilter_conntrack-devel >= 1.0.1 +BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0 +BuildRequires: libnfnetlink-devel >= 1.0.0 +%endif %description The conntrack-tools are a set of tools targeted at system @@ -50,7 +57,6 @@ %prep %setup -q -%patch -P 1 -p1 %build %configure --disable-static ++++++ conntrack-tools-1.2.1.tar.bz2 -> conntrack-tools-1.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/Makefile.in new/conntrack-tools-1.2.2/Makefile.in --- old/conntrack-tools-1.2.1/Makefile.in 2012-05-26 21:06:59.000000000 +0200 +++ new/conntrack-tools-1.2.2/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -336,11 +358,18 @@ -rm -f libtool config.lt install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -553,13 +582,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/aclocal.m4 new/conntrack-tools-1.2.2/aclocal.m4 --- old/conntrack-tools-1.2.1/aclocal.m4 2012-05-26 21:06:57.000000000 +0200 +++ new/conntrack-tools-1.2.2/aclocal.m4 2012-07-31 13:11:56.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -198,7 +198,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +214,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/build-aux/config.sub new/conntrack-tools-1.2.2/build-aux/config.sub --- old/conntrack-tools-1.2.1/build-aux/config.sub 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/build-aux/config.sub 2012-07-31 13:11:57.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -1537,6 +1543,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/build-aux/depcomp new/conntrack-tools-1.2.2/build-aux/depcomp --- old/conntrack-tools-1.2.1/build-aux/depcomp 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/build-aux/depcomp 2012-07-31 13:11:57.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/$.*$/ \1 \\/p +s/$.*$/'"$tab"'\1 \\/p s/.$.*$ \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/build-aux/ltmain.sh new/conntrack-tools-1.2.2/build-aux/ltmain.sh --- old/conntrack-tools-1.2.1/build-aux/ltmain.sh 2012-05-26 21:06:55.000000000 +0200 +++ new/conntrack-tools-1.2.2/build-aux/ltmain.sh 2012-07-31 13:11:54.000000000 +0200 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1" +VERSION="2.4.2 Debian-2.4.2-1.1" TIMESTAMP="" package_revision=1.3337 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/configure new/conntrack-tools-1.2.2/configure --- old/conntrack-tools-1.2.1/configure 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/configure 2012-07-31 13:11:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for conntrack-tools 1.2.1. +# Generated by GNU Autoconf 2.69 for conntrack-tools 1.2.2. # # Report bugs to <pablo(a)netfilter.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='conntrack-tools' PACKAGE_TARNAME='conntrack-tools' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='conntrack-tools 1.2.1' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='conntrack-tools 1.2.2' PACKAGE_BUGREPORT='pablo(a)netfilter.org' PACKAGE_URL='' @@ -1338,7 +1338,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures conntrack-tools 1.2.1 to adapt to many kinds of systems. +\`configure' configures conntrack-tools 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of conntrack-tools 1.2.1:";; + short | recursive ) echo "Configuration of conntrack-tools 1.2.2:";; esac cat <<\_ACEOF @@ -1539,7 +1539,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -conntrack-tools configure 1.2.1 +conntrack-tools configure 1.2.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1908,7 +1908,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by conntrack-tools $as_me 1.2.1, which was +It was created by conntrack-tools $as_me 1.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2796,7 +2796,7 @@ # Define the identity of the package. PACKAGE='conntrack-tools' - VERSION='1.2.1' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -5184,10 +5184,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5226,7 +5222,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -8123,7 +8119,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10293,17 +10289,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10420,7 +10405,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12868,7 +12853,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by conntrack-tools $as_me 1.2.1, which was +This file was extended by conntrack-tools $as_me 1.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12925,7 +12910,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -conntrack-tools config.status 1.2.1 +conntrack-tools config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/configure.ac new/conntrack-tools-1.2.2/configure.ac --- old/conntrack-tools-1.2.1/configure.ac 2012-05-26 21:05:16.000000000 +0200 +++ new/conntrack-tools-1.2.2/configure.ac 2012-07-31 13:11:00.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(conntrack-tools, 1.2.1, pablo(a)netfilter.org) +AC_INIT(conntrack-tools, 1.2.2, pablo(a)netfilter.org) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/doc/manual/conntrack-tools.tmpl new/conntrack-tools-1.2.2/doc/manual/conntrack-tools.tmpl --- old/conntrack-tools-1.2.1/doc/manual/conntrack-tools.tmpl 2012-05-17 16:21:01.000000000 +0200 +++ new/conntrack-tools-1.2.2/doc/manual/conntrack-tools.tmpl 2012-07-30 02:18:20.000000000 +0200 @@ -689,7 +689,9 @@ ExpectationSync { ftp sip - h323 + ras # for H.323 + q.931 # for H.323 + h.245 # for H.323 } } }</programlisting> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/extensions/Makefile.in new/conntrack-tools-1.2.2/extensions/Makefile.in --- old/conntrack-tools-1.2.1/extensions/Makefile.in 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/extensions/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -118,6 +135,11 @@ $(libct_proto_udp_la_SOURCES) \ $(libct_proto_udplite_la_SOURCES) \ $(libct_proto_unknown_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/include/Makefile.in new/conntrack-tools-1.2.2/include/Makefile.in --- old/conntrack-tools-1.2.1/include/Makefile.in 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/include/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -442,13 +464,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/include/linux/Makefile.in new/conntrack-tools-1.2.2/include/linux/Makefile.in --- old/conntrack-tools-1.2.1/include/linux/Makefile.in 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/include/linux/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -60,6 +77,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -432,13 +454,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/include/linux/netfilter/Makefile.in new/conntrack-tools-1.2.2/include/linux/netfilter/Makefile.in --- old/conntrack-tools-1.2.1/include/linux/netfilter/Makefile.in 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/include/linux/netfilter/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,6 +72,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/include/netlink.h new/conntrack-tools-1.2.2/include/netlink.h --- old/conntrack-tools-1.2.1/include/netlink.h 2012-05-17 16:21:01.000000000 +0200 +++ new/conntrack-tools-1.2.2/include/netlink.h 2012-07-30 02:18:51.000000000 +0200 @@ -12,7 +12,7 @@ int nl_send_resync(struct nfct_handle *h); void nl_resize_socket_buffer(struct nfct_handle *h); int nl_dump_conntrack_table(struct nfct_handle *h); -int nl_flush_conntrack_table(struct nfct_handle *h); +int nl_flush_conntrack_table_selective(void); int nl_get_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct); int nl_create_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct, int timeout); int nl_update_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct, int timeout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/m4/libtool.m4 new/conntrack-tools-1.2.2/m4/libtool.m4 --- old/conntrack-tools-1.2.1/m4/libtool.m4 2012-05-26 21:06:56.000000000 +0200 +++ new/conntrack-tools-1.2.2/m4/libtool.m4 2012-07-31 13:11:54.000000000 +0200 @@ -2512,17 +2512,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2628,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3244,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3282,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4034,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4333,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6226,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6387,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/Makefile.in new/conntrack-tools-1.2.2/src/Makefile.in --- old/conntrack-tools-1.2.1/src/Makefile.in 2012-05-26 21:06:58.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/Makefile.in 2012-07-31 13:11:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -131,6 +148,11 @@ SOURCES = $(conntrack_SOURCES) $(conntrackd_SOURCES) $(nfct_SOURCES) DIST_SOURCES = $(conntrack_SOURCES) $(conntrackd_SOURCES) \ $(nfct_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -336,8 +358,11 @@ $(am__aclocal_m4_deps): install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/internal_bypass.c new/conntrack-tools-1.2.2/src/internal_bypass.c --- old/conntrack-tools-1.2.1/src/internal_bypass.c 2012-05-17 16:21:01.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/internal_bypass.c 2012-07-30 02:18:58.000000000 +0200 @@ -67,7 +67,7 @@ static void internal_bypass_ct_flush(void) { - nl_flush_conntrack_table(STATE(flush)); + nl_flush_conntrack_table_selective(); } struct { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/netlink.c new/conntrack-tools-1.2.2/src/netlink.c --- old/conntrack-tools-1.2.1/src/netlink.c 2012-05-17 16:21:01.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/netlink.c 2012-07-30 02:18:58.000000000 +0200 @@ -151,9 +151,42 @@ return nfct_query(h, NFCT_Q_DUMP, &CONFIG(family)); } -int nl_flush_conntrack_table(struct nfct_handle *h) +static int +nl_flush_selective_cb(enum nf_conntrack_msg_type type, + struct nf_conntrack *ct, void *data) { - return nfct_query(h, NFCT_Q_FLUSH, &CONFIG(family)); + /* don't delete this conntrack, it's in the ignore filter */ + if (ct_filter_conntrack(ct, 1)) + return NFCT_CB_CONTINUE; + + switch(type) { + case NFCT_T_UPDATE: + nl_destroy_conntrack(STATE(flush), ct); + break; + default: + STATE(stats).nl_dump_unknown_type++; + break; + } + return NFCT_CB_CONTINUE; +} + +int nl_flush_conntrack_table_selective(void) +{ + struct nfct_handle *h; + int ret; + + h = nfct_open(CONNTRACK, 0); + if (h == NULL) { + dlog(LOG_ERR, "cannot open handle"); + return -1; + } + nfct_callback_register(h, NFCT_T_ALL, nl_flush_selective_cb, NULL); + + ret = nfct_query(h, NFCT_Q_DUMP, &CONFIG(family)); + + nfct_close(h); + + return ret; } int nl_send_resync(struct nfct_handle *h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/parse.c new/conntrack-tools-1.2.2/src/parse.c --- old/conntrack-tools-1.2.1/src/parse.c 2012-05-17 16:21:01.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/parse.c 2012-07-30 02:18:20.000000000 +0200 @@ -19,6 +19,7 @@ #include "network.h" +#include <stdlib.h> #include <libnetfilter_conntrack/libnetfilter_conntrack.h> #ifndef ssizeof diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/run.c new/conntrack-tools-1.2.2/src/run.c --- old/conntrack-tools-1.2.1/src/run.c 2012-05-26 21:05:06.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/run.c 2012-07-30 02:19:23.000000000 +0200 @@ -196,7 +196,7 @@ * meanwhile the parent process handles events. */ if (fork_process_new(CTD_PROC_FLUSH, CTD_PROC_F_EXCL, NULL, NULL) == 0) { - nl_flush_conntrack_table(STATE(flush)); + nl_flush_conntrack_table_selective(); exit(EXIT_SUCCESS); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/sync-mode.c new/conntrack-tools-1.2.2/src/sync-mode.c --- old/conntrack-tools-1.2.1/src/sync-mode.c 2012-05-26 21:05:06.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/sync-mode.c 2012-07-30 02:18:58.000000000 +0200 @@ -304,7 +304,7 @@ * meanwhile the parent process handles events. */ if (fork_process_new(CTD_PROC_FLUSH, CTD_PROC_F_EXCL, NULL, NULL) == 0) { - nl_flush_conntrack_table(STATE(flush)); + nl_flush_conntrack_table_selective(); exit(EXIT_SUCCESS); } /* this is not required if events don't get lost */ @@ -608,6 +608,12 @@ } break; case CT_FLUSH_CACHE: + /* if we're still committing, abort this command */ + if (STATE_SYNC(commit).clientfd != -1) { + dlog(LOG_ERR, "ignoring flush command, " + "commit still in progress"); + break; + } /* inmediate flush, remove pending flush scheduled if any */ del_alarm(&STATE_SYNC(reset_cache_alarm)); dlog(LOG_NOTICE, "flushing caches"); @@ -621,6 +627,12 @@ STATE(mode)->internal->ct.flush(); break; case CT_FLUSH_EXT_CACHE: + /* if we're still committing, abort this command */ + if (STATE_SYNC(commit).clientfd != -1) { + dlog(LOG_ERR, "ignoring flush command, " + "commit still in progress"); + break; + } dlog(LOG_NOTICE, "flushing external cache"); STATE_SYNC(external)->ct.flush(); break; @@ -684,9 +696,15 @@ dlog(LOG_NOTICE, "committing expectation cache"); STATE_SYNC(commit).rq[0].cb = STATE_SYNC(external)->exp.commit; STATE_SYNC(commit).rq[1].cb = NULL; - local_commit(fd); + ret = local_commit(fd); break; case ALL_FLUSH_CACHE: + /* if we're still committing, abort this command */ + if (STATE_SYNC(commit).clientfd != -1) { + dlog(LOG_ERR, "ignoring flush command, " + "commit still in progress"); + break; + } dlog(LOG_NOTICE, "flushing caches"); STATE(mode)->internal->ct.flush(); STATE_SYNC(external)->ct.flush(); @@ -704,7 +722,7 @@ } else { STATE_SYNC(commit).rq[1].cb = NULL; } - local_commit(fd); + ret = local_commit(fd); break; case EXP_DUMP_INT_XML: if (fork_process_new(CTD_PROC_ANY, 0, NULL, NULL) == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conntrack-tools-1.2.1/src/tcp.c new/conntrack-tools-1.2.2/src/tcp.c --- old/conntrack-tools-1.2.1/src/tcp.c 2012-05-26 21:05:06.000000000 +0200 +++ new/conntrack-tools-1.2.2/src/tcp.c 2012-07-30 02:18:20.000000000 +0200 @@ -27,7 +27,7 @@ struct tcp_sock *tcp_server_create(struct tcp_conf *c) { - int yes = 1, ret; + int yes = 1; struct tcp_sock *m; socklen_t socklen = sizeof(int); @@ -109,30 +109,7 @@ return NULL; } - /* now we accept new connections ... */ - ret = accept(m->fd, NULL, NULL); - if (ret == -1) { - if (errno != EAGAIN) { - /* unexpected error, give up. */ - close(m->fd); - free(m); - m = NULL; - } else { - /* still in progress ... we'll do it in tcp_recv() */ - m->state = TCP_SERVER_ACCEPTING; - } - } else { - /* very unlikely at this stage. */ - if (fcntl(ret, F_SETFL, O_NONBLOCK) == -1) { - /* unexpected error, give up. */ - close(m->fd); - free(m); - return NULL; - } - m->client_fd = ret; - m->state = TCP_SERVER_CONNECTED; - register_fd(m->client_fd, STATE(fds)); - } + m->state = TCP_SERVER_ACCEPTING; return m; } @@ -367,7 +344,6 @@ close(m->client_fd); m->client_fd = -1; m->state = TCP_SERVER_ACCEPTING; - tcp_accept(m); } else if (errno != EAGAIN) { m->stats.error++; } @@ -377,7 +353,6 @@ close(m->client_fd); m->client_fd = -1; m->state = TCP_SERVER_ACCEPTING; - tcp_accept(m); } if (ret >= 0) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mime-types for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package rubygem-mime-types for openSUSE:Factory checked in at 2012-08-04 09:43:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-mime-types (Old) and /work/SRC/openSUSE:Factory/.rubygem-mime-types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-mime-types", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-mime-types/rubygem-mime-types.changes 2012-07-23 10:35:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-mime-types.new/rubygem-mime-types.changes 2012-08-04 09:43:25.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 2 12:35:11 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0+ or Artistic-1.0 or Ruby + See data/License.rdoc + +------------------------------------------------------------------- +Tue Jul 31 14:50:42 UTC 2012 - jreidinger(a)suse.com + +- use new gem2rpm to get new provisions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-mime-types.spec ++++++ --- /var/tmp/diff_new_pack.e88BT3/_old 2012-08-04 09:43:26.000000000 +0200 +++ /var/tmp/diff_new_pack.e88BT3/_new 2012-08-04 09:43:26.000000000 +0200 @@ -19,28 +19,26 @@ Name: rubygem-mime-types Version: 1.19 Release: 0 -Summary: Manages a MIME Content-Type database that will return the Content-Type for a given filename -License: MIT -Group: Development/Languages/Ruby -Url: http://mime-types.rubyforge.org/ %define mod_name mime-types %define mod_full_name %{mod_name}-%{version} -Source: %{mod_full_name}.gem -BuildRequires: rubygems_with_buildroot_patch -Provides: rubygem-%{mod_name}-1 = %{version} -Provides: rubygem-%{mod_name}-1_17 = %{version} + BuildRoot: %{_tmppath}/%{name}-%{version}-build -%rubygems_requires +BuildRequires: ruby-macros >= 1 +Url: http://mime-types.rubyforge.org/ +Source: %{mod_full_name}.gem +Summary: This library allows for the identification of a file's likely MIME content type +License: GPL-2.0+ or Artistic-1.0 or Ruby +Group: Development/Languages/Ruby %description This library allows for the identification of a file's likely MIME content -type. This is release 1.17.2. The identification of MIME content type is based -on a file's filename extensions. - -MIME::Types for Ruby originally based on and synchronized with MIME::Types for -Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data +type. This is release 1.19 with new MIME types. The identification of MIME +content type is based on a file's filename extensions. +MIME::Types for Ruby was originally based on and synchronized with MIME::Types +for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen. +:include: Licence.rdoc %package doc Summary: RDoc documentation for %{mod_name} @@ -60,9 +58,14 @@ Test::Unit or RSpec files, useful for developers. %prep +#gem_unpack +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build + %build + %install -%gem_install %{SOURCE0} +%gem_install -f %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-metaclass for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package rubygem-metaclass for openSUSE:Factory checked in at 2012-08-04 09:43:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-metaclass (Old) and /work/SRC/openSUSE:Factory/.rubygem-metaclass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-metaclass", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-metaclass/rubygem-metaclass.changes 2012-05-16 21:09:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-metaclass.new/rubygem-metaclass.changes 2012-08-04 09:43:18.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 1 07:58:56 UTC 2012 - jreidinger(a)suse.com + +- use new gem2rpm to get new provisions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-metaclass.spec ++++++ --- /var/tmp/diff_new_pack.UWUJXb/_old 2012-08-04 09:43:18.000000000 +0200 +++ /var/tmp/diff_new_pack.UWUJXb/_new 2012-08-04 09:43:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-metaclass # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: rubygem-metaclass Version: 0.0.1 Release: 0 %define mod_name metaclass %define mod_full_name %{mod_name}-%{version} -# -Group: Development/Languages/Ruby -License: MIT -# + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: rubygems_with_buildroot_patch -%rubygems_requires -Provides: rubygem-%{mod_name}-0_0 = %{version} -# +BuildRequires: ruby-macros >= 1 Url: http://github.com/floehopper/metaclass Source: %{mod_full_name}.gem -# Summary: Adds a metaclass method to all Ruby objects +License: MIT +Group: Development/Languages/Ruby + %description Adds a metaclass method to all Ruby objects @@ -41,6 +37,7 @@ Summary: RDoc documentation for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} + %description doc Documentation generated at gem installation time. Usually in RDoc and RI formats. @@ -49,16 +46,19 @@ Summary: Test suite for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} + %description testsuite Test::Unit or RSpec files, useful for developers. %prep +#gem_unpack +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build + %build -%install -%gem_install %{S:0} -%clean -%{__rm} -rf %{buildroot} +%install +%gem_install -f %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-libwebsocket for openSUSE:Factory
by root＠hilbert.suse.de 04 Aug '12

04 Aug '12

Hello community, here is the log from the commit of package rubygem-libwebsocket for openSUSE:Factory checked in at 2012-08-04 09:42:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-libwebsocket (Old) and /work/SRC/openSUSE:Factory/.rubygem-libwebsocket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-libwebsocket", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-libwebsocket/rubygem-libwebsocket.changes 2012-07-16 12:55:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-libwebsocket.new/rubygem-libwebsocket.changes 2012-08-04 09:42:45.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 28 17:00:13 UTC 2012 - coolo(a)suse.com + +- update to 0.1.5 + - Fixed problem caused by invalid draft 10 suppor + +------------------------------------------------------------------- Old: ---- libwebsocket-0.1.4.gem New: ---- libwebsocket-0.1.5.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-libwebsocket.spec ++++++ --- /var/tmp/diff_new_pack.M6TKif/_old 2012-08-04 09:42:46.000000000 +0200 +++ /var/tmp/diff_new_pack.M6TKif/_new 2012-08-04 09:42:46.000000000 +0200 @@ -17,24 +17,15 @@ Name: rubygem-libwebsocket -Version: 0.1.4 +Version: 0.1.5 Release: 0 %define mod_name libwebsocket %define mod_full_name %{mod_name}-%{version} -# -# + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: rubygems_with_buildroot_patch -%rubygems_requires -# addressable >= 0 -BuildRequires: rubygem-addressable -Requires: rubygem-addressable -Provides: %name-0 = %{version} -Provides: %name-0_1 = %{version} -# +BuildRequires: ruby-macros >= 1 Url: http://github.com/imanel/libwebsocket Source: %{mod_full_name}.gem -# Summary: Universal Ruby library to handle WebSocket protocol License: MIT Group: Development/Languages/Ruby @@ -60,9 +51,14 @@ Test::Unit or RSpec files, useful for developers. %prep +#gem_unpack +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build + %build + %install -%gem_install %{S:0} +%gem_install -f %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0