Re: [PR PATCH] [Updated] add changelogs

[lemmi <lemmi@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

There is an updated pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages changelogs
https://github.com/void-linux/void-packages/pull/38979

add changelogs
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/38979.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-changelogs-38979.patch --]
[-- Type: text/x-diff, Size: 4661 bytes --]

From e6495ccc8efb6b652f6aaa07b3efda38e9f96ff9 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 30 Aug 2022 14:23:21 +0200
Subject: [PATCH 1/3] babeld: update to 1.12.1.

add changelog
add conflict with frr (/usr/bin/babeld)
---
 srcpkgs/babeld/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template
index 5a46f57aafaf..ebf55a4a787e 100644
--- a/srcpkgs/babeld/template
+++ b/srcpkgs/babeld/template
@@ -1,15 +1,16 @@
 # Template file for 'babeld'
 pkgname=babeld
-version=1.10
+version=1.12.1
 revision=1
-wrksrc=babeld-babeld-${version}
 build_style=gnu-makefile
 short_desc="Babel loop-avoiding distance-vector routing daemon"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"
 homepage="https://www.irif.fr/~jch/software/babel/"
-distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz"
-checksum=d44a0ca3cf67595e1ed67ca219c975c3c011c6046028be75df254715c4611d31
+changelog="https://raw.githubusercontent.com/jech/babeld/master/CHANGES"
+distfiles="https://www.irif.fr/~jch/software/files/babeld-${version}.tar.gz"
+checksum=9ab59d7ac741f3630df23f9c3b67c60294d8b34ab622398f9b89773a878ecb1e
+conflicts="frr"
 
 pre_build() {
 	echo ${version}-${revision} > version

From 426c09bb1be9b92c28a1a5937b05792566cd122b Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 30 Aug 2022 21:50:47 +0200
Subject: [PATCH 2/3] frr: add conflict with babeld (/usr/bin/babeld)

---
 srcpkgs/frr/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 664313adf10e..ec895357d5b4 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.5
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
@@ -23,6 +23,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://frrouting.org"
 distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
 checksum=54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136
+conflicts="babeld"
 python_version=3
 system_groups="_frrvty"
 system_accounts="_frr"
@@ -42,11 +43,6 @@ else
 	subpackages+=" frr-devel"
 fi
 
-post_patch() {
-	# Typo in configure macro
-	vsed -i m4/ax_python.m4 -e 's/"{py_ver}"/"${py_ver}"/g'
-}
-
 pre_configure() {
 	autoreconf -fi
 }

From 04ba38e4abe76cd1916aafe2a280c782a45be894 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 30 Aug 2022 14:23:26 +0200
Subject: [PATCH 3/3] usbhid-dump: replace with usbutils

usbhid-dump is shipped with usbutils
---
 srcpkgs/usbhid-dump/template | 17 -----------------
 srcpkgs/usbutils/template    |  5 +++--
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/usbhid-dump/template

diff --git a/srcpkgs/usbhid-dump/template b/srcpkgs/usbhid-dump/template
deleted file mode 100644
index bf47fb064393..000000000000
--- a/srcpkgs/usbhid-dump/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'usbhid-dump'
-pkgname=usbhid-dump
-version=1.4
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="libusb-devel"
-short_desc="USB HID device dumping utility"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/DIGImend/usbhid-dump"
-distfiles="https://github.com/DIGImend/usbhid-dump/archive/${version}.tar.gz"
-checksum=8e39092396bddbda3bc520b39417f78c09958efb3df1f2e16ff37006a3b1905d
-
-pre_configure() {
-	autoreconf -i -f
-}
diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index 0b149585e8e6..4c7f552a3fe0 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -1,7 +1,7 @@
 # Template file for 'usbutils'
 pkgname=usbutils
 version=014
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/hwdata --disable-zlib"
 hostmakedepends="automake libtool pkg-config"
@@ -10,10 +10,11 @@ depends="hwids"
 short_desc="Linux USB utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://linux-usb.sourceforge.net/"
+homepage="https://github.com/gregkh/usbutils"
 changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS"
 distfiles="${KERNEL_SITE}/utils/usb/usbutils/usbutils-${version}.tar.xz"
 checksum=3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69
+replaces="usbhid-dump<=1.4_1"
 
 post_install() {
 	# Remove lsusb.py - avoid useless python scripts