From d87b570026dc9d9884466af6e4f024d53e79dbcd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 13 Jun 2025 11:32:17 -0400 Subject: [PATCH] youtube-dl: make transitional package on yt-dlp - upstream now only releases nightly versions - currently-packaged version is vulnerable (GHSA-22fp-mf44-f2mq) - the fork yt-dlp is packaged and maintained, and has a compatibility mode we can use Co-Authored-By: menaechmi --- srcpkgs/python3-youtube-dl | 2 +- srcpkgs/youtube-dl | 1 + srcpkgs/youtube-dl/template | 34 ---------------------------------- srcpkgs/youtube-dl/update | 1 - srcpkgs/yt-dlp/template | 24 +++++++++++++++++++++++- 5 files changed, 25 insertions(+), 37 deletions(-) create mode 120000 srcpkgs/youtube-dl delete mode 100644 srcpkgs/youtube-dl/template delete mode 100644 srcpkgs/youtube-dl/update diff --git a/srcpkgs/python3-youtube-dl b/srcpkgs/python3-youtube-dl index 067dc06bf49..b21e42fb29d 120000 --- a/srcpkgs/python3-youtube-dl +++ b/srcpkgs/python3-youtube-dl @@ -1 +1 @@ -youtube-dl \ No newline at end of file +yt-dlp \ No newline at end of file diff --git a/srcpkgs/youtube-dl b/srcpkgs/youtube-dl new file mode 120000 index 00000000000..b21e42fb29d --- /dev/null +++ b/srcpkgs/youtube-dl @@ -0,0 +1 @@ +yt-dlp \ No newline at end of file diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template deleted file mode 100644 index dd8d445cf5e..00000000000 --- a/srcpkgs/youtube-dl/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'youtube-dl' -pkgname=youtube-dl -version=2021.12.17 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3" -short_desc="CLI program to download videos from YouTube and other sites" -maintainer="Orphaned " -license="Unlicense" -homepage="http://ytdl-org.github.io/youtube-dl" -changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog" -distfiles="https://github.com/ytdl-org/youtube-dl/archive/${version}.tar.gz" -checksum=d095479ccdbc5f42d312faf4a42c7bd009a2efb5703120311b7a86ad6a3197f4 -make_check=no # Tests require removed python3-nose - -do_check() { - PYTHON=/usr/bin/python3 make offlinetest -} - -post_install() { - make youtube-dl.{bash-completion,zsh,fish} - vcompletion youtube-dl.bash-completion bash - vcompletion youtube-dl.zsh zsh - vcompletion youtube-dl.fish fish - - rm -r ${DESTDIR}/usr/etc -} - -python3-youtube-dl_package() { - depends="youtube-dl" - short_desc+=" - transitional dummy package" - metapackage=yes -} diff --git a/srcpkgs/youtube-dl/update b/srcpkgs/youtube-dl/update deleted file mode 100644 index f07969487f1..00000000000 --- a/srcpkgs/youtube-dl/update +++ /dev/null @@ -1 +0,0 @@ -pattern="${pkgname}-\K[0-9.]+(?=\.tar)" diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template index bb62e688053..fdabed6cedb 100644 --- a/srcpkgs/yt-dlp/template +++ b/srcpkgs/yt-dlp/template @@ -1,7 +1,7 @@ # Template file for 'yt-dlp' pkgname=yt-dlp version=2025.06.25 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="-k not((download)or(test_socks))" hostmakedepends="hatchling" @@ -14,3 +14,25 @@ homepage="https://github.com/yt-dlp/yt-dlp" changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md" distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/${version}/yt-dlp.tar.gz>yt-dlp-$version.tar.gz" checksum=9416b3891b49f8929ed57789914256ce26930c9bf44980742e838db2100bbbf8 + +post_install() { + cat <<- "EOF" > youtube-dl + #!/bin/sh + exec yt-dlp --compat-options youtube-dl "$@" + EOF + vbin youtube-dl +} + +youtube-dl_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional compatibility package)" + pkg_install() { + vmove usr/bin/youtube-dl + } +} + +python3-youtube-dl_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + metapackage=yes +}