gentoo auto-resync : 22:11:2023 - 23:21:15

9 files changed, 107 insertions, 34 deletions

diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
index b1fa16c92dc6..661b1e65a291 100644
--- a/net-misc/htbinit/Manifest
+++ b/net-misc/htbinit/Manifest
@@ -1,10 +1,11 @@
-AUX htb.init-v0.8.5_tos.patch 1583 BLAKE2B 794c51472cfe08c8d56023f0dcf1a75fbcd2f215a8dee56add23e19fd7e9861946eeb757110cde22ec7204a3566e82f1ea00f738e04fac4626b3588c5e7e6f3b SHA512 902bb6d157deb4161d67e6ca2317410ccb1f2c771debe5c631fc76c9dc20a6920554b2776104247050191a03ec18e7d57fa79e4df79b5c6e6d98061013cf0b61
-AUX htb.init_find_fix.patch 1092 BLAKE2B f94b0f133ccfbdd03902ed5629965670f7947cb6d75acb6879e25d037094b98d7b859f53e16ffcea2edfe8448f40726861e57c83c66fef1fe759d38d2af86c46 SHA512 babb5092fb52447067c7d9246dec4e3605bb4ef14a908ffcd69dc03161a8451b5e9e35621748780f03604c8406e218ea84c066f4aff3552586daa5d7ac28ee61
-AUX htb_0.8.5_esfq.patch 1771 BLAKE2B 8b82f373273cbcb4547cdec198134873c484dee373ad78b6e09bc802422fa20583c9dc69793ae17f81500f299fca9131a5755da52daaf191e33c024afc02aeb2 SHA512 193724a11662df0ee306936f98034e6537c76147bbbdeae3074c77a9abcd8fa42ef06ebc169b8abdae1fcb62295839e7d70d52216d0ca037b5b27bfe37411f78
-AUX htb_0.8.5_ipv6.patch 4590 BLAKE2B 04fbcf0bde55ce921a938bf70adcaebcec1fcb580f9171e711f244fae01a00f9ecca4c917106f3243762844ae8e2aaf226c484f04e4276dbd7e27e84f1bd9adc SHA512 e35e3d1cd5c79ff456dffd880339a37a963a631b5a42f1e9663f0331c7b01a44ba1ae4d0633abc6bed13419502b0afb15d6c601ca61aac51119864ab0a6f9adf
+AUX htb.init-v0.8.5_tos.patch 1573 BLAKE2B 2875ff4022b7a56389f2bcd1c67d634ded341828d87839a941241f641e590ee32b37ad4e14812088e1ed40d48b371128f3e84564d2d6a843e6170c0ae163d8b8 SHA512 fb40ed2e8858b02524f937ad45ae5af777bb470726f0ca2d926eb7e951ccadb6e64c8425163d409616e2981c04161cebaf43e7db293023988660539059ec3958
+AUX htb.init_find_fix.patch 1092 BLAKE2B d054da94549a24d1fdc86e341c9fd533609998a3907198f332c1af38f343bff58a752d93fde431033cfd31765735c1172532f6163386c0e002591571970f54fa SHA512 876c9e8c1c12ab00bf04bf1beac5f80a03056bf7497381957e0e2f607e90c59e13286eba9a594e57aa722882a4bad0587145aa35a5e1c792e83afdf27ef93aa6
+AUX htb_0.8.5_esfq.patch 1771 BLAKE2B 072817b3de625c522f968e82e522e31acb0f84cc84d1308ea24e3cfbb2cd6b022946fb31ecafbaf2b9996b2f094e6953fca4b68f5b1e1be5d9dbfed1a3612767 SHA512 42fd0a04d65cc6871eb82f9e0632b6b10244ba8902054d8410fb64fe840e86aa6a6de865d8373362f5997ae437d311c2a6880175a0059c8c56ef7ff6eed1d712
+AUX htb_0.8.5_ipv6.patch 4599 BLAKE2B aa083e5805adccdc58e4db574c9ddc39485d7a26ed66637d3412fabe6f79f887411bf9aebebd1c5b732bb60599b295ffcf8ce18be51b85de65ec52f19499b810 SHA512 83afdb38c4745e9645ffd10d8bead579498f79479a4cc55d6d33b43bf027230cab438ee5457bd757dd1e121628ddc852ac95ee9048b4c59b89991cd5a5049d3c
 AUX htbinit.rc 706 BLAKE2B af87c49783feaea896d91b84284a21d902ea1f6180a231815094c378a7d4c8db76ccef8e412134ad72c1affe44b3234313c40cade2fc16f414d86c14f745d391 SHA512 17ddfb3dcc2c0b069c3af3548b385cbb894364f7a0c1a37f612c45368d1241dda03fadd544663fe09e2b2c7f2a4c2286f10848fb0230eb520e204b63fb7a3b52
-AUX prio_rule.patch 563 BLAKE2B 17fe3c20556baf52b70885d9ea1c889e420b2f78b0178b1e1b0a19a227754e89ad2940e30f4df069e7568473d79e5338dd017d8dbbd5bfe2d26e7274cd1e3182 SHA512 0b2b20a699bad9062890172e4289b28b1d9e17494bab11211f801791e71134c4001406ee491a30f8d8ebbdd34486e4317929c21d2e16588101c8b2eeadeb9745
-AUX timecheck_fix.patch 1148 BLAKE2B d24d45dd565cdd578d2f17f3b1e1c171472b8eea053fff199e9dac9486472ad5be55fb9c89dd1fb6cfecad4d171184997406a04f4e077d28829e7a221e034f4c SHA512 5e8583d004e15f6dde4ac37771e91683e46d2bb132b776002924508e3e6ca32b2e32bda471c20d0237f448cb443e6d6d1bf023a8b6f7e14a478ea7a699c89bbe
+AUX prio_rule.patch 563 BLAKE2B c73dfcd5a63651bb50a57fb2c2aa95add7522510d15c946a364b6f44e6326df6a441aef34e78058d98d0b30a99d8cd0cfa60c24005acbdee1994bea61718ab7a SHA512 57d61fb83c4d6908bbbab4b90ad828398ba1f3b13ac74828caebbc45b763da9dd7e9d6213e1e9c30b9c1da04d8c8e3be73139d1803d7f808c3541774f7a983da
+AUX timecheck_fix.patch 1148 BLAKE2B 8652531c9a908695502e0eb25e4ab55a11f22e35a92c666658ca07b08111b34527b795d4bd2d810a36d5955b907b99e64570475435c742923037515413b6d8f8 SHA512 ec0b1ca92d3f24a26b1c41c7003e185eb0bdd6204b57038632bcd87f80d5e30c803593869c6c05c1ea6eae561f943b20976b2f5210160af0e1ed921a3ff2b10b
 DIST htb.init-v0.8.5 32038 BLAKE2B a21cc92b3a5d7badc3b3c7813549d25668152e3dd9c7c0f54ca14227b9d6e194a727d5ff97380c2795dbaada71d3b54894c8755f9bf80ba684552de14dc8dfaf SHA512 5f54f662e8b30c4efa6c8cac50eeddfec8650aa6f651065c0962c32067ca7ba17266d20860c296bac44d1f78caa50f6c948f3c55d468a76f9ce2069a43d3c6dd
-EBUILD htbinit-0.8.5-r7.ebuild 1587 BLAKE2B 96737cbb4b66904c0b6a8fece086b632d90a128fb090b6bc2c11f8f03d317913596810d2bb90e5c9137044cfa9167cc8b39743b6994fd7ce557bc36a1751974c SHA512 f1f12a91cfeb7801586323a763789427a3422dd12f3a4872c911f28711228a737f1b5f56b9dfca11288ebf54ce991de63004d638ef15574167ef436b43e02689
+EBUILD htbinit-0.8.5-r7.ebuild 1584 BLAKE2B b4022e495038eb48bda872ba9e5aa7886060573ea07462595c13ce1bb03f5037f4acff25fee6d8d39d004140867be4a6f57d7d66fdd6abe85ad183ff4bf46a2e SHA512 ad16d46bc5bb3583344c91096ead1952ff2bfcb9ffdb90ebf5699b386ba8bdecd4dfc7a97f6868c4295aa3e669a1a179427bcdb363d772eebd2db56b19c2e7cd
+EBUILD htbinit-0.8.5-r8.ebuild 1562 BLAKE2B 4ca94e6f6f3bd48d1e2bc67e423337197acc0ac79e626d8c74114aba0362182b14fbc1e1a5308b9b8904eec12bba4b55e4f7691eb165b92ed01fcd958041a282 SHA512 0b4f3e65cf06d48a1cd9a9d63a89d3c66ac102d5edda127477a445f58ee3febf84389cf7304af52a3ad8c35ad2223ac5dadf62cf834da004262c0d46b7876863
 MISC metadata.xml 1023 BLAKE2B 06982afbf0a26ca2b56c5da0dc9f0e4fc5fcf646375a94a2023102211346a6a8cd42ac68ee0bbf69356ac5ec435249ece88d50b92e5e5626c3c7d9fa69b67d60 SHA512 9efa13f33923d52d81abd0e05fc57e6d491e52836e4b8f3a86d2e16f647ce2c70f4a9c9297ccc789d97f352fb07fa524206afcc17a6d05ef190f9a6aea11ee6c
diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
index f45b5c073493..438ba7d83962 100644
--- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
+++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
@@ -1,8 +1,8 @@
 --- a/htb.init
 +++ b/htb.init
 @@ -240,6 +240,10 @@
- #      Maximum packet size HTB creates rate maps for. The default should
- #      be sufficient for most cases, it certainly is for Ethernet.
+ #	Maximum packet size HTB creates rate maps for. The default should
+ #	be sufficient for most cases, it certainly is for Ethernet.
  #
 +# TOS=<number>                                 optional, default "none"
 +#
@@ -11,7 +11,7 @@
  ### SFQ qdisc parameters
  #
  # The SFQ queueing discipline is a cheap way to fairly share class bandwidth
-@@ -435,6 +435,7 @@
+@@ -435,6 +439,7 @@
  HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU"
  HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM"
  HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB"
@@ -19,7 +19,7 @@
  
  
  #############################################################################
-@@ -646,7 +647,7 @@
+@@ -646,7 +651,7 @@
  	### Set defaults & load class
  	MTU=""; LEAF=none; PERTURB=10
  	RATE=""; BURST=""; CEIL=""; CBURST=""
@@ -28,7 +28,7 @@
  	
  	PRIO_RULE=$PRIO_RULE_DEFAULT
  	PRIO_MARK=$PRIO_MARK_DEFAULT
-@@ -868,12 +869,19 @@
+@@ -868,12 +873,19 @@
  		u32_d="${DPORT:+match ip dport $DPORT $DMASK}"
  		u32_d="${DADDR:+match ip dst $DADDR} $u32_d"
  
diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch
index 27fce89ef2da..200fcfbfb411 100644
--- a/net-misc/htbinit/files/htb.init_find_fix.patch
+++ b/net-misc/htbinit/files/htb.init_find_fix.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -468,8 +468,8 @@
+@@ -473,8 +473,8 @@
  	### List of classes in $HTB_PATH
  	htb_class_list () {
  		for dev in `htb_device_list`; do
@@ -11,7 +11,7 @@
  			-printf "%f\n"| sort
  		done
  	} # htb_class_list
-@@ -483,8 +483,8 @@
+@@ -488,8 +488,8 @@
  	### Validate cache against config files
  	htb_valid_cache () {
  		for dev in `htb_device_list`; do
@@ -22,7 +22,7 @@
  			  wc -l` -gt 0 ] && VALID=0
  			[ $VALID -ne 1 ] && break
  		done
-@@ -493,7 +493,7 @@
+@@ -498,7 +498,7 @@
  
  	### Find class config for device $1, which is newer than cache
  	htb_cache_older () {
diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.patch b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
index 506c505f8e47..fc7c92ddb4cb 100644
--- a/net-misc/htbinit/files/htb_0.8.5_esfq.patch
+++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
@@ -9,7 +9,7 @@
  #
  #	Tells the script to attach specified leaf queueing discipline to HTB
  #	class. By default, no leaf qdisc is used.
-@@ -261,6 +261,15 @@
+@@ -265,6 +265,15 @@
  #	will never take place which is what you probably don't want. The
  #	default value of 10 seconds is probably a good value.
  #
@@ -25,7 +25,7 @@
  ### PFIFO/BFIFO qdisc parameters
  #
  # Those are simple FIFO queueing disciplines. They only have one parameter
-@@ -427,14 +445,14 @@
+@@ -440,14 +449,14 @@
  
  ### Modules to probe for. Uncomment the last HTB_PROBE
  ### line if you have QoS support compiled into kernel
@@ -42,7 +42,7 @@
  HTB_CLASS="$HTB_CLASS\|TOS"
  
  
-@@ -801,6 +819,8 @@
+@@ -815,6 +824,8 @@
  			LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}"
  		elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then
  			LEAFPARM="${LIMIT:+limit $LIMIT}"
diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
index 6e99319f2c62..526e7fcb85c5 100644
--- a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
+++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -275,6 +284,7 @@
+@@ -279,6 +279,7 @@
  ### Filtering parameters
  #
  # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]]
@@ -8,7 +8,7 @@
  #
  #	These parameters make up "u32" filter rules that select traffic for
  #	each of the classes. You can use multiple RULE fields per config.
-@@ -300,9 +310,13 @@
+@@ -304,9 +305,13 @@
  #	RULE=10.5.5.5:80,
  #		selects traffic going from port 80 of single host 10.5.5.5
  #
@@ -22,7 +22,7 @@
  #
  #	These parameters make up "route" filter rules that classify traffic
  #	according to packet source/destination realms. For information about
-@@ -327,6 +341,7 @@
+@@ -331,6 +336,7 @@
  #
  #
  # MARK=<mark>
@@ -30,7 +30,7 @@
  #
  #	These parameters make up "fw" filter rules that select traffic for
  #	each of the classes accoring to firewall "mark". Mark is a decimal
-@@ -414,6 +429,9 @@
+@@ -418,6 +424,9 @@
  PRIO_RULE_DEFAULT=${PRIO_RULE:-100}
  PRIO_MARK_DEFAULT=${PRIO_MARK:-200}
  PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
@@ -40,7 +40,7 @@
  
  ### Default HTB_PATH & HTB_CACHE settings
  HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb}
-@@ -818,6 +838,13 @@
+@@ -823,6 +832,13 @@
  		prio $PRIO_MARK handle $mark fw classid 1:$CLASS
  	done ### mark
  
@@ -54,7 +54,7 @@
  	### Create route filter for REALM fields
  	for realm in `htb_cfile_rules REALM`; do
  		### Split realm into source & destination realms
-@@ -833,6 +860,21 @@
+@@ -838,6 +854,21 @@
  		${DREALM:+to $DREALM} classid 1:$CLASS
  	done ### realm
  
@@ -76,8 +76,8 @@
  	### Create u32 filter for RULE fields
  	for rule in `htb_cfile_rules RULE`; do
  		### Split rule into source & destination
-@@ -876,6 +918,49 @@
- 		prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS
+@@ -888,6 +919,49 @@
+ 		prio $PRIO_RULE u32 $u32_s $u32_d $u32_tos classid 1:$CLASS
  	done ### rule
  
 +       ### Create u32 filter for RULEIPv6 fields
diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch
index 429a1bed0ad1..9a73840e234d 100644
--- a/net-misc/htbinit/files/prio_rule.patch
+++ b/net-misc/htbinit/files/prio_rule.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -453,7 +457,7 @@
+@@ -458,7 +458,7 @@
  	### Load & filter file $HTB_PATH/$1
  	htb_filter_file () {
  		sed -n "s/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g; \
@@ -9,7 +9,7 @@
  	} # htb_filter_file
  
  
-@@ -517,7 +521,7 @@
+@@ -522,7 +522,7 @@
  
  	htb_filter_file () {
  		sed 's/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g' $HTB_PATH/$1 \
diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch
index 4797ea6fd0ab..e39ea9333d1b 100644
--- a/net-misc/htbinit/files/timecheck_fix.patch
+++ b/net-misc/htbinit/files/timecheck_fix.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -891,7 +895,6 @@
+@@ -903,7 +903,6 @@
  TIME_TMP=`date +%w/%k:%M`
  TIME_DOW=${TIME_TMP%%/*}
  TIME_NOW=${TIME_TMP##*/}
@@ -8,7 +8,7 @@
  
  ### Check all classes (if configured)
  for classfile in `htb_class_list`; do
-@@ -914,6 +917,7 @@
+@@ -926,6 +925,7 @@
  		### Compute interval boundaries
  		BEG_ABS=`htb_time2abs $BEG_TIME`
  		END_ABS=`htb_time2abs $END_TIME`
@@ -16,7 +16,7 @@
  
  		### Midnight wrap fixup
  		if [ $BEG_ABS -gt $END_ABS ]; then
-@@ -926,6 +930,23 @@
+@@ -938,6 +938,23 @@
  		### If time period matches, remember params and set MATCH flag
  		if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then
  			RATESPEC=${PARAMS%%,*}; CEILSPEC=${PARAMS##*,}
diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
index 1ae14a2d6a5b..3ac43d29785a 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,11 +6,11 @@ EAPI=7
 inherit linux-info
 
 DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
-HOMEPAGE="https://www.sourceforge.net/projects/htbinit/"
+HOMEPAGE="https://sourceforge.net/projects/htbinit/"
 SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}"
 S="${WORKDIR}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="esfq ipv6"
diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild
new file mode 100644
index 000000000000..438692db1db6
--- /dev/null
+++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
+HOMEPAGE="https://sourceforge.net/projects/htbinit/"
+SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="esfq"
+
+DEPEND="sys-apps/iproute2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/htb.init-v0.8.5_tos.patch
+	"${FILESDIR}"/prio_rule.patch
+	"${FILESDIR}"/timecheck_fix.patch
+	"${FILESDIR}"/htb.init_find_fix.patch
+	"${FILESDIR}"/htb_0.8.5_ipv6.patch
+)
+
+pkg_setup() {
+	local i
+	for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do
+		CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+	done
+
+	use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ"
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	cp "${DISTDIR}"/htb.init-v${PV} "${S}"/htb.init || die
+}
+
+src_prepare() {
+	default
+
+	sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init || die
+
+	use esfq && eapply "${FILESDIR}"/htb_0.8.5_esfq.patch
+
+	# bug #474700
+	sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dosbin htb.init
+
+	newinitd "${FILESDIR}"/htbinit.rc htbinit
+
+	keepdir /etc/htb
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'Run "rc-update add htbinit default" to run htb.init at startup.'
+		elog 'Please, read carefully the htb.init documentation.'
+		elog 'New directory to store configuration is /etc/htb.'
+	fi
+}