Merge commit 'ncopa/master'

32 files changed, 1310 insertions, 32 deletions

diff --git a/extra/acct/APKBUILD b/extra/acct/APKBUILD
index 12a01ee781..73902efe63 100644
--- a/extra/acct/APKBUILD
+++ b/extra/acct/APKBUILD
@@ -8,18 +8,19 @@ license="GPL"
 depends="uclibc"
 makedepends=""
 install=
-subpackages=""
+subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/acct/${pkgname}-${pkgver}.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr 
+	# seems like this makefile does not respect DESTDIR
+	./configure --prefix=/usr \
+		--mandir="$pkgdir"/usr/share/man \
+		--infodir="$pkgdir"/usr/share/info
+
 	make || return 1
 	make prefix="$pkgdir/usr" install
-	mv "$pkgdir/usr/man" "$pkgdir/usr/share/"
-	mv "$pkgdir/usr/info" "$pkgdir/usr/share/"
-
 }
 
 md5sums="da0055b254f7da8b8920db83ef1ebba1  acct-6.3.2.tar.gz"
diff --git a/extra/chrony/APKBUILD b/extra/chrony/APKBUILD
index 3c3fbce7a6..d6eb661ffb 100644
--- a/extra/chrony/APKBUILD
+++ b/extra/chrony/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrony
 pkgver=1.23
-pkgrel=0
+pkgrel=1
 pkgdesc="NTP client and server programs"
 url="http://chrony.sunsite.dk/"
 license="GPL-2"
@@ -13,6 +13,7 @@ source="http://chrony.sunsite.dk/download/$pkgname-$pkgver.tar.gz
 	$pkgname-1.20-chrony.conf.example-gentoo.diff
 	$pkgname-1.21-makefile.diff
 	$pkgname-1.23-sources.diff
+	$pkgname-1.23-reply-ip.diff
 	chronyd.confd
 	chronyd.initd
 	"
@@ -50,5 +51,6 @@ bd6bd57363865d3ed0c3187d0c9f7151  chrony-1.20-conf.c-gentoo.diff
 b2a23e02f7af50bebdd5d18bccdedbf0  chrony-1.20-chrony.conf.example-gentoo.diff
 d47015a34b6b2f9eebca77ef939cec72  chrony-1.21-makefile.diff
 39cbce9f66638b67623e1ee6bb0f943f  chrony-1.23-sources.diff
+caa6589a1a1cd56f64957e312d1ef84c  chrony-1.23-reply-ip.diff
 d5c09be46226774d22c08c5a4c28093a  chronyd.confd
 dac8aa4913d7c323abfa1719ddd7e5e4  chronyd.initd"
diff --git a/extra/chrony/chrony-1.23-reply-ip.diff b/extra/chrony/chrony-1.23-reply-ip.diff
new file mode 100644
index 0000000000..f4e5d8eff4
--- /dev/null
+++ b/extra/chrony/chrony-1.23-reply-ip.diff
@@ -0,0 +1,242 @@
+
+Currently, on multihomed host, when chrony is not bound to a specific
+IP address, a query is sent to an interface and the default source IP
+hint for the back route differs, the reply will have a source IP
+different than where the query was destinied to. This will cause
+problems because connection tracking firewalls will drop the replies
+and most likely the client program will get confused too.
+
+This patch uses the IP_PKTINFO mechanism to get the IP address where
+received packets where targetted to and use that IP address as source
+hint when sending a reply.
+---
+ addressing.h |    1 +
+ broadcast.c  |    1 +
+ cmdmon.c     |    3 ++
+ conf.c       |    1 +
+ ntp_io.c     |   92 +++++++++++++++++++++++++++++++++++++++++----------------
+ 5 files changed, 72 insertions(+), 26 deletions(-)
+
+diff --git a/addressing.h b/addressing.h
+index aa20ed9..05152f4 100644
+--- a/addressing.h
++++ b/addressing.h
+@@ -36,6 +36,7 @@
+ typedef struct {
+   unsigned long ip_addr;
+   unsigned short port;
++  unsigned long local_ip_addr;
+ } NTP_Remote_Address;
+ 
+ #if 0
+diff --git a/broadcast.c b/broadcast.c
+index be217e7..c979741 100644
+--- a/broadcast.c
++++ b/broadcast.c
+@@ -146,6 +146,7 @@ BRD_AddDestination(unsigned long addr, unsigned short port, int interval)
+ 
+   destinations[n_destinations].addr.ip_addr = addr;
+   destinations[n_destinations].addr.port = port;
++  destinations[n_destinations].addr.local_ip_addr = 0;
+   destinations[n_destinations].interval = interval;
+ 
+   SCH_AddTimeoutInClass((double) interval, 1.0,
+diff --git a/cmdmon.c b/cmdmon.c
+index 819977c..8affb0b 100644
+--- a/cmdmon.c
++++ b/cmdmon.c
+@@ -1097,6 +1097,7 @@ handle_add_server(CMD_Request *rx_message, CMD_Reply *tx_message)
+   
+   rem_addr.ip_addr = ntohl(rx_message->data.ntp_source.ip_addr);
+   rem_addr.port = (unsigned short)(ntohl(rx_message->data.ntp_source.port));
++  rem_addr.local_ip_addr = 0;
+   params.minpoll = ntohl(rx_message->data.ntp_source.minpoll);
+   params.maxpoll = ntohl(rx_message->data.ntp_source.maxpoll);
+   params.presend_minpoll = ntohl(rx_message->data.ntp_source.presend_minpoll);
+@@ -1133,6 +1134,7 @@ handle_add_peer(CMD_Request *rx_message, CMD_Reply *tx_message)
+   
+   rem_addr.ip_addr = ntohl(rx_message->data.ntp_source.ip_addr);
+   rem_addr.port = (unsigned short)(ntohl(rx_message->data.ntp_source.port));
++  rem_addr.local_ip_addr = 0;
+   params.minpoll = ntohl(rx_message->data.ntp_source.minpoll);
+   params.maxpoll = ntohl(rx_message->data.ntp_source.maxpoll);
+   params.presend_minpoll = ntohl(rx_message->data.ntp_source.presend_minpoll);
+@@ -1167,6 +1169,7 @@ handle_del_source(CMD_Request *rx_message, CMD_Reply *tx_message)
+   
+   rem_addr.ip_addr = ntohl(rx_message->data.del_source.ip_addr);
+   rem_addr.port = 0;
++  rem_addr.local_ip_addr = 0;
+   
+   status = NSR_RemoveSource(&rem_addr);
+   switch (status) {
+diff --git a/conf.c b/conf.c
+index e34927e..ddd13f1 100644
+--- a/conf.c
++++ b/conf.c
+@@ -949,6 +949,7 @@ CNF_AddSources(void) {
+   for (i=0; i<n_ntp_sources; i++) {
+     server.ip_addr = ntp_sources[i].ip_addr;
+     server.port = ntp_sources[i].port;
++    server.local_ip_addr = 0;
+ 
+     switch (ntp_sources[i].type) {
+       case SERVER:
+diff --git a/ntp_io.c b/ntp_io.c
+index afb6ad1..db89758 100644
+--- a/ntp_io.c
++++ b/ntp_io.c
+@@ -118,6 +118,12 @@ NIO_Initialise(void)
+     LOG(LOGS_ERR, LOGF_NtpIO, "Could not set broadcast socket options");
+     /* Don't quit - we might survive anyway */
+   }
++  /* We want the local IP info too */
++  if (setsockopt(sock_fd, IPPROTO_IP, IP_PKTINFO, (char *)&on_off, sizeof(on_off)) < 0) {
++    LOG(LOGS_ERR, LOGF_NtpIO, "Could not request packet info using socket option");
++    /* Don't quit - we might survive anyway */
++  }
++
+ 
+   /* Bind the port */
+   my_addr.sin_family = AF_INET;
+@@ -182,22 +188,30 @@ read_from_socket(void *anything)
+ 
+   int status;
+   ReceiveBuffer message;
+-  int message_length;
+   struct sockaddr_in where_from;
+-  socklen_t from_length;
+   unsigned int flags = 0;
+   struct timeval now;
+   NTP_Remote_Address remote_addr;
+   double local_clock_err;
++  char cmsgbuf[256];
++  struct cmsghdr *cmsg;
++  struct msghdr msg;
++  struct iovec iov;
+ 
+   assert(initialised);
+ 
+-  from_length = sizeof(where_from);
+-  message_length = sizeof(message);
++  iov.iov_base = message.arbitrary;
++  iov.iov_len = sizeof(message);
++  msg.msg_name = &where_from;
++  msg.msg_namelen = sizeof(where_from);
++  msg.msg_iov = &iov;
++  msg.msg_iovlen = 1;
++  msg.msg_control = (void *) cmsgbuf;
++  msg.msg_controllen = sizeof(cmsgbuf);
++  msg.msg_flags = 0;
+ 
+   LCL_ReadCookedTime(&now, &local_clock_err);
+-  status = recvfrom(sock_fd, (char *)&message, message_length, flags,
+-                    (struct sockaddr *)&where_from, &from_length);
++  status = recvmsg(sock_fd, &msg, flags);
+ 
+   /* Don't bother checking if read failed or why if it did.  More
+      likely than not, it will be connection refused, resulting from a
+@@ -209,6 +223,13 @@ read_from_socket(void *anything)
+   if (status > 0) {
+     remote_addr.ip_addr = ntohl(where_from.sin_addr.s_addr);
+     remote_addr.port = ntohs(where_from.sin_port);
++    remote_addr.local_ip_addr = 0;
++
++    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++      if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO)
++        remote_addr.local_ip_addr =
++          ntohl(((struct in_pktinfo *) CMSG_DATA(cmsg))->ipi_spec_dst.s_addr);
++    }
+ 
+     if (status == NTP_NORMAL_PACKET_SIZE) {
+ 
+@@ -229,21 +250,45 @@ read_from_socket(void *anything)
+ }
+ 
+ /* ================================================== */
+-/* Send an unauthenticated packet to a given address */
++/* Send a packet to given address */
+ 
+-void
+-NIO_SendNormalPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr)
++static void
++NIO_SendPacket(NTP_Packet *packet, int packetlen, NTP_Remote_Address *remote_addr)
+ {
+   struct sockaddr_in remote;
++  struct msghdr msg;
++  struct iovec iov;
++  struct {
++    struct cmsghdr cm;
++    struct in_pktinfo ipi;
++  } cmsg;
+ 
+   assert(initialised);
+ 
+   remote.sin_family = AF_INET;
+   remote.sin_port = htons(remote_addr->port);
+   remote.sin_addr.s_addr = htonl(remote_addr->ip_addr);
++  iov.iov_base = (void *) packet;
++  iov.iov_len = packetlen;
++  msg.msg_name = &remote;
++  msg.msg_namelen = sizeof(remote);
++  msg.msg_iov = &iov;
++  msg.msg_iovlen = 1;
++  if (remote_addr->local_ip_addr) {
++    cmsg.cm.cmsg_len = sizeof(cmsg);
++    cmsg.cm.cmsg_level = IPPROTO_IP;
++    cmsg.cm.cmsg_type = IP_PKTINFO;
++    memset(&cmsg.ipi, 0, sizeof(cmsg.ipi));
++    cmsg.ipi.ipi_spec_dst.s_addr = htonl(remote_addr->local_ip_addr);
++    msg.msg_control = (void *) &cmsg;
++    msg.msg_controllen = sizeof(cmsg);
++  } else {
++    msg.msg_control = NULL;
++    msg.msg_controllen = 0;
++  }
++  msg.msg_flags = 0;
+ 
+-  if (sendto(sock_fd, (void *) packet, NTP_NORMAL_PACKET_SIZE, 0,
+-             (struct sockaddr *) &remote, sizeof(remote)) < 0) {
++  if (sendmsg(sock_fd, &msg, 0) < 0) {
+     LOG(LOGS_WARN, LOGF_NtpIO, "Could not send to %s:%d : %s",
+         UTI_IPToDottedQuad(remote_addr->ip_addr), remote_addr->port, strerror(errno));
+   }
+@@ -252,26 +297,21 @@ NIO_SendNormalPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr)
+ }
+ 
+ /* ================================================== */
+-/* Send an authenticated packet to a given address */
++/* Send an unauthenticated packet to a given address */
+ 
+ void
+-NIO_SendAuthenticatedPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr)
++NIO_SendNormalPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr)
+ {
+-  struct sockaddr_in remote;
+-
+-  assert(initialised);
+-
+-  remote.sin_family = AF_INET;
+-  remote.sin_port = htons(remote_addr->port);
+-  remote.sin_addr.s_addr = htonl(remote_addr->ip_addr);
++  NIO_SendPacket(packet, NTP_NORMAL_PACKET_SIZE, remote_addr);
++}
+ 
+-  if (sendto(sock_fd, (void *) packet, sizeof(NTP_Packet), 0,
+-             (struct sockaddr *) &remote, sizeof(remote)) < 0) {
+-    LOG(LOGS_WARN, LOGF_NtpIO, "Could not send to %s:%d : %s",
+-        UTI_IPToDottedQuad(remote_addr->ip_addr), remote_addr->port, strerror(errno));
+-  }
++/* ================================================== */
++/* Send an authenticated packet to a given address */
+ 
+-  return;
++void
++NIO_SendAuthenticatedPacket(NTP_Packet *packet, NTP_Remote_Address *remote_addr)
++{
++  NIO_SendPacket(packet, sizeof(NTP_Packet), remote_addr);
+ }
+ 
+ /* ================================================== */
+-- 
+1.5.6.3
+
diff --git a/extra/cracklib/APKBUILD b/extra/cracklib/APKBUILD
new file mode 100644
index 0000000000..e03c6a7700
--- /dev/null
+++ b/extra/cracklib/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=cracklib
+pkgver=2.8.13
+pkgrel=0
+pkgdesc="A library used to enforce strong passwords"
+url="http://sourceforge.net/projects/cracklib"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	"
+build() {
+
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--without-python \
+		--disable-nls \
+		--with-default-dict
+	make -j1 all || return 1
+	make -j1 DESTDIR="$pkgdir" install
+
+}
+
+md5sums="5beb4c6b3c31c83fc98c4c225b25cd94  cracklib-2.8.13.tar.gz"
diff --git a/extra/cutter/APKBUILD b/extra/cutter/APKBUILD
new file mode 100644
index 0000000000..be27d880c7
--- /dev/null
+++ b/extra/cutter/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=cutter
+pkgver=1.03
+pkgrel=1
+pkgdesc="A program that allows firewall administrators to abort TCP/IP connections."
+url="http://www.lowth.com/cutter"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages=""
+source="http://www.lowth.com/cutter/software/$pkgname-$pkgver.tgz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	#no make install and no configure script
+
+	make || return 1
+	
+	mkdir -p "$pkgdir"/usr/sbin/
+
+	install -m755 -D cutter "$pkgdir"/usr/sbin/cutter
+
+}
+
+md5sums="50093db9b64277643969ee75b83ebbd1  cutter-1.03.tgz"
diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD
index 46903ebaaf..4449d1d0af 100644
--- a/extra/djbdns/APKBUILD
+++ b/extra/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=21
+pkgrel=22
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
@@ -57,7 +57,13 @@ tinydns() {
 dnscache() {
 	pkgdesc="A recursive resolver"
 	install=dnscache.install
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/dnscache 
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/etc/dnscache/ip \
+		"$subpkgdir"/etc/dnscache/servers
+
+	cp "$pkgdir"/etc/dnsroots.global "$subpkgdir"/etc/dnscache/servers/@
+	touch "$subpkgdir"/etc/dnscache/ip/127 || return 1
+
 	mv "$pkgdir"/usr/bin/dnscache* "$subpkgdir"/usr/bin
 	install -D -m755 "$srcdir"/dnscache.initd \
 		"$subpkgdir"/etc/init.d/dnscache
diff --git a/extra/fcgi/APKBUILD b/extra/fcgi/APKBUILD
index ff619df703..fc208006cb 100644
--- a/extra/fcgi/APKBUILD
+++ b/extra/fcgi/APKBUILD
@@ -21,22 +21,17 @@ build() {
                 patch -p1 < $i || return 1
         done
 	
-	# not sure how to use autotools for this apk
-	# Removed makefile patch and added libs -lm
-	#aclocal || return 1
-	#autoconf || return 1
-	# add missing files so automake doesnt error
-	#touch NEWS AUTHORS ChangeLog || return 1
-	#automake --add-missing || return 1
-	#libtoolize || return 1
 	export LIBS="$LIBS -lm"
 
+	# seems like there is no way to disable c++ from configure script
+	# the row below helps us to build even if g++ is installed on system
+	export CXX=false
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-shared \
-		--enable-static
+		--enable-shared
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
diff --git a/extra/fetchmail/APKBUILD b/extra/fetchmail/APKBUILD
new file mode 100644
index 0000000000..e04e23c349
--- /dev/null
+++ b/extra/fetchmail/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Michael Mason <ms13sp@gmail.com> 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=fetchmail
+pkgver=6.3.9
+pkgrel=0
+pkgdesc="A remote-mail retrieval and forwarding utility"
+url="http://fetchmail.berlios.de/"
+license="GPL"
+depends="openssl uclibc"
+makedepends="openssl-dev"
+install=
+subpackages="$pkgname-doc fetchmailconf"
+source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
+	fetchmail.initrd"
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-ssl \
+		--disable-nls
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm755 $srcdir/fetchmail.initrd "$pkgdir"/etc/init.d/fetchmail
+}
+
+fetchmailconf() {
+	depends="python"
+	pkgdesc="A GUI for generating fetchmail configuration files"
+	mkdir -p "$subpkgdir"/usr/bin
+	cd "$pkgdir" 
+	mv usr/bin/fetchmailconf "$subpkgdir"/usr/bin/
+	mv usr/lib "$subpkgdir"/usr/
+}
+
+md5sums="72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
+b6b95767279d77c98acdc3aa4d00ec89  fetchmail.initrd"
diff --git a/extra/fetchmail/fetchmail.initrd b/extra/fetchmail/fetchmail.initrd
new file mode 100755
index 0000000000..30eea50369
--- /dev/null
+++ b/extra/fetchmail/fetchmail.initrd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use mta
+}
+
+checkconfig() {
+        if [ ! -f /etc/fetchmailrc ]; then
+                eerror "Configuration file /etc/fetchmailrc not found"
+                return 1
+        fi
+}
+
+start() {
+        checkconfig || return 1
+
+        ebegin "Starting fetchmail"
+        start-stop-daemon --start --quiet --exec /usr/bin/fetchmail \
+		--chuid ${USER:-fetchmail}:${GROUP:-fetchmail} \
+                -- -d ${polling_period} -f /etc/fetchmailrc
+        eend ${?}
+}
+
+stop() {
+        ebegin "Stopping fetchmail"
+        start-stop-daemon --stop --quiet --pidfile /var/run/fetchmail.pid
+        eend ${?}
+}
+
diff --git a/extra/gawk/APKBUILD b/extra/gawk/APKBUILD
new file mode 100644
index 0000000000..2fc9be58c5
--- /dev/null
+++ b/extra/gawk/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gawk
+pkgver=3.1.6
+pkgrel=0
+pkgdesc="GNU awk pattern-matching language"
+url="http://www.gnu.org/software/gawk/gawk.html"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages="$pkgname-doc"
+source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-nls
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="b237751aef53c9ead9644e376bc53386  gawk-3.1.6.tar.gz"
diff --git a/extra/ghostscript/APKBUILD b/extra/ghostscript/APKBUILD
new file mode 100644
index 0000000000..e387f850f3
--- /dev/null
+++ b/extra/ghostscript/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Cameron Banta <cbanta@gmail.com>
+# Maintainer: Cameron Banta <cbanta@gmail.com>
+pkgname=ghostscript
+pkgver=8.64
+pkgrel=0
+pkgdesc="An interpreter for the PostScript language and for PDF"
+url="http://ghostscript.com/"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages="$pkgname-doc"
+source="http://ghostscript.com/releases/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-drivers=FILES \
+		--disable-cups --disable-gtk --disable-cairo \
+		--docdir=/usr/share/doc/"$pkgname"
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+	# license and copying
+	install -m644 -D "$srcdir/$pkgname-$pkgver/LICENSE" \
+		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -m644 -D "$srcdir/$pkgname-$pkgver/doc/COPYING" \
+		"$pkgdir/usr/share/licenses/$pkgname/COPYING"
+	
+
+
+	# make the doc and examples more alpine like 
+	#	(the --docdir above doesn't seem to work so good)
+	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+	mv "$pkgdir/usr/share/$pkgname/$pkgver/doc" "$pkgdir/usr/share/doc/$pkgname"
+	mv "$pkgdir/usr/share/$pkgname/$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname"
+	
+
+}
+
+md5sums="dd927ecf7e4db38b62be3dc17b1b04d2  ghostscript-8.64.tar.gz"
diff --git a/extra/htop/APKBUILD b/extra/htop/APKBUILD
index 4ae195d565..b6e4ee8880 100644
--- a/extra/htop/APKBUILD
+++ b/extra/htop/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:Carlo Landmeter
 pkgname=htop
 pkgver=0.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="An interactive process viewer for Linux"
 url="http://htop.sourceforge.net"
 license='GPL'
diff --git a/extra/iaxmodem/APKBUILD b/extra/iaxmodem/APKBUILD
new file mode 100644
index 0000000000..86ca156f25
--- /dev/null
+++ b/extra/iaxmodem/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Cameron Banta <cbanta@gmail.com>
+# Maintainer: Cameron Banta <cbanta@gmail.com>
+pkgname=iaxmodem
+pkgver=1.2.0
+pkgrel=0
+pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
+url="http://iaxmodem.sourceforge.net/"
+license="GPL"
+depends="uclibc tiff"
+makedepends="tiff-dev"
+#install=
+#subpackages="$pkgname-doc $pkgname-dev"
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure
+	make || return 1
+	install -m755 -s -D "$srcdir/$pkgname-$pkgver/iaxmodem" \
+		"$pkgdir/sbin/iaxmodem"
+	mkdir -p "$pkgdir/etc/iaxmodem"
+	mkdir -p "$pkgdir/var/log/iaxmodem"
+
+	#library licenses
+	install -m644 -D "$srcdir/$pkgname-$pkgver/lib/libiax2/COPYING" \
+		"$pkgdir"/usr/share/licenses/$pkgname/libiax2.COPYING
+	install -m644 -D "$srcdir/$pkgname-$pkgver/lib/libiax2/COPYING.LIB" \
+		"$pkgdir"/usr/share/licenses/$pkgname/libiax2.COPYING.LIB
+	
+	install -m644 -D "$srcdir/$pkgname-$pkgver/lib/spandsp/COPYING" \
+		"$pkgdir"/usr/share/licenses/$pkgname/libspandsp.COPYING
+
+	#docs
+	install -m644 -D "$srcdir/$pkgname-$pkgver/README" \
+		"$pkgdir/usr/share/doc/$pkgname/README"
+	install -m644 -D "$srcdir/$pkgname-$pkgver/FAQ" \
+		"$pkgdir/usr/share/doc/$pkgname/FAQ"
+
+	install -m644 -D "$srcdir/$pkgname-$pkgver/iaxmodem-cfg.ttyIAX" \
+		"$pkgdir/usr/share/doc/$pkgname/iaxmodem-cfg.ttyIAX"
+	install -m644 -D "$srcdir/$pkgname-$pkgver/iaxmodem.init.debian" \
+		"$pkgdir/usr/share/doc/$pkgname/iaxmodem.init.debian"
+	install -m644 -D "$srcdir/$pkgname-$pkgver/config.ttyIAX" \
+		"$pkgdir/usr/share/doc/$pkgname/config.ttyIAX"
+
+	# install -m755 -D "$srcdir"/$pkgname.initd \
+	#	"$pkgdir"/etc/init.d/$pkgname
+	# install -m644 -D "$srcdir"/$pkgname.confd \
+	#	"$pkgdir"/etc/conf.d/$pkgname
+}
+
+md5sums="f8b26cfeed188e5c1dcbc5ae5ef923b3  iaxmodem-1.2.0.tar.gz"
diff --git a/extra/links/APKBUILD b/extra/links/APKBUILD
new file mode 100644
index 0000000000..2d11cf9dba
--- /dev/null
+++ b/extra/links/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=links
+pkgver=2.2
+pkgrel=0
+pkgdesc="A text WWW browser, similar to Lynx"
+url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
+license="GPL"
+subpackages="$pkgname-doc"
+# the bzip2 lib is linked static so we dont need in depends
+depends="zlib openssl"
+makedepends="pkgconfig zlib-dev openssl-dev bzip2-dev"
+source="http://$pkgname.twibright.com/download/$pkgname-$pkgver.tar.bz2"
+
+build () {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-javascript \
+		--disable-graphics \
+		--without-x \
+		--disable-nls || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="bf5b20529a2a811701c5af52b28ebdd4  links-2.2.tar.bz2"
diff --git a/extra/lzo/APKBUILD b/extra/lzo/APKBUILD
new file mode 100644
index 0000000000..a9f2b912e1
--- /dev/null
+++ b/extra/lzo/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=lzo
+pkgver=2.03
+pkgrel=0
+pkgdesc="LZO -- a real-time data compression library"
+url="http://www.oberhumer.com/opensource/lzo"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages="$pkgname-dev"
+source="http://www.oberhumer.com/opensource/lzo/download/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-shared
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="0c3d078c2e8ea5a88971089a2f02a726  lzo-2.03.tar.gz"
diff --git a/extra/nano/APKBUILD b/extra/nano/APKBUILD
new file mode 100644
index 0000000000..bc911ba7df
--- /dev/null
+++ b/extra/nano/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: ms13sp <ms13sp@gmail.com>
+# Maintainer: ms13sp <ms13sp@gmail.com>
+pkgname=nano
+pkgver=2.0.9
+pkgmaj=2.0
+pkgrel=0
+pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor."
+url="http://www.nano-editor.org/"
+license="GPL"
+depends="ncurses uclibc"
+makedepends="ncurses-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://www.nano-editor.org/dist/v$pkgmaj/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-tiny \
+		--disable-nls \
+		--disable-speller
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+
+md5sums="2be94dc43fb60fff4626a2401a977220  nano-2.0.9.tar.gz"
diff --git a/extra/nmap/APKBUILD b/extra/nmap/APKBUILD
index ae7be5ed19..367523d3ba 100644
--- a/extra/nmap/APKBUILD
+++ b/extra/nmap/APKBUILD
@@ -2,19 +2,27 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=nmap 
 pkgver=4.76
-pkgrel=0
+pkgrel=1
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
 license="custom:GPL"
-depends="pcre libpcap openssl-dev lua-dev"
-makedepends="g++"
+depends="pcre libpcap openssl-dev lua-dev uclibc++"
+makedepends="uclibc++-dev libpcap-dev"
 install=
 subpackages="$pkgname-doc $pkgname-nse"
-source="http://nmap.org/dist/$pkgname-$pkgver.tgz"
+source="http://nmap.org/dist/$pkgname-$pkgver.tgz
+	nmap-4.53-uclibc++-output.cc.patch
+	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
+	for i in ../*.patch; do
+		msg "Applying $i..."
+		patch -p1 < $i || return 1
+	done
+
+	export CXX=g++-uc
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -35,4 +43,5 @@ nse() {
 	mv "$pkgdir"/usr/share/$pkgname/scripts "$subpkgdir"/usr/share/$pkgname/
 }
 
-md5sums="54b5c9e3f44c1adde17df68170eb7cfe  nmap-4.76.tgz"
+md5sums="54b5c9e3f44c1adde17df68170eb7cfe  nmap-4.76.tgz
+507b0936aaafaeddebad309b0924de39  nmap-4.53-uclibc++-output.cc.patch"
diff --git a/extra/nmap/nmap-4.53-uclibc++-output.cc.patch b/extra/nmap/nmap-4.53-uclibc++-output.cc.patch
new file mode 100644
index 0000000000..3253fc26b3
--- /dev/null
+++ b/extra/nmap/nmap-4.53-uclibc++-output.cc.patch
@@ -0,0 +1,11 @@
+--- nmap/output.cc.orig	2007-12-15 09:54:07.000000000 -0800
++++ nmap/output.cc	2007-12-15 09:54:19.000000000 -0800
+@@ -1904,7 +1904,7 @@
+ 
+   /* Compares this record to another. First compare the directory names, then
+      compare the file names. */
+-  bool operator<(const struct data_file_record& other) {
++  bool operator<(const struct data_file_record& other) const {
+     int cmp;
+ 
+     cmp = dir.compare(other.dir);
diff --git a/extra/pingu/APKBUILD b/extra/pingu/APKBUILD
index 244cdf6876..8089c15626 100644
--- a/extra/pingu/APKBUILD
+++ b/extra/pingu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="http://git.alpinelinux.org/cgit/pingu"
 license="GPL"
@@ -20,4 +20,4 @@ build() {
 }
 
 md5sums="5f7b72e4eb0af88a5d568b383513591f  pingu-0.2.tar.bz2
-2b06ea0dbb9ccfc8e0d5afb7fb6aee6a  pingu.initd"
+d2162d9c02a66691bb6360f4f2d9d701  pingu.initd"
diff --git a/extra/pingu/pingu.initd b/extra/pingu/pingu.initd
new file mode 100644
index 0000000000..39301f80e4
--- /dev/null
+++ b/extra/pingu/pingu.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+
+# Sample init.d file for alpine linux.
+
+NAME=pingu
+DAEMON=/usr/bin/$NAME
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${NAME}"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/${NAME}.pid \
+			--exec ${DAEMON} -- -d
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+		start-stop-daemon --stop --quiet \
+			--exec ${DAEMON} \
+			--pidfile /var/run/${NAME}.pid
+	eend $?
+}
+
diff --git a/extra/postgresql/APKBUILD b/extra/postgresql/APKBUILD
new file mode 100644
index 0000000000..d2cb83a6dc
--- /dev/null
+++ b/extra/postgresql/APKBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=postgresql
+pkgver=8.3.5
+pkgrel=0
+pkgdesc="A sophisticated object-relational DBMS"
+url="http://www.postgresql.org/"
+license="BSD"
+depends="uclibc openssl libpq bbsuid"
+makedepends="readline-dev openssl-dev"
+subpackages="$pkgname-dev $pkgname-doc libpq $pkgname-client"
+source="ftp://ftp.$pkgname.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
+	$pkgname.initd
+	$pkgname.confd
+	"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver || return 1
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-docdir=/usr/share/doc \
+		--with-openssl \
+		|| return 1
+
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+
+	install -D -m755 "$srcdir"/postgresql.initd \
+		"$pkgdir"/etc/init.d/postgresql
+	install -D -m644 "$srcdir"/postgresql.confd \
+		"$pkgdir"/etc/conf.d/postgresql || return 1
+}
+
+libpq() {
+	depends="uclibc openssl"
+	pkgdesc="PostgreSQL libraries"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib/
+}
+
+client() {
+	depends="uclibc openssl libpq readline"
+	pkgdesc="PostgreSQL client"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/psql "$subpkgdir"/usr/bin/
+}
+
+
+md5sums="3bc028774d7a79e926be0c6a9c7ca209  postgresql-8.3.5.tar.bz2
+7ed7e95246798ac3d5474ed12bf98e98  postgresql.initd
+ea3320c56a22f5c305199886c2766387  postgresql.confd"
diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd
new file mode 100644
index 0000000000..56561b0c40
--- /dev/null
+++ b/extra/postgresql/postgresql.confd
@@ -0,0 +1,52 @@
+# PostgreSQL's Database Directory
+PGDATA="/var/lib/postgresql/8.3/data"
+
+# PostgreSQL User
+PGUSER="postgres"
+
+# PostgreSQL Group
+PGGROUP="postgres"
+
+# Extra options to run postmaster with, e.g.:
+# -N is the maximal number of client connections
+# -B is the number of shared buffers and has to be at least 2x the value for -N
+# Please read the man-page to postmaster for more options. Many of these options
+# can be set directly in the configuration-file.
+#PGOPTS="-N 512 -B 1024"
+
+
+# SERVER SHUTDOWN:
+# The server will receive 3 signals in the worst case:
+# 1. SIGTERM
+#  This signals the server to ignore new connections and to
+#  wait for all clients to end their transactions before shutting down.
+#  Use WAIT_FOR_DISCONNECT to control how much time the clients
+#  should have until the next signal is being sent.
+# 2. SIGINT
+#  Tell the server to forcefully disconnect all clients.
+#  Terminating a client results in a rollback of the open transactions for this client.
+#  Use WAIT_FOR_CLEANUP to determine how much time the server has
+#  for cleanup.
+# 3. SIGQUIT
+#  This will terminate the server immediately and results in a recovery run for the next start.
+
+# Wait for clients to disconnect
+WAIT_FOR_DISCONNECT=30
+
+# Time the server has to clean up
+WAIT_FOR_CLEANUP=60
+
+# Time the server has to quit (with a recover-run on next startup)
+# Set to 0 to deactivate it
+WAIT_FOR_QUIT=60
+
+# Comment this out if you don't want to wait for the server to
+# startup before continuing.  For example, if this server is a 
+# PITR log shipping based replication standby
+WAIT_FOR_START="-w"
+
+# If you have to export environment variables for the database process,
+# this can be done here.
+#
+# Example:
+#   export R_HOME="/usr/lib/R"
diff --git a/extra/postgresql/postgresql.initd b/extra/postgresql/postgresql.initd
new file mode 100644
index 0000000000..bc50ae2f73
--- /dev/null
+++ b/extra/postgresql/postgresql.initd
@@ -0,0 +1,114 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.4 2008/09/28 22:53:02 caleb Exp $
+
+opts="${opts} reload setup"
+
+depend() {
+	use net
+	provide postgresql
+}
+
+checkconfig() {
+	if [ ! -d "$PGDATA" ] ; then
+		eerror "Directory not found: $PGDATA"
+		eerror "Please make sure that PGDATA points to the right path."
+		eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting PostgreSQL"
+
+	if [ -f "$PGDATA/postmaster.pid" ] ; then
+		rm -f "$PGDATA/postmaster.pid"
+	fi
+
+	local retval
+
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'" >/dev/null
+	retval=$?
+	[ $retval -ne 0 ] && eend $retval && return $retval
+
+	# The following is to catch the case of an already running server
+	# in which pg_ctl doesn't know to which server it connected to and false reports the server as 'up'
+	sleep 2
+	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
+		eerror "The pid-file doesn't exist but pg_ctl reported a running server."
+		eerror "Please check whether there is another server running on the same port or read the log-file."
+		eend 1
+		return 1
+	fi
+
+	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
+	test -d /proc/"${pid}" 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
+
+	local retval
+
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart" >/dev/null
+
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
+
+	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
+	ewarn "Going to shutdown the server anyway."
+
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl stop -m fast" >/dev/null
+
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
+
+	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
+		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
+		eend $retval
+		return $retval
+	fi
+
+	ewarn "Shutting down the server gracefully failed."
+	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
+
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl stop -m immediate" >/dev/null
+
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
+
+	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading PostgreSQL configuration"
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl reload" >/dev/null
+	eend $?
+}
+
+setup() { 
+	ebegin "Creating a new PostgreSQL database cluster" 
+	if [ -d "${PGDATA}" ] ; then 
+		eend 1 "${PGDATA} already exist" 
+		return 
+	fi 
+	mkdir -p "${PGDATA}" 
+	chown -Rf postgres:postgres "${PGDATA}" 
+	chmod 0700 "${PGDATA}" 
+	cd "${PGDATA}" # to avoid the: could not change directory to "/root" 
+	su -c "/usr/bin/initdb --pgdata ${PGDATA}" postgres
+	einfo "You can use the '/etc/init.d/postgresql' script to run PostgreSQL instead"
+	einfo "of 'pg_ctl'."
+	eend $? 
+} 
+
diff --git a/extra/quagga/APKBUILD b/extra/quagga/APKBUILD
index 04f33d4084..e941224ce5 100644
--- a/extra/quagga/APKBUILD
+++ b/extra/quagga/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=0.99.11
-pkgrel=4
+pkgrel=7
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 license="GPL-2"
-depends="uclibc readline ncurses"
+depends="uclibc readline ncurses iproute2"
 makedepends="readline-dev ncurses-dev
 	autoconf automake libtool"
 install=quagga.install
@@ -76,6 +76,6 @@ cc109a746273bc0d6aee9d758e7524ab  bgpd.initd
 89b0cf4e70172bfcd195b2869cae28da  ospfd.initd
 39b8cb21b55de53af38c94c2f5d85917  ripd.initd
 120ab1b53975ec86e78266f31e935ab6  ripngd.initd
-6d51e9fca8d206a6d9d1d9fde793b48f  zebra.initd
+3490a10510e416ab83d5b4d767136de8  zebra.initd
 c38e884372406e9e59616e436cd26388  zebra.confd
-6d2ca71d32ed9d9517f7779986db91da  quagga.install"
+c5c0ae236d32df9e7a000b19f3fc3684  quagga.install"
diff --git a/extra/quagga/quagga.install b/extra/quagga/quagga.install
index a69fe81a26..52a261a1f7 100644
--- a/extra/quagga/quagga.install
+++ b/extra/quagga/quagga.install
@@ -4,10 +4,11 @@ case "$1" in
 	pre_install)
 		adduser -H -h /var/empty -s /bin/false -D quagga 2>/dev/null
 		mkdir -p var/empty
+		;;
+	post_install)
 		chown root:root var/empty
 		chown quagga:quagga /var/run/quagga
 		;;
 esac
 exit 0
 
-
diff --git a/extra/quagga/zebra.initd b/extra/quagga/zebra.initd
index 5ca8ef58c0..f0cc008432 100644
--- a/extra/quagga/zebra.initd
+++ b/extra/quagga/zebra.initd
@@ -17,7 +17,7 @@ checkconfig() {
 
 cleanup() {
 	ebegin "Cleaning up stale zebra routes..."
-	ip route flush proto zebra
+	/usr/sbin/ip route flush proto zebra
 	eend $?
 }
 
diff --git a/extra/screen/APKBUILD b/extra/screen/APKBUILD
new file mode 100644
index 0000000000..ffa48fa208
--- /dev/null
+++ b/extra/screen/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Michael Mason <ms13sp@gmail.com> 
+# Maintainer: 
+pkgname=screen
+pkgver=4.0.3
+pkgrel=0
+pkgdesc="A window manager that multiplexes a physical terminal"
+url="http://ftp.gnu.org/gnu/screen/"
+license="GPL"
+depends="uclibc ncurses"
+makedepends=""
+install=
+subpackages="$pkgname-doc"
+source="http://ftp.gnu.org/gnu/screen/$pkgname-$pkgver.tar.gz
+	$pkgname-$pkgver.patch"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	for i in ../*.patch; do
+		msg "Applying $i"
+		patch -p1 < $i || return 1
+	done
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="8506fd205028a96c741e4037de6e3c42  screen-4.0.3.tar.gz
+243e18daf4b2bbff898fdf0d772fad52  screen-4.0.3.patch"
diff --git a/extra/screen/screen-4.0.3.patch b/extra/screen/screen-4.0.3.patch
new file mode 100644
index 0000000000..4a90f49b91
--- /dev/null
+++ b/extra/screen/screen-4.0.3.patch
@@ -0,0 +1,272 @@
+--- screen-4.0.3-orig/acls.h	Mon Sep  8 14:23:38 2003
++++ screen-4.0.3/acls.h	Fri Feb 27 18:32:07 2009
+@@ -20,6 +20,8 @@
+  *
+  ****************************************************************
+  */
++#ifndef _SCREEN_ACLS_H_
++#define _SCREEN_ACLS_H_
+ 
+ #ifdef MULTIUSER
+ 
+@@ -91,3 +93,4 @@
+ 
+ extern int DefaultEsc, DefaultMetaEsc;
+ 
++#endif /* define _SCREEN_ACLS_H_ */
+--- screen-4.0.3-orig/ansi.h	Mon Feb 24 16:55:08 2003
++++ screen-4.0.3/ansi.h	Fri Feb 27 18:32:49 2009
+@@ -21,6 +21,8 @@
+  ****************************************************************
+  * $Id: ansi.h,v 1.6 1994/05/31 12:31:28 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_ANSI_H_
++#define _SCREEN_ANSI_H_
+ 
+ #define NATTR		6
+ 
+@@ -168,3 +170,5 @@
+ # define dw_left(ml, x, enc) 0
+ # define dw_right(ml, x, enc) 0
+ #endif
++
++#endif /* define _SCREEN_ANSI_H_ */
+--- screen-4.0.3-orig/braille.h	Sat Apr 28 13:26:42 2001
++++ screen-4.0.3/braille.h	Fri Feb 27 18:33:51 2009
+@@ -24,6 +24,8 @@
+  ****************************************************************
+  * $Id: braille.h,v 1.1 1995/09/06 15:51:18 jnweiger Exp jnweiger $ FAU
+  */
++#ifndef _SCREEN_BRAILLE_H_
++#define _SCREEN_BRAILLE_H_
+ 
+ #ifdef HAVE_BRAILLE
+ 
+@@ -81,3 +83,5 @@
+ #define BD_FORE bd.bd_dpy->d_fore
+ 
+ #endif
++
++#endif /* define _SCREEN_BRAILLE_H_ */
+--- screen-4.0.3-orig/display.h	Tue Jul  1 14:01:42 2003
++++ screen-4.0.3/display.h	Fri Feb 27 18:34:30 2009
+@@ -21,6 +21,8 @@
+  ****************************************************************
+  * $Id: display.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_DISPLAY_H_
++#define _SCREEN_DISPLAY_H_
+ 
+ #ifdef MAPKEYS
+ 
+@@ -343,3 +345,5 @@
+ #define HSTATUS_MESSAGE		2
+ #define HSTATUS_HS		3
+ #define HSTATUS_ALWAYS		(1<<2)
++
++#endif /* define _SCREEN_DISPLAY_H_ */
+--- screen-4.0.3-orig/extern.h	Fri Aug 22 12:27:57 2003
++++ screen-4.0.3/extern.h	Fri Feb 27 18:35:17 2009
+@@ -21,6 +21,8 @@
+  ****************************************************************
+  * $Id: extern.h,v 1.18 1994/05/31 12:31:57 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_EXTERN_H_
++#define _SCREEN_EXTERN_H_
+ 
+ #if !defined(__GNUC__) || __GNUC__ < 2
+ #undef __attribute__
+@@ -490,3 +492,5 @@
+ # endif
+ #endif
+ extern int   EncodeChar __P((char *, int, int, int *));
++
++#endif /* define _SCREEN_EXTERN_H_ */
+--- screen-4.0.3-orig/image.h	Fri Dec  5 13:45:41 2003
++++ screen-4.0.3/image.h	Fri Feb 27 18:35:53 2009
+@@ -21,8 +21,9 @@
+  ****************************************************************
+  * $Id: image.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_IMAGE_H_
++#define _SCREEN_IMAGE_H_
+ 
+-
+ #undef IFFONT
+ #undef IFCOLOR
+ 
+@@ -161,3 +162,5 @@
+ #  define cole2i(c) ((c) ^ 9)
+ # endif
+ #endif
++
++#endif /* define _SCREEN_IMAGE_H_ */
+--- screen-4.0.3-orig/layer.h	Tue Jan  8 15:42:25 2002
++++ screen-4.0.3/layer.h	Fri Feb 27 18:36:50 2009
+@@ -22,6 +22,9 @@
+  * $Id: overlay.h,v 1.3 1994/05/31 12:32:31 mlschroe Exp $ FAU
+  */
+ 
++#ifndef _SCREEN_LAYER_H_
++#define _SCREEN_LAYER_H_
++
+ /*
+  * This is the overlay structure. It is used to create a seperate
+  * layer over the current windows.
+@@ -103,3 +106,4 @@
+ 	  display = olddisplay;				\
+ 	} while(0)
+ 
++#endif /* define _SCREEN_LAYER_H_ */
+--- screen-4.0.3-orig/logfile.h	Tue Jan  8 15:42:27 2002
++++ screen-4.0.3/logfile.h	Fri Feb 27 18:37:29 2009
+@@ -22,6 +22,9 @@
+  * $Id: logfile.h,v 1.11 1994/05/31 12:33:27 jnweiger Exp $ FAU
+  */
+ 
++#ifndef _SCREEN_LOGFILE_H_
++#define _SCREEN_LOGFILE_H_
++
+ struct logfile
+ {
+   struct logfile *next;
+@@ -80,3 +83,5 @@
+  * It closes fd and opens wantfd to access whatever fd accessed.
+  */
+ int lf_move_fd __P((int fd, int wantfd));
++
++#endif /* define _SCREEN_LOGFILE_H_ */
+--- screen-4.0.3-orig/mark.h	Tue Jan  8 15:42:30 2002
++++ screen-4.0.3/mark.h	Fri Feb 27 18:38:02 2009
+@@ -21,6 +21,8 @@
+  ****************************************************************
+  * $Id: mark.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU
+  */
++#ifndef _SCREEN_MARK_H_
++#define _SCREEN_MARK_H_
+ 
+ struct markdata
+ {
+@@ -47,3 +49,4 @@
+ #define W2D(y) ((y) - markdata->hist_offset)
+ #define D2W(y) ((y) + markdata->hist_offset)
+ 
++#endif /* define _SCREEN_MARK_H_ */
+--- screen-4.0.3-orig/os.h	Tue Jan  8 15:42:33 2002
++++ screen-4.0.3/os.h	Fri Feb 27 18:39:09 2009
+@@ -21,6 +21,8 @@
+  ****************************************************************
+  * $Id: os.h,v 1.10 1994/05/31 12:32:22 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_OS_H_
++#define _SCREEN_OS_H_
+ 
+ #include <stdio.h>
+ #include <errno.h>
+@@ -531,3 +533,4 @@
+  */
+ #define IOSIZE		4096
+ 
++#endif /* define _SCREEN_OS_H_ */
+--- screen-4.0.3-orig/osdef.h.in	Sat Apr 28 13:26:43 2001
++++ screen-4.0.3/osdef.h.in	Fri Feb 27 18:38:36 2009
+@@ -27,6 +27,8 @@
+  * mangled the screen source through 'gcc -Wall'.
+  ****************************************************************
+  */
++#ifndef _SCREEN_OSDEF_H_
++#define _SCREEN_OSDEF_H_
+ 
+ extern int   printf __P((char *, ...));
+ extern int   fprintf __P((FILE *, char *, ...));
+@@ -199,3 +201,4 @@
+ extern int getloadavg(double *, int);
+ #endif
+ 
++#endif /* define _SCREEN_OSDEF_H_ */
+--- screen-4.0.3-orig/patchlevel.h	Mon Oct 23 13:04:11 2006
++++ screen-4.0.3/patchlevel.h	Fri Feb 27 18:40:53 2009
+@@ -523,6 +523,8 @@
+  *                     (cstone & Rich Felker).
+  *                     -- DISTRIBUTED
+  */
++#ifndef _SCREEN_PATCHLEVEL_H_
++#define _SCREEN_PATCHLEVEL_H_
+ 
+ #define ORIGIN "FAU"
+ #define REV 4
+@@ -530,3 +532,5 @@
+ #define PATCHLEVEL 3
+ #define DATE "23-Oct-06"
+ #define STATE ""
++
++#endif /* define _SCREEN_PATCHLEVEL_H_ */
+--- screen-4.0.3-orig/pty.c	Mon Sep  8 14:26:18 2003
++++ screen-4.0.3/pty.c	Fri Feb 27 19:31:53 2009
+@@ -33,11 +33,6 @@
+ # include <sys/ioctl.h>
+ #endif
+ 
+-/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_SVR4_PTYS
+-# include <sys/stropts.h>
+-#endif
+-
+ #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
+ # include <sys/ttold.h>
+ #endif
+--- screen-4.0.3-orig/sched.h	Tue Jan  8 15:42:43 2002
++++ screen-4.0.3/sched.h	Fri Feb 27 19:39:49 2009
+@@ -21,6 +21,9 @@
+  ****************************************************************
+  * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU
+  */
++#ifndef _SCREEN_SCHED_H_
++#define _SCREEN_SCHED_H_
++#include <sys/types.h>
+ 
+ struct event
+ {
+@@ -41,3 +44,5 @@
+ #define EV_READ		1
+ #define EV_WRITE	2
+ #define EV_ALWAYS	3
++
++#endif /* define _SCREEN_SCHED_H_ */
+--- screen-4.0.3-orig/screen.h	Fri Aug 22 12:28:43 2003
++++ screen-4.0.3/screen.h	Fri Feb 27 18:42:11 2009
+@@ -22,6 +22,9 @@
+  * $Id: screen.h,v 1.12 1994/05/31 12:32:54 mlschroe Exp $ FAU
+  */
+ 
++#ifndef _SCREEN_SCREEN_H_
++#define _SCREEN_SCREEN_H_
++
+ #include "os.h"
+ 
+ #if defined(__STDC__)
+@@ -293,3 +296,5 @@
+  */
+ #define WLIST_NUM 0
+ #define WLIST_MRU 1
++
++#endif /* define _SCREEN_SCREEN_H_ */
+--- screen-4.0.3-orig/window.h	Thu Aug 21 14:57:30 2003
++++ screen-4.0.3/window.h	Fri Feb 27 18:42:45 2009
+@@ -21,8 +21,9 @@
+  ****************************************************************
+  * $Id: window.h,v 1.11 1994/05/31 12:33:27 mlschroe Exp $ FAU
+  */
++#ifndef _SCREEN_WINDOW_H_
++#define _SCREEN_WINDOW_H_
+ 
+-
+ /* keep this in sync with the initialisations in window.c */
+ struct NewWindow
+ {
+@@ -315,3 +316,5 @@
+     : &fore->w_mlines[y - fore->w_histheight])
+ 
+ #define Layer2Window(l) ((struct win *)(l)->l_bottom->l_data)
++
++#endif /* define _SCREEN_WINDOW_H_ */
diff --git a/extra/tiff/APKBUILD b/extra/tiff/APKBUILD
new file mode 100644
index 0000000000..c580a84a30
--- /dev/null
+++ b/extra/tiff/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=tiff
+pkgver=3.8.2
+pkgrel=0
+pkgdesc="Provides support for the Tag Image File Format or TIFF"
+url="http://www.libtiff.org/"
+license="GPL"
+depends="uclibc"
+subpackages="$pkgname-doc $pkgname-dev"
+source="ftp://ftp.remotesensing.org/pub/lib$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-cxx
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="fbb6f446ea4ed18955e2714934e5b698  tiff-3.8.2.tar.gz"
diff --git a/extra/tinyproxy/APKBUILD b/extra/tinyproxy/APKBUILD
new file mode 100644
index 0000000000..046daa8307
--- /dev/null
+++ b/extra/tinyproxy/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=tinyproxy
+pkgver=1.6.3
+pkgrel=0
+pkgdesc="Lightweight HTTP proxy"
+url="https://www.banu.com/tinyproxy/"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install="tinyproxy.install"
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	tinyproxy.initd
+	$install
+	"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	# set default user to tinyproxy:tinyproxy and correct pidfile
+	sed -i -e 's:^User.*:User tinyproxy:' \
+		-e 's:^Group.*:Group tinyproxy:' \
+		-e 's:^PidFile.*:PidFile "/var/run/tinyproxy/tinyproxy.pid":' \
+		doc/tinyproxy.conf
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/var/run/tinyproxy
+	install -Dm755 "$srcdir"/tinyproxy.initd "$pkgdir"/etc/init.d/tinyproxy
+}
+
+md5sums="bd14d029b12621bcfd7ee71b2f4893da  tinyproxy-1.6.3.tar.gz
+554da6fc363fbe251f081b342541bef4  tinyproxy.initd
+2f5d9f4a8b7f4c7f1f5b9d59d99839e4  tinyproxy.install"
diff --git a/extra/tinyproxy/tinyproxy.initd b/extra/tinyproxy/tinyproxy.initd
new file mode 100644
index 0000000000..bee5d041fb
--- /dev/null
+++ b/extra/tinyproxy/tinyproxy.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/files/tinyproxy.initd,v 1.1 2008/02/16 07:11:25 mrness Exp $
+
+CONFFILE="/etc/tinyproxy/${SVCNAME}.conf"
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "Configuration file ${CONFFILE} not found!"
+		return 1
+	fi
+
+	PIDFILE=$(sed -n -e 's/^[[:space:]]*PidFile[[:space:]]\+"\(.*\)"[[:space:]]*$/\1/p' "${CONFFILE}")
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting tinyproxy"
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --start --pidfile "${PIDFILE}" --startas /usr/sbin/tinyproxy -- -c "${CONFFILE}"
+	else
+		start-stop-daemon --start --exec /usr/sbin/tinyproxy -- -c "${CONFFILE}"
+	fi
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping tinyproxy"
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --stop --pidfile "${PIDFILE}"
+	else
+		start-stop-daemon --stop --exec /usr/sbin/tinyproxy
+	fi
+	eend $?
+}
diff --git a/extra/tinyproxy/tinyproxy.install b/extra/tinyproxy/tinyproxy.install
new file mode 100644
index 0000000000..5fa366737b
--- /dev/null
+++ b/extra/tinyproxy/tinyproxy.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case "$1" in
+	pre_install)
+		adduser -h /dev/null -s /bin/false -D tinyproxy 2>/dev/null
+		;;
+	post_install)
+		chown tinyproxy:tinyproxy /var/run/tinyproxy
+		;;
+esac
+
+# return with success even if user already exist
+exit 0