wok rev 4229

partimage*, fix build with gcc 4.x
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Thu Sep 24 12:41:52 2009 +0000 (2009-09-24)
parents ec142b71c3e7
children cc233e5d5706
files partimage-pam/receipt partimage-pam/stuff/partimage-0.6.7_gcc4.u partimage/receipt partimage/stuff/partimage-0.6.7_gcc4.u
line diff
     1.1 --- a/partimage-pam/receipt	Thu Sep 24 14:45:15 2009 +0200
     1.2 +++ b/partimage-pam/receipt	Thu Sep 24 12:41:52 2009 +0000
     1.3 @@ -16,6 +16,9 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	# fix build with gcc4
     1.8 +	busybox patch -p0 -i stuff/partimage-0.6.7_gcc4.u
     1.9 +	
    1.10  	cd $src
    1.11  	./configure --prefix=/usr --enable-pam \
    1.12  	 --sysconfdir=/etc \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/partimage-pam/stuff/partimage-0.6.7_gcc4.u	Thu Sep 24 12:41:52 2009 +0000
     2.3 @@ -0,0 +1,47 @@
     2.4 +--- partimage-0.6.7-ori/src/client/main.cpp	Sun Feb  3 21:58:00 2008
     2.5 ++++ partimage-0.6.7/src/client/main.cpp	Thu Sep 24 12:03:23 2009
     2.6 +@@ -26,9 +26,11 @@
     2.7 +   #include <sys/param.h>
     2.8 + #endif
     2.9 + 
    2.10 ++
    2.11 + #include <stdlib.h>
    2.12 + #include <stdio.h>
    2.13 + #include <unistd.h>
    2.14 ++#include <cstdlib>
    2.15 + 
    2.16 + #define __STDC_FORMAT_MACROS
    2.17 + #include <inttypes.h>
    2.18 +--- partimage-0.6.7-ori/src/server/partimaged-main.cpp	Sun Feb  3 21:57:53 2008
    2.19 ++++ partimage-0.6.7/src/server/partimaged-main.cpp	Thu Sep 24 10:31:42 2009
    2.20 +@@ -27,7 +27,7 @@
    2.21 + 
    2.22 + #include <stdio.h>
    2.23 + #include <stdlib.h>
    2.24 +-#include <iostream.h>
    2.25 ++#include <iostream>
    2.26 + #include <sys/types.h>
    2.27 + #include <sys/stat.h>
    2.28 + #include <signal.h>
    2.29 +--- partimage-0.6.7-ori/src/server/partimaged.cpp	Sun Feb  3 21:57:53 2008
    2.30 ++++ partimage-0.6.7/src/server/partimaged.cpp	Thu Sep 24 10:32:08 2009
    2.31 +@@ -22,7 +22,7 @@
    2.32 + 
    2.33 + #include <stdio.h>
    2.34 + #include <stdlib.h>
    2.35 +-#include <iostream.h>
    2.36 ++#include <iostream>
    2.37 + 
    2.38 + #include "net.h"
    2.39 + #include "netserver.h"
    2.40 +--- partimage-0.6.7-ori/src/shared/net.h	Sun Feb  3 21:57:55 2008
    2.41 ++++ partimage-0.6.7/src/shared/net.h	Thu Sep 24 10:32:35 2009
    2.42 +@@ -28,7 +28,7 @@
    2.43 + #include <sys/types.h>
    2.44 + #include <sys/socket.h>
    2.45 + #include <arpa/inet.h>
    2.46 +-#include <iostream.h>
    2.47 ++#include <iostream>
    2.48 + #include <pthread.h>
    2.49 + 
    2.50 + #include "pathnames.h"
     3.1 --- a/partimage/receipt	Thu Sep 24 14:45:15 2009 +0200
     3.2 +++ b/partimage/receipt	Thu Sep 24 12:41:52 2009 +0000
     3.3 @@ -14,6 +14,8 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 +	busybox patch -p0 -i stuff/partimage-0.6.7_gcc4.u
     3.8 +	
     3.9  	cd $src
    3.10  	./configure --prefix=/usr \
    3.11  	 --sysconfdir=/etc \
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/partimage/stuff/partimage-0.6.7_gcc4.u	Thu Sep 24 12:41:52 2009 +0000
     4.3 @@ -0,0 +1,47 @@
     4.4 +--- partimage-0.6.7-ori/src/client/main.cpp	Sun Feb  3 21:58:00 2008
     4.5 ++++ partimage-0.6.7/src/client/main.cpp	Thu Sep 24 12:03:23 2009
     4.6 +@@ -26,9 +26,11 @@
     4.7 +   #include <sys/param.h>
     4.8 + #endif
     4.9 + 
    4.10 ++
    4.11 + #include <stdlib.h>
    4.12 + #include <stdio.h>
    4.13 + #include <unistd.h>
    4.14 ++#include <cstdlib>
    4.15 + 
    4.16 + #define __STDC_FORMAT_MACROS
    4.17 + #include <inttypes.h>
    4.18 +--- partimage-0.6.7-ori/src/server/partimaged-main.cpp	Sun Feb  3 21:57:53 2008
    4.19 ++++ partimage-0.6.7/src/server/partimaged-main.cpp	Thu Sep 24 10:31:42 2009
    4.20 +@@ -27,7 +27,7 @@
    4.21 + 
    4.22 + #include <stdio.h>
    4.23 + #include <stdlib.h>
    4.24 +-#include <iostream.h>
    4.25 ++#include <iostream>
    4.26 + #include <sys/types.h>
    4.27 + #include <sys/stat.h>
    4.28 + #include <signal.h>
    4.29 +--- partimage-0.6.7-ori/src/server/partimaged.cpp	Sun Feb  3 21:57:53 2008
    4.30 ++++ partimage-0.6.7/src/server/partimaged.cpp	Thu Sep 24 10:32:08 2009
    4.31 +@@ -22,7 +22,7 @@
    4.32 + 
    4.33 + #include <stdio.h>
    4.34 + #include <stdlib.h>
    4.35 +-#include <iostream.h>
    4.36 ++#include <iostream>
    4.37 + 
    4.38 + #include "net.h"
    4.39 + #include "netserver.h"
    4.40 +--- partimage-0.6.7-ori/src/shared/net.h	Sun Feb  3 21:57:55 2008
    4.41 ++++ partimage-0.6.7/src/shared/net.h	Thu Sep 24 10:32:35 2009
    4.42 +@@ -28,7 +28,7 @@
    4.43 + #include <sys/types.h>
    4.44 + #include <sys/socket.h>
    4.45 + #include <arpa/inet.h>
    4.46 +-#include <iostream.h>
    4.47 ++#include <iostream>
    4.48 + #include <pthread.h>
    4.49 + 
    4.50 + #include "pathnames.h"