From 91d90886ef29e6c45a76801d8d0f4ce6efd13cd5 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Jan 22 2010 22:16:35 +0000 Subject: - ifcfg-rh: read and write DHCPv6 enabled connections (rh #429710) - nmcli: update Thu Jan 21 2010 Dan Williams - 0.7.999-2.git20100120 - core: clean NSS up later to preserve errors from crypto_init() Wed Jan 20 2010 Dan Williams - 0.7.999-1.git20100120 - core: support for managed-mode DHCPv6 (rh #429710) - ifcfg-rh: gracefully handle missing PREFIX/NETMASK - cli: initial preview of command-line client - applet: add --help to explain what the applet is (rh #494641) --- diff --git a/.cvsignore b/.cvsignore index ac36db9..a65290c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -177,3 +177,6 @@ NetworkManager-0.7.997.git20091214.tar.bz2 network-manager-applet-0.7.997.git20091214.tar.bz2 NetworkManager-0.7.998.git20100106.tar.bz2 network-manager-applet-0.7.998.git20100106.tar.bz2 +NetworkManager-0.7.999.git20100122.tar.bz2 +network-manager-applet-0.7.999.git20100120.tar.bz2 +nmcli-git20100122.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index 9232886..36da249 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,24 +9,27 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20100106 -%define applet_snapshot .git20100106 +%define snapshot .git20100122 +%define applet_snapshot .git20100120 +%define realversion 0.7.999 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.998 -Release: 1%{snapshot}%{?dist} +Version: 0.8.0 +Release: 0.1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{snapshot}.tar.bz2 -Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2 +Source: %{name}-%{realversion}%{snapshot}.tar.bz2 +Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf +Source3: nmcli-git20100122.tar.bz2 Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch +Patch4: nmcli-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -76,6 +79,7 @@ BuildRequires: gtk-doc BuildRequires: libudev-devel BuildRequires: libuuid-devel BuildRequires: libgudev1-devel >= 143 +BuildRequires: cmake # No bluetooth on s390 %ifnarch s390 s390x BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 @@ -147,14 +151,16 @@ NetworkManager functionality from applications that use glib. %prep -%setup -q +%setup -q -n NetworkManager-%{realversion} -# unpack the applet +# unpack the applet and nmcli tar -xjf %{SOURCE1} +tar -xjf %{SOURCE3} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .no-notifications +%patch4 -p1 -b .nmcli-buildfix %build @@ -166,7 +172,8 @@ autoreconf -i %configure \ --disable-static \ --with-distro=redhat \ - --with-dhcp-client=dhclient \ + --with-dhclient=yes \ + --with-dhcpcd=no \ --with-crypto=nss \ --enable-more-warnings=yes \ --with-docs=yes \ @@ -177,7 +184,13 @@ autoreconf -i make %{?_smp_mflags} # build the applet -pushd network-manager-applet-%{version} +pushd nmcli + cmake . + make %{?_smp_mflags} +popd + +# build the applet +pushd network-manager-applet-%{realversion} autoreconf -i intltoolize --force %configure --disable-static --enable-more-warnings=yes @@ -193,7 +206,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet -pushd network-manager-applet-%{version} +pushd network-manager-applet-%{realversion} make install DESTDIR=$RPM_BUILD_ROOT popd @@ -207,6 +220,8 @@ popd %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager +%{__cp} nmcli/src/nmcli $RPM_BUILD_ROOT%{_bindir}/ + %find_lang %{name} %find_lang nm-applet cat nm-applet.lang >> %{name}.lang @@ -289,6 +304,7 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} +%{_bindir}/nmcli %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/dispatcher.d %dir %{_sysconfdir}/%{name}/VPN @@ -363,6 +379,19 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Fri Jan 22 2010 Dan Williams - 0.8-0.1.git20100122 +- ifcfg-rh: read and write DHCPv6 enabled connections (rh #429710) +- nmcli: update + +* Thu Jan 21 2010 Dan Williams - 0.7.999-2.git20100120 +- core: clean NSS up later to preserve errors from crypto_init() + +* Wed Jan 20 2010 Dan Williams - 0.7.999-1.git20100120 +- core: support for managed-mode DHCPv6 (rh #429710) +- ifcfg-rh: gracefully handle missing PREFIX/NETMASK +- cli: initial preview of command-line client +- applet: add --help to explain what the applet is (rh #494641) + * Wed Jan 6 2010 Dan Williams - 0.7.998-1.git20100106 - build: fix for new pppd (rh #548520) - core: add WWAN enable/disable functionality diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 872156a..79a1bef 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac 2009-07-28 13:11:39.261718877 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac 2009-07-28 13:11:39.261718877 -0400 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 -- NetworkManager >= 0.7.998 -- libnm-glib >= 0.7.998 -- libnm-util >= 0.7.998 -- libnm-glib-vpn >= 0.7.998 +- NetworkManager >= 0.7.999 +- libnm-glib >= 0.7.999 +- libnm-util >= 0.7.999 +- libnm-glib-vpn >= 0.7.999 gtk+-2.0 >= 2.14 libglade-2.0 gmodule-export-2.0 @@ -23,9 +23,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac.buil have_gbt=yes, have_gbt=no) AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -48,9 +48,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-ed gladedir = $(datadir)/nm-applet glade_DATA = \ -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -68,9 +68,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 @@ -6,6 +6,9 @@ INCLUDES = \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -I$(top_srcdir)/src/gconf-helpers/ \ @@ -94,9 +94,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetoo endif EXTRA_DIST = network-manager-applet.c -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -119,9 +119,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am.b gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -141,9 +141,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefil + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la + -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -153,9 +153,9 @@ diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/M noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch index 50582b6..c791279 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in.foo NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in ---- NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 -+++ NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in +--- NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 @@ -6,7 +6,7 @@ /apps/nm-applet/disable-connected-notifications nm-applet diff --git a/nmcli-build.patch b/nmcli-build.patch new file mode 100644 index 0000000..44ac432 --- /dev/null +++ b/nmcli-build.patch @@ -0,0 +1,30 @@ +diff -up NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo NetworkManager-0.7.999/nmcli/src/CMakeLists.txt +--- NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo 2010-01-20 18:49:43.561505337 -0800 ++++ NetworkManager-0.7.999/nmcli/src/CMakeLists.txt 2010-01-20 18:51:51.262342074 -0800 +@@ -1,14 +1,15 @@ + FIND_PACKAGE (PkgConfig REQUIRED) + PKG_CHECK_MODULES (GLIB2 REQUIRED glib-2.0>=2.18 ) + PKG_CHECK_MODULES (DBUS_GLIB REQUIRED dbus-glib-1>=0.76) +-PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7) +-PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7) +-PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7) ++#PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7) ++#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7) ++#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7) + + INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES (${DBUS_GLIB_INCLUDE_DIRS}) +-INCLUDE_DIRECTORIES (${NETWORK_MANAGER_INCLUDE_DIRS}) +-INCLUDE_DIRECTORIES (${LIBNM_INCLUDE_DIRS}) ++INCLUDE_DIRECTORIES (../../include) ++INCLUDE_DIRECTORIES (../../libnm-glib) ++INCLUDE_DIRECTORIES (../../libnm-util) + + #ADD_DEFINITIONS( -Wall -Werror -std=gnu89 -g -O2 -Wshadow + ADD_DEFINITIONS( -Wall -std=gnu89 -g -O0 -Wshadow +@@ -28,4 +29,4 @@ set (NMCLI_SRC + + ADD_EXECUTABLE (nmcli ${NMCLI_SRC}) + +-TARGET_LINK_LIBRARIES (nmcli ${LIBNM_LIBRARIES}) ++TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn) diff --git a/sources b/sources index 0a46160..bf68277 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -2ec2743b8a68fb18f751e0aea0ca2b11 NetworkManager-0.7.998.git20100106.tar.bz2 -3c071bad92ca4d66d98e02c30419d99a network-manager-applet-0.7.998.git20100106.tar.bz2 +3269a3e71f546c4fec3d9029c12a6102 network-manager-applet-0.7.999.git20100120.tar.bz2 +9d2517416102480d29d92753bd52b299 NetworkManager-0.7.999.git20100122.tar.bz2 +76eda6ab0acd9f4b32a793cf04697a3d nmcli-git20100122.tar.bz2