[macchanger] Update to macchanger 1.7.0

thoger thoger at fedoraproject.org
Fri Jul 4 06:39:30 UTC 2014


commit 59415396348e38119499d81503d11a8458521a03
Author: Tomas Hoger <thoger at redhat.com>
Date:   Fri Jul 4 08:38:14 2014 +0200

    Update to macchanger 1.7.0

 .gitignore                              |    1 +
 macchanger-1.6.0-bia-fix.diff           |   94 -----------------------
 macchanger-1.6.0-dev-name-overflow.diff |   29 -------
 macchanger-1.6.0-doc-cleanup.diff       |   84 --------------------
 macchanger-1.6.0-dynamic-lists.diff     |  126 -------------------------------
 macchanger-1.6.0-endding.diff           |   94 -----------------------
 macchanger-1.6.0-show-default.diff      |   93 -----------------------
 macchanger-1.7.0-seed-source.diff       |   20 +++++
 macchanger.spec                         |   63 ++++++++--------
 sources                                 |    4 +-
 10 files changed, 53 insertions(+), 555 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9c01df5..1ef0eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /macchanger-1.6.0.tar.gz
 /macchanger-1.6.0.tar.gz.sig
 /gpl-2.0.txt
+/macchanger-1.7.0.tar.gz
diff --git a/macchanger-1.7.0-seed-source.diff b/macchanger-1.7.0-seed-source.diff
new file mode 100644
index 0000000..bd90bf7
--- /dev/null
+++ b/macchanger-1.7.0-seed-source.diff
@@ -0,0 +1,20 @@
+Prefer /dev/urandom as seed source.  This reverts upstream commit:
+https://github.com/alobbs/macchanger/commit/99ea3798680459fe8f5259748f2b8f917f1c952e
+
+Related discussion:
+https://github.com/alobbs/macchanger/issues/5
+
+--- macchanger-1.7.0/src/main.c	2014-01-01 10:23:39.000000000 +0100
++++ rpm/BUILD/macchanger-1.6.0/src/main.c	2014-07-03 22:53:03.649214864 +0200
+@@ -94,9 +94,8 @@ random_seed (void)
+ 	struct timeval tv;
+ 	unsigned int   seed;
+ 
+-	if ((fd = open("/dev/hwrng", O_RDONLY)) >= 0 ||
+-	    (fd = open("/dev/random", O_RDONLY)) >= 0 ||
+-	    (fd = open("/dev/urandom", O_RDONLY)) >= 0)
++	if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 ||
++	    (fd = open("/dev/random", O_RDONLY)) >= 0)
+ 	{
+ 		read (fd, &seed, sizeof(seed));
+ 		close (fd);
diff --git a/macchanger.spec b/macchanger.spec
index e85c227..68dda4b 100644
--- a/macchanger.spec
+++ b/macchanger.spec
@@ -1,41 +1,32 @@
 Name:           macchanger
-Version:        1.6.0
-Release:        3%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        An utility for viewing/manipulating the MAC address of network interfaces
 Group:          Applications/System
-License:        GPLv2+
+License:        GPLv3+
 
-URL:            http://www.alobbs.com/macchanger
-#               https://github.com/alobbs/macchanger
+URL:            https://github.com/alobbs/macchanger
+#               http://www.alobbs.com/macchanger
 
-Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-Source1:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+#Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+#Source1:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
 
-# https://github.com/alobbs/macchanger/issues/3
-Source2:        http://www.gnu.org/licenses/gpl-2.0.txt
+Source0:        https://github.com/alobbs/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 
 # no OUI update at the moment
 #Patch0:         macchanger-1.X.0-OUI-list-update.diff
 
-# https://github.com/alobbs/macchanger/commit/27cbde0df8f1bfcfbcacc38d4c40096694303874
-Patch3:         macchanger-1.6.0-dynamic-lists.diff
-# https://github.com/alobbs/macchanger/commit/8e59754795d9431314e72c19b09d8f150499c8a1
-Patch4:         macchanger-1.6.0-dev-name-overflow.diff
-# https://github.com/alobbs/macchanger/commit/72f813e68ee6dbedacc87b98286c4803af30ac76
-Patch7:         macchanger-1.6.0-endding.diff
-# https://github.com/alobbs/macchanger/commit/d93794a34686f9f75f6579e929a17a7762fcb383
-Patch8:         macchanger-1.6.0-doc-cleanup.diff
-# https://github.com/alobbs/macchanger/commit/52c07ddc355a3415ac31a4106334098e336a5890
-Patch9:         macchanger-1.6.0-bia-fix.diff
-# https://github.com/alobbs/macchanger/commit/26eda412450f09c4f43961a2e5ac31e92f47d30d
-Patch10:        macchanger-1.6.0-show-default.diff
+# prefer /dev/urandom as source of seed for random
+Patch1:         macchanger-1.7.0-seed-source.diff
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/install-info
 Requires(preun):  /sbin/install-info
-BuildRequires:    texinfo
+
+# texinfo is only needed when .info rebuild is required
+#BuildRequires:    texinfo
 
 
 %description
@@ -45,19 +36,12 @@ Features:
   * set a MAC of another vendor
   * set another MAC of the same vendor
   * reset MAC address to its original permanent hardware value
-  * display a vendor MAC list (more than 17000 items)
+  * display a vendor MAC list (more than 18000 items)
 
 
 %prep
 %setup -q
-%patch3 -p1 -b .dynlists
-%patch4 -p1 -b .devnameoverflow
-%patch7 -p1 -b .endding
-%patch8 -p1 -b .docclean
-%patch9 -p1 -b .bia
-%patch10 -p1 -b .show
-
-cp %{SOURCE2} COPYING
+%patch1 -p1 -b .seedsource
 
 
 %build
@@ -92,6 +76,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul  4 2014 Tomas Hoger <thoger at fedoraproject.org> - 1.7.0-1
+- Update to upstream 1.7.0
+- Licence change from GPLv2+ to GPLv3+
+  https://github.com/alobbs/macchanger/issues/3#issuecomment-31526964
+- Upstream sources are now on github, no more signatures :-(.
+- Dropped patches - fixes applied upstream:
+  1.6.0-dynamic-lists.diff
+  1.6.0-dev-name-overflow.diff
+  1.6.0-endding.diff
+  1.6.0-doc-cleanup.diff
+  1.6.0-bia-fix.diff
+  1.6.0-show-default.diff
+- New patche for 1.7.0:
+  1.7.0-seed-source.diff - keep preferring /dev/urandom as seed source
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -129,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Tue Jan 10 2012 Tomas Hoger <thoger at fedoraproject.org> - 1.5.0-11
-- Fix build warning to do bad format string (size_t).
+- Fix build warning caused by bad format string (size_t).
 - Fix command line argument typo: endding -> ending, see Debian bug
   http://bugs.debian.org/621698
 - Add option to reset MAC address to hardware permanent address.
diff --git a/sources b/sources
index 1bcf7c2..8300848 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-1257b18e9067a8192c9747da52aabdda  macchanger-1.6.0.tar.gz
-9bafe99d392344b6001d4378ee722221  macchanger-1.6.0.tar.gz.sig
-b234ee4d69f5fce4486a80fdaf4a4263  gpl-2.0.txt
+ca56f16142914337391dac91603eb332  macchanger-1.7.0.tar.gz


More information about the scm-commits mailing list