diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-23 09:35:03 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-23 09:49:39 +0000 |
commit | e3bf283ffc053f865f7d2bf607e5b518782fafb2 (patch) | |
tree | 2b2a0a0d8c69443ed8cff6386fd364459d7cb7af | |
parent | 52b1fb5af93e3781ff3a719e034fbe15e28162c5 (diff) | |
download | alpine_aports-e3bf283ffc053f865f7d2bf607e5b518782fafb2.tar.bz2 alpine_aports-e3bf283ffc053f865f7d2bf607e5b518782fafb2.tar.xz alpine_aports-e3bf283ffc053f865f7d2bf607e5b518782fafb2.zip |
main/perdition: rebuild against gdbm-1.10 and create user properly
-rw-r--r-- | main/perdition/APKBUILD | 17 | ||||
-rw-r--r-- | main/perdition/gdbm-version.patch | 26 | ||||
-rwxr-xr-x[-rw-r--r--] | main/perdition/perdition.initd | 15 | ||||
-rw-r--r-- | main/perdition/perdition.post-install | 4 | ||||
-rw-r--r-- | main/perdition/perdition.pre-install | 6 |
5 files changed, 56 insertions, 12 deletions
diff --git a/main/perdition/APKBUILD b/main/perdition/APKBUILD index 6d4ce2be78..470dc3ba91 100644 --- a/main/perdition/APKBUILD +++ b/main/perdition/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> | 1 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> |
2 | pkgname=perdition | 2 | pkgname=perdition |
3 | pkgver=1.18 | 3 | pkgver=1.18 |
4 | pkgrel=3 | 4 | pkgrel=4 |
5 | pkgdesc="A Mail retrieval proxy" | 5 | pkgdesc="A Mail retrieval proxy" |
6 | url="http://horms.net/projects/perdition/" | 6 | url="http://horms.net/projects/perdition/" |
7 | arch="all" | 7 | arch="all" |
@@ -10,15 +10,21 @@ depends= | |||
10 | depends_dev="gdbm-dev openssl-dev popt-dev vanessa_adt-dev vanessa_logger-dev | 10 | depends_dev="gdbm-dev openssl-dev popt-dev vanessa_adt-dev vanessa_logger-dev |
11 | vanessa_socket-dev" | 11 | vanessa_socket-dev" |
12 | makedepends="$depends_dev" | 12 | makedepends="$depends_dev" |
13 | install=$pkgname.post-install | 13 | install=$pkgname.pre-install |
14 | subpackages="$pkgname-doc" | 14 | subpackages="$pkgname-doc" |
15 | source="http://horms.net/projects/perdition/download/$pkgver/$pkgname-$pkgver.tar.bz2" | 15 | source="http://horms.net/projects/perdition/download/$pkgver/$pkgname-$pkgver.tar.bz2 |
16 | gdbm-version.patch" | ||
16 | 17 | ||
17 | 18 | ||
18 | _builddir="$srcdir"/$pkgname-$pkgver | 19 | _builddir="$srcdir"/$pkgname-$pkgver |
19 | 20 | ||
20 | prepare() { | 21 | prepare() { |
21 | cd "$_builddir" | 22 | cd "$_builddir" |
23 | for i in $source; do | ||
24 | case $i in | ||
25 | *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; | ||
26 | esac | ||
27 | done | ||
22 | return 0 | 28 | return 0 |
23 | } | 29 | } |
24 | 30 | ||
@@ -28,10 +34,10 @@ build() { | |||
28 | --sysconfdir=/etc \ | 34 | --sysconfdir=/etc \ |
29 | --mandir=/usr/share/man \ | 35 | --mandir=/usr/share/man \ |
30 | --infodir=/usr/share/info \ | 36 | --infodir=/usr/share/info \ |
37 | --enable-gdbm \ | ||
31 | --disable-libtool-lock \ | 38 | --disable-libtool-lock \ |
32 | --disable-mysql \ | 39 | --disable-mysql \ |
33 | --disable-odbc \ | 40 | --disable-odbc \ |
34 | --disable-db \ | ||
35 | --disable-pg \ | 41 | --disable-pg \ |
36 | --disable-cdb \ | 42 | --disable-cdb \ |
37 | --disable-nis \ | 43 | --disable-nis \ |
@@ -51,4 +57,5 @@ package() { | |||
51 | install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 57 | install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname |
52 | } | 58 | } |
53 | 59 | ||
54 | md5sums="df84d5fc4ab78b94a9baf17c5790ba38 perdition-1.18.tar.bz2" | 60 | md5sums="df84d5fc4ab78b94a9baf17c5790ba38 perdition-1.18.tar.bz2 |
61 | cfdd151cb92d2283151b8e48caf04337 gdbm-version.patch" | ||
diff --git a/main/perdition/gdbm-version.patch b/main/perdition/gdbm-version.patch new file mode 100644 index 0000000000..ae33fd92ae --- /dev/null +++ b/main/perdition/gdbm-version.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | gdbm.h has a conficting declaration of gdbm_version | ||
2 | |||
3 | diff --git a/makegdbm/options.h b/makegdbm/options.h | ||
4 | index 51597d1..9019af7 100644 | ||
5 | --- a/makegdbm/options.h | ||
6 | +++ b/makegdbm/options.h | ||
7 | @@ -39,7 +39,6 @@ | ||
8 | #endif | ||
9 | |||
10 | extern gdbm_error gdbm_errno; | ||
11 | -extern char *gdbm_version; | ||
12 | |||
13 | #define COPYRIGHT \ | ||
14 | "(c) 1999 Horms <horms@verge.net.au>\nReleased under the GNU GPL\n" | ||
15 | diff --git a/perdition/db/gdbm/perditiondb_gdbm.h b/perdition/db/gdbm/perditiondb_gdbm.h | ||
16 | index 4047025..c23a8db 100644 | ||
17 | --- a/perdition/db/gdbm/perditiondb_gdbm.h | ||
18 | +++ b/perdition/db/gdbm/perditiondb_gdbm.h | ||
19 | @@ -31,7 +31,6 @@ | ||
20 | #include <gdbm.h> | ||
21 | |||
22 | extern gdbm_error gdbm_errno; | ||
23 | -extern char *gdbm_version; | ||
24 | |||
25 | #ifndef PERDITIONDB_GDBM_SYSCONFDIR | ||
26 | #define PERDITIONDB_GDBM_SYSCONFDIR "/usr/local/etc/perdition" | ||
diff --git a/main/perdition/perdition.initd b/main/perdition/perdition.initd index 0242169c4b..397ed47751 100644..100755 --- a/main/perdition/perdition.initd +++ b/main/perdition/perdition.initd | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/sbin/runscript | 1 | #!/sbin/runscript |
2 | # Copyright 1999-2005 Gentoo Foundation | 2 | # Copyright 1999-2011 Gentoo Foundation |
3 | # Distributed under the terms of the GNU General Public License v2 | 3 | # Distributed under the terms of the GNU General Public License v2 |
4 | # $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/files/perdition.initd,v 1.2 2008/06/10 18:28:27 dertobi123 Exp $ | 4 | # $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/files/perdition.initd,v 1.3 2011/06/15 15:24:06 eras Exp $ |
5 | 5 | ||
6 | depend() { | 6 | depend() { |
7 | need net | 7 | need net |
@@ -16,7 +16,16 @@ check_key() { | |||
16 | fi | 16 | fi |
17 | } | 17 | } |
18 | 18 | ||
19 | checkconfig() { | ||
20 | # create PIDDIR (usually /var/run/perdition) if necessary | ||
21 | if [ ! -d "${PIDDIR:-/var/run/perdition}" ] ; then | ||
22 | checkpath -q -d -o ${PERDITION_USER:-perdition}:${PERDITION_USER:-perdition} \ | ||
23 | -m 0775 "${PIDDIR:-/var/run/perdition}" || return 1 | ||
24 | fi | ||
25 | } | ||
26 | |||
19 | start() { | 27 | start() { |
28 | checkconfig || return 1 | ||
20 | if [ "${POP3}" = "yes" ]; then | 29 | if [ "${POP3}" = "yes" ]; then |
21 | ebegin "Starting perdition services (POP3)" | 30 | ebegin "Starting perdition services (POP3)" |
22 | start-stop-daemon --quiet --start --startas /usr/sbin/perdition.pop3 -p ${PIDDIR}/pop3.pid \ | 31 | start-stop-daemon --quiet --start --startas /usr/sbin/perdition.pop3 -p ${PIDDIR}/pop3.pid \ |
@@ -70,7 +79,7 @@ stop() { | |||
70 | 79 | ||
71 | if [ "${IMAP4S}" = "yes" ]; then | 80 | if [ "${IMAP4S}" = "yes" ]; then |
72 | ebegin "Shutting down perdition services (IMAP4S)" | 81 | ebegin "Shutting down perdition services (IMAP4S)" |
73 | start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imap4s.pid | 82 | start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imaps.pid |
74 | eend $? | 83 | eend $? |
75 | fi | 84 | fi |
76 | } | 85 | } |
diff --git a/main/perdition/perdition.post-install b/main/perdition/perdition.post-install deleted file mode 100644 index b2820345e5..0000000000 --- a/main/perdition/perdition.post-install +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | adduser -h /var/run/perdition -s /bin/false -S -D perdition &>/dev/null | ||
4 | chown perdition /var/run/perdition | ||
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install new file mode 100644 index 0000000000..6396823f82 --- /dev/null +++ b/main/perdition/perdition.pre-install | |||
@@ -0,0 +1,6 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | addgroup -S perdition 2>/dev/null | ||
4 | adduser -h /var/run/perdition -s /bin/false -S -G perdition -D perdition 2>/dev/null | ||
5 | |||
6 | exit 0 | ||