This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 4f209325081fef9dfed0951a99bb553cb46243bd (commit) via efba80b68b9279e1ff11217a659c0e87c44fb752 (commit) via fafd5fb887fb0836cd9ec13ef63657fefc4cb634 (commit) from 5663d181bb599806acc2413affa6a3a58c3518a0 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 4f209325081fef9dfed0951a99bb553cb46243bd Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 26 15:02:42 2014 +0200
systemd: Remove udev rules for "predictable" network device names
commit efba80b68b9279e1ff11217a659c0e87c44fb752 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 26 15:01:45 2014 +0200
crda: Update to 3.13 (wireless-regdb 2014.06.13)
commit fafd5fb887fb0836cd9ec13ef63657fefc4cb634 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 26 14:47:19 2014 +0200
libnl3: New package.
Yet an other netlink library.
-----------------------------------------------------------------------
Summary of changes: crda/crda.nm | 19 +++++--- ...TDIR-support-in-install-libreg-rules-in-.patch0 | 36 +++++++++++++++ crda/patches/crda-remove-ldconfig.patch0 | 11 +++++ libnl/libnl.nm => libnl3/libnl3.nm | 51 ++++++++++++++++------ systemd/systemd.nm | 6 ++- 5 files changed, 103 insertions(+), 20 deletions(-) create mode 100644 crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 create mode 100644 crda/patches/crda-remove-ldconfig.patch0 copy libnl/libnl.nm => libnl3/libnl3.nm (51%)
Difference in files: diff --git a/crda/crda.nm b/crda/crda.nm index 64e775c..76993a5 100644 --- a/crda/crda.nm +++ b/crda/crda.nm @@ -5,8 +5,8 @@
name = crda version = %{ver_crda}-%{ver_regdb} -ver_crda = 1.1.3 -ver_regdb = 2013.02.13 +ver_crda = 3.13 +ver_regdb = 2014.06.13 release = 1
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org @@ -23,14 +23,14 @@ description end
source_dl = \ - http://wireless.kernel.org/download/crda/ \ + https://www.kernel.org/pub/software/network/crda/ \ https://www.kernel.org/pub/software/network/wireless-regdb/ -sources = crda-%{ver_crda}.tar.bz2 wireless-regdb-%{ver_regdb}.tar.xz +sources = crda-%{ver_crda}.tar.xz wireless-regdb-%{ver_regdb}.tar.xz
build requires libgcrypt-devel - libnl-devel + libnl3-devel openssl python-m2crypto end @@ -54,7 +54,8 @@ build popd
pushd %{DIR_SRC}/crda-%{ver_crda} - make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir} + make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir} \ + SBINDIR=%{sbindir}/ LIBDIR=%{libdir}/ popd end end @@ -65,6 +66,12 @@ packages obsoletes = wireless-regdb < %{ver_regdb} end
+ package %{name}-devel + template DEVEL + + files += !%{libdir}/libreg.so + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 b/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 new file mode 100644 index 0000000..9085718 --- /dev/null +++ b/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 @@ -0,0 +1,36 @@ +From 79f5cb8d130a635e0ee3eeb6a061a31d6bd7286e Mon Sep 17 00:00:00 2001 +From: "John W. Linville" linville@tuxdriver.com +Date: Fri, 14 Feb 2014 13:39:14 -0500 +Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in + Makefile + +Signed-off-by: John W. Linville linville@tuxdriver.com +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 4a351c645bf4..807a53819453 100644 +--- crda-3.13/Makefile ++++ crda-3.13/Makefile +@@ -119,13 +119,13 @@ $(LIBREG): regdb.h reglib.h reglib.c + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +- $(Q)mkdir -p $(INCLUDE_DIR) +- $(Q)cp *.h $(INCLUDE_DIR)/ ++ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) ++ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ + + install-libreg: + $(NQ) ' INSTALL libreg' +- $(Q)mkdir -p $(LIBDIR) +- $(Q)cp $(LIBREG) $(LIBDIR)/ ++ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) ++ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ + $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) +-- +1.8.5.3 + diff --git a/crda/patches/crda-remove-ldconfig.patch0 b/crda/patches/crda-remove-ldconfig.patch0 new file mode 100644 index 0000000..b9ba785 --- /dev/null +++ b/crda/patches/crda-remove-ldconfig.patch0 @@ -0,0 +1,11 @@ +diff -up crda-3.13/Makefile.ldconfig crda-3.13/Makefile +--- crda-3.13/Makefile.ldconfig 2014-02-14 13:47:10.674521882 -0500 ++++ crda-3.13/Makefile 2014-02-14 13:47:14.284552473 -0500 +@@ -126,7 +126,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ diff --git a/libnl3/libnl3.nm b/libnl3/libnl3.nm new file mode 100644 index 0000000..a74529d --- /dev/null +++ b/libnl3/libnl3.nm @@ -0,0 +1,70 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = libnl3 +version = 3.2.25 +release = 1 +thisapp = libnl-%{version} + +groups = Development/Libraries +url = http://www.infradead.org/~tgr/libnl/ +license = LGPLv2 +summary = Convenience library for kernel netlink sockets. + +description + This package contains a convenience library to simplify using the \ + Linux kernel's netlink sockets interface for network manipulation. +end + +source_dl = http://www.infradead.org/~tgr/libnl/files/ + +build + requires + autoconf + automake + bison + flex + libtool + end + + prepare_cmds + autoreconf -vif + end + + configure_options += \ + --disable-static +end + +packages + package %{name} + + package %{name}-cli + summary = Command line interface utils for libnl3 + description + This package contains various libnl3 utils and additional + libraries on which they depend. + end + + requires += %{name} = %{thisver} + + files + %{libdir}/libnl-cli*.so.* + %{libdir}/libnl/ + %{sbindir}/* + %{mandir}/man8/* + end + end + + package %{name}-devel + template DEVEL + + requires += %{name} = %{thisver} + requires += %{name}-cli = %{thisver} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index ea7d6ea..1c6cb26 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 204 -release = 4 +release = 5
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -125,6 +125,10 @@ build
# Install legacy tmpfile to autocreate /run/lock on startup. install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/ + + # Remove udev rules for "predictable" network device renaming. + # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterface... + rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-name-slot.rules end end
hooks/post-receive -- IPFire 3.x development tree