From c5cf66f3780b236ee71bfe7e4c71f5c016df2b84 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 8 May 2013 11:42:14 -0500 Subject: [PATCH] Update to new pre-0.9.8.2 snapshot --- NetworkManager.spec | 27 +++++++++++++++++++---- nss-error.patch | 15 ------------- rh853199-fix-gtk-doc-hardened-build.patch | 11 +++++++++ sources | 2 +- 4 files changed, 35 insertions(+), 20 deletions(-) delete mode 100644 nss-error.patch create mode 100644 rh853199-fix-gtk-doc-hardened-build.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 735d4c2..d75f975 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,7 +6,7 @@ %define libnl3_version 3.2.7 %define ppp_version 2.4.5 -%define snapshot .git20130327 +%define snapshot .git20130507 %define realversion 0.9.8.1 %if 0%{?fedora} && 0%{?fedora} < 17 @@ -15,11 +15,15 @@ %define systemd_dir %{_prefix}/lib/systemd/system %endif +# gtk-doc conflicts with hardened build even with the patch, disable +# until redhat-rpm-config is fixed: https://bugzilla.redhat.com/show_bug.cgi?id=892837 +#global _hardened_build 1 + Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.8.1 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -27,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{realversion}%{snapshot}.tar.bz2 Source1: NetworkManager.conf Patch1: explain-dns1-dns2.patch -Patch2: nss-error.patch +Patch2: rh853199-fix-gtk-doc-hardened-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -154,7 +158,6 @@ NetworkManager functionality from applications that use glib. %setup -q -n NetworkManager-%{realversion} %patch1 -p1 -b .explain-dns1-dns2 -%patch2 -p1 -b .nss-error %build @@ -185,6 +188,9 @@ intltoolize --force --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --with-dist-version=%{version}-%{release} +# Patch here because gtk-doc.make is generated +patch -p1 -b -z .gtkdoc-hardened-build < %{PATCH2} + make %{?_smp_mflags} %install @@ -358,6 +364,19 @@ exit 0 %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue May 7 2013 Dan Williams - 0.9.8.1-2.git20130507 +- core: fix issue with UI not showing disconnected on rfkill +- core: memory leak fixes +- core: silence warning about failure reading permanent MAC address (rh #907912) +- core: wait up to 120s for slow-connecting modems +- core: don't crash on PPPoE connections without a wired setting +- core: ensure the AvailableConnections property is always correct +- keyfile: ensure all-default VLAN connections are read correctly +- core: suppress kernel's automatic creation of bond0 (rh #953466) +- libnm-glib: make NMSecretAgent usable with GObject Introspection +- libnm-util: fix GObject Introspection annotations of nm_connection_need_secrets() +- core: documentation updates + * Wed Mar 27 2013 Dan Williams - 0.9.8.1-1.git20130327 - Update to 0.9.8.2 snapshot - core: fix VLAN parent handling when identified by UUID diff --git a/nss-error.patch b/nss-error.patch deleted file mode 100644 index 0a63148..0000000 --- a/nss-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo NetworkManager-0.9.2.0/libnm-util/crypto_nss.c ---- NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo 2011-11-10 12:40:14.365009479 -0600 -+++ NetworkManager-0.9.2.0/libnm-util/crypto_nss.c 2011-11-10 12:40:48.787579140 -0600 -@@ -26,6 +26,11 @@ - #include - #include - -+/* Work around NSS error: -+ * /usr/include/nss3/pkcs11n.h:365:26: error: "__GNUC_MINOR" is not defined [-Werror=undef] -+ */ -+#define __GNUC_MINOR __GNUC_MINOR__ -+ - #include - #include - #include diff --git a/rh853199-fix-gtk-doc-hardened-build.patch b/rh853199-fix-gtk-doc-hardened-build.patch new file mode 100644 index 0000000..a9dad20 --- /dev/null +++ b/rh853199-fix-gtk-doc-hardened-build.patch @@ -0,0 +1,11 @@ +--- NetworkManager-0.9.8.1/gtk-doc.make 2013-04-30 15:16:13.049980141 -0500 ++++ NetworkManager-0.9.8.1/gtk-doc.make 2013-04-30 15:17:41.525874040 -0500 +@@ -108,7 +108,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_ + scanobj_options="--verbose"; \ + fi; \ + fi; \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ diff --git a/sources b/sources index 143b7b4..ea54fed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b672fc0932992b4c178db363d9a6f8d NetworkManager-0.9.8.1.git20130327.tar.bz2 +e2cdc55cda2d2b3967fb020524505d16 NetworkManager-0.9.8.1.git20130507.tar.bz2