Merge remote branch 'alpine/master'

Conflicts:
	main/libconfig/APKBUILD

8 files changed, 40 insertions, 231 deletions

diff --git a/testing/awstats/APKBUILD b/testing/awstats/APKBUILD
deleted file mode 100644
index 4dddfdd1fe..0000000000
--- a/testing/awstats/APKBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=awstats
-pkgver=6.95
-pkgrel=0
-pkgdesc="AWStats is short for Advanced Web Statistics."
-url="http://awstats.sourceforge.net/"
-license="GPL-2"
-depends="perl perl-uri"
-subpackages="$pkgname-doc"
-source="http://awstats.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local file
-	cd "$_builddir"
-	for file in tools/* wwwroot/cgi-bin/*; do
-		[ -f "${file}" ] || continue
-		sed -e "s:/usr/local/awstats/wwwroot:/usr/lib/awstats:g" \
-			-i "$file"
-	done
-}
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-#	logpath="awstats_log"
-#	sed -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
-#	-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|"
-#	-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|"
-#	-e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" 
-#	-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-#	if use ipv6; then
-#	sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-#	fi
-	
-	install -d "$pkgdir"/usr/share/doc/awstats \
-		"$pkgdir"/var/lib/awstats \
-		"$pkgdir"/usr/lib/awstats \
-		"$pkgdir"/usr/bin \
-		"$pkgdir"/etc/awstats
-	# docs
-	cp -a docs tools/xslt "$pkgdir"/usr/share/doc/awstats || return 1
-
-	# cgi-bin
-	cp -a wwwroot/* "$pkgdir"/usr/lib/awstats
-	mv "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf \
-		"$pkgdir"/etc/awstats/
-	ln -s /etc/aswtats/awstats \
-		"$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf
-
-	# tools
-	cp tools/*.pl "$pkgdir"/usr/bin/ || return 1
-	ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/
-}
-md5sums="26a5b19fa9f395e9e7dafed37b795d7f  awstats-6.95.tar.gz"
diff --git a/testing/fuse/APKBUILD b/testing/fuse/APKBUILD
deleted file mode 100644
index 5f2d4eb61e..0000000000
--- a/testing/fuse/APKBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fuse
-pkgver=2.8.1
-pkgrel=1
-pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
-url="http://fuse.sourceforge.net/"
-license="GPL2"
-depends=
-makedepends="pkgconfig libiconv-dev gettext-dev
-	autoconf automake libtool"
-install=
-subpackages="$pkgname-dev"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	fuse-iconv.patch
-	fuse.initd"
-
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	patch -p1 -i "$srcdir"/fuse-iconv.patch || return 1
-	aclocal -I m4 && libtoolize && autoconf && automake
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--enable-lib \
-		--enable-util \
-		--bindir=/bin \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	
-	rm -rf "$pkgdir"/dev
-	rm -rf "$pkgdir"/etc/init.d
-
-	install -Dm755 "$srcdir"/fuse.initd "$pkgdir"/etc/init.d/fuse
-	# create config
-	install -d "$pkgdir"/etc
-	cat >"$pkgdir"/etc/fuse.conf << _EOF_
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other
-_EOF_
-
-}
-
-md5sums="0e3505ce90155983f1bc995eb2cf6fa7  fuse-2.8.1.tar.gz
-e5183506aabc5bf7795da52953d38888  fuse-iconv.patch
-5983726cfabf0830dffbbbf9a3abcddc  fuse.initd"
diff --git a/testing/fuse/fuse-iconv.patch b/testing/fuse/fuse-iconv.patch
deleted file mode 100644
index 4710f576f2..0000000000
--- a/testing/fuse/fuse-iconv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 3eec119..c7414ac 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -11,8 +11,10 @@ else
- mount_source = mount.c mount_util.c mount_util.h
- endif
- 
-+libfuse_la_LDFLAGS =
- if ICONV
- iconv_source = modules/iconv.c
-+libfuse_la_LDFLAGS += -liconv
- else
- iconv_source =
- endif
-@@ -35,7 +37,7 @@ libfuse_la_SOURCES = 		\
- 	$(iconv_source)		\
- 	$(mount_source)
- 
--libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:1 \
-+libfuse_la_LDFLAGS += @libfuse_libs@ -version-number 2:8:1 \
- 	-Wl,--version-script,$(srcdir)/fuse_versionscript
- 
- libulockmgr_la_SOURCES = ulockmgr.c
diff --git a/testing/fuse/fuse.initd b/testing/fuse/fuse.initd
deleted file mode 100644
index 30b512e8dc..0000000000
--- a/testing/fuse/fuse.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MOUNTPOINT=/sys/fs/fuse/connections
-
-depend() {
-	need localmount
-}
-
-start() {
-
-	ebegin "Starting fuse"
-	if ! grep -qw fuse /proc/filesystems; then
-		modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	if grep -qw fusectl /proc/filesystems && \
-	   ! grep -qw $MOUNTPOINT /proc/mounts; then
-		mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error mounting control filesystem"
-	fi
-	eend ${?}
-	
-}
-
-stop() {
-
-	ebegin "Stopping fuse"
-	if grep -qw $MOUNTPOINT /proc/mounts; then
-		umount $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error unmounting control filesystem"
-	fi
-	eend ${?}
-	
-}
diff --git a/testing/ivtv-utils/APKBUILD b/testing/ivtv-utils/APKBUILD
index 33bccec539..17e349d8a7 100644
--- a/testing/ivtv-utils/APKBUILD
+++ b/testing/ivtv-utils/APKBUILD
@@ -1,20 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ivtv-utils
 pkgver=1.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace utilities and firmware for Hauppauge PVR cards"
 url="http://ivtvdriver.org"
 license="GPL"
 depends=
-makedepends="uclibc++-dev"
+makedepends=
 source="http://dl.ivtvdriver.org/ivtv/stable/$pkgname-$pkgver.tar.gz
 	http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz"
 
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	export CXX=${CXX_UC:-g++-uc}
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
 
 	cd "$srcdir"
diff --git a/testing/libgssglue/APKBUILD b/testing/libgssglue/APKBUILD
deleted file mode 100644
index 4701c765cf..0000000000
--- a/testing/libgssglue/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libgssglue
-pkgver=0.1
-pkgrel=1
-pkgdesc="exports a gssapi interface which calls other random gssapi libraries"
-url="http://www.citi.umich.edu/projects/nfsv4/linux/"
-license="BSD"
-depends=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
-	gssapi_mech.conf"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir/" install || return 1
-	install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/libgssglue/COPYING
-}
-md5sums="ce1b4c758e6de01b712d154c5c97e540  libgssglue-0.1.tar.gz
-234b9cca75a33af98eda3f1683756879  gssapi_mech.conf"
diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf
deleted file mode 100644
index f71aca08ee..0000000000
--- a/testing/libgssglue/gssapi_mech.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example /etc/gssapi_mech.conf file
-#
-# GSSAPI Mechanism Definitions
-#
-# This configuration file determines which GSS-API mechanisms
-# the gssd code should use
-#
-# NOTE:
-# The initiaiization function "mechglue_internal_krb5_init"
-# is used for the MIT krb5 gssapi mechanism.  This special
-# function name indicates that an internal function should
-# be used to determine the entry points for the MIT gssapi
-# mechanism funtions.
-#
-# library                               initialization function
-# ================================      ==========================
-# The MIT K5 gssapi library, use special function for initialization.
-#/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
-/usr/lib/libgssapi.so            mechglue_internal_krb5_init
-#
-# The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
-# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize
diff --git a/testing/sqstat/APKBUILD b/testing/sqstat/APKBUILD
new file mode 100644
index 0000000000..d40862eaf8
--- /dev/null
+++ b/testing/sqstat/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa
+pkgname=sqstat
+pkgver=1.20
+pkgrel=0
+pkgdesc="SqStat is a script which allows to look through active squid users connections"
+url="http://samm.kiev.ua/sqstat/"
+license="ISC"
+depends=
+makedepends=
+install=
+subpackages=
+source="http://samm.kiev.ua/sqstat/sqstat-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/share/webapps/sqstat \
+		"$pkgdir"/etc/sqstat
+	cp config.inc.php.defaults "$pkgdir"/etc/sqstat/config.inc.php
+	mv * "$pkgdir"/usr/share/webapps/sqstat/
+	ln -s /etc/sqstat/config.inc.php \
+		"$pkgdir"/usr/share/webapps/sqstat/config.inc.php
+}
+
+md5sums="2b038a72eb5816995c3d7218ca516f30  sqstat-1.20.tar.gz"