Tor: Bump package version

[ipfire-2.x.git] / lfs / udev

diff --git a/lfs/udev b/lfs/udev
index 7d5bdbca19106b427367a7f1903aff517536f6d0..e712ef6ea00dac67093bf20abbe9586ad274617a 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,26 +24,26 @@
 
 include Config
 
-VER        = 208
+VER        = 3.2.11
+RULES_VER  = 20171102
 
-THISAPP    = udev-$(VER)
-DL_FILE    = systemd-$(VER).tar.xz
+THISAPP    = eudev-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/systemd-$(VER)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) udev-lfs-208-1.tar.bz2
-
+objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2
+udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2
 
-$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165
-udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7
+$(DL_FILE)_BLAKE2 = e1985a4fd0d497b739543d027b5b40033932819e3e5402a51f73fab666144f97f768dff325b5f0e0beb43420efa9afdefb76a9da6b88fa065ad25c76fe1fbc6a
+udev-lfs-$(RULES_VER).tar.bz2_BLAKE2 = b5fb8177a87719e28adc976b83953024dbcfb8739b0c2e61da186cbc4df5e75e62c888da987d15c64db164002bb0a1e66ce0ff206b143dc953d7571b66d5d5c0
 
 install : $(TARGET)
 
@@ -51,10 +51,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -63,8 +63,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -73,28 +73,36 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
+       cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2
 
-       cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --bindir=/bin \
+               --sbindir=/sbin \
+               --sysconfdir=/etc \
+               --libdir=/usr/lib \
+               --libexecdir=/lib \
+               --with-rootprefix= \
+               --with-rootlibdir=/lib \
+               --enable-manpages \
+               --disable-static
 
-       rm -rf /lib/udev/devices
-       install -dv /lib/firmware
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 
-       cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING)
-       cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install
+       # Generate hardware database
+       udevadm hwdb --update
 
-       # Make some compat symlinks
-       ln -sf /lib/udev/udevd /sbin/udevd
-       ln -sf /sbin/udevadm /bin/udevadm
+       # Install rules
+       cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install
 
        # Disable net generator rule. This does not work with the setup.
        rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
        rm -f /lib/udev/rules.d/80-net-name-slot.rules
 
        # Blacklist some modules
-       cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf
+       cp -vf $(DIR_SRC)/config/udev/blacklist.conf \
+               /etc/modprobe.d/blacklist.conf
 
        # Install config file
        install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \
@@ -109,6 +117,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /lib/udev/network-hotplug-rename
        install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-vlan \
                /lib/udev/network-hotplug-vlan
+       install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-bridges \
+               /lib/udev/network-hotplug-bridges
        install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
                /lib/udev/rules.d
 
@@ -116,10 +126,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/udev/90-hwrng.rules \
                /lib/udev/rules.d
 
-       # Install codel rules.
-       install -v -m 644 $(DIR_SRC)/config/udev/99-codel.rules \
+       # Install AQM rules
+       install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
                /lib/udev/rules.d
-       install -m 755 $(DIR_SRC)/config/udev/enable_codel \
-               /lib/udev/enable_codel
+       install -m 755 $(DIR_SRC)/config/udev/network-aqm \
+               /lib/udev/network-aqm
+
+       # Install offloading rules
+       install -v -m 644 $(DIR_SRC)/config/udev/99-offloading.rules \
+               /lib/udev/rules.d
+       install -m 755 $(DIR_SRC)/config/udev/network-offloading \
+               /lib/udev/network-offloading
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)