Merge git://github.com/prymeroot/aports

2 files changed, 118 insertions, 16 deletions

diff --git a/testing/json-c/APKBUILD b/testing/json-c/APKBUILD
index fa2ede3bf6..6950479024 100644
--- a/testing/json-c/APKBUILD
+++ b/testing/json-c/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=json-c
-pkgver=0.10
+pkgver=0.11
 pkgrel=0
 pkgdesc="A JSON implementation in C"
 url="https://github.com/json-c/json-c/wiki"
@@ -11,18 +11,18 @@ depends_dev=""
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
-source="https://github.com/downloads/json-c/json-c/json-c-$pkgver.tar.gz"
+source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz"
 
 _builddir="$srcdir"/json-c-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+#prepare() {
+#	local i
+#	cd "$_builddir"
+#	for i in $source; do
+#		case $i in
+#		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+#		esac
+#	done
+#}
 
 build() {
 	cd "$_builddir"
@@ -33,8 +33,8 @@ build() {
 		--localstatedir=/var \
 		--disable-static \
 		--enable-shared \
-		|| return 1
-	make || return 1
+		 || return 1
+	make -j1 || return 1
 }
 
 package() {
@@ -43,6 +43,6 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="a4edc79410eb894f08d7d52ca9f88732  json-c-0.10.tar.gz"
-sha256sums="274fc9d47c1911fad9caab4db117e4be5d6b68c4547eab0c508d79c4768e170c  json-c-0.10.tar.gz"
-sha512sums="d254eb223ebfb05e828bf039efb280f5e83b9f59116fba3af2892cf1f7732d152f7d0e2d8b77ec32e175b168022c2342f954e97f867c438b349f36b4dfdbd746  json-c-0.10.tar.gz"
+md5sums="aa02367d2f7a830bf1e3376f77881e98  json-c-0.11.tar.gz"
+sha256sums="28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c  json-c-0.11.tar.gz"
+sha512sums="65ab563fe908d585ba05fff3b77283050ec4f94114ff6e4b916557013d75498271cf65b2660a0aaf74b23beaa80385c80d37ab6a700ba967dd859fa779a81cb0  json-c-0.11.tar.gz"
diff --git a/testing/rsyslog/APKBUILD b/testing/rsyslog/APKBUILD
new file mode 100644
index 0000000000..b221f18ecf
--- /dev/null
+++ b/testing/rsyslog/APKBUILD
@@ -0,0 +1,102 @@
+# Maintainer: Cameron Banta <cbanta@gmail.com>
+# Contributor: cbanta@gmail.com
+pkgname=rsyslog
+pkgver=7.4.1
+pkgrel=0
+pkgdesc="Enhanced multi-threaded syslogd with database support and more."
+url="http://www.rsyslog.com/"
+arch="all"
+license="GPLv3 LGPL-3"
+makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev
+	libnet-dev libgcrypt-dev libee-dev libestr-dev json-c-dev"
+subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp"
+source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd
+	$pkgname.logrotate
+	$pkgname.conf"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	export LDFLAGS="-lestr"
+	./configure \
+		--disable-gui \
+		--disable-rfc3195 \
+		--enable-largefile \
+		--enable-imdiag \
+		--enable-imfile \
+		--enable-mail \
+		--enable-omprog \
+		--enable-omstdout \
+		--enable-omudpspoof \
+		--enable-zlib \
+		--enable-mysql \
+		--enable-pgsql \
+		--enable-gnutls \
+		--enable-snmp \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-cached-man-pages \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	rm -f "$pkgdir"/usr/lib/rsyslog/*.la || return 1
+
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf
+}
+
+mysql() {
+	pkgdesc="rsyslog mysql support"
+	mkdir -p "$subpkgdir"/usr/lib/rsyslog/
+	mv "$pkgdir"/usr/lib/rsyslog/ommysql.so "$subpkgdir"/usr/lib/rsyslog/
+}
+
+pgsql() {
+	pkgdesc="rsyslog pgsql support"
+	mkdir -p "$subpkgdir"/usr/lib/rsyslog/
+	mv "$pkgdir"/usr/lib/rsyslog/ompgsql.so "$subpkgdir"/usr/lib/rsyslog/
+}
+
+tls() {
+	pkgdesc="rsyslog tls support"
+	mkdir -p "$subpkgdir"/usr/lib/rsyslog/
+	mv "$pkgdir"/usr/lib/rsyslog/lmnsd_gtls.so "$subpkgdir"/usr/lib/rsyslog/
+}
+
+snmp() {
+	pkgdesc="rsyslog snmp support"
+	mkdir -p "$subpkgdir"/usr/lib/rsyslog/
+	mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so "$subpkgdir"/usr/lib/rsyslog/
+}
+
+md5sums="8e0e868a425bfa5c2c13bdc28338e1af  rsyslog-7.4.1.tar.gz
+6b63d774eb718bc1ab91f3fb5471ade3  rsyslog.initd
+0a0aef98f677364e6178c34274df7723  rsyslog.confd
+bc43debc9ffdf66bc1409025fd3d1176  rsyslog.logrotate
+65fbf5a7a81a53a70974e3085e96cb41  rsyslog.conf"
+sha256sums="f890b56fc5122fabf79994e11bdefb26285e3415ba80c20f23bd3ce489098c96  rsyslog-7.4.1.tar.gz
+dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c  rsyslog.initd
+c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56  rsyslog.confd
+f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5  rsyslog.logrotate
+559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5  rsyslog.conf"
+sha512sums="c74de170ee83725d8e89712e9a980569e8331d776b52e773d6eeff33dff0c524691378c0d469096691846beffdaf46fab9be706873679588d0afc4cb83f9a663  rsyslog-7.4.1.tar.gz
+e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3  rsyslog.initd
+c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3  rsyslog.confd
+d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f  rsyslog.logrotate
+032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1  rsyslog.conf"
+