laine pushed to netcf (master). "update to 0.2.7-1"

[notifications at fedoraproject.org]

>From cb9ccf7165bcdf5ad8b8a68a682f14946377965b Mon Sep 17 00:00:00 2001
From: Laine Stump <laine at laine.org>
Date: Mon, 6 Apr 2015 12:35:39 -0400
Subject: update to 0.2.7-1


diff --git a/.gitignore b/.gitignore
index 83b5f85..1fa0ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ netcf-0.1.6.tar.gz
 /netcf-0.2.4.tar.gz
 /netcf-0.2.5.tar.gz
 /netcf-0.2.6.tar.gz
+/netcf-0.2.7.tar.gz
diff --git a/netcf.spec b/netcf.spec
index 1289cd3..d5c77a2 100644
--- a/netcf.spec
+++ b/netcf.spec
@@ -1,6 +1,6 @@
 Name:           netcf
-Version:        0.2.6
-Release:        2%{?dist}%{?extra_release}
+Version:        0.2.7
+Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
 Group:          System Environment/Libraries
@@ -9,11 +9,26 @@ URL:            https://fedorahosted.org/netcf/
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Patches
+# One patch per line, in this format:
+# Patch001: file1.patch
+# Patch002: file2.patch
+# ...
+#
+# The patches will automatically be put into the build source tree
+# during the %prep stage (using git, which is now required for an rpm
+# build)
+#
+
 # Default to skipping autoreconf.  Distros can change just this one
 # line (or provide a command-line override) if they backport any
 # patches that touch configure.ac or Makefile.am.
 %{!?enable_autotools:%define enable_autotools 0}
 
+# git is used to build a source tree with patches applied (see the
+# %prep section)
+BuildRequires: git
+
 # Fedora 20 / RHEL-7 are where netcf first uses systemd. Although earlier
 # Fedora has systemd, netcf still used sysvinit there.
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -87,8 +102,41 @@ The libraries for %{name}.
 %prep
 %setup -q
 
-# do not spam console (#1135744)
-sed -i /StandardOutput=journal+console/d src/netcf-transaction.service.in
+# Patches have to be stored in a temporary file because RPM has
+# a limit on the length of the result of any macro expansion;
+# if the string is longer, it's silently cropped
+%{lua:
+    tmp = os.tmpname();
+    f = io.open(tmp, "w+");
+    count = 0;
+    for i, p in ipairs(patches) do
+        f:write(p.."\n");
+        count = count + 1;
+    end;
+    f:close();
+    print("PATCHCOUNT="..count.."\n")
+    print("PATCHLIST="..tmp.."\n")
+}
+
+git init -q
+git config user.name rpm-build
+git config user.email rpm-build
+git config gc.auto 0
+git add .
+git commit -q -a --author 'rpm-build <rpm-build>' \
+           -m '%{name}-%{version} base'
+
+COUNT=$(grep '\.patch$' $PATCHLIST | wc -l)
+if [ $COUNT -ne $PATCHCOUNT ]; then
+    echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT"
+    exit 1
+fi
+if [ $COUNT -gt 0 ]; then
+    xargs git am <$PATCHLIST || exit 1
+fi
+echo "Applied $COUNT patches"
+rm -f $PATCHLIST
+
 
 %build
 %if %{with_libnl1}
@@ -164,6 +212,17 @@ fi
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Mon Apr 06 2015 Laine Stump <laine at redhat.com> - 0.2.7-1
+ - rebase to netcf-0.2.7
+ - resolve CVE-2014-8119
+ - support multiple IPv4 addresses in interface config (redhat driver)
+ - allow static IPv4 config simultaneous with DHCPv4 (redhat driver)
+ - recognize IPADDR0/NETMASK0/PREFIX0
+ - remove extra quotes from IPV6ADDR_SECONDARIES (redhat+suse drivers)
+ - miscellaneous systemd service fixes
+ - use git to apply patches in rpm specfile
+ - revert the 0.2.6-2 specfile patch mentioned below (now fixed properly)
+
 * Thu Jan  8 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 0.2.6-2
 - do not write to the console (#1135744)
 
diff --git a/sources b/sources
index d76e97f..d104ac9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-042f1c67f0d63d612d7481492eb91b54  netcf-0.2.6.tar.gz
+3698f883b0ee524266692bda7a3a6606  netcf-0.2.7.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/netcf.git/commit/?h=master&id=cb9ccf7165bcdf5ad8b8a68a682f14946377965b