diff options
| -rw-r--r-- | main/smokeping/0001-fix-sysconfdir-in-etc.patch | 13 | ||||
| -rw-r--r-- | main/smokeping/0002-fix-sysconfdir-in-doc.patch | 26 | ||||
| -rw-r--r-- | main/smokeping/0003-fix-sysconfdir-in-lib.patch | 13 | ||||
| -rw-r--r-- | main/smokeping/0004-fix-sysconfdir-in-htdocs.patch | 13 | ||||
| -rw-r--r-- | main/smokeping/APKBUILD | 120 | ||||
| -rw-r--r-- | testing/perl-config-grammar/APKBUILD | 35 |
6 files changed, 172 insertions, 48 deletions
diff --git a/main/smokeping/0001-fix-sysconfdir-in-etc.patch b/main/smokeping/0001-fix-sysconfdir-in-etc.patch new file mode 100644 index 000000000..b449a2c00 --- /dev/null +++ b/main/smokeping/0001-fix-sysconfdir-in-etc.patch @@ -0,0 +1,13 @@ +Patch from: Jeff Bilyk <jbilyk@alpinelinux.org> + +--- smokeping-2.6.1/etc/Makefile.in ++++ smokeping-2.6.1/etc/Makefile.in.new +@@ -207,7 +207,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist +-etcdir = $(DESTDIR)$(sysconfdir) ++etcdir = $(sysconfdir) + etc_DATA = $(EXTRA_DIST) + all: all-am + diff --git a/main/smokeping/0002-fix-sysconfdir-in-doc.patch b/main/smokeping/0002-fix-sysconfdir-in-doc.patch new file mode 100644 index 000000000..7d6246a9c --- /dev/null +++ b/main/smokeping/0002-fix-sysconfdir-in-doc.patch @@ -0,0 +1,26 @@ +Patch from: Jeff Bilyk <jbilyk@alpinelinux.org> + +--- smokeping-2.6.1/doc/Makefile.in ++++ smokeping-2.6.1/doc/Makefile.in.new +@@ -239,16 +239,16 @@ + MAKEPOD = PERL5LIB=$(PERL5LIB) $(PERL) -I$(DESTDIR)$(prefix)/thirdparty/lib/perl5 -I../lib -mSmokeping -e 'Smokeping::main()' -- --makepod + GENEX = PERL5LIB=$(PERL5LIB) $(PERL) -I$(DESTDIR)$(prefix)/thirdparty/lib/perl5 -I../lib -mSmokeping -e 'Smokeping::main()' -- --gen-examples + CLEANFILES = *.[1357] smokeping_examples.pod smokeping_config.pod examples/* +-iman1dir = $(DESTDIR)$(mandir)/man1 ++iman1dir = $(mandir)/man1 + iman1_DATA = $(MAN1) +-iman3dir = $(DESTDIR)$(mandir)/man3 ++iman3dir = $(mandir)/man3 + iman3_DATA = $(MAN3) +-iman5dir = $(DESTDIR)$(mandir)/man5 ++iman5dir = $(mandir)/man5 + iman5_DATA = $(MAN5) +-iman7dir = $(DESTDIR)$(mandir)/man7 ++iman7dir = $(mandir)/man7 + iman7_DATA = $(MAN7) + EXAMPLES := $(wildcard examples/config.*) +-etcdir = $(DESTDIR)$(sysconfdir)/examples ++etcdir = $(sysconfdir)/examples + etc_DATA = $(EXAMPLES) + all: all-am + diff --git a/main/smokeping/0003-fix-sysconfdir-in-lib.patch b/main/smokeping/0003-fix-sysconfdir-in-lib.patch new file mode 100644 index 000000000..37d30a26c --- /dev/null +++ b/main/smokeping/0003-fix-sysconfdir-in-lib.patch @@ -0,0 +1,13 @@ +Patch from: Jeff Bilyk <jbilyk@alpinelinux.org> + +--- smokeping-2.6.1/lib/Makefile.in ++++ smokeping-2.6.1/lib/Makefile.in.new +@@ -216,7 +216,7 @@ + PROBE := $(wildcard Smokeping/probes/*.pm) + MATCH := $(wildcard Smokeping/matchers/*.pm) + EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) +-perllibdir = $(DESTDIR)$(prefix)/lib ++perllibdir = $(prefix)/lib + nobase_perllib_DATA = $(EXTRA_DIST) + all: all-am + diff --git a/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch b/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch new file mode 100644 index 000000000..2e247b4d0 --- /dev/null +++ b/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch @@ -0,0 +1,13 @@ +Patch from: Jeff Bilyk <jbilyk@alpinelinux.org> + +--- smokeping-2.6.1/htdocs/Makefile.in ++++ smokeping-2.6.1/htdocs/Makefile.in.new +@@ -214,7 +214,7 @@ + cropper/cropper.uncompressed.js cropper/cropper.js + + EXTRA_DIST = $(JS) +-jsdir = $(DESTDIR)$(HTDOCSDIR) ++jsdir = $(HTDOCSDIR) + nobase_js_DATA = $(JS) + all: all-am + diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD index 4af520317..7614736e2 100644 --- a/main/smokeping/APKBUILD +++ b/main/smokeping/APKBUILD @@ -1,81 +1,104 @@ -# Contributor: Jeff Bilyk <jbilyk at gmail> +# Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=smokeping -pkgver=2.4.2 -pkgrel=3 +pkgver=2.6.1 +pkgrel=4 pkgdesc="Smokeping network latency monitoring" pkgusers="smokeping" pkggroups="smokeping" install="$pkgname.pre-install" url="http://oss.oetiker.ch/smokeping/" source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz - smokeping.initd" + smokeping.initd + 0001-fix-sysconfdir-in-etc.patch + 0002-fix-sysconfdir-in-doc.patch + 0003-fix-sysconfdir-in-lib.patch + 0004-fix-sysconfdir-in-htdocs.patch" depends="perl fping rrdtool perl-rrd - perl-uri + perl-uri-escape perl-digest-hmac perl-cgi-session perl-libwww perl-snmp-session perl-net-dns + perl-fcgi + perl-config-grammar " arch="noarch" license="GPL" +subpackages="$pkgname-doc" _builddir="$srcdir"/$pkgname-$pkgver _vendorlib=/usr/share/perl5/vendor_perl prepare() { cd "$_builddir" - # provided by perl-digest-hmac - rm -rf lib/Digest - # provided by perl-cgi-session - rm -rf lib/CGI + + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + # provided by perl-snmp-session rm -r lib/BER.pm lib/SNMP_Session.pm lib/SNMP_util.pm - rm -r qooxdoo/qooxdoolink } build() { - return 0 + cd "$_builddir" + ./configure --prefix=/usr \ + --bindir=/usr/bin \ + --libdir=/usr/lib \ + --sysconfdir=/etc/smokeping \ + --libexecdir=/usr/libexec \ + --datarootdir=/usr/share \ + --mandir=/usr/share/man \ + --with-htdocs-dir=/usr/share/webapps/smokeping \ + || return 1 } package() { cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 - # create dirs - mkdir -p "$pkgdir"/etc/smokeping \ - "$pkgdir"/usr/bin \ - "$pkgdir"/usr/share/webapps/smokeping \ - "$pkgdir"/$_vendorlib - - # install libs - cp -ra "$_builddir"/lib/* "$pkgdir"/$_vendorlib - - # install cgi scripts - for i in smokeping.cgi tr.cgi; do - sed -i -e 's:^use lib:#use lib:' \ - -e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \ - -e '1s:.*:#!/usr/bin/perl:' \ - htdocs/$i.dist || return 1 - mv htdocs/$i.dist \ - "$pkgdir"/usr/share/webapps/smokeping/$i \ - || return 1 + for i in basepage.html config smokemail smokeping_secrets tmail; do + mv "$pkgdir"/etc/smokeping/${i}.dist "$pkgdir"/etc/smokeping/${i} done - # install ajax scripts - mv "$_builddir/htdocs"/* "$pkgdir"/usr/share/webapps/smokeping + # Next part here cleans up the mess that the Makefile leaves behind... + + mkdir -p "$pkgdir"/$_vendorlib + mv "$pkgdir"/usr/lib/Smokeping.pm "$pkgdir"/$_vendorlib/ + mv "$pkgdir"/usr/lib/Smokeping "$pkgdir"/$_vendorlib/ + + # Fix path to config file + sed -i -e 's#/usr/etc/config#/etc/smokeping/config#' "$pkgdir"/usr/share/webapps/smokeping/smokeping.fcgi.dist + + # Install cgi in the right spot and fix permissions + mv "$pkgdir"/usr/share/webapps/smokeping/smokeping.fcgi.dist "$pkgdir"/usr/share/webapps/smokeping/smokeping.cgi + chmod 755 "$pkgdir"/usr/share/webapps/smokeping/smokeping.cgi + + # Fix up some paths within smokeping.cgi + sed -i -e 's:^use lib:#use lib:' \ + -e 's:/etc/config:/etc/smokeping/config:' \ + -e '1s:.*:#!/usr/bin/perl:' \ + "$pkgdir"/usr/bin/smokeping_cgi || return 1 - # install smokeping executables - for i in smokeping tSmoke; do + for i in smokeping smokeinfo; do sed -e 's:^use lib:#use lib:g' \ - -e 's:etc/config.dist:/etc/smokeping/config:' \ - -i bin/$i.dist - install -m755 bin/$i.dist "$pkgdir"/usr/bin/$i + -e 's:etc/config:etc/smokeping/config:' \ + -i "$pkgdir"/usr/bin/$i done + sed -e 's#Smokeping::main("$FindBin::Bin/../etc/config")#Smokeping::main("/etc/smokeping/config")#' \ + -i "$pkgdir"/usr/bin/smokeping + + sed -e 's:etc/config.dist:etc/smokeping/config:' \ + -i "$pkgdir"/usr/bin/tSmoke + # config sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ - -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ + -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 img:}' \ -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \ -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ @@ -84,17 +107,15 @@ package() { -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ -e '/^sendmail/{s:usr/lib:usr/sbin:}' \ - -i etc/config.dist || return 1 - + -i "$pkgdir"/etc/smokeping/config || return 1 + + # Create softlink for image directory + ln -s /var/lib/smokeping/.simg/ "$pkgdir"/usr/share/webapps/smokeping/img + sed -e '/^<script/{s:cropper/:/cropper/:}' \ - -i etc/basepage.html.dist \ + -i "$pkgdir"/etc/smokeping/basepage.html \ || return 1 - for i in etc/*; do - local f=${i##*/} - install -m644 "$i" "$pkgdir"/etc/smokeping/${f%.dist} - done - chmod 700 "$pkgdir"/etc/smokeping/smokeping_secrets # initscript @@ -105,8 +126,11 @@ package() { "$pkgdir"/var/lib/smokeping \ "$pkgdir"/var/lib/smokeping/.simg \ "$pkgdir"/var/run/smokeping - } -md5sums="eb8e7679fcad35e59d7c51f2328250a2 smokeping-2.4.2.tar.gz -550979e008f49299bf404aceeb81fe61 smokeping.initd" +md5sums="f4a5437b71e02f982f08bf318bb9857d smokeping-2.6.1.tar.gz +550979e008f49299bf404aceeb81fe61 smokeping.initd +b3f3c968c582adb9e4e0fdcc9c7163e9 0001-fix-sysconfdir-in-etc.patch +2bdafaade171bfb2241d1e6450fb094a 0002-fix-sysconfdir-in-doc.patch +1942e4eceecb80b4bbe4cfc95e3e642f 0003-fix-sysconfdir-in-lib.patch +974909d772ed67cbba45f20c14c2bb49 0004-fix-sysconfdir-in-htdocs.patch" diff --git a/testing/perl-config-grammar/APKBUILD b/testing/perl-config-grammar/APKBUILD new file mode 100644 index 000000000..e1fc3e932 --- /dev/null +++ b/testing/perl-config-grammar/APKBUILD @@ -0,0 +1,35 @@ +# Maintainer: Leonardo Arena <rnalrd@gmail.com> +pkgname=perl-config-grammar +_pkgreal=Config-Grammar +pkgver=1.10 +pkgrel=0 +pkgdesc="A grammar-based, user-friendly config parser" +url="http://search.cpan.org/dist/Config-Grammar/" +arch="noarch" +license="GPL PerlArtistic" +cpandepends="" +cpanmakedepends="" +depends="$cpandepends" +makedepends="perl-dev $cpanmakedepends" +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/D/DS/DSCHWEI/$_pkgreal-$pkgver.tar.gz" + +_builddir="$srcdir/$_pkgreal-$pkgver" + +prepare() { + cd "$_builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor +} + +build() { + cd "$_builddir" + make && make test +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +md5sums="ce904f687f1ee9c70521142a2e0f15c9 Config-Grammar-1.10.tar.gz" |