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 2.x development tree".

The branch, next has been updated via 06c3030bc6550d76f08590e6a2dc8cb20f7ab1e8 (commit) via c9517c7bbb570b393be7f42da2b5f697776fda5d (commit) via 8c5865abc48424012dceb285bc1ae335bc0c680e (commit) from 06104d4e6f8293b0d695f94df06a9e94eb21d72d (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 06c3030bc6550d76f08590e6a2dc8cb20f7ab1e8 Merge: c9517c7bb 06104d4e6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 31 18:52:02 2021 +0200

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-3.x into next

commit c9517c7bbb570b393be7f42da2b5f697776fda5d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 31 18:51:22 2021 +0200

core159: add libusb

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 8c5865abc48424012dceb285bc1ae335bc0c680e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 31 13:27:54 2021 +0200

Revert "libusb: update to 0.0.24"

This reverts commit 937d8dbcb19fcfbdfc0d914b769c93b5cffdba65.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/libusb | 2 +- config/rootfiles/{oldcore/145 => core/159}/filelists/libusb | 0 config/rootfiles/core/159/update.sh | 1 + lfs/libusb | 6 +++--- 4 files changed, 5 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/145 => core/159}/filelists/libusb (100%)

Difference in files: diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb index db0215195..232574159 100644 --- a/config/rootfiles/common/libusb +++ b/config/rootfiles/common/libusb @@ -5,5 +5,5 @@ etc/udev/rules.d/23-usb.rules #usr/lib/libusb-1.0.la #usr/lib/libusb-1.0.so usr/lib/libusb-1.0.so.0 -usr/lib/libusb-1.0.so.0.3.0 +usr/lib/libusb-1.0.so.0.2.0 #usr/lib/pkgconfig/libusb-1.0.pc diff --git a/config/rootfiles/core/159/filelists/libusb b/config/rootfiles/core/159/filelists/libusb new file mode 120000 index 000000000..edbe8c215 --- /dev/null +++ b/config/rootfiles/core/159/filelists/libusb @@ -0,0 +1 @@ +../../../common/libusb \ No newline at end of file diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/core/159/update.sh index 89ce31111..b5a80fcf4 100644 --- a/config/rootfiles/core/159/update.sh +++ b/config/rootfiles/core/159/update.sh @@ -95,6 +95,7 @@ rm -rf /usr/share/u-boot/rpi* # Remove files rm -rf /opt/pakfire/db/meta/meta-libstatgrab rm -rf /opt/pakfire/db/installed/meta-libstatgrab +rm -rf /usr/lib/libusb-1.0.so.0.3.0

# Stop services /etc/init.d/ipsec stop diff --git a/lfs/libusb b/lfs/libusb index 9c8a9ac9a..4b99a6d18 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 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,7 +24,7 @@

include Config

-VER = 1.0.24 +VER = 1.0.23

THISAPP = libusb-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 5bc27df16155302f308d409e73589872 +$(DL_FILE)_MD5 = 1e29700f6a134766d32b36b8d1d61a95

install : $(TARGET)

hooks/post-receive -- IPFire 2.x development tree