diff options
108 files changed, 1476 insertions, 1636 deletions
diff --git a/core/abuild/APKBUILD b/core/abuild/APKBUILD index a21c205148..c68050df9b 100644 --- a/core/abuild/APKBUILD +++ b/core/abuild/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=1.14 -pkgrel=0 +pkgver=1.15.2 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 " -depends="fakeroot file sudo" +depends="fakeroot file sudo pax-utils" license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" + make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="25463a14946eab5b120851e8077679a5 abuild-1.14.tar.bz2" +md5sums="dd03e8e79b3b4fa9bc17a9acc1b4e520 abuild-1.15.2.tar.bz2" diff --git a/core/alpine-baselayout/APKBUILD b/core/alpine-baselayout/APKBUILD index 85ab413224..6f449f190c 100644 --- a/core/alpine-baselayout/APKBUILD +++ b/core/alpine-baselayout/APKBUILD @@ -1,17 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout -pkgver=2.0_alpha11 -pkgrel=1 +pkgver=2.0_alpha12 +pkgrel=2 pkgdesc="Alpine base dir structure and init scripts" url=http://git.alpinelinux.org/cgit/alpine-baselayout -depends="uclibc" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +depends= +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + mdev-usbdisk.patch + mdev-initd.patch" license=GPL-2 build() { cd "$srcdir"/$pkgname-$pkgver + patch -p1 < ../mdev-usbdisk.patch + patch -p1 < ../mdev-initd.patch make make install PREFIX= DESTDIR="$pkgdir" || return 1 - chmod 700 "$pkgdir"/root } -md5sums="5b9d5506690e7cf41e92be5202c40630 alpine-baselayout-2.0_alpha11.tar.bz2" +md5sums="5549065f87374ea5c4249cba6ba85d16 alpine-baselayout-2.0_alpha12.tar.bz2 +4bf6829d019d2b43dd45208c7390c91c mdev-usbdisk.patch +6d3c5789e6f02c209a6f7fbf047ea3df mdev-initd.patch" diff --git a/core/alpine-baselayout/mdev-initd.patch b/core/alpine-baselayout/mdev-initd.patch new file mode 100644 index 0000000000..2af8497648 --- /dev/null +++ b/core/alpine-baselayout/mdev-initd.patch @@ -0,0 +1,13 @@ +diff --git a/init.d/mdev b/init.d/mdev +index fb9e8d5..42f6a1c 100755 +--- a/init.d/mdev ++++ b/init.d/mdev +@@ -2,7 +2,7 @@ + + depend() { + provide dev +- need sysfs mdev-mount ++ need sysfs + before checkfs fsck + keyword novserver + } diff --git a/core/alpine-baselayout/mdev-usbdisk.patch b/core/alpine-baselayout/mdev-usbdisk.patch new file mode 100644 index 0000000000..cfa0331fab --- /dev/null +++ b/core/alpine-baselayout/mdev-usbdisk.patch @@ -0,0 +1,36 @@ +commit 9542c009af40331e8770256148aa13075f4d8294 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu Jun 4 14:11:43 2009 +0000 + + mdev: look for FAT in device to create usbdisk link + + it seems like mkfs.vfat creates MBR signature + +diff --git a/mdev.conf b/mdev.conf +index 3e2339b..6ee65a2 100644 +--- a/mdev.conf ++++ b/mdev.conf +@@ -27,7 +27,7 @@ ptmx root:tty 0666 + # ram.* + ram([0-9]*) root:disk 0660 >rd/%1 + loop([0-9]+) root:disk 0660 >loop/ +-sd[a-z]1 root:disk 0660 */lib/mdev/usbdisk_link ++sd[a-z].* root:disk 0660 */lib/mdev/usbdisk_link + hd[a-z][0-9]* root:disk 0660 */lib/mdev/ide_links + md[0-9] root:disk 0660 + +diff --git a/usbdisk_link b/usbdisk_link +index 6acaad3..750242b 100644 +--- a/usbdisk_link ++++ b/usbdisk_link +@@ -14,8 +14,8 @@ if [ -e /sys/block/$MDEV ]; then + # if /sys device path contains '/usb[0-9]' then we assume its usb + # also, if its an usb without partitions we require FAT + if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then +- # do not create link if there is an MBR signature +- dd if=/dev/$MDEV bs=1 count=2 skip=510 2>/dev/null | hexdump | grep aa55 >/dev/null && exit 0 ++ # do not create link if there is not FAT ++ dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0 + + ln -sf $MDEV usbdisk + # keep this for compat. people have it in fstab diff --git a/core/apk-tools/APKBUILD b/core/apk-tools/APKBUILD index d1c5c0c630..f4ece5d32c 100644 --- a/core/apk-tools/APKBUILD +++ b/core/apk-tools/APKBUILD @@ -3,7 +3,7 @@ pkgname=apk-tools pkgver=2.0_pre12 pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" -depends="uclibc" +depends= makedepends="zlib-dev" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 fd-leak.patch" @@ -14,7 +14,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 < ../fd-leak.patch || return 1 sed -i -e 's:-Werror::' Make.rules - make + make || return 1 make DESTDIR="$pkgdir" install cd "$pkgdir/sbin" ln -s apk apk_add diff --git a/core/autoconf/APKBUILD b/core/autoconf/APKBUILD index 67bf8646d6..8de79f6ef3 100644 --- a/core/autoconf/APKBUILD +++ b/core/autoconf/APKBUILD @@ -1,9 +1,8 @@ - +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=autoconf pkgver=2.63 pkgrel=1 pkgdesc="A GNU tool for automatically configuring source code" -arch=i486 license="GPL2 GPL3" url="http://www.gnu.org/software/autoconf" depends="m4 perl" @@ -11,13 +10,13 @@ source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" subpackages="$pkgname-doc" build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + cd "$srcdir"/$pkgname-$pkgver + M4=/usr/bin/m4 ./configure --prefix=/usr make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/usr/share/info/dir + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/share/info/dir # conflict with bintuils - rm -f ${pkgdir}/usr/share/info/standards.info + rm -f "$pkgdir"/usr/share/info/standards.info } md5sums='43d76649fb86cd21d64f68c48d5abdcf autoconf-2.63.tar.gz' diff --git a/core/automake/APKBUILD b/core/automake/APKBUILD index 05fe9dccce..356f68e3f5 100644 --- a/core/automake/APKBUILD +++ b/core/automake/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake -pkgver=1.10.2 +pkgver=1.11 pkgrel=0 pkgdesc="A GNU tool for automatically creating Makefiles" arch=i486 @@ -18,4 +18,4 @@ build() { make DESTDIR=$pkgdir install } -md5sums="ede3e08c696861a01f4d2c6a2e822053 automake-1.10.2.tar.gz" +md5sums="fab0bd2c3990a6679adaf9eeac0c6d2a automake-1.11.tar.gz" diff --git a/core/build-base/APKBUILD b/core/build-base/APKBUILD index 1d42d78180..32c4e93b62 100644 --- a/core/build-base/APKBUILD +++ b/core/build-base/APKBUILD @@ -1,8 +1,9 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=build-base -pkgver=0.1 +pkgver=0.2 url=http://dev.alpinelinux.org/cgit pkgdesc="Meta package for build base" -depends="binutils gcc make patch uclibc-dev" +depends="binutils gcc make patch uclibc-dev g++" license=none build() { diff --git a/core/e2fsprogs/APKBUILD b/core/e2fsprogs/APKBUILD index 8252eead06..466f1a0abd 100644 --- a/core/e2fsprogs/APKBUILD +++ b/core/e2fsprogs/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs -pkgver=1.41.5 +pkgver=1.41.6 pkgrel=0 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" license="GPL LGPL MIT" -depends="uclibc libuuid libcom_err libblkid" +depends= subpackages="$pkgname-dev $pkgname-doc libuuid libcom_err libblkid" source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz" @@ -23,21 +23,21 @@ build () { } libuuid() { - depends="uclibc" + depends= mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/ } libcom_err() { - depends="uclibc" + depends= mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } libblkid() { - depends="uclibc libuuid" + depends= mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ } -md5sums="e218df6c84fc17c1126d31de9472a76c e2fsprogs-1.41.5.tar.gz" +md5sums="732c559db400c8fc994f4f38568c9f1f e2fsprogs-1.41.6.tar.gz" diff --git a/core/lvm2/APKBUILD b/core/lvm2/APKBUILD index 07df9f6005..59384f4879 100644 --- a/core/lvm2/APKBUILD +++ b/core/lvm2/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.45 +pkgver=2.02.47 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" license="GPL" -depends="uclibc readline" +depends= makedepends="readline-dev" source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz lvm.initd @@ -31,5 +31,5 @@ build () { install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm } -md5sums="440daa01b8f2ec4fe97b1cc621108220 LVM2.2.02.45.tgz +md5sums="669d57ff97d171fd4e077c61da1f9a34 LVM2.2.02.47.tgz e60d88f78eedb9c1252deb5b9b9b978b lvm.initd" diff --git a/core/mkinitfs/APKBUILD b/core/mkinitfs/APKBUILD index f4a37223fe..bc79fc1411 100644 --- a/core/mkinitfs/APKBUILD +++ b/core/mkinitfs/APKBUILD @@ -1,16 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs pkgver=1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + init.patch + " license="GPL-2" build() { cd "$srcdir"/$pkgname-$pkgver + patch -p1 < ../init.patch make make install DESTDIR="$pkgdir" || return 1 } -md5sums="0a7eefb454fc96763983048ee60a1bcd mkinitfs-1.5.tar.bz2" +md5sums="0a7eefb454fc96763983048ee60a1bcd mkinitfs-1.5.tar.bz2 +deb3fa8e83c877e72e6b3b420cef3864 init.patch" diff --git a/core/mkinitfs/init.patch b/core/mkinitfs/init.patch new file mode 100644 index 0000000000..6f2c367eff --- /dev/null +++ b/core/mkinitfs/init.patch @@ -0,0 +1,39 @@ +commit db606b4b4861076524232f52002411dc900a03ad +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu Jun 4 14:56:28 2009 +0000 + + init: unpack uclibc when dealing with encrypted apkovls + + openssl needs libdl which is not there by default. + +diff --git a/initramfs-init.in b/initramfs-init.in +index f8827a0..ae82e8a 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -66,6 +66,14 @@ retry_mount() { + return 1 + } + ++unpack_apk() { ++ local i ++ for i in $ALPINE_MNT/*/*/$1-[0-9]*.apk $ALPINE_MNT/*/$1-[0-9]*.apk; do ++ [ -f "$i" ] && tar --numeric-owner -C / -zxf $i && return 0 ++ done ++ return 1 ++} ++ + unpack_apkovl() { + local ovl="$1" + local dest="$2" +@@ -76,9 +84,8 @@ unpack_apkovl() { + return $? + fi + +- for i in $ALPINE_MNT/*/*/openssl-[0-9]*.apk $ALPINE_MNT/*/openssl-[0-9]*.apk; do +- [ -f "$i" ] && tar --numeric-owner -C / -zxf $i && break +- done ++ unpack_apk uclibc ++ unpack_apk openssl + + if ! openssl list-cipher-commands | grep "^$suffix$" > /dev/null; then + errstr="Cipher $suffix is not supported" diff --git a/core/mtools/APKBUILD b/core/mtools/APKBUILD index 0b84bdd616..b556426163 100644 --- a/core/mtools/APKBUILD +++ b/core/mtools/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mtools pkgver=4.0.10 -pkgrel=0 +pkgrel=2 pkgdesc="A collection of utilities to access MS-DOS disks from Unix without mounting them" url="http://www.gnu.org/software/mtools/" license="GPL" -depends="uclibc" +depends= makedepends="texinfo" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2" subpackages="$pkgname-doc" @@ -15,7 +15,8 @@ build () { ./configure --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --without-x make || return 1 make -j1 install DESTDIR="$pkgdir" } diff --git a/core/openrc/APKBUILD b/core/openrc/APKBUILD index ecf30e0768..f7a56e285d 100644 --- a/core/openrc/APKBUILD +++ b/core/openrc/APKBUILD @@ -1,16 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc -pkgver=0.4.3 -pkgrel=4 +pkgver=0.5.0 +pkgrel=1 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://roy.marples.name/openrc" license='BSD-2' -depends="uclibc" +depends="" subpackages="$pkgname-doc $pkgname-dev" -install="$pkgname.post-install" +install="$pkgname.post-install $pkgname.post-upgrade" source="http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2 openrc-0.4.3-mkmntdirs.patch - openrc-gendepends-speedup.patch hostname.initd keymaps.initd modules.initd @@ -31,7 +30,7 @@ build() { # we cannot have anything turned on by default rm -f "$pkgdir"/etc/runlevels/*/* - rm -f "$pkgdir"/lib/rc/net/* "$pkgdir"/etc/init.d/net.lo + #rm -f "$pkgdir"/lib/rc/net/* "$pkgdir"/etc/init.d/net.lo # we override some of the scripts for i in ../*.initd; do @@ -41,11 +40,11 @@ build() { } -md5sums="57ca95533e629f06a0775e176e19bdb5 openrc-0.4.3.tar.bz2 +md5sums="9ec7f8425e12abbbd0f7a962aae3fa3c openrc-0.5.0.tar.bz2 8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch -dcdcb34591e3d9eaaaf82db736cc5135 openrc-gendepends-speedup.patch c32e15b0858eef708497e7ee6355a055 hostname.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd 5608e6e3d836ad01b9714e5b41d223cb modules.initd 747168eee535e845179eaef5a3fcb334 networking.initd -6e834194b246563fc5acd77e91e038c4 openrc.post-install" +6e834194b246563fc5acd77e91e038c4 openrc.post-install +393ff61bc0bf2c07f9af81795554c584 openrc.post-upgrade" diff --git a/core/openrc/openrc-gendepends-speedup.patch b/core/openrc/openrc-gendepends-speedup.patch deleted file mode 100644 index 528b571695..0000000000 --- a/core/openrc/openrc-gendepends-speedup.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: sh/gendepends.sh.in -=================================================================== ---- a/sh/gendepends.sh.in (revision 1511) -+++ b/sh/gendepends.sh.in (working copy) -@@ -81,6 +81,7 @@ - [ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf - - if . "${_dir}/${RC_SVCNAME}"; then -+ _shell_var_RC_SVCNAME=$(shell_var "${RC_SVCNAME}") - echo "${RC_SVCNAME}" >&3 - depend - -@@ -91,9 +92,9 @@ - IFS=: - set -- ${_deptype} - unset IFS -- eval _depends=\$rc_$(shell_var "${RC_SVCNAME}")_$1 -+ eval _depends=\$rc_${_shell_var_RC_SVCNAME}_$1 - [ -z "${_depends}" ] && eval _depends=\$rc_$1 -- [ -z "${_depends}" ] && eval _depends=\$RC_$(shell_var "${RC_SVCNAME}")_$2 -+ [ -z "${_depends}" ] && eval _depends=\$RC_${_shell_var_RC_SVCNAME}_$2 - [ -z "${_depends}" ] && eval _depends=\$RC_$2 - - $1 ${_depends} diff --git a/core/openrc/openrc.post-upgrade b/core/openrc/openrc.post-upgrade new file mode 100644 index 0000000000..b09f2f240c --- /dev/null +++ b/core/openrc/openrc.post-upgrade @@ -0,0 +1,9 @@ +#!/bin/sh + +# in 0.5.x the state dir moved from /lib/rc/init.d to /libexec/rc/init.d + +[ -d /lib/rc/init.d ] || exit 0 + +mv /lib/rc/init.d/* /libexec/rc/init.d/ +rmdir /lib/rc/init.d +exit 0 diff --git a/core/syslinux/APKBUILD b/core/syslinux/APKBUILD index c05168cf10..e7036c0f87 100644 --- a/core/syslinux/APKBUILD +++ b/core/syslinux/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=3.80 +pkgver=3.81 pkgrel=0 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." url="http://syslinux.org" @@ -21,5 +21,5 @@ build () make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install } -md5sums="b909ea282a408dfb5dd95c5e0fa3d5b5 syslinux-3.80.tar.bz2 +md5sums="9be7f19e65aa8ffad325ccff1b6175a4 syslinux-3.81.tar.bz2 c08398d165d29e48711e55058e2897de syslinux-3.72-nopie.patch" diff --git a/core/zlib/APKBUILD b/core/zlib/APKBUILD index 72738d4032..5a171860e2 100644 --- a/core/zlib/APKBUILD +++ b/core/zlib/APKBUILD @@ -1,10 +1,11 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib pkgver=1.2.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="A compression/decompression Library" license=custom:zlib url="http://www.gzip.org/zlib" -depends='uclibc' +depends= source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-dev $pkgname-doc" diff --git a/extra/acct/APKBUILD b/extra/acct/APKBUILD index 73902efe63..29657feed9 100644 --- a/extra/acct/APKBUILD +++ b/extra/acct/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acct pkgver=6.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Accounting Utilities" url="http://www.gnu.org/software/acct/" license="GPL" -depends="uclibc" -makedepends="" +depends= +makedepends= install= subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/acct/${pkgname}-${pkgver}.tar.gz" diff --git a/extra/acf-alpine-baselayout/APKBUILD b/extra/acf-alpine-baselayout/APKBUILD index ad95472d15..c3e9574cf2 100644 --- a/extra/acf-alpine-baselayout/APKBUILD +++ b/extra/acf-alpine-baselayout/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-alpine-baselayout -pkgver=0.4.12 +pkgver=0.5.0 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" license="GPL-2" depends="acf-core json4lua lua luaposix" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="9a492c3e2a2491dc2e451286ce297db9 acf-alpine-baselayout-0.4.12.tar.bz2" +md5sums="5b5c503f3350c5ef9f4cf5be81719e4e acf-alpine-baselayout-0.5.0.tar.bz2" diff --git a/extra/acf-alpine-conf/APKBUILD b/extra/acf-alpine-conf/APKBUILD index e705df897d..8467e6324d 100644 --- a/extra/acf-alpine-conf/APKBUILD +++ b/extra/acf-alpine-conf/APKBUILD @@ -3,10 +3,10 @@ pkgname=acf-alpine-conf pkgver=0.3.12 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-conf" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-alpine-conf" license="GPL-2" depends="acf-core lua luaposix" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acf-apk-tools/APKBUILD b/extra/acf-apk-tools/APKBUILD index b195a2f18a..af4480bdd2 100644 --- a/extra/acf-apk-tools/APKBUILD +++ b/extra/acf-apk-tools/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Mika Havela <mika.havela@gmail.com> pkgname=acf-apk-tools -pkgver=0.1.5 +pkgver=0.2.0 pkgrel=0 pkgdesc="ACF module for apk" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-apk-tools" license="GPL-2" depends="acf-core lua luaposix" -source="http://dev.alpinelinux.org/alpine/acf/apk-tools/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="6f5bb27ebf5e7b85cf3e78bbb06bea2d acf-apk-tools-0.1.5.tar.bz2" +md5sums="c25cfbab7528cbd7dce11fab25276422 acf-apk-tools-0.2.0.tar.bz2" diff --git a/extra/acf-asterisk/APKBUILD b/extra/acf-asterisk/APKBUILD index 35203099ee..c7abd3b02f 100644 --- a/extra/acf-asterisk/APKBUILD +++ b/extra/acf-asterisk/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-asterisk -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for asterisk" -url="http://git.alpinelinux.org/cgit/acf-asterisk/" +url="http://git.alpinelinux.org/cgit/acf-asterisk" license="GPL-2" depends="acf-core lua asterisk" makedepends="" @@ -18,4 +18,4 @@ build() { } -md5sums="0e1e142b3ae3712925cacc8d358336ec acf-asterisk-0.1.1.tar.bz2" +md5sums="50481ed7662a93f24610e2af92ca6cd5 acf-asterisk-0.2.0.tar.bz2" diff --git a/extra/acf-chrony/APKBUILD b/extra/acf-chrony/APKBUILD index c7c22ba641..9db7c4d000 100644 --- a/extra/acf-chrony/APKBUILD +++ b/extra/acf-chrony/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-chrony -pkgver=0.1.10 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for chrony" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-chrony" license="GPL-2" depends="acf-core lua luaposix chrony" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="b462feb44962cd8b83fca322a654c07f acf-chrony-0.1.10.tar.bz2" +md5sums="04a3b4f80eafc65b29cf93266049b804 acf-chrony-0.2.0.tar.bz2" diff --git a/extra/acf-clamav/APKBUILD b/extra/acf-clamav/APKBUILD index 834f9ca5d9..511844df49 100644 --- a/extra/acf-clamav/APKBUILD +++ b/extra/acf-clamav/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-clamav -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for clamav" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-clamav" license="GPL-2" depends="acf-core lua clamav" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="41548eb88627e9ea896ca3fd8a9b3eef acf-clamav-0.1.0.tar.bz2" +md5sums="a3da6fc06f95a947819e308f8092e77b acf-clamav-0.2.0.tar.bz2" diff --git a/extra/acf-clamsmtp/APKBUILD b/extra/acf-clamsmtp/APKBUILD index 71c055d289..b72fc2e32b 100644 --- a/extra/acf-clamsmtp/APKBUILD +++ b/extra/acf-clamsmtp/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-clamsmtp -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for clamsmtp" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-clamsmtp" license="GPL-2" depends="acf-core lua clamsmtp" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="05eeabf4efd0d20b891844693ba427be acf-clamsmtp-0.1.1.tar.bz2" +md5sums="139d06632bf900d58c9a145b13e39517 acf-clamsmtp-0.2.0.tar.bz2" diff --git a/extra/acf-core/APKBUILD b/extra/acf-core/APKBUILD index 7c77b2d8d9..f966d649e3 100644 --- a/extra/acf-core/APKBUILD +++ b/extra/acf-core/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-core -pkgver=0.4.22 +pkgver=0.5.0 pkgrel=0 pkgdesc="A web-based system administration interface framework" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-core" license="GPL-2" depends="acf-skins haserl lua luaposix md5" -source="http://dev.alpinelinux.org/alpine/acf/core/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="c491d0decae8fe8341a685f2f0247815 acf-core-0.4.22.tar.bz2" +md5sums="77133185ded192fa8c53585feeb9fb58 acf-core-0.5.0.tar.bz2" diff --git a/extra/acf-dansguardian/APKBUILD b/extra/acf-dansguardian/APKBUILD index 314ebfad3b..c5d5ef7dd5 100644 --- a/extra/acf-dansguardian/APKBUILD +++ b/extra/acf-dansguardian/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-dansguardian -pkgver=0.2.6 +pkgver=0.3.0 pkgrel=0 pkgdesc="A web-based system administration interface for dansguardian" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-dansguardian" license="GPL-2" depends="acf-core lua dansguardian" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="192b9fc31d0b9ae0f22c345d2d78a42c acf-dansguardian-0.2.6.tar.bz2" +md5sums="23740882f651776070bad5d4959f8035 acf-dansguardian-0.3.0.tar.bz2" diff --git a/extra/acf-dhcp/APKBUILD b/extra/acf-dhcp/APKBUILD index 6b19f861f6..bc92419bb9 100644 --- a/extra/acf-dhcp/APKBUILD +++ b/extra/acf-dhcp/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-dhcp -pkgver=0.3.10 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for dhcp" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-dhcp" license="GPL-2" depends="acf-core lua dhcp" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="c83c0a657c36f9b71e0dbf271095afa5 acf-dhcp-0.3.10.tar.bz2" +md5sums="a30d069327655fd562e40fc118810eb7 acf-dhcp-0.4.0.tar.bz2" diff --git a/extra/acf-dnscache/APKBUILD b/extra/acf-dnscache/APKBUILD index 2654720510..979df43c19 100644 --- a/extra/acf-dnscache/APKBUILD +++ b/extra/acf-dnscache/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-dnscache -pkgver=0.1.9 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for dnscache" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-dnscache" license="GPL-2" depends="acf-core lua luaposix dnscache" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="a6bf9d701bf0aa004c082d5b0e895eb6 acf-dnscache-0.1.9.tar.bz2" +md5sums="58c991b5ccb59c51b20779fa0a7189fa acf-dnscache-0.2.0.tar.bz2" diff --git a/extra/acf-dnsmasq/APKBUILD b/extra/acf-dnsmasq/APKBUILD index cb1403b543..8f0b8397b3 100644 --- a/extra/acf-dnsmasq/APKBUILD +++ b/extra/acf-dnsmasq/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-dnsmasq -pkgver=0.1.2 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for dnsmasq" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-dnsmasq" license="GPL-2" depends="acf-core lua dnsmasq" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="f8c8d973469e9e34fd6b9a3fce475503 acf-dnsmasq-0.1.2.tar.bz2" +md5sums="320ac909465f25a49eb9e427e456a3e6 acf-dnsmasq-0.2.0.tar.bz2" diff --git a/extra/acf-dovecot/APKBUILD b/extra/acf-dovecot/APKBUILD index 80d9bf9b64..a95208ad6e 100644 --- a/extra/acf-dovecot/APKBUILD +++ b/extra/acf-dovecot/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-dovecot -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for dovecot" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-dovecot" license="GPL-2" depends="acf-core lua dovecot" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="6db0db877bdcb7b1dede836e182e1201 acf-dovecot-0.1.0.tar.bz2" +md5sums="fc5ca553148b77550bbfa731acab62f5 acf-dovecot-0.2.0.tar.bz2" diff --git a/extra/acf-fetchmail/APKBUILD b/extra/acf-fetchmail/APKBUILD index 58d9c2e420..3065d63a72 100644 --- a/extra/acf-fetchmail/APKBUILD +++ b/extra/acf-fetchmail/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-fetchmail -pkgver=0.2.5 +pkgver=0.3.0 pkgrel=0 pkgdesc="A web-based system administration interface for fetchmail" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-fetchmail" license="GPL-2" depends="acf-core lua fetchmail" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="897ef9e3b6b0231087ed937c8fa22859 acf-fetchmail-0.2.5.tar.bz2" +md5sums="1fa9a7a46382757bdbae99fed539e28d acf-fetchmail-0.3.0.tar.bz2" diff --git a/extra/acf-gnats/APKBUILD b/extra/acf-gnats/APKBUILD index b93338b1d2..0dc58acd83 100644 --- a/extra/acf-gnats/APKBUILD +++ b/extra/acf-gnats/APKBUILD @@ -3,10 +3,10 @@ pkgname=acf-gnats pkgver=0.3.5 pkgrel=0 pkgdesc="ACF module for gnats" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-gnats" license="GPL-2" depends="acf-core gnats lua" -source="http://dev.alpinelinux.org/alpine/acf/gnats/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acf-gross/APKBUILD b/extra/acf-gross/APKBUILD index 12a31c5f95..4dcf979d18 100644 --- a/extra/acf-gross/APKBUILD +++ b/extra/acf-gross/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-gross -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for gross" url="http://git.alpinelinux.org/cgit/acf-gross" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="24647773752931c4d00d44f60d15608f acf-gross-0.1.0.tar.bz2" +md5sums="11e4f72ffb2ed0ef2fceca1f1dc88251 acf-gross-0.2.0.tar.bz2" diff --git a/extra/acf-ipsec-tools/APKBUILD b/extra/acf-ipsec-tools/APKBUILD index 13aa389e29..2da2f90f29 100644 --- a/extra/acf-ipsec-tools/APKBUILD +++ b/extra/acf-ipsec-tools/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-ipsec-tools -pkgver=0.3.15 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for ipsec-tools" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-ipsec-tools" license="GPL-2" depends="acf-core lua ipsec-tools" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="7fca8f1873b1214ce46c28c93dc9b483 acf-ipsec-tools-0.3.15.tar.bz2" +md5sums="3c3dd54927f539245fb3907bf90b7a26 acf-ipsec-tools-0.4.0.tar.bz2" diff --git a/extra/acf-iptables/APKBUILD b/extra/acf-iptables/APKBUILD index 9033723fad..12665845f8 100644 --- a/extra/acf-iptables/APKBUILD +++ b/extra/acf-iptables/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-iptables -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for iptables" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-iptables" license="GPL-2" depends="acf-core lua iptables" makedepends="" @@ -18,4 +18,4 @@ build() { } -md5sums="02ef8d8538c91ed842346860105bdd94 acf-iptables-0.1.0.tar.bz2" +md5sums="dcecc96699add7e9f4b58c866e6adcb0 acf-iptables-0.2.0.tar.bz2" diff --git a/extra/acf-mdadm/APKBUILD b/extra/acf-mdadm/APKBUILD new file mode 100644 index 0000000000..5069fa0c41 --- /dev/null +++ b/extra/acf-mdadm/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=acf-mdadm +pkgver=0.2.0 +pkgrel=0 +pkgdesc="ACF module for mdadm" +url="http://git.alpinelinux.org/cgit/$pkgname" +license="GPL-2" +depends="acf-core lua mdadm" +makedepends="" +install= +subpackages="" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + +} + +md5sums="3a94b48e2f678bef0dc5aad6ef699ee2 acf-mdadm-0.2.0.tar.bz2" diff --git a/extra/acf-opennhrp/APKBUILD b/extra/acf-opennhrp/APKBUILD index 77a05a8a7f..4bc246496b 100644 --- a/extra/acf-opennhrp/APKBUILD +++ b/extra/acf-opennhrp/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-opennhrp -pkgver=0.3.12 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for opennhrp" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-opennhrp" license="GPL-2" depends="acf-core lua luaposix opennhrp" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="3492849cca24420e2ecd5399369d1a88 acf-opennhrp-0.3.12.tar.bz2" +md5sums="3b86f9859871b6c788b3aee1e90ee9fc acf-opennhrp-0.4.0.tar.bz2" diff --git a/extra/acf-openntpd/APKBUILD b/extra/acf-openntpd/APKBUILD index d1587d44b0..f33272d176 100644 --- a/extra/acf-openntpd/APKBUILD +++ b/extra/acf-openntpd/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-openntpd -pkgver=0.3.12 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for openntpd" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-openntpd" license="GPL-2" depends="acf-core lua openntpd" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="e33b7fd22648f2f419bad0cee3202b8b acf-openntpd-0.3.12.tar.bz2" +md5sums="43cbfc627ddd51451917c2a99e587224 acf-openntpd-0.4.0.tar.bz2" diff --git a/extra/acf-openssh/APKBUILD b/extra/acf-openssh/APKBUILD index 327946583b..9228bacd75 100644 --- a/extra/acf-openssh/APKBUILD +++ b/extra/acf-openssh/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-openssh -pkgver=0.1.4 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for openssh" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-openssh" license="GPL-2" depends="acf-core lua openssh" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="3cfd5a933b2f3d65037e096da582936f acf-openssh-0.1.4.tar.bz2" +md5sums="aa975654ce91969a978cc100dc046c63 acf-openssh-0.2.0.tar.bz2" diff --git a/extra/acf-openssl/APKBUILD b/extra/acf-openssl/APKBUILD index ce75d87d3b..abaeeed12a 100644 --- a/extra/acf-openssl/APKBUILD +++ b/extra/acf-openssl/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-openssl -pkgver=0.1.8 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for openssl" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-openssl" license="GPL-2" depends="acf-core lua openssl" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="c6041445f371251fd0952f30ef6eb81d acf-openssl-0.1.8.tar.bz2" +md5sums="468be0f280214d83084ff56c2fab202d acf-openssl-0.2.0.tar.bz2" diff --git a/extra/acf-openvpn/APKBUILD b/extra/acf-openvpn/APKBUILD index 83d7d6b1ed..34febc34c4 100644 --- a/extra/acf-openvpn/APKBUILD +++ b/extra/acf-openvpn/APKBUILD @@ -3,13 +3,13 @@ pkgname=acf-openvpn pkgver=0.4.1 pkgrel=0 pkgdesc="A web-based system administration interface for openvpn" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-openvpn" license="GPL-2" depends="acf-core lua openvpn" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acf-pingu/APKBUILD b/extra/acf-pingu/APKBUILD index 284cd1dbfd..9efbf5b9a3 100644 --- a/extra/acf-pingu/APKBUILD +++ b/extra/acf-pingu/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-pingu -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for pingu" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-pingu" license="GPL-2" depends="acf-core lua pingu" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="df1c849d63896a4efa3ff796395ee392 acf-pingu-0.1.0.tar.bz2" +md5sums="db13e3b589995915a3f7cbc41ce02a4a acf-pingu-0.2.0.tar.bz2" diff --git a/extra/acf-postfix/APKBUILD b/extra/acf-postfix/APKBUILD index 3558c3861f..b525015e0d 100644 --- a/extra/acf-postfix/APKBUILD +++ b/extra/acf-postfix/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-postfix -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for postfix" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-postfix" license="GPL-2" depends="acf-core lua postfix" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="d7c7bee3a73988e348b7223f9caf7ce3 acf-postfix-0.1.1.tar.bz2" +md5sums="7ac128ba01fcf58ed517cffad5caf8fe acf-postfix-0.2.0.tar.bz2" diff --git a/extra/acf-postgresql/APKBUILD b/extra/acf-postgresql/APKBUILD new file mode 100644 index 0000000000..a86446ca82 --- /dev/null +++ b/extra/acf-postgresql/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=acf-postgresql +pkgver=0.2.0 +pkgrel=0 +pkgdesc="ACF module for postgresql" +url="http://git.alpinelinux.org/cgit/$pkgname" +license="GPL-2" +depends="acf-core lua postgresql" +makedepends="" +install= +subpackages="" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + +} + +md5sums="9cef31e42ee80fbf5487835c52cf44b9 acf-postgresql-0.2.0.tar.bz2" diff --git a/extra/acf-quagga/APKBUILD b/extra/acf-quagga/APKBUILD index 3c37d41a81..01c71c8851 100644 --- a/extra/acf-quagga/APKBUILD +++ b/extra/acf-quagga/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-quagga -pkgver=0.3.4 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for quagga" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-quagga" license="GPL-2" depends="acf-core lua quagga" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="bc7748b276cb2bbac5ba4c8213494634 acf-quagga-0.3.4.tar.bz2" +md5sums="ff46d473979a147abb3111e058f33993 acf-quagga-0.4.0.tar.bz2" diff --git a/extra/acf-samba/APKBUILD b/extra/acf-samba/APKBUILD index ba0e769abd..e238c1b21a 100644 --- a/extra/acf-samba/APKBUILD +++ b/extra/acf-samba/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-samba -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=0 pkgdesc="A web-based system administration interface for samba" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-samba" license="GPL-2" depends="acf-core lua samba" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="b41534b0e131252316641576129d578c acf-samba-0.1.1.tar.bz2" +md5sums="092b41c639e47936674900b0c28f695e acf-samba-0.2.0.tar.bz2" diff --git a/extra/acf-shorewall/APKBUILD b/extra/acf-shorewall/APKBUILD index 99f3c468bf..64bd03a81e 100644 --- a/extra/acf-shorewall/APKBUILD +++ b/extra/acf-shorewall/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-shorewall -pkgver=0.4.4 +pkgver=0.5.0 pkgrel=0 pkgdesc="A web-based system administration interface for shorewall" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-shorewall" license="GPL-2" depends="acf-core lua shorewall" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="0c681a4b3f145174355a885ea4809a60 acf-shorewall-0.4.4.tar.bz2" +md5sums="12d8bbc1242ee2e0206fa7369a60ca66 acf-shorewall-0.5.0.tar.bz2" diff --git a/extra/acf-skins/APKBUILD b/extra/acf-skins/APKBUILD index 08551f3025..4e377d4b7f 100644 --- a/extra/acf-skins/APKBUILD +++ b/extra/acf-skins/APKBUILD @@ -3,10 +3,10 @@ pkgname=acf-skins pkgver=0.1.6 pkgrel=0 pkgdesc="Skins for ACF" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-skins" license="GPL-2" depends="" -source="http://dev.alpinelinux.org/alpine/acf/skins/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acf-snort/APKBUILD b/extra/acf-snort/APKBUILD index 4eb78b5ec3..abe972d44a 100644 --- a/extra/acf-snort/APKBUILD +++ b/extra/acf-snort/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-snort -pkgver=0.3.9 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for snort" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-snort" license="GPL-2" depends="acf-core lua snort" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="d9fb7db548ab5145c03238f68814071a acf-snort-0.3.9.tar.bz2" +md5sums="8d8114c3ec17a752a2a0b6ce3e37fdfd acf-snort-0.4.0.tar.bz2" diff --git a/extra/acf-squid/APKBUILD b/extra/acf-squid/APKBUILD index 9c2f0090e1..b0579be7d7 100644 --- a/extra/acf-squid/APKBUILD +++ b/extra/acf-squid/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-squid -pkgver=0.3.8 +pkgver=0.4.0 pkgrel=0 pkgdesc="A web-based system administration interface for squid" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-squid" license="GPL-2" depends="acf-core lua squid" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="34e171b069dd27d683b5ff92350dd860 acf-squid-0.3.8.tar.bz2" +md5sums="d32e8ed6dcbab89194deb44edf519b41 acf-squid-0.4.0.tar.bz2" diff --git a/extra/acf-tcpproxy/APKBUILD b/extra/acf-tcpproxy/APKBUILD index 1f4b785c06..c483088c62 100644 --- a/extra/acf-tcpproxy/APKBUILD +++ b/extra/acf-tcpproxy/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=acf-tcpproxy -pkgver=0.0.4 +pkgver=0.1.0 pkgrel=0 pkgdesc="A web-based system administration interface for tcpproxy" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-tcpproxy" license="GPL-2" depends="acf-core lua tcpproxy" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,4 +18,4 @@ build() { } -md5sums="53df7f696700500f850bbcb905f208ea acf-tcpproxy-0.0.4.tar.bz2" +md5sums="96e3448e51ced1782492bc714587eb78 acf-tcpproxy-0.1.0.tar.bz2" diff --git a/extra/acf-tinydns/APKBUILD b/extra/acf-tinydns/APKBUILD index 64b97a615b..75eeab0b1a 100644 --- a/extra/acf-tinydns/APKBUILD +++ b/extra/acf-tinydns/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-tinydns -pkgver=0.2.13 +pkgver=0.3.0 pkgrel=0 pkgdesc="A web-based system administration interface for tinydns" -url="http://dev.alpinelinux.org/alpine/acf" +url="http://git.alpinelinux.org/cgit/acf-tinydns" license="GPL-2" depends="acf-core lua tinydns" -source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="7fc0c62683c86afe5d6b43a8c103887d acf-tinydns-0.2.13.tar.bz2" +md5sums="0f24bd338b0918fcc2047c42e2d59522 acf-tinydns-0.3.0.tar.bz2" diff --git a/extra/asterisk/APKBUILD b/extra/asterisk/APKBUILD index 2e0f680c92..e5b8290066 100644 --- a/extra/asterisk/APKBUILD +++ b/extra/asterisk/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=1.6.0.9 -pkgrel=2 +pkgrel=3 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" -depends="ncurses popt zlib newt dahdi-linux dahdi-tools libltdl libpri freetds" +depends="dahdi-linux" makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev - postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev g++ tar + postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar freetds-dev" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc @@ -43,6 +43,7 @@ build() { --without-iconv --with-popt --with-z --with-newt \ --with-odbc --with-postgres --with-tds \ --with-dahdi --with-pri --with-tonezone \ + --without-x11 \ || return 1 # and figure out which modules to build @@ -67,19 +68,19 @@ _find_and_move() { } pgsql() { - depends="uclibc asterisk libpq zlib" + depends= install= _find_and_move '*_pgsql*' } odbc() { - depends="uclibc asterisk unixodbc" + depends= install= _find_and_move '*odbc*' } tds() { - depends="uclibc asterisk freetds" + depends= install= _find_and_move '*_tds*' } @@ -91,5 +92,5 @@ b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 5008f51c737ec91f5047519bc9f25b85 103-rundir.patch b4a97cb1ec3cc3f71a10ce8c067ab430 asterisk.pre-install 62ecffc90b6714b85f377d1fac73c58b asterisk.post-install -9748fc0fb3cf43b18a68584bdc20cb6c asterisk.initd +c618b7fdf4a9edf4cde6d8ccd1e32ee6 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd" diff --git a/extra/asterisk/asterisk.initd b/extra/asterisk/asterisk.initd index cd5ee00540..864a96b3cf 100644 --- a/extra/asterisk/asterisk.initd +++ b/extra/asterisk/asterisk.initd @@ -2,6 +2,11 @@ opts="${opts} forcestop reload" +depend() { + need net + use nscd dns zaptel mysql postgresql slapd capi +} + is_running() { if [ -z "$(pidof asterisk)" ]; then return 1 diff --git a/testing/cyrus-sasl/APKBUILD b/extra/cyrus-sasl/APKBUILD index 4e9075769a..4e9075769a 100644 --- a/testing/cyrus-sasl/APKBUILD +++ b/extra/cyrus-sasl/APKBUILD diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch index f7bf44b794..f7bf44b794 100644 --- a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch diff --git a/testing/cyrus-sasl/db-4.7.patch b/extra/cyrus-sasl/db-4.7.patch index 8937d7633d..8937d7633d 100644 --- a/testing/cyrus-sasl/db-4.7.patch +++ b/extra/cyrus-sasl/db-4.7.patch diff --git a/testing/cyrus-sasl/saslauthd.initd b/extra/cyrus-sasl/saslauthd.initd index a5e9a44061..a5e9a44061 100644 --- a/testing/cyrus-sasl/saslauthd.initd +++ b/extra/cyrus-sasl/saslauthd.initd diff --git a/extra/dansguardian/APKBUILD b/extra/dansguardian/APKBUILD index 5ed84d76a2..24c50a6333 100644 --- a/extra/dansguardian/APKBUILD +++ b/extra/dansguardian/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dansguardian pkgver=2.10.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Web content filter" url="http://dansguardian.org" license="GPL" -depends="uclibc uclibc++ libiconv libgcc pcre zlib" +depends= makedepends="zlib-dev uclibc++-dev pcre-dev pkgconfig libiconv-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc" @@ -36,4 +36,4 @@ build() { md5sums="68c8e9a97a3b58d2467a19cb15db5599 dansguardian-2.10.0.3.tar.gz 0c04f74cd5db9fc7a8e80b407ec34214 dansguardian.initd -308f391e5105e7902664d2bbda14cc08 dansguardian.pre-install" +ab4e1104633aad0595a8b530fceb810a dansguardian.pre-install" diff --git a/extra/dansguardian/dansguardian.pre-install b/extra/dansguardian/dansguardian.pre-install index 89358de923..2d06f3a6f6 100644 --- a/extra/dansguardian/dansguardian.pre-install +++ b/extra/dansguardian/dansguardian.pre-install @@ -1,4 +1,5 @@ #!/bin/sh adduser -h /var/log/dansguardian -s /bin/false -D dansguar 2>/dev/null +exit 0 diff --git a/extra/db/APKBUILD b/extra/db/APKBUILD index 2efe80293c..00940e41c6 100644 --- a/extra/db/APKBUILD +++ b/extra/db/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=db -pkgver=4.7.25.3 +pkgver=4.7.25.4 _ver=${pkgver%.*} pkgrel=0 pkgdesc="The Berkeley DB embedded database system 4.7" url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" license="custom" -depends="uclibc" -makedepends="g++" +depends= +makedepends= subpackages="$pkgname-dev $pkgname-doc" # Patches were found here: # http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.html @@ -15,6 +15,7 @@ source="http://download-uk.oracle.com/berkeley-db/db-$_ver.tar.gz patch.$_ver.1 patch.$_ver.2 patch.$_ver.3 + patch.$_ver.4 " build () { @@ -44,4 +45,5 @@ build () { md5sums="ec2b87e833779681a0c3a814aa71359e db-4.7.25.tar.gz 5fdf101259e5164dea1c8c86214fde38 patch.4.7.25.1 bd410a11c71fee52fddb6aa2d8d4f80c patch.4.7.25.2 -6fcd69f64f5b34bfe8f0a63cc2e402c1 patch.4.7.25.3" +6fcd69f64f5b34bfe8f0a63cc2e402c1 patch.4.7.25.3 +42c5d1a727e4a7f59b9dce12ff2f6b84 patch.4.7.25.4" diff --git a/extra/db/patch.4.7.25.4 b/extra/db/patch.4.7.25.4 new file mode 100644 index 0000000000..7a55340023 --- /dev/null +++ b/extra/db/patch.4.7.25.4 @@ -0,0 +1,183 @@ +*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 +--- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 374,379 **** +--- 374,380 ---- + #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) + #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) + #define IS_VALID_EID(e) ((e) >= 0) ++ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) + #define SELF_EID INT_MAX + + #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ +*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 +--- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 +*************** +*** 33,39 **** + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); + + /* + * __rep_elect -- +--- 33,39 ---- + static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); + static void __rep_elect_master __P((ENV *, REP *)); + static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); +! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); + + /* + * __rep_elect -- +*************** +*** 55,61 **** + ENV *env; + LOG *lp; + REP *rep; +! int done, eid, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +--- 55,61 ---- + ENV *env; + LOG *lp; + REP *rep; +! int done, elected, full_elect, locked, in_progress, need_req; + int ret, send_vote, t_ret; + u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; + u_int32_t tiebreaker; +*************** +*** 181,188 **** + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, &eid, +! 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +--- 181,187 ---- + REP_SYSTEM_UNLOCK(env); + (void)__rep_send_message(env, DB_EID_BROADCAST, + REP_MASTER_REQ, NULL, NULL, 0, 0); +! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); + REP_SYSTEM_LOCK(env); + F_CLR(rep, REP_F_EPHASE0); + switch (ret) { +*************** +*** 286,296 **** + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +--- 285,295 ---- + REP_SYSTEM_LOCK(env); + goto vote; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); + switch (ret) { + case 0: + /* Check if election complete or phase complete. */ +! if (!IN_ELECTION(rep)) { + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 1")); + goto edone; +*************** +*** 398,412 **** + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! if (eid != DB_EID_INVALID) +! goto edone; +! ret = DB_REP_UNAVAIL; +! break; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +--- 397,408 ---- + REP_SYSTEM_LOCK(env); + goto i_won; + } +! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); + RPRINT(env, DB_VERB_REP_ELECT, + (env, "Ended election phase 2 %d", ret)); + switch (ret) { + case 0: +! goto edone; + case DB_REP_EGENCHG: + if (to > timeout) + to = timeout; +*************** +*** 1050,1062 **** + ENV *env; + REP *rep; + { +- /* +- * We often come through here twice, sometimes even more. We mustn't +- * let the redundant calls affect stats counting. But rep_elect relies +- * on this first part for setting eidp. +- */ +- rep->master_id = rep->eid; +- + if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { + /* We've been through here already; avoid double counting. */ + return; +--- 1046,1051 ---- +*************** +*** 1093,1102 **** + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, eidp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int *eidp, full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +--- 1082,1091 ---- + (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); + + static int +! __rep_wait(env, timeoutp, full_elect, flags) + ENV *env; + db_timeout_t *timeoutp; +! int full_elect; + u_int32_t flags; + { + DB_REP *db_rep; +*************** +*** 1174,1180 **** + F_CLR(rep, REP_F_EGENUPDATE); + ret = DB_REP_EGENCHG; + } else if (phase_over) { +- *eidp = rep->master_id; + done = 1; + ret = 0; + } +--- 1163,1168 ---- +*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 +--- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 +*************** +*** 100,105 **** +--- 100,107 ---- + control, rec, &nsites_sent, &npeers_sent)) != 0) + goto out; + } else { ++ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); ++ + /* + * If this is a request that can be sent anywhere, then see if + * we can send it to our peer (to save load on the master), but diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD index 10de879793..0596907a79 100644 --- a/extra/djbdns/APKBUILD +++ b/extra/djbdns/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=djbdns pkgver=1.05 -pkgrel=25 +pkgrel=26 pkgdesc="Excellent high-performance DNS services" url="http://cr.yp.to/djbdns.html" license="public-domain" -depends="uclibc" +depends= subpackages="tinydns dnscache" source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz headtail.patch @@ -79,7 +79,7 @@ dfd675b2775efcbb604413a84db8bf1a dnsroots.patch c7be73fe2fb4ae02d5096fa2c1f55a68 1.05-errno.patch 1292500c04baba3995d9753fe40fdc94 1.05-response.patch 7695bf50559c09798ec852b578ac8698 tinydns.pre-install -39622a5eaaf9b6c6a461dfb10b7951a3 tinydns.initd +e8a84fc4ee5ff1525b4f74889422e93c tinydns.initd 7dcf6674c07d46c736b3c25d9c92384a tinydns.confd e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install e368a86ddc320937d663dd47684ba410 dnscache.initd diff --git a/extra/djbdns/tinydns.initd b/extra/djbdns/tinydns.initd index 396b8ab33b..a68474c4ec 100755 --- a/extra/djbdns/tinydns.initd +++ b/extra/djbdns/tinydns.initd @@ -5,8 +5,6 @@ opts="reload" # -- Statrup variables -UID=$( grep tinydns /etc/passwd | cut -f3 -d: ) -GID=$( grep tinydns /etc/group | cut -f3 -d: ) DAEMON=/usr/bin/tinydns COMPILER=/usr/bin/tinydns-data @@ -26,6 +24,9 @@ fi # Main program reload() { local rc opwd="$opwd" + UID=$( grep tinydns /etc/passwd | cut -f3 -d: ) + GID=$( grep tinydns /etc/group | cut -f3 -d: ) + # Create the $ROOT directory if necessary if [ ! -d "$ROOT" ]; then mkdir -p "$ROOT" @@ -67,38 +68,20 @@ start() { return 1 fi - # if its already running, just report it is - if [ -e ${VARRUN}.pid ] && [ -d /proc/$( cat ${VARRUN}.pid ) ]; then - eend 0 - return 0 - fi - if [ -z "$IP" ]; then eend 1 "IP is not specified in /etc/conf.d/$SVCNAME" return 1 fi - ( - export UID GID ROOT IP - $DAEMON >/dev/null 2>/dev/null & - pid=$! - sleep 1 - # Check if its still running - if ! [ -d /proc/$pid ]; then - rm ${VARRUN}.pid - $DAEMON - return 1 - fi - echo $pid > ${VARRUN}.pid - ) + start-stop-daemon --start --env "UID=$UID" --env "GID=$GID" \ + --env "ROOT=$ROOT" --env "IP=$IP" --pidfile ${VARRUN}.pid \ + --background --make-pidfile --exec $DAEMON eend $? - return 0 } stop() { ebegin "Stopping tinydns" - start-stop-daemon --stop --pidfile ${VARRUN}.pid --oknodo \ - --exec $DAEMON && rm ${VARRUN}.pid + start-stop-daemon --stop --pidfile ${VARRUN}.pid --exec $DAEMON eend $? } diff --git a/extra/dovecot/APKBUILD b/extra/dovecot/APKBUILD index 657d8fd2c2..95491d4d62 100644 --- a/extra/dovecot/APKBUILD +++ b/extra/dovecot/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot -pkgver=1.1.14 -pkgrel=1 +pkgver=1.1.15 +pkgrel=0 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" @@ -32,6 +32,6 @@ build() { install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -md5sums="60b1deccc0ae77e5669060d2b1894e5e dovecot-1.1.14.tar.gz +md5sums="90562401bbf6bd052b23b89f7f5a700f dovecot-1.1.15.tar.gz 573e14589a6f8424d55753a2794ab99a dovecot.initd f0f8893411f5e482e14f40a81a177b19 dovecot.pre-install" diff --git a/extra/icu/APKBUILD b/extra/icu/APKBUILD index 77fb93bf38..8bbacde8d9 100644 --- a/extra/icu/APKBUILD +++ b/extra/icu/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=icu -pkgver=4.1.3 -_ver=4_1_3 +pkgver=4.2.0.1 +_ver=4_2_0_1 pkgrel=0 pkgdesc="International Components for Unicode library" url="http://www.icu-project.org/" license="custom:icu" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc++ uclibc libgcc" +depends="" makedepends="uclibc++-dev" -source="http://download.icu-project.org/files/icu4c/${pkgver%.*}/${pkgname}4c-$_ver-src.tgz" +source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz" build () { @@ -24,4 +24,4 @@ build () install -Dm644 "$srcdir"/icu/license.html \ "$pkgdir"/usr/share/licenses/icu/license.html } -md5sums="c3c16d2731c9c5da9007cb6c9e4f1929 icu4c-4_1_3-src.tgz" +md5sums="fd80d21ea863e47ee57b95d466752701 icu4c-4_2_0_1-src.tgz" diff --git a/extra/imagemagick/APKBUILD b/extra/imagemagick/APKBUILD index 6df8f894a7..ba660d19fd 100644 --- a/extra/imagemagick/APKBUILD +++ b/extra/imagemagick/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.5.2.1 -_pkgver=6.5.2-1 +pkgver=6.5.3.2 +_pkgver=6.5.3-2 pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" license="GPL" -depends="zlib libpng libjpeg freetype" +depends= makedepends="zlib-dev libpng-dev libjpeg-dev freetype-dev" subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$_pkgver.tar.gz" @@ -32,4 +32,4 @@ build() { } -md5sums="e6e691002f15b1490983752cc61238cc ImageMagick-6.5.2-1.tar.gz" +md5sums="51547d4deafdba1d74ea4225805e63e9 ImageMagick-6.5.3-2.tar.gz" diff --git a/extra/nfs-utils/APKBUILD b/extra/nfs-utils/APKBUILD index 6a51efb1ba..b9225f9663 100644 --- a/extra/nfs-utils/APKBUILD +++ b/extra/nfs-utils/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nfs-utils -pkgver=1.1.6 +pkgver=1.2.0 pkgrel=0 pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" license="GPL" -depends="uclibc portmap libblkid" -makedepends="e2fsprogs-dev g++" +depends="portmap" +makedepends="e2fsprogs-dev" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 nfs.initd nfs.confd nfs.exports - nfs-utils-rpc.patch nfs-utils-no-exec.patch nfs-utils-mtab-sym.patch" @@ -21,6 +20,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" for i in "$srcdir"/*.patch; do + msg "Applying $i" patch -p0 -i "${i}" || return 1 done @@ -46,10 +46,9 @@ build() { install -m755 -D tools/rpcgen/rpcgen "$pkgdir"/usr/bin/rpcgen } -md5sums="b0d1b8ec5c8c081a340cfc77bb8670cd nfs-utils-1.1.6.tar.bz2 +md5sums="779cf81044e92cb51ad590960e7b3671 nfs-utils-1.2.0.tar.bz2 4538f67470c916f8da9c76a17e314906 nfs.initd 09135438d6df50b868bbe5a2260f973c nfs.confd 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports -dd9a90ce39cf8c725fdbf65d1139447f nfs-utils-rpc.patch 5e0963b0889e779ff36af0299d17d6cb nfs-utils-no-exec.patch a3a7338f8de3ac37c1ffc05bdcb77d16 nfs-utils-mtab-sym.patch" diff --git a/extra/nfs-utils/nfs-utils-rpc.patch b/extra/nfs-utils/nfs-utils-rpc.patch deleted file mode 100644 index b05b67a6bd..0000000000 --- a/extra/nfs-utils/nfs-utils-rpc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/rpcgen/rpc_main.c Tue Apr 7 21:53:12 2009 -+++ tools/rpcgen/rpc_main.c Tue Apr 7 21:53:12 2009 -@@ -550,7 +550,7 @@ - f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); - #else - if( !tirpcflag ) -- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); -+ f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n"); - #endif - if( Cflag && (inetdflag || pmflag ) ) { - f_print(fout, "#ifdef __cplusplus\n"); diff --git a/extra/pgcluster/APKBUILD b/extra/pgcluster/APKBUILD new file mode 100644 index 0000000000..155b3c4154 --- /dev/null +++ b/extra/pgcluster/APKBUILD @@ -0,0 +1,51 @@ +# Maintainer: Cameron Banta <cbanta@gmail.com> +pkgname=pgcluster +pkgver=1.9.0_rc5 +_myver=1.9.0rc5 +pkgrel=0 +pkgdesc="PostgreSQL with multi-master cluster/replication patch" +url="http://pgfoundry.org/projects/pgcluster/" +license="BSD" +depends= +makedepends="readline-dev openssl-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libpq $pkgname-client" +source="http://pgfoundry.org/frs/download.php/1705/$pkgname-$_myver.tar.gz + $pkgname.initd + $pkgname.confd + " + +build() { + cd "$srcdir"/$pkgname-$_myver || 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"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname + install -D -m644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname || return 1 +} + +libpq() { + depends= + pkgdesc="PGCluster libraries" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib/ +} + +client() { + depends= + pkgdesc="PGCluster client" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/psql "$subpkgdir"/usr/bin/ +} + + +md5sums="d2fe705e25a01c19c8f8daa1fbcc55d1 pgcluster-1.9.0rc5.tar.gz +ad21a30c7fd5ce9de1290c317492a0e5 pgcluster.initd +503f94824fc7a385a831d7e55b74f9a0 pgcluster.confd" diff --git a/extra/pgcluster/pgcluster.confd b/extra/pgcluster/pgcluster.confd new file mode 100644 index 0000000000..9e1376eec7 --- /dev/null +++ b/extra/pgcluster/pgcluster.confd @@ -0,0 +1,57 @@ +# PostgreSQL's Database Directory +PGDATA="/var/lib/postgresql/pgcluster" + +# PostgreSQL User +PGUSER="postgres" + +# PostgreSQL Group +PGGROUP="postgres" + +# control what gets started by init script +PG_START_DB="yes" +PG_START_REPLICATE="yes" +PG_START_LB="no" + +# 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/pgcluster/pgcluster.initd b/extra/pgcluster/pgcluster.initd new file mode 100644 index 0000000000..fb5cdfdf35 --- /dev/null +++ b/extra/pgcluster/pgcluster.initd @@ -0,0 +1,172 @@ +#!/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/pgcluster 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 + + if [ ${PG_START_DB} == "yes" ]; then + ebegin "Starting PGCluster database instance" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'" >/dev/null + retval=$? + if [ $retval -ne 0 ]; then + eend $retval + else + + # 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 + else + local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid") + test -d /proc/"${pid}" + eend $? + fi + fi + fi + + if [ ${PG_START_REPLICATE} == "yes" ]; then + ebegin "Starting PGCluster replicate instance" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pgreplicate -D ${PGDATA} -l" >/dev/null + retval=$? + sleep 1 + if [ ! -f "$PGDATA/pgreplicate.pid" ] ; then + eerror "Where's the pid file?" + eend 1 + else + local pid=$(grep "^[0-9]\+" "$PGDATA/pgreplicate.pid") + test -d /proc/"${pid}" + eend $? + fi + fi + + if [ ${PG_START_LB} == "yes" ]; then + ebegin "Starting PGCluster load balancer instance" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pglb -D ${PGDATA} -l" >/dev/null + retval=$? + sleep 1 + if [ ! -f "$PGDATA/pglb.pid" ] ; then + eerror "Where's the pid file?" + eend 1 + else + local pid=$(grep "^[0-9]\+" "$PGDATA/pglb.pid") + test -d /proc/"${pid}" + eend $? + fi + fi + return +} + +stop() { + local retval + + if [ ${PG_START_LB} == "yes" ]; then + ebegin "Stopping PGCluster Load Balancer instance" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pglb -D ${PGDATA} -l stop" >/dev/null + eend $? + fi + if [ ${PG_START_REPLICATE} == "yes" ]; then + ebegin "Stopping PGCluster Replicate instance" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pgreplicate -D ${PGDATA} -l stop" >/dev/null + eend $? + fi + + + if [ ${PG_START_DB} == "yes" ]; then + ebegin "Stopping PGCLuster database (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)" + if [ ! -f "$PGDATA/postmaster.pid" ] ; then + ewarn "$PGDATA/postmaster.pid not found. Was it running?" + eend 1 + return 0 + fi + 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 $? + fi +} + +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 PGCluster 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/pgcluster' script to run PostgreSQL instead" + einfo "of 'pg_ctl'." + eend $? +} + diff --git a/extra/postfix/APKBUILD b/extra/postfix/APKBUILD index dc0d0e8c3f..07431f5f58 100644 --- a/extra/postfix/APKBUILD +++ b/extra/postfix/APKBUILD @@ -1,19 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.5.6 -pkgrel=5 +pkgver=2.6.1 +pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" license="IPL-1" -depends="db pcre openssl" -makedepends="db-dev pcre-dev openssl-dev postgresql-dev mysql-dev openldap-dev" +depends= +makedepends="db-dev pcre-dev openssl-dev postgresql-dev mysql-dev openldap-dev cyrus-sasl-dev perl" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre $pkgname-pgsql" source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz $pkgname.initd $install - postfix-2.5.5-dynamicmaps.patch + postfix-2.6.1-dynamicmaps.patch dynamicmaps.cf postfix-ldap.post-install postfix-mysql.post-install @@ -51,8 +51,12 @@ build () { ccargs="$ccargs -DUSE_TLS" auxlibs="$auxlibs -lssl -lcrypto" - # dovecot-sasl - ccargs="$ccargs -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + ## dovecot-sasl + #ccargs="$ccargs -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + + # cyrus sasl + ccargs="$ccargs -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" + auxlibs="$auxlibs -lsasl2" # postgresql ccargs="$ccargs -DHAS_PGSQL -I$(pg_config --includedir)" @@ -99,8 +103,13 @@ build () { mkdir -p "$pkgdir"/etc/postfix mv "$pkgdir"/usr/share/doc/$pkgname/defaults/*.cf \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/post*-* \ "$pkgdir"/usr/share/doc/$pkgname/defaults/aliases \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/canonical \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/generic \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/header_checks \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/relocated \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/transport \ + "$pkgdir"/usr/share/doc/$pkgname/defaults/virtual \ "$pkgdir"/etc/postfix/ || return 1 install -d -o postfix -g postfix "$pkgdir"/var/spool/postfix @@ -112,23 +121,23 @@ _mv_dict() { local m=$1 shift pkgdesc="$m map support for postfix" - depends="postfix uclibc $@" + depends= install="postfix-${m}.post-install" mkdir -p "$subpkgdir"/usr/lib/postfix mv "$pkgdir"/usr/lib/postfix/dict_${m}.so \ "$subpkgdir"/usr/lib/postfix/ } -ldap() { _mv_dict ldap libldap; } -mysql() { _mv_dict mysql libmysqlclient;} -pcre() { _mv_dict pcre pcre; } -pgsql() { _mv_dict pgsql libpq; } +ldap() { _mv_dict ldap ; } +mysql() { _mv_dict mysql ;} +pcre() { _mv_dict pcre ; } +pgsql() { _mv_dict pgsql ; } -md5sums="ec2cb63b53f5f36c3ca91da8f3bc9407 postfix-2.5.6.tar.gz +md5sums="737bbc245da9c72c174893397f70ae86 postfix-2.6.1.tar.gz 8416354d402f3be288fa98b60af86240 postfix.initd 2bfc3864183694e5484ac073bb0cb7ef postfix.pre-install 0064d45c2c8a46c374b55c4abc46cfb2 postfix.post-install -e71b0c501150cba4d30aef52a6fb542c postfix-2.5.5-dynamicmaps.patch +b8812dbf2d076c79cf948ee017e81b39 postfix-2.6.1-dynamicmaps.patch 0efff9b4bb493ad2ff0b9915cb244d14 dynamicmaps.cf 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install 2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install diff --git a/extra/postfix/postfix-2.5.5-dynamicmaps.patch b/extra/postfix/postfix-2.5.5-dynamicmaps.patch deleted file mode 100644 index 92446559fd..0000000000 --- a/extra/postfix/postfix-2.5.5-dynamicmaps.patch +++ /dev/null @@ -1,1042 +0,0 @@ -This patch is taken from mandriva: -http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/postfix/current/SOURCES/ - -diff -Naurp postfix-2.5.5/conf/postfix-files postfix-2.5.5.oden/conf/postfix-files ---- postfix-2.5.5/conf/postfix-files 2008-01-24 01:13:49.000000000 +0100 -+++ postfix-2.5.5.oden/conf/postfix-files 2008-12-17 18:17:11.000000000 +0100 -@@ -64,6 +64,10 @@ $queue_directory/saved:d:$mail_owner:-:7 - $queue_directory/trace:d:$mail_owner:-:700:ucr - $daemon_directory/anvil:f:root:-:755 - $daemon_directory/bounce:f:root:-:755 -+$daemon_directory/dict_ldap.so:f:root:-:755 -+$daemon_directory/dict_pcre.so:f:root:-:755 -+$daemon_directory/dict_mysql.so:f:root:-:755 -+$daemon_directory/dict_pgsql.so:f:root:-:755 - $daemon_directory/cleanup:f:root:-:755 - $daemon_directory/discard:f:root:-:755 - $daemon_directory/error:f:root:-:755 -@@ -86,6 +90,11 @@ $daemon_directory/tlsmgr:f:root:-:755 - $daemon_directory/trivial-rewrite:f:root:-:755 - $daemon_directory/verify:f:root:-:755 - $daemon_directory/virtual:f:root:-:755 -+/usr/lib/libpostfix-dns.so.1:f:root:-:755 -+/usr/lib/libpostfix-global.so.1:f:root:-:755 -+/usr/lib/libpostfix-tls.so.1:f:root:-:755 -+/usr/lib/libpostfix-master.so.1:f:root:-:755 -+/usr/lib/libpostfix-util.so.1:f:root:-:755 - $daemon_directory/nqmgr:h:$daemon_directory/qmgr - $daemon_directory/lmtp:h:$daemon_directory/smtp - $command_directory/postalias:f:root:-:755 -@@ -108,6 +117,7 @@ $config_directory/access:f:root:-:644:p - $config_directory/aliases:f:root:-:644:p - $config_directory/bounce.cf.default:f:root:-:644 - $config_directory/canonical:f:root:-:644:p -+$config_directory/dynamicmaps.cf:f:root:-:644:p - $config_directory/cidr_table:f:root:-:644:o - $config_directory/generic:f:root:-:644:p - $config_directory/generics:f:root:-:644:o -diff -Naurp postfix-2.5.5/src/dns/Makefile.in postfix-2.5.5.oden/src/dns/Makefile.in ---- postfix-2.5.5/src/dns/Makefile.in 2007-03-17 18:51:37.000000000 +0100 -+++ postfix-2.5.5.oden/src/dns/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a - LIB_DIR = ../../lib - INC_DIR = ../../include - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -Naurp postfix-2.5.5/src/global/Makefile.in postfix-2.5.5.oden/src/global/Makefile.in ---- postfix-2.5.5/src/global/Makefile.in 2007-12-06 14:49:03.000000000 +0100 -+++ postfix-2.5.5.oden/src/global/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -33,7 +33,7 @@ OBJS = abounce.o anvil_clnt.o been_here. - canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ - clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ - defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ -- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ -+ deliver_request.o \ - dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ - dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ - ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ -@@ -101,10 +101,13 @@ LIBS = ../../lib/libutil.a - LIB_DIR = ../../lib - INC_DIR = ../../include - MAKES = -+LDAPSO = dict_ldap.so -+MYSQLSO = dict_mysql.so -+PGSQLSO = dict_pgsql.so - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) - - $(OBJS): ../../conf/makedefs.out - -@@ -114,14 +117,30 @@ Makefile: Makefile.in - test: $(TESTPROG) - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) -+ -+$(LDAPSO): dict_ldap.o $(LIB) -+ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal -+ -+$(MYSQLSO): dict_mysql.o $(LIB) -+ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal -+ -+$(PGSQLSO): dict_pgsql.o $(LIB) -+ gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(LDAPSO): $(LDAPSO) -+ cp $(LDAPSO) ../../libexec -+ -+../../libexec/$(MYSQLSO): $(MYSQLSO) -+ cp $(MYSQLSO) ../../libexec -+ -+../../libexec/$(PGSQLSO): $(PGSQLSO) -+ cp $(PGSQLSO) ../../libexec -+ -+update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -489,7 +508,7 @@ lint: - lint $(DEFS) $(SRCS) $(LINTFIX) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk -+ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk - rm -rf printfck - - tidy: clean -diff -Naurp postfix-2.5.5/src/global/mail_conf.c postfix-2.5.5.oden/src/global/mail_conf.c ---- postfix-2.5.5/src/global/mail_conf.c 2004-04-10 16:52:51.000000000 +0200 -+++ postfix-2.5.5.oden/src/global/mail_conf.c 2008-12-17 18:17:11.000000000 +0100 -@@ -175,6 +175,13 @@ void mail_conf_suck(void) - path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); - dict_load_file(CONFIG_DICT, path); - myfree(path); -+ -+#ifndef NO_DYNAMIC_MAPS -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif -+ - } - - /* mail_conf_eval - expand macros in string */ -diff -Naurp postfix-2.5.5/src/global/mail_dict.c postfix-2.5.5.oden/src/global/mail_dict.c ---- postfix-2.5.5/src/global/mail_dict.c 2008-01-08 22:07:47.000000000 +0100 -+++ postfix-2.5.5.oden/src/global/mail_dict.c 2008-12-17 18:17:11.000000000 +0100 -@@ -45,6 +45,7 @@ typedef struct { - - static const DICT_OPEN_INFO dict_open_info[] = { - DICT_TYPE_PROXY, dict_proxy_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_LDAP - DICT_TYPE_LDAP, dict_ldap_open, - #endif -@@ -54,6 +55,7 @@ static const DICT_OPEN_INFO dict_open_in - #ifdef HAS_PGSQL - DICT_TYPE_PGSQL, dict_pgsql_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - 0, - }; - -diff -Naurp postfix-2.5.5/src/global/mail_params.c postfix-2.5.5.oden/src/global/mail_params.c ---- postfix-2.5.5/src/global/mail_params.c 2008-01-08 21:35:08.000000000 +0100 -+++ postfix-2.5.5.oden/src/global/mail_params.c 2008-12-17 18:17:11.000000000 +0100 -@@ -78,6 +78,7 @@ - /* char *var_export_environ; - /* char *var_debug_peer_list; - /* int var_debug_peer_level; -+/* int var_command_maxtime; - /* int var_in_flow_delay; - /* int var_fault_inj_code; - /* char *var_bounce_service; -@@ -254,6 +255,7 @@ char *var_import_environ; - char *var_export_environ; - char *var_debug_peer_list; - int var_debug_peer_level; -+int var_command_maxtime; - int var_fault_inj_code; - char *var_bounce_service; - char *var_cleanup_service; -@@ -265,6 +267,7 @@ char *var_showq_service; - char *var_error_service; - char *var_flush_service; - char *var_verify_service; -+char *var_scache_service; - char *var_trace_service; - int var_db_create_buf; - int var_db_read_buf; -diff -Naurp postfix-2.5.5/src/global/mkmap_open.c postfix-2.5.5.oden/src/global/mkmap_open.c ---- postfix-2.5.5/src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100 -+++ postfix-2.5.5.oden/src/global/mkmap_open.c 2008-12-17 18:17:11.000000000 +0100 -@@ -81,7 +81,7 @@ - * We use a different table (in dict_open.c) when querying maps. - */ - typedef struct { -- char *type; -+ const char *type; - MKMAP *(*before_open) (const char *); - } MKMAP_OPEN_INFO; - -@@ -156,7 +156,16 @@ MKMAP *mkmap_open(const char *type, con - */ - for (mp = mkmap_types; /* void */ ; mp++) { - if (mp->type == 0) -+#ifndef NO_DYNAMIC_MAPS -+ { -+ static MKMAP_OPEN_INFO oi; -+ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); -+ oi.type=type; -+ mp=&oi; -+ } -+#else - msg_fatal("unsupported map type: %s", type); -+#endif - if (strcmp(type, mp->type) == 0) - break; - } -diff -Naurp postfix-2.5.5/src/master/Makefile.in postfix-2.5.5.oden/src/master/Makefile.in ---- postfix-2.5.5/src/master/Makefile.in 2007-09-03 19:51:46.000000000 +0200 -+++ postfix-2.5.5.oden/src/master/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -20,7 +20,7 @@ LIB_DIR = ../../lib - INC_DIR = ../../include - BIN_DIR = ../../libexec - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c - - all: $(PROG) $(LIB) - -@@ -39,12 +39,10 @@ tests: - root_tests: - - $(LIB): $(LIB_OBJ) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR)/$(LIB) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - $(BIN_DIR)/$(PROG): $(PROG) - cp $(PROG) $(BIN_DIR) -diff -Naurp postfix-2.5.5/src/milter/Makefile.in postfix-2.5.5.oden/src/milter/Makefile.in ---- postfix-2.5.5/src/milter/Makefile.in 2007-12-23 22:22:58.000000000 +0100 -+++ postfix-2.5.5.oden/src/milter/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -14,7 +14,7 @@ LIB_DIR = ../../lib - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -30,12 +30,10 @@ tests: - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -Naurp postfix-2.5.5/src/postconf/postconf.c postfix-2.5.5.oden/src/postconf/postconf.c ---- postfix-2.5.5/src/postconf/postconf.c 2008-01-08 21:48:38.000000000 +0100 -+++ postfix-2.5.5.oden/src/postconf/postconf.c 2008-12-17 18:17:11.000000000 +0100 -@@ -893,6 +893,16 @@ static void show_maps(void) - { - ARGV *maps_argv; - int i; -+#ifndef NO_DYNAMIC_MAPS -+ char *path; -+ char *config_dir; -+ -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif - - maps_argv = dict_mapnames(); - for (i = 0; i < maps_argv->argc; i++) -diff -Naurp postfix-2.5.5/src/postmap/postmap.c postfix-2.5.5.oden/src/postmap/postmap.c ---- postfix-2.5.5/src/postmap/postmap.c 2007-12-04 17:25:13.000000000 +0100 -+++ postfix-2.5.5.oden/src/postmap/postmap.c 2008-12-17 18:17:11.000000000 +0100 -@@ -5,7 +5,7 @@ - /* Postfix lookup table management - /* SYNOPSIS - /* .fi --/* \fBpostmap\fR [\fB-Nfinoprsvw\fR] [\fB-c \fIconfig_dir\fR] -+/* \fBpostmap\fR [\fB-Nfinoprsuvw\fR] [\fB-c \fIconfig_dir\fR] - /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] - /* [\fIfile_type\fR:]\fIfile_name\fR ... - /* DESCRIPTION -@@ -115,6 +115,8 @@ - /* as the original input order. - /* This feature is available in Postfix version 2.2 and later, - /* and is not available for all database types. -+/* .IP \fB-u\fR -+/* Upgrade the database to the current version. - /* .IP \fB-v\fR - /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR - /* options make the software increasingly verbose. -@@ -555,6 +557,18 @@ static void postmap_seq(const char *map_ - dict_close(dict); - } - -+/* postmap_upgrade - upgrade a map */ -+ -+static int postmap_upgrade(const char *map_type, const char *map_name) -+{ -+ DICT *dict; -+ -+ dict = dict_open3(map_type, map_name, O_RDWR, -+ DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); -+ dict_close(dict); -+ return (dict != 0); -+} -+ - /* usage - explain */ - - static NORETURN usage(char *myname) -@@ -575,6 +589,7 @@ int main(int argc, char **argv) - int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; - int open_flags = O_RDWR | O_CREAT | O_TRUNC; - int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; -+ int upgrade = 0; - char *query = 0; - char *delkey = 0; - int sequence = 0; -@@ -619,7 +634,7 @@ int main(int argc, char **argv) - /* - * Parse JCL. - */ -- while ((ch = GETOPT(argc, argv, "Nc:d:finopq:rsvw")) > 0) { -+ while ((ch = GETOPT(argc, argv, "Nc:d:finopq:rsuvw")) > 0) { - switch (ch) { - default: - usage(argv[0]); -@@ -633,8 +648,8 @@ int main(int argc, char **argv) - msg_fatal("out of memory"); - break; - case 'd': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - delkey = optarg; - break; - case 'f': -@@ -654,8 +669,8 @@ int main(int argc, char **argv) - postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; - break; - case 'q': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - query = optarg; - break; - case 'r': -@@ -663,10 +678,15 @@ int main(int argc, char **argv) - dict_flags |= DICT_FLAG_DUP_REPLACE; - break; - case 's': -- if (query || delkey) -- msg_fatal("specify only one of -s or -q or -d"); -+ if (query || delkey || upgrade) -+ msg_fatal("specify only one of -s or -q -u or -d"); - sequence = 1; - break; -+ case 'u': -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); -+ upgrade=1; -+ break; - case 'v': - msg_verbose++; - break; -@@ -734,6 +754,21 @@ int main(int argc, char **argv) - exit(0); - } - exit(1); -+ } else if (upgrade) { /* Upgrade the map(s) */ -+ int success = 1; -+ if (optind + 1 > argc) -+ usage(argv[0]); -+ while (optind < argc) { -+ if ((path_name = split_at(argv[optind], ':')) != 0) { -+ success &= postmap_upgrade(argv[optind], path_name); -+ } else { -+ success &= postmap_upgrade(var_db_type, path_name); -+ } -+ if (!success) -+ exit(1); -+ optind++; -+ } -+ exit(0); - } else { /* create/update map(s) */ - if (optind + 1 > argc) - usage(argv[0]); -diff -Naurp postfix-2.5.5/src/tls/Makefile.in postfix-2.5.5.oden/src/tls/Makefile.in ---- postfix-2.5.5/src/tls/Makefile.in 2008-01-08 02:42:47.000000000 +0100 -+++ postfix-2.5.5.oden/src/tls/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -22,7 +22,7 @@ LIB_DIR = ../../lib - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -38,12 +38,10 @@ tests: - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -Naurp postfix-2.5.5/src/util/Makefile.in postfix-2.5.5.oden/src/util/Makefile.in ---- postfix-2.5.5/src/util/Makefile.in 2008-01-07 17:22:02.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/Makefile.in 2008-12-17 18:17:11.000000000 +0100 -@@ -31,21 +31,21 @@ SRCS = alldig.c allprint.c argv.c argv_s - vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ - write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ - allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ -- upass_listen.c upass_trigger.c -+ upass_listen.c upass_trigger.c load_lib.c - OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ - attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ - attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ - chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ - ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ - dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ -- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ -- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ -+ dict_nisplus.o dict_open.o dict_regexp.o \ -+ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ - dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ - fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ - fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ - host_port.o htable.o inet_addr_host.o inet_addr_list.o \ - inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ -- inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ -+ inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o load_lib.o \ - mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ - msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ - mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ -@@ -78,7 +78,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_cl - msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ - mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ - open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ -- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ -+ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ - sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ - sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ - stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ -@@ -90,6 +90,7 @@ DEFS = -I. -D$(SYSTYPE) - CFLAGS = $(DEBUG) $(OPT) $(DEFS) - FILES = Makefile $(SRCS) $(HDRS) - INCL = -+PCRESO = dict_pcre.so - LIB = libutil.a - TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ - fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ -@@ -104,10 +105,11 @@ TESTPROG= dict_open dup2_pass_on_exec ev - - LIB_DIR = ../../lib - INC_DIR = ../../include -+LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(PCRESO) - - $(OBJS): ../../conf/makedefs.out - -@@ -116,15 +118,19 @@ Makefile: Makefile.in - - test: $(TESTPROG) - -+$(PCRESO): dict_pcre.o -+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil -+ - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(PCRESO): $(PCRESO) -+ cp $(PCRESO) ../../libexec -+ -+update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -146,7 +152,8 @@ lint: - lint $(SRCS) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp -+ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ -+ junk $(MAKES) *.tmp - rm -rf printfck - - tidy: clean -diff -Naurp postfix-2.5.5/src/util/dict.h postfix-2.5.5.oden/src/util/dict.h ---- postfix-2.5.5/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/dict.h 2008-12-17 18:17:11.000000000 +0100 -@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *); - #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ - #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ - #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ -+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ - #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) - - /* IMPORTANT: Update the dict_mask[] table when the above changes */ -@@ -138,6 +139,11 @@ extern const char *dict_eval(const char - extern DICT *dict_open(const char *, int, int); - extern DICT *dict_open3(const char *, const char *, int, int); - extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); -+#ifndef NO_DYNAMIC_MAPS -+extern void dict_open_dlinfo(const char *path); -+typedef void* (*dict_mkmap_func_t)(const char *); -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type); -+#endif - - #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) - #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) -diff -Naurp postfix-2.5.5/src/util/dict_db.c postfix-2.5.5.oden/src/util/dict_db.c ---- postfix-2.5.5/src/util/dict_db.c 2007-01-04 15:06:07.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/dict_db.c 2008-12-17 18:17:11.000000000 +0100 -@@ -664,6 +664,12 @@ static DICT *dict_db_open(const char *cl - msg_fatal("set DB cache size %d: %m", dict_db_cache_size); - if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) - msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); -+ if (dict_flags & DICT_FLAG_UPGRADE) { -+ if (msg_verbose) -+ msg_info("upgrading database %s",db_path); -+ if ((errno = db->upgrade(db,db_path,0)) != 0) -+ msg_fatal("upgrade of database %s: %m",db_path); -+ } - #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) - if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) - msg_fatal("open database %s: %m", db_path); -diff -Naurp postfix-2.5.5/src/util/dict_dbm.c postfix-2.5.5.oden/src/util/dict_dbm.c ---- postfix-2.5.5/src/util/dict_dbm.c 2007-01-04 15:07:36.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/dict_dbm.c 2008-12-17 18:17:11.000000000 +0100 -@@ -407,6 +407,10 @@ DICT *dict_dbm_open(const char *path, - char *dbm_path; - int lock_fd; - -+#ifdef HAVE_GDBM -+ msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", -+ path); -+#endif - /* - * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in - * the time domain) locking while accessing individual database records. -diff -Naurp postfix-2.5.5/src/util/dict_open.c postfix-2.5.5.oden/src/util/dict_open.c ---- postfix-2.5.5/src/util/dict_open.c 2008-01-08 22:05:20.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/dict_open.c 2008-12-17 18:17:11.000000000 +0100 -@@ -44,6 +44,8 @@ - /* DICT *(*open) (const char *, int, int); - /* - /* ARGV *dict_mapnames() -+/* -+/* void (*)() dict_mkmap_func(const char *dict_type) - /* DESCRIPTION - /* This module implements a low-level interface to multiple - /* physical dictionary types. -@@ -159,6 +161,9 @@ - /* - /* dict_mapnames() returns a sorted list with the names of all available - /* dictionary types. -+/* -+/* dict_mkmap_func() returns a pointer to the mkmap setup function -+/* for the given map type, as given in /etc/dynamicmaps.cf - /* DIAGNOSTICS - /* Fatal error: open error, unsupported dictionary type, attempt to - /* update non-writable dictionary. -@@ -183,6 +188,9 @@ - #include <strings.h> - #endif - -+#include <sys/stat.h> -+#include <unistd.h> -+ - /* Utility library. */ - - #include <argv.h> -@@ -207,6 +215,27 @@ - #include <split_at.h> - #include <htable.h> - -+#ifndef NO_DYNAMIC_MAPS -+#include <load_lib.h> -+#include <vstring.h> -+#include <vstream.h> -+#include <vstring_vstream.h> -+#include <mvect.h> -+ -+ /* -+ * Interface for dynamic map loading. -+ */ -+typedef struct { -+ const char *pattern; -+ const char *soname; -+ const char *openfunc; -+ const char *mkmapfunc; -+} DLINFO; -+ -+static DLINFO *dict_dlinfo; -+static DLINFO *dict_open_dlfind(const char *type); -+#endif -+ - /* - * lookup table for available map types. - */ -@@ -221,9 +250,11 @@ static const DICT_OPEN_INFO dict_open_in - #endif - DICT_TYPE_ENVIRON, dict_env_open, - DICT_TYPE_UNIX, dict_unix_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef SNAPSHOT - DICT_TYPE_TCP, dict_tcp_open, - #endif -+#endif - #ifdef HAS_SDBM - DICT_TYPE_SDBM, dict_sdbm_open, - #endif -@@ -243,9 +274,11 @@ static const DICT_OPEN_INFO dict_open_in - #ifdef HAS_NETINFO - DICT_TYPE_NETINFO, dict_ni_open, - #endif -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_PCRE - DICT_TYPE_PCRE, dict_pcre_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - #ifdef HAS_POSIX_REGEXP - DICT_TYPE_REGEXP, dict_regexp_open, - #endif -@@ -303,8 +336,31 @@ DICT *dict_open3(const char *dict_type - dict_type, dict_name); - if (dict_open_hash == 0) - dict_open_init(); -- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) -- msg_fatal("unsupported dictionary type: %s", dict_type); -+ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { -+#ifdef NO_DYNAMIC_MAPS -+ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); -+#else -+ struct stat st; -+ LIB_FN fn[2]; -+ DICT *(*open) (const char *, int, int); -+ DLINFO *dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ fn[0].name = dl->openfunc; -+ fn[0].ptr = (void**)&open; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ dict_open_register(dict_type, open); -+ dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); -+#endif -+ } -+ if (msg_verbose>1) { -+ msg_info("%s: calling %s open routine",myname,dict_type); -+ } - if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) - msg_fatal("opening %s:%s %m", dict_type, dict_name); - if (msg_verbose) -@@ -312,6 +368,36 @@ DICT *dict_open3(const char *dict_type - return (dict); - } - -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type) -+{ -+ char *myname="dict_mkmap_func"; -+ struct stat st; -+ LIB_FN fn[2]; -+ dict_mkmap_func_t mkmap; -+ DLINFO *dl; -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ if (!dl->mkmapfunc) -+ msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); -+ -+ fn[0].name = dl->mkmapfunc; -+ fn[0].ptr = (void**)&mkmap; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ return mkmap; -+#else -+ return (void(*)())NULL; -+#endif -+} -+ - /* dict_open_register - register dictionary type */ - - void dict_open_register(const char *type, -@@ -345,6 +431,9 @@ ARGV *dict_mapnames() - HTABLE_INFO **ht; - DICT_OPEN_INFO *dp; - ARGV *mapnames; -+#ifndef NO_DYNAMIC_MAPS -+ DLINFO *dlp; -+#endif - - if (dict_open_hash == 0) - dict_open_init(); -@@ -353,6 +442,13 @@ ARGV *dict_mapnames() - dp = (DICT_OPEN_INFO *) ht[0]->value; - argv_add(mapnames, dp->type, ARGV_END); - } -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ for (dlp=dict_dlinfo; dlp->pattern; dlp++) { -+ argv_add(mapnames, dlp->pattern, ARGV_END); -+ } -+#endif - qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), - dict_sort_alpha_cpp); - myfree((char *) ht_info); -@@ -360,6 +456,87 @@ ARGV *dict_mapnames() - return mapnames; - } - -+#ifndef NO_DYNAMIC_MAPS -+#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) -+ -+void dict_open_dlinfo(const char *path) -+{ -+ char *myname="dict_open_dlinfo"; -+ VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); -+ VSTRING *buf = vstring_alloc(100); -+ char *cp; -+ ARGV *argv; -+ MVECT vector; -+ int nelm=0; -+ int linenum=0; -+ -+ dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); -+ -+ if (!conf_fp) { -+ msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", -+ myname, path); -+ } else { -+ while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { -+ cp = vstring_str(buf); -+ linenum++; -+ if (*cp == '#' || *cp == '\0') -+ continue; -+ argv = argv_split(cp, " \t"); -+ if (argv->argc != 3 && argv->argc != 4) { -+ msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", -+ myname, linenum); -+ } -+ if (STREQ(argv->argv[0],"*")) { -+ msg_warn("%s: wildcard dynamic map entry no longer supported.", -+ myname); -+ continue; -+ } -+ if (argv->argv[1][0] != '/') { -+ msg_fatal("%s: .so name must begin with a \"/\" at line %d", -+ myname, linenum); -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); -+ } -+ dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); -+ dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); -+ dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); -+ if (argv->argc==4) -+ dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); -+ else -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ nelm++; -+ argv_free(argv); -+ } -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); -+ } -+ dict_dlinfo[nelm].pattern = NULL; -+ dict_dlinfo[nelm].soname = NULL; -+ dict_dlinfo[nelm].openfunc = NULL; -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ if (conf_fp) -+ vstream_fclose(conf_fp); -+ vstring_free(buf); -+} -+ -+static DLINFO *dict_open_dlfind(const char *type) -+{ -+ DLINFO *dp; -+ -+ if (!dict_dlinfo) -+ return NULL; -+ -+ for (dp=dict_dlinfo; dp->pattern; dp++) { -+ if (STREQ(dp->pattern,type)) -+ return dp; -+ } -+ return NULL; -+} -+ -+#endif /* !NO_DYNAMIC_MAPS */ -+ - #ifdef TEST - - /* -diff -Naurp postfix-2.5.5/src/util/load_lib.c postfix-2.5.5.oden/src/util/load_lib.c ---- postfix-2.5.5/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/load_lib.c 2008-12-17 18:17:11.000000000 +0100 -@@ -0,0 +1,135 @@ -+/*++ -+/* NAME -+/* load_lib 3 -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include <load_lib.h> -+/* -+/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+/* const char *libname; -+/* LIB_FN *libfuncs; -+/* LIB_FN *libdata; -+/* -+/* DESCRIPTION -+/* This module loads functions from libraries, returnine pointers -+/* to the named functions. -+/* -+/* load_library_symbols() loads all of the desired functions, and -+/* returns zero for success, or exits via msg_fatal(). -+/* -+/* SEE ALSO -+/* msg(3) diagnostics interface -+/* DIAGNOSTICS -+/* Problems are reported via the msg(3) diagnostics routines: -+/* library not found, symbols not found, other fatal errors. -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System libraries. */ -+ -+#include "sys_defs.h" -+#include <stdlib.h> -+#include <stddef.h> -+#include <string.h> -+#if defined(HAS_DLOPEN) -+#include <dlfcn.h> -+#elif defined(HAS_SHL_LOAD) -+#include <dl.h> -+#endif -+ -+/* Application-specific. */ -+ -+#include "msg.h" -+#include "load_lib.h" -+ -+extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) -+{ -+ char *myname = "load_library_symbols"; -+ LIB_FN *fn; -+ -+#if defined(HAS_DLOPEN) -+ void *handle; -+ char *emsg; -+ -+ handle=dlopen(libname,RTLD_NOW); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); -+ } -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+#elif defined(HAS_SHL_LOAD) -+ shl_t handle; -+ -+ handle = shl_load(libname,BIND_IMMEDIATE,0); -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+#else -+ msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", -+ myname); -+#endif -+ return 0; -+} -diff -Naurp postfix-2.5.5/src/util/load_lib.h postfix-2.5.5.oden/src/util/load_lib.h ---- postfix-2.5.5/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.5.5.oden/src/util/load_lib.h 2008-12-17 18:17:11.000000000 +0100 -@@ -0,0 +1,41 @@ -+#ifndef _LOAD_LIB_H_INCLUDED_ -+#define _LOAD_LIB_H_INCLUDED_ -+ -+/*++ -+/* NAME -+/* load_lib 3h -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include "load_lib.h" -+/* DESCRIPTION -+/* .nf -+ -+ /* -+ * External interface. -+ */ -+/* NULL name terminates list */ -+typedef struct LIB_FN { -+ const char *name; -+ void **ptr; -+} LIB_FN; -+ -+extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+ -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+#endif diff --git a/testing/postfix/postfix-2.6.1-dynamicmaps.patch b/extra/postfix/postfix-2.6.1-dynamicmaps.patch index 6000caaf08..6000caaf08 100644 --- a/testing/postfix/postfix-2.6.1-dynamicmaps.patch +++ b/extra/postfix/postfix-2.6.1-dynamicmaps.patch diff --git a/extra/postfix/postfix-mysql.post-install b/extra/postfix/postfix-mysql.post-install index 1e64c6a60f..b8d23833b6 120000..100644 --- a/extra/postfix/postfix-mysql.post-install +++ b/extra/postfix/postfix-mysql.post-install @@ -1 +1,19 @@ -postfix-ldap.post-install
\ No newline at end of file +#!/bin/sh + +# update the dynamicmaps.cf +conf=/etc/postfix/dynamicmaps.cf + +sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf + +( +echo '## AUTO BEGIN ##' +if cd /usr/lib/postfix/; then + for i in *.so; do + m=${i#dict_} + m=${m%.so} + echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" + done +fi + +echo '## AUTO END ##' +) >> $conf diff --git a/extra/postfix/postfix-pcre.post-install b/extra/postfix/postfix-pcre.post-install index 1e64c6a60f..b8d23833b6 120000..100644 --- a/extra/postfix/postfix-pcre.post-install +++ b/extra/postfix/postfix-pcre.post-install @@ -1 +1,19 @@ -postfix-ldap.post-install
\ No newline at end of file +#!/bin/sh + +# update the dynamicmaps.cf +conf=/etc/postfix/dynamicmaps.cf + +sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf + +( +echo '## AUTO BEGIN ##' +if cd /usr/lib/postfix/; then + for i in *.so; do + m=${i#dict_} + m=${m%.so} + echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" + done +fi + +echo '## AUTO END ##' +) >> $conf diff --git a/extra/postfix/postfix-pgsql.post-install b/extra/postfix/postfix-pgsql.post-install index 1e64c6a60f..b8d23833b6 120000..100644 --- a/extra/postfix/postfix-pgsql.post-install +++ b/extra/postfix/postfix-pgsql.post-install @@ -1 +1,19 @@ -postfix-ldap.post-install
\ No newline at end of file +#!/bin/sh + +# update the dynamicmaps.cf +conf=/etc/postfix/dynamicmaps.cf + +sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf + +( +echo '## AUTO BEGIN ##' +if cd /usr/lib/postfix/; then + for i in *.so; do + m=${i#dict_} + m=${m%.so} + echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" + done +fi + +echo '## AUTO END ##' +) >> $conf diff --git a/testing/linux-vserver-sources/APKBUILD b/testing/linux-vserver-sources/APKBUILD index 03e3493370..22097641d4 100644 --- a/testing/linux-vserver-sources/APKBUILD +++ b/testing/linux-vserver-sources/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _suff=vserver pkgname=linux-$_suff-sources -pkgver=2.6.28.7 +pkgver=2.6.29.2 pkgdesc="Linux kernel sources with vserver patch" -_kernver=2.6.28 -_vsver=2.3.0.36.7 +_kernver=2.6.29 +_vsver=2.3.0.36.10 pkgrel=0 options="!strip" license=GPL-2 @@ -22,7 +22,7 @@ build() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1 fi - for i in ../*.patch; do + for i in ../*.patch ../*.diff; do msg "Applying $i..." patch -p1 < $i || return 1 done @@ -32,8 +32,8 @@ build() { mv "linux-$_kernver" "$pkgdir/usr/src/linux-$pkgver-$_suff" } -md5sums="d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 -346c912ebaffcf84361859014009be50 patch-2.6.28.7.bz2 -00587a89fc85b5a21caed34de067bbe2 patch-2.6.28.7-vs2.3.0.36.7.diff +md5sums="64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 +a3e79545ef18ff2a172f82fffef92deb patch-2.6.29.2.bz2 +df8fc25982478856480e8040c76d402c patch-2.6.29.2-vs2.3.0.36.10.diff 7673b4521283ad41434a18ca18b16ad8 0001-linux-2.6.28.5-ipgre-strict-binding.patch 8f405c738b150c532c46eaad5390cca2 0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch" diff --git a/testing/luaexpat/APKBUILD b/testing/luaexpat/APKBUILD new file mode 100644 index 0000000000..e11ba10750 --- /dev/null +++ b/testing/luaexpat/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=luaexpat +pkgver=1.1 +pkgrel=0 +pkgdesc="LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0." +url="http://luaforge.net/projects/luaexpat/" +license="MIT" +depends="lua expat uclibc" +makedepends="lua-dev expat-dev" +install= +source="http://luaforge.net/frs/download.php/2469/$pkgname-$pkgver.tar.gz +newconfig" + +build() { + cd "$srcdir/$pkgname-$pkgver" + mv ../newconfig ./config + + make || return 1 + make LUA_DIR="$pkgdir"/usr/share/lua/5.1 LUA_LIBDIR="$pkgdir"/usr/lib/lua/5.1 install + +} + +md5sums="6ecb895ccf5cff1e7f2facd438b1f8d0 luaexpat-1.1.tar.gz +eb947b7aa99b487289b02c1ab1b8ccd3 newconfig" diff --git a/testing/luaexpat/newconfig b/testing/luaexpat/newconfig new file mode 100644 index 0000000000..7d8d6331fc --- /dev/null +++ b/testing/luaexpat/newconfig @@ -0,0 +1,26 @@ +LUA_LIBDIR= usr/lib/lua/5.1 +LUA_DIR= usr/share/lua/5.1 +LUA_INC= /usr/include +EXPAT_INC= /usr/include + +# OS dependent +LIB_OPTION= -shared + +LIBNAME= $T.so.$V +LUA_VERSION_NUM= 514 +COMPAT_DIR= ../compat/src + +# Compilation parameters +CWARNS = -Wall -pedantic \ + -Waggregate-return \ + -Wcast-align \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wnested-externs \ + -Wpointer-arith \ + -Wshadow \ + -Wwrite-strings + +CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ + -I$(COMPAT_DIR) -I$(EXPAT_INC) +CC = gcc diff --git a/testing/luasocket/APKBUILD b/testing/luasocket/APKBUILD new file mode 100644 index 0000000000..c42a6229fd --- /dev/null +++ b/testing/luasocket/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=luasocket +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language." +url="http://luaforge.net/projects/luasocket/" +license="MIT" +depends="lua" +makedepends="lua-dev" +install= +source="http://luaforge.net/frs/download.php/2664/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make || return 1 + make INSTALL_TOP_SHARE="$pkgdir/usr/share/lua/5.1" INSTALL_TOP_LIB="$pkgdir/usr/lib/lua/5.1" install + +} + +md5sums="41445b138deb7bcfe97bff957503da8e luasocket-2.0.2.tar.gz" diff --git a/testing/luasql-postgres/APKBUILD b/testing/luasql-postgres/APKBUILD new file mode 100644 index 0000000000..36756ca657 --- /dev/null +++ b/testing/luasql-postgres/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=luasql-postgres +pkgver=2.1.1 +pkgrel=0 +pkgdesc="LuaSQL is a simple interface from Lua to a DBMS" +url="http://www.keplerproject.org/luasql/" +license="MIT" +depends="lua" +makedepends="lua-dev postgresql-dev" +install= +subpackages= +source="http://luaforge.net/frs/download.php/2686/luasql-$pkgver.tar.gz + config.new + " + +build() { + cd "$srcdir/luasql-$pkgver" + cp "$srcdir/config.new" config + + make || return 1 + mkdir -p "$pkgdir"/usr/lib/lua/5.1/luasql + cp src/postgres.so "$pkgdir"/usr/lib/lua/5.1/luasql +} + +md5sums="63bdd57de4b9d1be336ba112d8cb69eb luasql-2.1.1.tar.gz +6ee28fa90394da6a7e38cf507d56ba80 config.new" diff --git a/testing/luasql-postgres/config.new b/testing/luasql-postgres/config.new new file mode 100644 index 0000000000..a8650c5511 --- /dev/null +++ b/testing/luasql-postgres/config.new @@ -0,0 +1,59 @@ +# Driver (leave uncommented ONLY the line with the name of the driver) +#T= mysql +#T= oci8 +#T= odbc +T= postgres +#T= sqlite +#T=sqlite3 + +# Installation directories + +# Default prefix +PREFIX = /usr + +# System's libraries directory (where binary libraries are installed) +LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 + +# System's lua directory (where Lua libraries are installed) +LUA_DIR= $(PREFIX)/share/lua/5.1 + +# Lua includes directory +LUA_INC= $(PREFIX)/include + +# Lua version number (first and second digits of target version) +LUA_VERSION_NUM= 514 + +# OS dependent +LIB_OPTION= -shared #for Linux +#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X + +LIBNAME= $T.so +COMPAT_DIR= ../compat/src + +# Compilation parameters +# Driver specific +######## MySQL +#DRIVER_LIBS= -L/usr/local/mysql/lib -lmysqlclient -lz +#DRIVER_INCS= -I/usr/local/mysql/include +######## Oracle OCI8 +#DRIVER_LIBS= -L/home/oracle/OraHome1/lib -lz -lclntsh +#DRIVER_INCS= -I/home/oracle/OraHome1/rdbms/demo -I/home/oracle/OraHome1/rdbms/public +######## PostgreSQL +DRIVER_LIBS= -L/usr/pgsql/lib -lpq +DRIVER_INCS= -I/usr/pgsql/include +######## SQLite +#DRIVER_LIBS= -lsqlite +#DRIVER_INCS= +######## SQLite3 +#DRIVER_LIBS= -L/opt/local/lib -lsqlite3 +#DRIVER_INCS= -I/opt/local/include +######## ODBC +#DRIVER_LIBS= -L/usr/local/lib -lodbc +#DRIVER_INCS= -DUNIXODBC -I/usr/local/include + +WARN= -Wall -Wmissing-prototypes -Wmissing-declarations -ansi -pedantic +INCS= -I$(LUA_INC) +CFLAGS= -O2 $(WARN) -I$(COMPAT_DIR) $(DRIVER_INCS) $(INCS) $(DEFS) +CC= gcc + +# $Id: config,v 1.8 2007/10/27 22:55:27 carregal Exp $ diff --git a/testing/postfix/APKBUILD b/testing/postfix/APKBUILD deleted file mode 100644 index a0a83f46f7..0000000000 --- a/testing/postfix/APKBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=postfix -pkgver=2.6.1 -pkgrel=0 -pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" -url="http://www.postfix.org/" -license="IPL-1" -depends="db pcre openssl libsasl" -makedepends="db-dev pcre-dev openssl-dev postgresql-dev mysql-dev openldap-dev cyrus-sasl-dev" -install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre - $pkgname-pgsql" -source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz - $pkgname.initd - $install - postfix-2.6.1-dynamicmaps.patch - dynamicmaps.cf - postfix-ldap.post-install - postfix-mysql.post-install - postfix-pcre.post-install - postfix-pgsql.post-install - " - -# the dynamic maps patch is taken from mandriva -# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/postfix/current/SOURCES - -build () { - cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 < $i || return 1 - done - cp ../dynamicmaps.cf conf/ - - sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \ - -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/postfix/aliases|" \ - src/util/sys_defs.h || return 1 - sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || return 1 - - # needed for dynamic maps. - local ccargs="-DHAS_DLOPEN -DHAS_SHL_LOAD" - local auxlibs="$LDFLAGS -lpthread -lcrypt" - - ccargs="$ccargs -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\"" - - # pcre - ccargs="$ccargs -DHAS_PCRE" - #auxlibs="$auxlibs -lpcre" - - # ssl - ccargs="$ccargs -DUSE_TLS" - auxlibs="$auxlibs -lssl -lcrypto" - - ## dovecot-sasl - #ccargs="$ccargs -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" - - # cyrus sasl - ccargs="$ccargs -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" - auxlibs="$auxlibs -lsasl2" - - # postgresql - ccargs="$ccargs -DHAS_PGSQL -I$(pg_config --includedir)" - #auxlibs="$auxlibs -lpq -L$(pg_config --libdir)" - - # mysql - ccargs="$ccargs -DHAS_MYSQL $(mysql_config --include)" - #auxlibs="$auxlibs -lmysqlclient -lm -lz" - - # compile - make DEBUG="" \ - OPT="$CFLAGS" \ - CCARGS="$ccargs" \ - AUXLIBS="$auxlibs" \ - makefiles || return 1 - - make OPT="$CFLAGS" || return 1 - - for i in lib/*.a; do - j=${i#lib/lib} - ln -s ${i#lib/} lib/libpostfix-${j%.a}.so.1 - done - - # install to pkgdir - LD_LIBRARY_PATH=$PWD/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} make \ - non-interactive-package \ - install_root="$pkgdir" \ - config_directory=/usr/share/doc/$pkgname/defaults \ - readme_directory=/usr/share/doc/$pkgname/readme \ - manpage_directory=/usr/share/man \ - || return 1 - - install -d "$pkgdir"/usr/lib - for i in lib/*.a; do - j=${i#lib/lib} - install $i "$pkgdir"/usr/lib/libpostfix-${j%.a}.so.1 || return 1 - done - - # fix permissions - for i in postdrop postqueue; do - chgrp postdrop "$pkgdir"/usr/sbin/$i - chmod g+s "$pkgdir"/usr/sbin/$i - done - - mkdir -p "$pkgdir"/etc/postfix - mv "$pkgdir"/usr/share/doc/$pkgname/defaults/*.cf \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/aliases \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/canonical \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/generic \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/header_checks \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/relocated \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/transport \ - "$pkgdir"/usr/share/doc/$pkgname/defaults/virtual \ - "$pkgdir"/etc/postfix/ || return 1 - - install -d -o postfix -g postfix "$pkgdir"/var/spool/postfix - install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE -} - -_mv_dict() { - local m=$1 - shift - pkgdesc="$m map support for postfix" - depends="postfix uclibc $@" - install="postfix-${m}.post-install" - mkdir -p "$subpkgdir"/usr/lib/postfix - mv "$pkgdir"/usr/lib/postfix/dict_${m}.so \ - "$subpkgdir"/usr/lib/postfix/ -} - -ldap() { _mv_dict ldap libldap; } -mysql() { _mv_dict mysql libmysqlclient;} -pcre() { _mv_dict pcre pcre; } -pgsql() { _mv_dict pgsql libpq; } - -md5sums="737bbc245da9c72c174893397f70ae86 postfix-2.6.1.tar.gz -8416354d402f3be288fa98b60af86240 postfix.initd -2bfc3864183694e5484ac073bb0cb7ef postfix.pre-install -0064d45c2c8a46c374b55c4abc46cfb2 postfix.post-install -b8812dbf2d076c79cf948ee017e81b39 postfix-2.6.1-dynamicmaps.patch -0efff9b4bb493ad2ff0b9915cb244d14 dynamicmaps.cf -2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install -2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install -2ebe51a882eb9d6d7866583eb6af3969 postfix-pcre.post-install -2ebe51a882eb9d6d7866583eb6af3969 postfix-pgsql.post-install" diff --git a/testing/postfix/dynamicmaps.cf b/testing/postfix/dynamicmaps.cf deleted file mode 100644 index 49d25480c0..0000000000 --- a/testing/postfix/dynamicmaps.cf +++ /dev/null @@ -1,15 +0,0 @@ -# Postfix dynamic maps configuration file. -# -# The first match found is the one that is used. Wildcards are not -# supported. -# -#type location of .so file name of open function -#==== ============================= ===================== -#ldap /usr/lib/postfix/dict_ldap.so dict_ldap_open -#mysql /usr/lib/postfix/dict_mysql.so dict_mysql_open -#pcre /usr/lib/postfix/dict_pcre.so dict_pcre_open -#pgsq /usr/lib/postfix/dict_pgsql.so dict_pgsql_open - -# apk tools will manage the lines below -## AUTO BEGIN ## -## AUTO END ## diff --git a/testing/postfix/postfix-ldap.post-install b/testing/postfix/postfix-ldap.post-install deleted file mode 100644 index b8d23833b6..0000000000 --- a/testing/postfix/postfix-ldap.post-install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# update the dynamicmaps.cf -conf=/etc/postfix/dynamicmaps.cf - -sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf - -( -echo '## AUTO BEGIN ##' -if cd /usr/lib/postfix/; then - for i in *.so; do - m=${i#dict_} - m=${m%.so} - echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" - done -fi - -echo '## AUTO END ##' -) >> $conf diff --git a/testing/postfix/postfix-mysql.post-install b/testing/postfix/postfix-mysql.post-install deleted file mode 100644 index b8d23833b6..0000000000 --- a/testing/postfix/postfix-mysql.post-install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# update the dynamicmaps.cf -conf=/etc/postfix/dynamicmaps.cf - -sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf - -( -echo '## AUTO BEGIN ##' -if cd /usr/lib/postfix/; then - for i in *.so; do - m=${i#dict_} - m=${m%.so} - echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" - done -fi - -echo '## AUTO END ##' -) >> $conf diff --git a/testing/postfix/postfix-pcre.post-install b/testing/postfix/postfix-pcre.post-install deleted file mode 100644 index b8d23833b6..0000000000 --- a/testing/postfix/postfix-pcre.post-install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# update the dynamicmaps.cf -conf=/etc/postfix/dynamicmaps.cf - -sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf - -( -echo '## AUTO BEGIN ##' -if cd /usr/lib/postfix/; then - for i in *.so; do - m=${i#dict_} - m=${m%.so} - echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" - done -fi - -echo '## AUTO END ##' -) >> $conf diff --git a/testing/postfix/postfix-pgsql.post-install b/testing/postfix/postfix-pgsql.post-install deleted file mode 100644 index b8d23833b6..0000000000 --- a/testing/postfix/postfix-pgsql.post-install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# update the dynamicmaps.cf -conf=/etc/postfix/dynamicmaps.cf - -sed -i -e '/\#\# AUTO BEGIN/,/\#\# AUTO END/d' $conf - -( -echo '## AUTO BEGIN ##' -if cd /usr/lib/postfix/; then - for i in *.so; do - m=${i#dict_} - m=${m%.so} - echo -e "$m\t/usr/lib/postfix/$i\tdict_${m}_open" - done -fi - -echo '## AUTO END ##' -) >> $conf diff --git a/testing/postfix/postfix.initd b/testing/postfix/postfix.initd deleted file mode 100644 index b2396b3aea..0000000000 --- a/testing/postfix/postfix.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.5,v 1.3 2008/08/18 14:18:40 falco Exp $ - -# If you plan to simultaneously use several Postfix instances, don't forget -# to specify your alternate_config_directories variable in your main main.cf file. -# Then make a symlink from /etc/init.d/postfix to /etc/init.d/postfix.alt, -# prepare your new /etc/postfix.alt environment, and at least change these working paths: -# queue_directory = /var/spool/postfix.alt -# data_directory = /var/lib/postfix.alt - -CONF_DIR="/etc/postfix" -CONF_OPT="${SVCNAME##*.}" -if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then - CONF_DIR="${CONF_DIR}.${CONF_OPT}" -fi - -opts="${opts} reload" - -depend() { - use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist net saslauthd - if [ "${SVCNAME}" = "postfix" ]; then - provide mta - fi -} - -start() { - ebegin "Starting postfix (${CONF_DIR})" - if [ ! -d ${CONF_DIR} ]; then - eend 1 "${CONF_DIR} does not exist" - return 1 - fi - /usr/sbin/postfix -c ${CONF_DIR} start >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping postfix (${CONF_DIR})" - /usr/sbin/postfix -c ${CONF_DIR} stop >/dev/null 2>&1 - eend $? -} - -reload() { - ebegin "Reloading postfix (${CONF_DIR})" - /usr/sbin/postfix -c ${CONF_DIR} reload >/dev/null 2>&1 - eend $? -} diff --git a/testing/postfix/postfix.post-install b/testing/postfix/postfix.post-install deleted file mode 100644 index 98e01db0bb..0000000000 --- a/testing/postfix/postfix.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -chown postfix /var/spool/postfix/* /var/lib/postfix -chgrp postdrop /var/spool/postfix/maildrop /var/spool/postfix/public - -exit 0 diff --git a/testing/postfix/postfix.pre-install b/testing/postfix/postfix.pre-install deleted file mode 100644 index 22414ef615..0000000000 --- a/testing/postfix/postfix.pre-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -addgroup postfix 2>/dev/null -addgroup postdrop 2>/dev/null -adduser postfix -h /var/spool/postfix -G postfix,mail 2>/dev/null - -exit 0 diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD new file mode 100644 index 0000000000..f4ef1476ed --- /dev/null +++ b/testing/prosody/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=prosody +pkgver=0.4.2 +pkgrel=0 +pkgdesc="Lua based Jabber/XMPP server" +url="http://prosody.im/" +license="MIT" +depends="luasocket luaexpat" +makedepends="lua-dev libidn-dev openssl-dev" +install="prosody.pre-install prosody.post-install" +subpackages="" +source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz + $pkgname.cfg.lua + $pkgname.initd + $install + Makefile-0.4.2.patch + " + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch Makefile "$startdir/Makefile-0.4.2.patch" || return 1 + + ./configure --prefix=/usr \ + --sysconfdir=/etc/prosody \ + --with-lua=/usr/bin \ + --with-lua-lib=/usr/lib \ + --with-lua-include=/usr/include + + make || return 1 + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/var/log/prosody" || return 1 + install -d "$pkgdir/var/run/prosody" || return 1 + install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" + + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +md5sums="2669478311b3a67522669acdf03cf85c prosody-0.4.2.tar.gz +f42039e5a342fe62cd7e491546338aaa prosody.cfg.lua +c161a875295b45241229eb6db65211e8 prosody.initd +08484f183ba39233337d3fbc92cffadc prosody.pre-install +8202a40bf6de7cbacbaf76f2985aa220 prosody.post-install +684d033dac42399a245c061c9a374e1b Makefile-0.4.2.patch" diff --git a/testing/prosody/Makefile-0.4.2.patch b/testing/prosody/Makefile-0.4.2.patch new file mode 100644 index 0000000000..facfa2f94a --- /dev/null +++ b/testing/prosody/Makefile-0.4.2.patch @@ -0,0 +1,13 @@ +--- src/prosody-0.4.2/Makefile.org Thu Jun 4 13:44:20 2009 ++++ src/prosody-0.4.2/Makefile Thu Jun 4 13:44:11 2009 +@@ -19,8 +19,8 @@ + install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA) + install -d $(CONFIG)/certs + install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util +- install ./prosody.install $(BIN)/prosody +- install ./prosodyctl.install $(BIN)/prosodyctl ++ install -m755 ./prosody.install $(BIN)/prosody ++ install -m755 ./prosodyctl.install $(BIN)/prosodyctl + install -m644 core/* $(SOURCE)/core + install -m644 net/* $(SOURCE)/net + install -m644 util/* $(SOURCE)/util diff --git a/testing/prosody/prosody.cfg.lua b/testing/prosody/prosody.cfg.lua new file mode 100644 index 0000000000..99df66add6 --- /dev/null +++ b/testing/prosody/prosody.cfg.lua @@ -0,0 +1,107 @@ +-- Prosody Configuration File +-- +-- If it wasn't already obvious, -- starts a comment, and all text after it on +-- a line is ignored by Prosody. +-- +-- The config is split into sections, a global section, and one for each +-- defined host that we serve. You can add as many host sections as you like. +-- +-- Lists are written { "like", "this", "one" } +-- Lists can also be of { 1, 2, 3 } numbers, etc. +-- Either commas, or semi-colons; may be used as seperators. +-- +-- A table is a list of values, except each value has a name. An example would +-- be: +-- +-- logging = { type = "html", directory = "/var/logs", rotate = "daily" } +-- +-- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so +-- can +-- be placed anywhere +-- that you deem fitting. +-- +-- Tip: You can check that the syntax of this file is correct when you have +-- finished by running: luac -p prosody.cfg.lua +-- If there are any errors, it will let you know what and where they are, +-- otherwise it will keep quiet. +-- +-- Good luck, and happy Jabbering! + +-- Global settings go in this section +Host "*" + -- This is the list of modules Prosody will load on startup. + -- It looks for mod_modulename.lua in the plugins folder, so make sure that + -- exists too. + modules_enabled = { + -- Generally required + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended + -- if you want to log in. + "tls"; -- Add support for secure TLS on c2s/s2s connections + "dialback"; -- s2s dialback support + "disco"; -- Service discovery + + -- Not essential, but recommended + "private"; -- Private XML storage (for room bookmarks, etc.) + "vcard"; -- Allow users to set vCards + + -- Nice to have + "legacyauth"; -- Legacy authentication. Only used by some old + -- clients and bots. + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + + -- Required for daemonizing and logging + "posix"; -- POSIX functionality, sends server to background, + -- enables syslog, etc. + + -- Other specific functionality + "register"; -- Allow users to register on this server using a + -- client + --"console"; -- telnet to port 5582 (needs console_enabled = true) + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"httpserver"; -- Serve static files from a directory over HTTP + } + + -- These are the SSL/TLS-related settings. If you don't want to use + -- SSL/TLS, you may comment or remove this + --ssl = { + -- key = "/etc/prosody/certs/localhost.key"; + -- certificate = "/etc/prosody/certs/localhost.cert"; + --} + + log = { + -- Log all error messages to prosody.err + { levels = { min = "error" }, to = "file", timestamps = true, + filename = "/var/log/prosody/prosody.err" }; + -- Log everything of level "info" and higher (that is, all except + -- "debug" messages) to prosody.log + { levels = { min = "info" }, to = "file", timestamps = true, + filename = "/var/log/prosody/prosody.log" }; + } + + -- Required for proper daemonization support + pidfile = "/var/run/prosody/prosody.pid" + +-- This allows clients to connect to localhost. No harm in it. +Host "localhost" + +-- Section for example.com +-- (replace example.com with your domain name) +Host "example.com" + -- Assign this host a certificate for TLS, otherwise it would use the one + -- set in the global section (if any). + -- Note that old-style SSL on port 5223 only supports one certificate, and + -- will always use the global one. + --ssl = { + -- key = "/etc/prosody/certs/example.com.key"; + -- certificate = "/etc/prosody/certs/example.com.crt"; + --} + + enabled = false -- This will disable the host, preserving the config, but + -- denying connections + +-- Set up a MUC (multi-user chat) room server on conference.localhost: +Component "conference.localhost" "muc" diff --git a/testing/prosody/prosody.initd b/testing/prosody/prosody.initd new file mode 100644 index 0000000000..1c88672bce --- /dev/null +++ b/testing/prosody/prosody.initd @@ -0,0 +1,43 @@ +#!/sbin/runscript + +# Sample init.d file for alpine linux. + +NAME=prosody +DAEMON=/usr/bin/$NAME + +depend() { + need net +} + +start() { + ebegin "Starting ${NAME}" + /usr/bin/prosodyctl start +# start-stop-daemon --start --quiet --background \ +# --make-pidfile --pidfile /var/run/${NAME}/${NAME}.pid \ +# --chuid ${USER}:${GROUP} \ +# --exec ${DAEMON} -- ${OPTS} + eend $? +} + +stop() { + ebegin "Stopping ${NAME}" + /usr/bin/prosodyctl stop +# start-stop-daemon --stop --quiet \ +# --exec ${DAEMON} \ +# --pidfile /var/run/${NAME}/${NAME}.pid \ + eend $? +} + +reload() { + ebegin "Reloading ${NAME}" + if ! service_started "${NAME}" ; then + eend 1 "${NAME} is not started" + return 1 + fi + /usr/bin/prosodyctl stop + /usr/bin/prosodyctl start +# start-stop-daemon --stop --oknodo --signal HUP \ +# --exec ${DAEMON} --pidfile /var/run/${NAME}/${NAME}.pid + eend $? +} + diff --git a/testing/prosody/prosody.post-install b/testing/prosody/prosody.post-install new file mode 100644 index 0000000000..2f8f69cdd8 --- /dev/null +++ b/testing/prosody/prosody.post-install @@ -0,0 +1,6 @@ +#!/bin/sh + +chown prosody:prosody var/lib/prosody +chown prosody:prosody var/log/prosody +chown prosody:prosody var/run/prosody + diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install new file mode 100644 index 0000000000..db63efa179 --- /dev/null +++ b/testing/prosody/prosody.pre-install @@ -0,0 +1,9 @@ +#!/bin/sh + +user=prosody +home=/var/lib/prosody +adduser -h $home -s /bin/false -D $user 2>/dev/null +mkdir -p $home +chown $user:$user $home +exit 0 + diff --git a/unstable/ejabberd/APKBUILD b/unstable/ejabberd/APKBUILD new file mode 100644 index 0000000000..07064d7c6f --- /dev/null +++ b/unstable/ejabberd/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: +pkgname=ejabberd +pkgver=2.0.5 +pkgrel=0 +pkgdesc="The Erlang Jabber Daemon" +url="http://www.ejabberd.im/" +license="GPL" +depends="uclibc expat zlib libiconv erlang" +makedepends="expat-dev zlib-dev libiconv-dev erlang-dev" +install= +subpackages="$pkgname-doc $pkgname-dev" +source="http://www.process-one.net/downloads/ejabberd/$pkgver/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + 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="2d85b47df969daf0a78ed3b16562d731 ejabberd-2.0.5.tar.gz" diff --git a/unstable/erlang/APKBUILD b/unstable/erlang/APKBUILD new file mode 100644 index 0000000000..97a60746db --- /dev/null +++ b/unstable/erlang/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=erlang +pkgver=13A +pkgrel=0 +pkgdesc="Erlang programming language" +url="http://www.erlang.org/" +license="GPL" +depends="uclibc perl" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc $pkgname-dev" +source="http://www.erlang.org/download/otp_src_R$pkgver.tar.gz" + +build() { + cd "$srcdir/otp_src_R$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + 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="76804ff9c18710184cf0c0230a0443fc otp_src_R13A.tar.gz" diff --git a/unstable/haproxy/APKBUILD b/unstable/haproxy/APKBUILD new file mode 100644 index 0000000000..2f61f5642b --- /dev/null +++ b/unstable/haproxy/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=haproxy +pkgver=1.3.17 +pkgrel=0 +pkgdesc="A TCP/HTTP reverse proxy for high availability environments" +url="http://haproxy.1wt.eu" +license="GPL" +depends="uclibc" +makedepends="" +install= +subpackages="" +source="http://haproxy.1wt.eu/download/1.3/src/$pkgname-$pkgver.tar.gz + haproxy.initd" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make TARGET=linux26 || 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="423ad955828a2de1803410a4405696f2 haproxy-1.3.17.tar.gz +a7c6178dc4078fa233084ee36c8b440c haproxy.initd" diff --git a/unstable/kamailio/APKBUILD b/unstable/kamailio/APKBUILD new file mode 100644 index 0000000000..d4b566e1af --- /dev/null +++ b/unstable/kamailio/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +pkgname=kamailio +pkgver=1.5.1 +pkgrel=0 +pkgdesc="Open Source SIP Server" +url="http://www.kamailio.org/" +license="GPL" +depends="uclibc expat postgresql" +makedepends="bison flex coreutils expat-dev libpq" +install= +subpackages="$pkgname-doc" +source="http://www.kamailio.org/pub/kamailio/1.5.1/src/$pkgname-$pkgver-notls_src.tar.gz" + +build() { + cd "$srcdir/$pkgname-$pkgver-notls" + + make prefix=/usr || return 1 + make prefix=/usr basedir="$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="5dd6f66b155d9dde08ee0311439acc10 kamailio-1.5.1-notls_src.tar.gz" diff --git a/unstable/rrdcollect/APKBUILD b/unstable/rrdcollect/APKBUILD new file mode 100644 index 0000000000..cf4c623d08 --- /dev/null +++ b/unstable/rrdcollect/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=rrdcollect +pkgver=0.2.4 +pkgrel=0 +pkgdesc="Read system statistical data and feed it to RRDtool" +url="http://rrdcollect.sourceforge.net/" +license="GPL" +depends="uclibc libpcap rrdtool" +makedepends="libpcap-dev" +install= +subpackages="$pkgname-doc" +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 + make || return 1 + make DESTDIR="$pkgdir" install + +} + +md5sums="fd7ac95195e3e5cbab0677629505d9be rrdcollect-0.2.4.tar.gz" diff --git a/unstable/umix/APKBUILD b/unstable/umix/APKBUILD new file mode 100644 index 0000000000..1ed166b05a --- /dev/null +++ b/unstable/umix/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=umix +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Program for adjusting soundcard volumes" +url="http://umix.sf.net" +license="GPL" +depends="uclibc ncurses" +makedepends="ncurses-dev" +install= +subpackages="$pkgname-doc" +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 + make || return 1 + make DESTDIR="$pkgdir" install + +} + +md5sums="e38fc288273cc8b5b34f8769f06b32ee umix-1.0.2.tar.gz" diff --git a/x11/webkit/APKBUILD b/x11/webkit/APKBUILD index e0a8aa8092..774d3797b1 100644 --- a/x11/webkit/APKBUILD +++ b/x11/webkit/APKBUILD @@ -1,13 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkit -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" license="LGPL BSD" -depends="uclibc libsoup pango gtk+ libjpeg libpng libxml2 gperf icu cairo - atk gnutls sqlite libxslt libxt libiconv gettext zlib libgcrypt - libgpg-error expat libuuid enchant" +depends= makedepends=" libsoup-dev pango-dev gtk+-dev libjpeg-dev libpng-dev libxml2-dev gperf pkgconfig bison flex uclibc++-dev icu-dev cairo-dev atk-dev @@ -35,10 +33,10 @@ build() { gtklauncher() { pkgdesc="Application to test WebKit" - depends="webkit gtk+ glib" + depends="" install= install -Dm755 "$srcdir"/$pkgname-$pkgver/Programs/GtkLauncher \ "$subpkgdir"/usr/bin/GtkLauncher } -md5sums="f681773e29898509741cd3bc293816f4 webkit-1.1.7.tar.gz" +md5sums="0991b4f3c2ef0d09e8c5ac0737dfeba1 webkit-1.1.8.tar.gz" |