Merge branch 'master' of git://git.alpinelinux.org/aports

6 files changed, 81 insertions, 9 deletions

diff --git a/extra/fetchmail/APKBUILD b/extra/fetchmail/APKBUILD
index e04e23c3495..1431ac77767 100644
--- a/extra/fetchmail/APKBUILD
+++ b/extra/fetchmail/APKBUILD
@@ -2,16 +2,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
 pkgver=6.3.9
-pkgrel=0
+pkgrel=1
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 license="GPL"
 depends="openssl uclibc"
-makedepends="openssl-dev"
-install=
+makedepends="openssl-dev python"
+install="fetchmail.pre-install fetchmail.post-install"
 subpackages="$pkgname-doc fetchmailconf"
 source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
-	fetchmail.initrd"
+	$install
+	fetchmail.initd"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
@@ -24,6 +25,7 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 	install -Dm755 $srcdir/fetchmail.initrd "$pkgdir"/etc/init.d/fetchmail
+	install -d "$pkgdir"/var/lib/fetchmail
 }
 
 fetchmailconf() {
@@ -36,4 +38,6 @@ fetchmailconf() {
 }
 
 md5sums="72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
-b6b95767279d77c98acdc3aa4d00ec89  fetchmail.initrd"
+5a2fc8e8b3115fe2b9bf23503fb8f0a4  fetchmail.pre-install
+e27237ed73ad183ddd06dfd5e3dd0da7  fetchmail.post-install
+9a64c2b77d1a03a1eb8648a32d46b2c5  fetchmail.initd"
diff --git a/extra/fetchmail/fetchmail.initrd b/extra/fetchmail/fetchmail.initd
index 30eea503695..4646fa4ccaf 100755
--- a/extra/fetchmail/fetchmail.initrd
+++ b/extra/fetchmail/fetchmail.initd
@@ -1,5 +1,7 @@
 #!/sbin/runscript
 
+pidfile=/var/run/fetchmail/fetchmail.pid
+
 depend() {
 	need net
 	use mta
@@ -16,15 +18,16 @@ 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
+        start-stop-daemon --start --quiet \
+		--chuid fetchmail --exec /usr/bin/fetchmail \
+		-- -d ${polling_period} -f /etc/fetchmailrc \
+		--pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
         eend ${?}
 }
 
 stop() {
         ebegin "Stopping fetchmail"
-        start-stop-daemon --stop --quiet --pidfile /var/run/fetchmail.pid
+        start-stop-daemon --stop --quiet --pidfile ${pidfile}
         eend ${?}
 }
 
diff --git a/extra/fetchmail/fetchmail.post-install b/extra/fetchmail/fetchmail.post-install
new file mode 100644
index 00000000000..9ca24ddcd86
--- /dev/null
+++ b/extra/fetchmail/fetchmail.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+chown fetchmail:fetchmail /var/lib/fetchmail
diff --git a/extra/fetchmail/fetchmail.pre-install b/extra/fetchmail/fetchmail.pre-install
new file mode 100644
index 00000000000..4a1b630e008
--- /dev/null
+++ b/extra/fetchmail/fetchmail.pre-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+adduser -H -h /var/lib/fetchmail -s /bin/false -D fetchmail 2>/dev/null
+exit 0
diff --git a/extra/p7zip/APKBUILD b/extra/p7zip/APKBUILD
new file mode 100644
index 00000000000..38d6760282b
--- /dev/null
+++ b/extra/p7zip/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=p7zip
+pkgver=4.65
+pkgrel=0
+pkgdesc="A command-line port of the 7zip compression utility"
+url="http://p7zip.sourceforge.net"
+license="GPL"
+subpackages="$pkgname-doc"
+depends="uclibc uclibc++ libgcc"
+makedepends="bash uclibc++-dev"
+#install=p7zip.install
+source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2
+	p7zip-cc-cxx.patch"
+
+build ()
+{
+	cd "$srcdir"/${pkgname}_${pkgver}
+	patch -p1 -i ../p7zip-cc-cxx.patch || return 1
+	sed -i "s|usr/local|usr|g" makefile
+	export CXX=${UC_CXX:-g++-uc}
+
+	make all3 OPTFLAGS="${CXXFLAGS}" || return 1
+	make install DEST_HOME="$pkgdir"/usr DEST_MAN="$pkgdir"/usr/share/man \
+		DEST_SHARE_DOC="http://www.bugaco.com/7zip"
+
+#	echo "creating dir"
+#	mkdir -p "$pkgdir"/usr/share/doc/p7zip/DOCS
+#	install -m555 bin/7z.so "$pkgdir"/usr/lib/p7zip/
+	sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7z
+	sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7za
+	sed -i "s|"$pkgdir"/usr|/usr|g" "$pkgdir"/usr/bin/7zr
+#	install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z "$pkgdir"/usr/share/mc/extfs/u7z
+}
+
+md5sums="f78ed232436dc8f8be25a2f95d4e5f9a  p7zip_4.65_src_all.tar.bz2
+8e8f415267bb5db179e4a8ed75985244  p7zip-cc-cxx.patch"
diff --git a/extra/p7zip/p7zip-cc-cxx.patch b/extra/p7zip/p7zip-cc-cxx.patch
new file mode 100644
index 00000000000..d06708b4bbe
--- /dev/null
+++ b/extra/p7zip/p7zip-cc-cxx.patch
@@ -0,0 +1,22 @@
+--- a/makefile.machine	2009-05-29 07:24:22.000000000 +0000
++++ b/makefile.machine	2009-05-29 07:25:22.000000000 +0000
+@@ -2,6 +2,8 @@
+ # makefile for Linux (x86, PPC, alpha ...)
+ #
+ 
++CXX ?= g++
++CC ?= gcc
+ OPTFLAGS=-O
+ 
+ ALLFLAGS=${OPTFLAGS} -s \
+@@ -9,8 +11,8 @@
+ 	-DNDEBUG -D_REENTRANT -DENV_UNIX \
+ 	$(LOCAL_FLAGS)
+ 
+-CXX=g++ $(ALLFLAGS)
+-CC=gcc $(ALLFLAGS)
++CXX += $(ALLFLAGS)
++CC += $(ALLFLAGS)
+ CC_SHARED=-fPIC
+ LINK_SHARED=-fPIC -shared
+