From 253138c9a765682348b84ee4ea82b4a46c9eb0ff Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Mon, 23 Feb 2015 16:17:19 -0600 Subject: [PATCH 1/6] New package: sv-helper-1.0.0 sv-helper: update to 1.0.1 sv-helper: remove unzip dependency sv-helper: fix buildstyle to be build_style sv-helper: use tabs not spaces sv-helper: update to 1.0.2 and change user to rsvlog sv-helper: depend on runit for svlogd --- srcpkgs/sv-helper/template | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 srcpkgs/sv-helper/template diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template new file mode 100644 index 00000000000..dad032be999 --- /dev/null +++ b/srcpkgs/sv-helper/template @@ -0,0 +1,31 @@ +# Template file for 'sv-helper' +pkgname=sv-helper +version=1.0.2 +revision=1 +build_style="fetch" +depends="bash runit" +short_desc="Utilities to help administer a runit-as-pid1 system" +maintainer="bougyman " +license="MIT" +homepage="https://github.com/rubyists/sv-helper" +distfiles="https://api.github.com/repos/rubyists/sv-helper/tarball/${version}>${pkgname}-${version}.tar.gz" +checksum=3997895a65ee688dc1c7b071052f822c0b097c873aeea09081ec933df3140b13 + +system_accounts="rsvlog" +log_homedir="/var/log" +log_descr="User for logging" +_commands="sv-list svls sv-find sv-enable sv-disable" + +do_extract() { + tar xv --xform="s|rubyists-sv-helper-[^/]*/|sv-helper-${version}/|" -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz + mv ${pkgname}-${version}/* . +} + +do_install() { + vbin sv-helper.sh sv-helper + vbin rsvlog.sh rsvlog + for cmd in $_commands; do + ln -s sv-helper $DESTDIR/usr/bin/$cmd + done + vdoc README.md +} From 541f9dfcaf069c00c6bdceff53b3c51059cff2b6 Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Wed, 25 Feb 2015 12:32:54 -0600 Subject: [PATCH 2/6] sv-helper: remove build-style, add do_extract() --- srcpkgs/sv-helper/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index dad032be999..4c999fbce65 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -2,7 +2,6 @@ pkgname=sv-helper version=1.0.2 revision=1 -build_style="fetch" depends="bash runit" short_desc="Utilities to help administer a runit-as-pid1 system" maintainer="bougyman " @@ -12,16 +11,17 @@ distfiles="https://api.github.com/repos/rubyists/sv-helper/tarball/${version}>${ checksum=3997895a65ee688dc1c7b071052f822c0b097c873aeea09081ec933df3140b13 system_accounts="rsvlog" -log_homedir="/var/log" -log_descr="User for logging" -_commands="sv-list svls sv-find sv-enable sv-disable" +rsvlog_homedir="/var/log" +rsvlog_descr="User for logging" do_extract() { - tar xv --xform="s|rubyists-sv-helper-[^/]*/|sv-helper-${version}/|" -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz - mv ${pkgname}-${version}/* . + local f curfile + mkdir -p ${wrksrc} + tar x --strip-components=1 -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${wrksrc} } do_install() { + _commands="sv-list svls sv-find sv-enable sv-disable" vbin sv-helper.sh sv-helper vbin rsvlog.sh rsvlog for cmd in $_commands; do From 36045c6cdc40b1b2f0ebc63e73c688f05662c207 Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Wed, 25 Feb 2015 12:35:09 -0600 Subject: [PATCH 3/6] sv-helper: remove unused variable --- srcpkgs/sv-helper/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index 4c999fbce65..8f2cfed3a32 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -15,7 +15,6 @@ rsvlog_homedir="/var/log" rsvlog_descr="User for logging" do_extract() { - local f curfile mkdir -p ${wrksrc} tar x --strip-components=1 -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${wrksrc} } From 30443a1a3ec6830d9e5a6785eb332c70c755329c Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Wed, 25 Feb 2015 12:56:27 -0600 Subject: [PATCH 4/6] sv-helper: remove do_extract and use corect dl link --- srcpkgs/sv-helper/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index 8f2cfed3a32..12b92c0e063 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -7,18 +7,13 @@ short_desc="Utilities to help administer a runit-as-pid1 system" maintainer="bougyman " license="MIT" homepage="https://github.com/rubyists/sv-helper" -distfiles="https://api.github.com/repos/rubyists/sv-helper/tarball/${version}>${pkgname}-${version}.tar.gz" -checksum=3997895a65ee688dc1c7b071052f822c0b097c873aeea09081ec933df3140b13 +distfiles="https://github.com/rubyists/sv-helper/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=772669ba116c4004c394c7f259b15859a520e36170b35f8b5a4103ed2f69e7d0 system_accounts="rsvlog" rsvlog_homedir="/var/log" rsvlog_descr="User for logging" -do_extract() { - mkdir -p ${wrksrc} - tar x --strip-components=1 -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${wrksrc} -} - do_install() { _commands="sv-list svls sv-find sv-enable sv-disable" vbin sv-helper.sh sv-helper From 9c9918f0741b428bf910b2d6d6b3763b27d97fb1 Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Wed, 25 Feb 2015 13:07:38 -0600 Subject: [PATCH 5/6] sv-helper: remove distfiles naming redirection --- srcpkgs/sv-helper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index 12b92c0e063..48a76a5df8a 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -7,7 +7,7 @@ short_desc="Utilities to help administer a runit-as-pid1 system" maintainer="bougyman " license="MIT" homepage="https://github.com/rubyists/sv-helper" -distfiles="https://github.com/rubyists/sv-helper/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" +distfiles="https://github.com/rubyists/sv-helper/archive/${version}.tar.gz" checksum=772669ba116c4004c394c7f259b15859a520e36170b35f8b5a4103ed2f69e7d0 system_accounts="rsvlog" From ce9a23e43d553e7a9c89138effcd45d7b7ef1736 Mon Sep 17 00:00:00 2001 From: TJ Vanderpoel Date: Wed, 25 Feb 2015 13:09:19 -0600 Subject: [PATCH 6/6] sv-helper: set noarch="yes" --- srcpkgs/sv-helper/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index 48a76a5df8a..338808fc8cc 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -3,6 +3,7 @@ pkgname=sv-helper version=1.0.2 revision=1 depends="bash runit" +noarch="yes" short_desc="Utilities to help administer a runit-as-pid1 system" maintainer="bougyman " license="MIT"