[Pkg-xfce-commits] r5293 - in goodies/trunk/xfce4-netload-plugin: . debian debian/patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat Apr 2 09:39:27 UTC 2011


Author: mrpouit-guest
Date: 2011-04-02 21:39:08 +0000 (Sat, 02 Apr 2011)
New Revision: 5293

Added:
   goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-snprintf-format.patch
   goodies/trunk/xfce4-netload-plugin/debian/patches/series
   goodies/trunk/xfce4-netload-plugin/debian/source/
Removed:
   goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
   goodies/trunk/xfce4-netload-plugin/debian/patches/02_fix-tooltips-gtk2.16.patch
Modified:
   goodies/trunk/xfce4-netload-plugin/
   goodies/trunk/xfce4-netload-plugin/debian/changelog
   goodies/trunk/xfce4-netload-plugin/debian/control
   goodies/trunk/xfce4-netload-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-netload-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-netload-plugin:4344-5292
/goodies/tags/xfce4-netload-plugin/0.4.0-4:3809-4343

Modified: goodies/trunk/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/changelog	2011-04-02 21:33:34 UTC (rev 5292)
+++ goodies/trunk/xfce4-netload-plugin/debian/changelog	2011-04-02 21:39:08 UTC (rev 5293)
@@ -1,3 +1,23 @@
+xfce4-netload-plugin (1.0.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - add explicit build-dep on libxfcegui4-dev now that xfce4-panel-dev
+      doesn't provide it anymore.
+    - update build-deps for Xfce 4.8.
+    - update standards version to 3.9.1.
+  * debian/patches:
+    - 01_fix-ftbfs-kfreebsd dropped, included upstream.
+    - 02_fix-tooltips-gtk2.16 as well.
+    - 01_fix-snprintf-format added, fix snprintf() call.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs, --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * Switch to 3.0 (quilt) source format.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 19:28:34 +0100
+
 xfce4-netload-plugin (0.4.0-4) unstable; urgency=low
 
   * debian/patches:

Modified: goodies/trunk/xfce4-netload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/control	2011-04-02 21:33:34 UTC (rev 5292)
+++ goodies/trunk/xfce4-netload-plugin/debian/control	2011-04-02 21:39:08 UTC (rev 5293)
@@ -4,8 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.8.0), libxml2-dev, 
+ libxml-parser-perl, libxfcegui4-dev (>= 4.8.0), intltool, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-netload-plugin/

Deleted: goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2011-04-02 21:33:34 UTC (rev 5292)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2011-04-02 21:39:08 UTC (rev 5293)
@@ -1,50 +0,0 @@
-diff --git a/panel-plugin/net.c b/panel-plugin/net.c
-index e49390d..2e835c8 100644
---- a/panel-plugin/net.c
-+++ b/panel-plugin/net.c
-@@ -46,7 +46,7 @@
- #elif __APPLE__
- # include "src/macos.h"
- # include "src/macos.c"
--#elif __FreeBSD__
-+#elif __FreeBSD__ || __FreeBSD_kernel__
- # include "wormulon/freebsd.h"
- # include "wormulon/freebsd.c"
- #elif __linux__
-diff --git a/panel-plugin/net.h b/panel-plugin/net.h
-index ad0c262..4bd20cb 100644
---- a/panel-plugin/net.h
-+++ b/panel-plugin/net.h
-@@ -62,7 +62,7 @@ typedef struct
- #ifdef __HPUX__
-     int             wait_pcks_counter;
-     nmapi_logstat*  if_ptr;
--#elif __FreeBSD__
-+#elif __FreeBSD__ || __FreeBSD_kernel__
-     int             watchif;
-     int             dev_opened;
- #elif __NetBSD__
-diff --git a/panel-plugin/os.h b/panel-plugin/os.h
-index 524fefb..e49a356 100644
---- a/panel-plugin/os.h
-+++ b/panel-plugin/os.h
-@@ -72,7 +72,7 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
--#elif __FreeBSD__           /* F R E E B S D */
-+#elif __FreeBSD__ || __FreeBSD_kernel__          /* F R E E B S D */
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -94,8 +94,10 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
-+#if (__FreeBSD_kernel__ < 8) && (__FreeBSD__ < 8)
- #include <net/ppp_defs.h>
- #include <net/if_ppp.h>
-+#endif
- #elif __NetBSD__            /* N E T B S D */
- #include <stdio.h>
- #include <sys/param.h>

Copied: goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-snprintf-format.patch (from rev 5292, goodies/branches/experimental/xfce4-netload-plugin/debian/patches/01_fix-snprintf-format.patch)
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-snprintf-format.patch	                        (rev 0)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/01_fix-snprintf-format.patch	2011-04-02 21:39:08 UTC (rev 5293)
@@ -0,0 +1,22 @@
+diff --git a/panel-plugin/net.c b/panel-plugin/net.c
+index 261e466..e5afd5c 100644
+--- a/panel-plugin/net.c
++++ b/panel-plugin/net.c
+@@ -194,7 +194,7 @@ int get_interface_up(netdata* data)
+         return FALSE;
+     }
+     
+-    snprintf(ifr.ifr_name, IF_NAMESIZE, data->ifdata.if_name);
++    snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", data->ifdata.if_name);
+     if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) != 0)
+     {
+         PRINT_DBG("Error in ioctl(sockfd): %s", strerror(errno));
+@@ -231,7 +231,7 @@ char* get_ip_address(netdata* data)
+         return NULL;
+     }
+     
+-    snprintf(ifr.ifr_name, IF_NAMESIZE, data->ifdata.if_name);
++    snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", data->ifdata.if_name);
+     if (ioctl(sockfd, SIOCGIFADDR, &ifr) != 0)
+     {
+ 	    if (errno != EADDRNOTAVAIL)

Deleted: goodies/trunk/xfce4-netload-plugin/debian/patches/02_fix-tooltips-gtk2.16.patch
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/02_fix-tooltips-gtk2.16.patch	2011-04-02 21:33:34 UTC (rev 5292)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/02_fix-tooltips-gtk2.16.patch	2011-04-02 21:39:08 UTC (rev 5293)
@@ -1,86 +0,0 @@
---- ./panel-plugin/netload.c.orig	2005-10-09 12:08:01.000000000 +0300
-+++ ./panel-plugin/netload.c	2009-05-23 20:50:22.000000000 +0300
-@@ -30,8 +30,6 @@
- #include <libxfce4panel/xfce-panel-plugin.h>
- 
- 
--static GtkTooltips *tooltips = NULL;
--
- #define BORDER 8
- 
- /* Defaults */
-@@ -219,7 +217,7 @@
-                     "Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"),
-                     get_name(&(global->monitor->data)), ip ? ip : _("no IP address"),
-                     HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
--        gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->ebox), caption, NULL);
-+        gtk_widget_set_tooltip_text(GTK_WIDGET(global->ebox), caption);
-     }
- 
-     return TRUE;
-@@ -237,6 +235,14 @@
- 
-     if (global->monitor->options.update_interval > 0)
-     {
-+#if GLIB_CHECK_VERSION( 2,14,0 )
-+        if (global->monitor->options.update_interval % 1000 == 0)
-+        {
-+            global->timeout_id = g_timeout_add_seconds(global->monitor->
-+                options.update_interval / 1000, (GtkFunction)update_monitors, global);
-+        }
-+	else
-+#endif
-         global->timeout_id =  g_timeout_add( global->monitor->options.update_interval, 
-             (GtkFunction)update_monitors, global);
-     }
-@@ -368,11 +374,6 @@
-     global->plugin = plugin;
-     xfce_panel_plugin_add_action_widget (plugin, global->ebox);
- 
--    if (!tooltips) 
--    {
--        tooltips = gtk_tooltips_new();
--    }
--
-     global->monitor = g_new(t_monitor, 1);
-     global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
-     global->monitor->options.network_device = g_strdup("");
-@@ -819,6 +820,10 @@
-     GtkWidget        *sep1, *sep2;
-     GtkBox           *update_hbox;
-     GtkWidget        *update_label, *update_unit_label;
-+#if GLIB_CHECK_VERSION( 2,14,0 )
-+    GtkBox           *update_hint_hbox;
-+    GtkWidget        *update_hint_label;
-+#endif
-     GtkWidget        *color_label[SUM];
-     GtkWidget        *align;
-     GtkBox           *color_hbox[SUM];
-@@ -935,7 +940,7 @@
-     gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5);
-     gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0);
-     
--    global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05);
-+    global->monitor->update_spinner = gtk_spin_button_new_with_range (1.0, 10.0, 0.25);
-     gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 );
-     gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner), 
-             global->monitor->options.update_interval / 1000.0 );
-@@ -948,6 +953,18 @@
-     
-     gtk_widget_show_all(GTK_WIDGET(update_hbox));
-     gtk_size_group_add_widget(sg, update_label);
-+
-+#if GLIB_CHECK_VERSION( 2,14,0 )
-+    /* Update interval hint */
-+    update_hint_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
-+    update_hint_label = gtk_label_new(_("Note: Whole seconds are more power-efficient"));
-+    gtk_label_set_line_wrap(GTK_LABEL(update_hint_label), TRUE);
-+    gtk_box_pack_start(GTK_BOX(update_hint_hbox), GTK_WIDGET(update_hint_label),
-+                       FALSE, FALSE, 0);
-+    gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
-+                       GTK_WIDGET(update_hint_hbox), FALSE, FALSE, 0);
-+    gtk_widget_show_all(GTK_WIDGET(update_hint_hbox));
-+#endif
-     
-     
-     sep1 = gtk_hseparator_new();

Copied: goodies/trunk/xfce4-netload-plugin/debian/patches/series (from rev 5292, goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-netload-plugin/debian/patches/series	2011-04-02 21:39:08 UTC (rev 5293)
@@ -0,0 +1 @@
+01_fix-snprintf-format.patch

Modified: goodies/trunk/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/rules	2011-04-02 21:33:34 UTC (rev 5292)
+++ goodies/trunk/xfce4-netload-plugin/debian/rules	2011-04-02 21:39:08 UTC (rev 5293)
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 binary-post-install/xfce4-netload-plugin::
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.la




More information about the Pkg-xfce-commits mailing list