[Ipcop-svn] SF.net SVN: ipcop:[6366] ipcop/trunk

[gespinasse]

Revision: 6366
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6366&view=rev
Author:   gespinasse
Date:     2012-02-18 16:15:58 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Add a trivial patch for 'not a string literal and no format arguments' warning

Modified Paths:
--------------
    ipcop/trunk/lfs/bash
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Added Paths:
-----------
    ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch

Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash        2012-02-18 11:48:19 UTC (rev 6365)
+++ ipcop/trunk/lfs/bash        2012-02-18 16:15:58 UTC (rev 6366)
@@ -153,6 +153,9 @@
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH19).patch
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH20).patch
 
+       # Fix not a string literal and no format arguments, debian borrowed
+       cd $(DIR_APP) && patch -p2 -i 
$(DIR_PATCHES)/$(PKG_NAME)-4.1_hardening-formatstring.patch
+
        # In bash-3.2, configure and configure.in are patched in that order
        # if they are not in the same second, autoconf is called.
        # Toolchain compilation fail if autoconf is not available on the 
building machine

Added: ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch
===================================================================
--- ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch               
                (rev 0)
+++ ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch       
2012-02-18 16:15:58 UTC (rev 6366)
@@ -0,0 +1,15 @@
+Author: Pierre Chifflier
+Description: Fix build error with -Werror=format-security hardening flag.
+
+diff -ruN bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c
+--- a/bash/print_cmd.c 2009-09-16 21:32:26.000000000 +0200
++++ b/bash/print_cmd.c 2011-09-16 11:38:40.000000000 +0200
+@@ -1374,7 +1374,7 @@
+   for (i = 0; amount > 0; amount--)
+     indentation_string[i++] = ' ';
+   indentation_string[i] = '\0';
+-  cprintf (indentation_string);
++  cprintf ("%s", indentation_string);
+ }
+ 
+ static void

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-02-18 11:48:19 UTC 
(rev 6365)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-02-18 16:15:58 UTC 
(rev 6366)
@@ -8,6 +8,10 @@
 /home/httpd/cgi-bin/time.cgi
 /home/httpd/cgi-bin/urlfilter.cgi
 ##
+## bash-4.2.20 +format-string patch
+/bin/sh
+/bin/bash
+##
 ## linux-3.0-1 (3.0.21)
 /boot/vmlinuz
 /boot/vmlinuz-3.0-1

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml   2012-02-18 11:48:19 UTC (rev 
6365)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-02-18 16:15:58 UTC (rev 
6366)
@@ -3,7 +3,8 @@
         <version>2.1.0</version>
         <releasedate>2012-04-dd</releasedate>
         <size>0</size>
-        <description>Add URL filter.&lt;br /&gt;
+        <description>bash patch&lt;br /&gt;
+            Add URL filter.&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade kernel to 3.0.21,
             shadow to 4.1.5.

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn