packages (DEVEL): NetworkManager/NetworkManager-pld.patch - updated for 0.8...

megabajt megabajt at pld-linux.org
Fri Mar 11 23:37:59 CET 2011 

Author: megabajt                     Date: Fri Mar 11 22:37:59 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated for 0.8.996

---- Files affected:
packages/NetworkManager:
   NetworkManager-pld.patch (1.15 -> 1.15.2.1) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager-pld.patch
diff -u packages/NetworkManager/NetworkManager-pld.patch:1.15 packages/NetworkManager/NetworkManager-pld.patch:1.15.2.1
--- packages/NetworkManager/NetworkManager-pld.patch:1.15	Fri Nov  5 12:02:53 2010
+++ packages/NetworkManager/NetworkManager-pld.patch	Fri Mar 11 23:37:54 2011
@@ -1,53 +1,3 @@
-diff -urN NetworkManager-0.8.2/configure.ac NetworkManager-0.8.2.new//configure.ac
---- NetworkManager-0.8.2/configure.ac	2010-11-03 21:10:45.000000000 +0100
-+++ NetworkManager-0.8.2.new//configure.ac	2010-11-04 23:08:43.530778095 +0100
-@@ -84,7 +84,7 @@
- dnl
- AC_C_BIGENDIAN
- 
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus or linexa]))
-+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or pld]))
- if test "z$with_distro" = "z"; then
- 	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
- 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-@@ -97,6 +97,7 @@
- 	AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
- 	AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
- 	AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
-+	AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
- 	if test "z$with_distro" = "z"; then
- 		with_distro=`lsb_release -is`
- 	fi
-@@ -108,7 +109,7 @@
- 	exit 1
- else
- 	case $with_distro in
--		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa) ;;
-+		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|pld) ;;
- 		*)
- 			echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
- 			exit 1
-@@ -171,6 +172,11 @@
-   AC_DEFINE(TARGET_LINEXA, 1, [Define if you have linexa])
- fi
- 
-+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
-+if test x"$with_distro" = xpld; then
-+  AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
-+fi
-+
- dnl
- dnl Distribution version string
- dnl
-@@ -549,6 +555,8 @@
- initscript/paldo/NetworkManager
- initscript/Mandriva/Makefile
- initscript/Mandriva/networkmanager
-+initscript/PLD/Makefile
-+initscript/PLD/NetworkManager
- initscript/linexa/Makefile
- initscript/linexa/networkmanager
- introspection/Makefile
 diff -urN NetworkManager-0.8.2/initscript/Makefile.am NetworkManager-0.8.2.new//initscript/Makefile.am
 --- NetworkManager-0.8.2/initscript/Makefile.am	2010-10-19 01:44:05.000000000 +0200
 +++ NetworkManager-0.8.2.new//initscript/Makefile.am	2010-11-04 23:09:47.487444761 +0100
@@ -70,7 +20,7 @@
 diff -urN NetworkManager-0.8.2/initscript/PLD/NetworkManager.in NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in
 --- NetworkManager-0.8.2/initscript/PLD/NetworkManager.in	1970-01-01 01:00:00.000000000 +0100
 +++ NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in	2010-11-04 21:54:27.000000000 +0100
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,75 @@
 +#!/bin/sh
 +#
 +# NetworkManager	NetworkManager daemon
@@ -122,8 +72,9 @@
 +	fi
 +}
 +
-+RETVAL=0
++upstart_controlled
 +
++RETVAL=0
 +case "$1" in
 +  start)
 +	start
@@ -145,20 +96,6 @@
 +esac
 +	        
 +exit $RETVAL
-diff -urN NetworkManager-0.8.2/src/backends/Makefile.am NetworkManager-0.8.2.new//src/backends/Makefile.am
---- NetworkManager-0.8.2/src/backends/Makefile.am	2010-10-19 01:44:05.000000000 +0200
-+++ NetworkManager-0.8.2.new//src/backends/Makefile.am	2010-11-04 23:10:33.174111428 +0100
-@@ -57,6 +57,10 @@
- libnmbackend_la_SOURCES += NetworkManagerLinexa.c
- endif
- 
-+if TARGET_PLD
-+libnmbackend_la_SOURCES += NetworkManagerPLD.c
-+endif
-+
- libnmbackend_la_LIBADD += \
- 	$(top_builddir)/src/logging/libnm-logging.la \
- 	$(DBUS_LIBS) \
 diff -urN NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c
 --- NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c	1970-01-01 01:00:00.000000000 +0100
 +++ NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c	2010-11-04 21:54:27.000000000 +0100
@@ -225,16 +162,81 @@
 +	}
 +}
 +
-diff -urN NetworkManager-0.8.2/system-settings/plugins/Makefile.am NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am
---- NetworkManager-0.8.2/system-settings/plugins/Makefile.am	2010-10-07 21:09:52.000000000 +0200
-+++ NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am	2010-11-04 23:12:52.904111428 +0100
-@@ -1,5 +1,9 @@
- SUBDIRS=keyfile
+diff -urN NetworkManager-0.8.996/configure.ac NetworkManager-0.8.996.new//configure.ac
+--- NetworkManager-0.8.996/configure.ac	2011-03-10 07:44:53.000000000 +0000
++++ NetworkManager-0.8.996.new//configure.ac	2011-03-11 21:56:12.369999140 +0000
+@@ -95,7 +95,7 @@
+ dnl
+ AC_C_BIGENDIAN
+ 
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or exherbo]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa, exherbo or pld]))
+ if test "z$with_distro" = "z"; then
+ 	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
+ 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+@@ -109,6 +109,7 @@
+ 	AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+ 	AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
+ 	AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo")
++	AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+ 	if test "z$with_distro" = "z"; then
+ 		with_distro=`lsb_release -is`
+ 	fi
+@@ -120,7 +121,7 @@
+ 	exit 1
+ else
+ 	case $with_distro in
+-		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
++		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|pld) ;;
+ 		*)
+ 			echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
+ 			exit 1
+@@ -188,6 +189,11 @@
+   AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo])
+ fi
+ 
++AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
++if test x"$with_distro" = xpld; then
++  AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
++fi
++
+ dnl
+ dnl Distribution version string
+ dnl
+@@ -617,6 +623,8 @@
+ initscript/paldo/NetworkManager
+ initscript/Mandriva/Makefile
+ initscript/Mandriva/networkmanager
++initscript/PLD/Makefile
++initscript/PLD/NetworkManager
+ initscript/linexa/Makefile
+ initscript/linexa/networkmanager
+ introspection/Makefile
+diff -urN NetworkManager-0.8.996/src/backends/Makefile.am NetworkManager-0.8.996.new//src/backends/Makefile.am
+--- NetworkManager-0.8.996/src/backends/Makefile.am	2011-01-02 23:18:57.000000000 +0000
++++ NetworkManager-0.8.996.new//src/backends/Makefile.am	2011-03-11 21:57:30.163333077 +0000
+@@ -61,6 +61,10 @@
+ libnmbackend_la_SOURCES += NetworkManagerExherbo.c
+ endif
  
 +if TARGET_PLD
-+SUBDIRS+=ifcfg-rh
++libnmbackend_la_SOURCES += NetworkManagerPLD.c
 +endif
 +
- if TARGET_REDHAT
+ libnmbackend_la_LIBADD += \
+ 	$(top_builddir)/src/logging/libnm-logging.la \
+ 	$(DBUS_LIBS) \
+diff -urN NetworkManager-0.8.996/src/settings/plugins/Makefile.am NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am
+--- NetworkManager-0.8.996/src/settings/plugins/Makefile.am	2011-03-08 16:19:01.000000000 +0000
++++ NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am	2011-03-11 21:59:26.183332964 +0000
+@@ -4,6 +4,10 @@
  SUBDIRS+=ifcfg-rh
+ endif
+ 
++if TARGET_PLD
++SUBDIRS+=ifcfg-rh
++endif
++
+ if TARGET_SUSE
+ SUBDIRS+=ifcfg-suse
  endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager-pld.patch?r1=1.15&r2=1.15.2.1&f=u

More information about the pld-cvs-commit mailing list