From c6464bdae455b4693bafa5faef57df9ad83aa3e2 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 28 Dec 2022 15:17:07 -0600 Subject: [PATCH] rinse: update to 4.0.4. --- srcpkgs/rinse/patches/fix-tests.patch | 95 --------------------------- srcpkgs/rinse/template | 10 +-- 2 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 srcpkgs/rinse/patches/fix-tests.patch diff --git a/srcpkgs/rinse/patches/fix-tests.patch b/srcpkgs/rinse/patches/fix-tests.patch deleted file mode 100644 index 041421b63648..000000000000 --- a/srcpkgs/rinse/patches/fix-tests.patch +++ /dev/null @@ -1,95 +0,0 @@ -Source: maxice8 -Upstream: no (feel free to) -Reason: fixes test for tab chars - ---- a/scripts/opensuse-11.1/post-install.sh -+++ b/scripts/opensuse-11.1/post-install.sh -@@ -42,8 +42,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - ---- a/scripts/opensuse-11.2/post-install.sh -+++ b/scripts/opensuse-11.2/post-install.sh -@@ -60,8 +60,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - ---- a/scripts/opensuse-11.3/post-install.sh -+++ b/scripts/opensuse-11.3/post-install.sh -@@ -39,8 +39,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - ---- a/scripts/opensuse-12.3/post-install.sh -+++ b/scripts/opensuse-12.3/post-install.sh -@@ -38,8 +38,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - ---- a/scripts/opensuse-13.1/post-install.sh -+++ b/scripts/opensuse-13.1/post-install.sh -@@ -38,8 +38,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - ---- a/scripts/centos-7/post-install.sh -+++ b/scripts/centos-7/post-install.sh -@@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog - - cd $prefix/var/log - for n in messages secure maillog spooler;do -- [ -f $n ] && continue -- umask 066 && touch $n -+ [ -f $n ] && continue -+ umask 066 && touch $n - done - cd / - touch $prefix/var/log/lastlog ---- a/scripts/opensuse-42.2/post-install.sh -+++ b/scripts/opensuse-42.2/post-install.sh -@@ -38,8 +38,8 @@ gpgcheck=1 - EOF - - if [ $ARCH = "i386" ] ; then -- echo " Setting architecture to i686" -- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf -+ echo " Setting architecture to i686" -+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf - fi - - diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template index 27d6d0acd2fb..33cf849944cd 100644 --- a/srcpkgs/rinse/template +++ b/srcpkgs/rinse/template @@ -1,20 +1,20 @@ # Template file for 'rinse' pkgname=rinse -version=3.5 -revision=2 +version=4.0.4 +revision=1 build_style=gnu-makefile make_check_target=test hostmakedepends="dpkg" makedepends="perl" -depends="perl-LWP rpm wget" +depends="perl-LWP perl-LWP-Protocol-https perl-HTML-Parser rpm wget" checkdepends="perl-LWP perl-Test-Pod rpm wget" short_desc="Bootstrap a rpm based distribution like debootstrap" -maintainer="Orphaned " +maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://salsa.debian.org/debian/rinse" changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog" distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz" -checksum=ebe2384f2aa4565c5f29882b177f7afd4c7cdbca9de9525618c6040e63a76d23 +checksum=fc320d9a258e0b90986054641e86fcbe29b0710ae8be2cfb89875a98af4a64b2 conf_files="/etc/rinse/rinse.conf"